diff --git a/_maps/configs/syndicate_cybersun_kansatsu.json b/_maps/configs/syndicate_cybersun_kansatsu.json
index dbafa1605120..8c8ce0e2e89a 100644
--- a/_maps/configs/syndicate_cybersun_kansatsu.json
+++ b/_maps/configs/syndicate_cybersun_kansatsu.json
@@ -8,15 +8,16 @@
 		"NATURAL_AGGRESSIVE"
 	],
 	"map_name": "Kansatsu-class Scout Courier",
-	"description": "The Kansatsu-class is a Cybersun remodel of the old Type-S SolGov Courier, rebuilt for rapid package ferrying and light surveillance operations in the Frontier. While fairly cramped, it excels at its design goals, with rapid surveys, scouting, and espionage flowing from its presence. Syndicate deployments typically include a deployment of 5, with a recommended max of 7. This is broken down into 1 captain, an intelligence officer for coordinating the field agents, an engineer, and 2 field agents. The simplicity of the hull has led to the ship becoming a widespread indicator of Syndicate interest in locations, and some models have found their way into private purchasers' hands.",
+	"description": "The Kansatsu-class Scout-Courier is a Cybersun Virtual Solutions retrofit of obsolete Scanmag-class Fast Couriers, a design dating back to the early 200s F.S. The ubiquity of the Scanmag-class has made them an easy purchase for Cybersun, who can retrofit, equip, and deploy the newly christened Kansatsu into the Frontier. The typical mission goal of a Kansatsu is reconnaissance of assets in a particular system. Their speed allows them to undertake a wide variety of ‘odd-jobs’, ranging from high speed pizza delivery (a favorite of certain cybersun officials), to orbital insertion of an operative. A standard crew is no less than 4 people, but depending on the mission - a Kansatsu can safely carry up to 7, although there’s no guarantee that it will be comfortable.",
 	"tags": [
 		"Specialist"
 	],
+	"starting_funds": 4000,
 	"map_short_name": "Kansatsu-class",
 	"map_path": "_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm",
 	"map_id": "cybersun_kansatsu",
 	"job_slots": {
-		"Commander": {
+		"Captain": {
 			"outfit": "/datum/outfit/job/syndicate/captain/cybersun",
 			"officer": true,
 			"slots": 1
@@ -26,14 +27,14 @@
 			"officer": true,
 			"slots": 1
 		},
-		"Engineer": {
-			"outfit": "/datum/outfit/job/syndicate/engineer/cybersun",
-			"slots": 1
-		},
 		"Field Agent": {
 			"outfit": "/datum/outfit/job/syndicate/miner/cybersun",
 			"slots": 2
 		},
+		"Engineer": {
+			"outfit": "/datum/outfit/job/syndicate/engineer/cybersun",
+			"slots": 1
+		},
 		"Junior Agent": {
 			"outfit": "/datum/outfit/job/syndicate/assistant/cybersun",
 			"slots": 2
diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
index b838a83b5c36..277552f8a5fb 100644
--- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
+++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
@@ -1,102 +1,145 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aa" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/machinery/door/airlock/hatch{
+	dir = 4;
+	name = "Observation Deck";
+	req_access_txt = "19"
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
-	dir = 1
+/obj/machinery/door/poddoor/shutters{
+	id = "kansatsu_lockdown";
+	dir = 4
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered,
-/turf/open/floor/plasteel/white,
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
 "ah" = (
-/obj/machinery/door/airlock/external,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning,
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{
-	dir = 1
+/obj/effect/turf_decal/industrial/warning{
+	dir = 2;
+	color = "#FFFFFF"
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/engineering)
-"aQ" = (
-/obj/effect/decal/cleanable/glass,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/white,
-/area/ship/engineering)
+/turf/open/floor/plasteel/mono/white,
+/area/ship/cargo)
+"aj" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor{
+	dir = 4;
+	id = "kansatsu_observation"
+	},
+/obj/machinery/door/firedoor/window,
+/obj/structure/cable/orange{
+	icon_state = "0-1"
+	},
+/turf/open/floor/plating,
+/area/ship/bridge)
+"aQ" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/storage)
 "aT" = (
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
-	dir = 10
+/obj/effect/turf_decal/siding/wood/end{
+	dir = 8;
+	color = "#E6D2BA"
 	},
-/obj/machinery/holopad/emergency/command,
-/turf/open/floor/plasteel/white,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/airlock/hatch{
+	dir = 4;
+	name = "Bridge";
+	req_access_txt = "19"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
 "aZ" = (
-/obj/structure/rack,
-/obj/item/reagent_containers/food/snacks/canned/beans,
-/obj/item/reagent_containers/food/snacks/canned/beans,
-/obj/item/reagent_containers/food/snacks/canned/beans,
-/obj/item/reagent_containers/food/snacks/canned/beans,
-/obj/item/reagent_containers/food/snacks/canned/beans,
-/obj/item/reagent_containers/food/snacks/canned/beans,
-/obj/item/reagent_containers/food/snacks/canned/beans,
-/obj/item/reagent_containers/food/snacks/canned/beans,
-/obj/item/reagent_containers/food/snacks/canned/beans,
-/obj/item/reagent_containers/food/snacks/canned/beans,
-/obj/item/reagent_containers/food/snacks/canned/beans,
-/obj/effect/turf_decal/box,
-/obj/machinery/firealarm/directional/west,
-/obj/item/reagent_containers/food/snacks/canned/peaches,
-/obj/item/reagent_containers/food/snacks/canned/peaches,
-/obj/item/reagent_containers/food/snacks/canned/peaches,
-/obj/item/reagent_containers/food/snacks/canned/peaches,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo)
+/obj/structure/table/chem,
+/obj/machinery/light/directional/east,
+/obj/machinery/cell_charger,
+/turf/open/floor/plasteel/patterned/grid{
+	color = "#777777"
+	},
+/area/ship/engineering)
 "bn" = (
-/obj/structure/sign/poster/retro/we_watch,
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/bridge)
-"bI" = (
-/obj/effect/decal/cleanable/oil,
-/obj/effect/decal/cleanable/glass,
+/obj/effect/turf_decal/trimline/opaque/syndiered/corner{
+	dir = 4
+	},
+/obj/structure/railing,
+/obj/machinery/camera{
+	dir = 8;
+	c_tag = "Engineering"
+	},
 /obj/machinery/autolathe,
-/obj/effect/turf_decal/industrial/warning/corner{
-	dir = 1
+/turf/open/floor/plasteel/white,
+/area/ship/engineering)
+"bI" = (
+/obj/machinery/power/smes/engineering,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 9;
+	color = "#FFFFFF"
 	},
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/plasteel/tech/grid,
+/obj/structure/cable/orange{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
 /area/ship/engineering)
 "bO" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
+"cd" = (
+/obj/machinery/door/poddoor{
+	dir = 2;
+	id = "kansatsu_cargo"
+	},
+/obj/machinery/door/firedoor/heavy,
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "kansatsu_holo"
+	},
+/obj/structure/cable/orange{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
 "co" = (
-/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{
-	dir = 1
+/obj/structure/extinguisher_cabinet/directional/west{
+	pixel_y = -8
 	},
-/obj/item/storage/firstaid/medical,
-/obj/item/storage/firstaid/regular,
-/obj/item/storage/firstaid/regular,
-/obj/structure/closet/wall/white/directional/south{
-	name = "Medical Supplies"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/obj/machinery/firealarm/directional/west{
+	pixel_y = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/trimline/opaque/syndiered/corner{
+	dir = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "cu" = (
-/obj/machinery/door/airlock/external,
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning,
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{
-	dir = 1
-	},
 /obj/docking_port/mobile{
 	callTime = 250;
 	dir = 2;
@@ -105,254 +148,357 @@
 	port_direction = 8;
 	preferred_direction = 4
 	},
-/obj/effect/mapping_helpers/airlock/locked,
-/turf/open/floor/plasteel/white,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/engineering)
 "cw" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+	dir = 8
+	},
+/obj/structure/chair/handrail,
+/obj/machinery/firealarm/directional/north{
+	pixel_x = 6
+	},
+/obj/structure/extinguisher_cabinet/directional/north{
+	pixel_x = -6
+	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/corner{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/structure/closet/crate{
+	name = "office supplies crate"
+	},
+/obj/item/tape/random,
+/obj/item/tape/random,
+/obj/item/tape/random,
+/obj/item/tape/random,
+/obj/item/camera_film,
+/obj/item/camera_film,
+/obj/item/camera_film,
+/obj/item/camera_film,
+/obj/item/toner/extreme,
+/obj/item/toner/extreme,
+/turf/open/floor/plasteel/mono/white,
 /area/ship/cargo)
 "cL" = (
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 4
+	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/structure/cable{
+/obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/trimline/opaque/bar/filled/warning{
-	dir = 4
-	},
-/obj/machinery/light_switch{
-	pixel_y = 22
-	},
 /turf/open/floor/plasteel/white,
 /area/ship/engineering)
 "cZ" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/cargo)
 "df" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/structure/cable/orange{
+	icon_state = "1-8"
 	},
-/obj/effect/turf_decal/trimline/opaque/bar/filled/warning,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/effect/turf_decal/trimline/opaque/syndiered/corner,
+/obj/machinery/light/directional/south,
 /turf/open/floor/plasteel/white,
-/area/ship/hallway/central)
+/area/ship/crew)
 "dj" = (
-/obj/item/toy/cards/deck,
-/obj/machinery/light/small/broken/directional/north,
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 5
+	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
 	},
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer2{
+/obj/machinery/camera{
+	dir = 6;
+	c_tag = "Airlock - Internal"
+	},
+/obj/machinery/light/dim/directional/east,
+/obj/machinery/advanced_airlock_controller{
+	pixel_y = 24
+	},
+/obj/structure/chair/handrail{
 	dir = 8
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "dq" = (
-/obj/structure/window/reinforced/spawner/north,
-/obj/effect/turf_decal/box,
-/obj/structure/closet/crate{
-	name = "communications gear"
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
-/obj/item/modular_computer/tablet/preset/advanced,
-/obj/item/modular_computer/tablet/preset/advanced,
-/obj/item/modular_computer/tablet/preset/advanced,
-/obj/item/modular_computer/tablet/preset/advanced,
-/obj/item/paper{
-	default_raw_text = "Congratulations on your purchase of Cybersun G-1010 Long Range Communication Tables (Chat client installed seperately)"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/airlock/hatch{
+	name = "Cargo Bay"
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "dx" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/sillycup/smallcarton{
+	pixel_x = -7;
+	list_reagents = list(/datum/reagent/consumable/tomatojuice = 15)
+	},
+/obj/item/reagent_containers/food/drinks/dry_ramen{
+	pixel_x = 7;
+	list_reagents = null
 	},
-/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{
+/turf/open/floor/plasteel/tech,
+/area/ship/crew)
+"dA" = (
+/obj/effect/turf_decal/trimline/opaque/syndiered/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/corner{
 	dir = 4
 	},
-/obj/structure/sign/poster/contraband/robustmore_drinkfoods{
-	pixel_y = -32
+/obj/item/kirbyplants/fullysynthetic{
+	pixel_y = 20
 	},
-/turf/open/floor/plasteel/dark,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable/orange{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/crew)
-"dA" = (
-/obj/machinery/door/airlock/command{
-	dir = 4;
-	name = "Bridge"
+"dZ" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/food/drinks/bottle/wine{
+	pixel_y = 7;
+	pixel_x = -6
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 4;
-	id = "intelfucky"
+/obj/machinery/airalarm/directional/south,
+/obj/item/paper_bin{
+	pixel_y = 4;
+	pixel_x = 6
 	},
+/obj/item/pen/fourcolor,
+/obj/item/stamp/chameleon{
+	pixel_x = -15
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"ej" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/structure/cable{
+/obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{
+/obj/effect/turf_decal/trimline/opaque/syndiered/corner{
 	dir = 8
 	},
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+/obj/structure/chair/handrail{
+	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
+/turf/open/floor/plasteel/white,
+/area/ship/crew)
+"eu" = (
+/obj/structure/closet/crate/medical,
+/obj/item/storage/box/bodybags,
+/obj/item/clothing/gloves/color/latex/nitrile/evil,
+/obj/item/storage/pill_bottle/charcoal,
+/obj/item/storage/firstaid/regular,
+/obj/item/roller,
+/obj/item/reagent_containers/hypospray/medipen/morphine,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"dZ" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "intelwindow"
+/obj/structure/cable/orange{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plating,
-/area/ship/crew/office)
-"ej" = (
+/turf/open/floor/plasteel/mono/white,
+/area/ship/cargo)
+"ev" = (
+/obj/machinery/door/firedoor/border_only,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/trimline/opaque/bar/filled/corner{
-	dir = 8
-	},
-/obj/machinery/light/small/directional/east,
-/obj/effect/turf_decal/spline/fancy/transparent/grey{
-	dir = 4
+/obj/structure/cable/orange{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/central)
-"eu" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -19;
+	pixel_y = 5
 	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo)
-"ev" = (
-/obj/machinery/door/window{
-	dir = 1
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"eL" = (
+/obj/machinery/door/poddoor{
+	dir = 2;
+	id = "kansatsu_cargo"
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/door/firedoor/heavy,
+/obj/structure/cable/orange{
+	icon_state = "1-4"
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/structure/cable/orange{
+	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel/stairs,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "fk" = (
-/obj/machinery/computer/cargo{
-	dir = 8
+/obj/machinery/button/door{
+	id = "kansatsu_observation";
+	name = "Observation Windows";
+	dir = 2;
+	pixel_y = 20;
+	pixel_x = 6;
+	req_access_txt = "19"
 	},
 /obj/machinery/button/door{
-	dir = 1;
-	id = "intelfucky";
-	name = "Privacy Lock";
-	pixel_x = -7;
-	pixel_y = -23
+	id = "kansatsu_lockdown";
+	name = "Observation Lockdown";
+	dir = 2;
+	pixel_y = 20;
+	pixel_x = -6;
+	req_access_txt = "19"
 	},
-/obj/effect/turf_decal/industrial/outline/red,
-/obj/machinery/light/directional/east,
-/turf/open/floor/plasteel/tech/grid,
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/bridge)
-"gj" = (
-/obj/item/toy/plush/spider,
-/obj/structure/closet/emcloset/anchored,
-/obj/item/clothing/head/papersack,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+"fC" = (
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/effect/turf_decal/trimline/opaque/syndiered/line,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/engineering)
-"gP" = (
-/obj/machinery/door/poddoor{
-	id = "scbay"
+/obj/structure/cable/orange{
+	icon_state = "4-8"
 	},
-/obj/structure/cable,
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 4;
-	id = "scholo"
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/white,
+/area/ship/crew)
+"gj" = (
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/effect/turf_decal/corner/opaque/syndiered{
+	dir = 5
 	},
-/turf/open/floor/plating,
+/obj/structure/closet/crate/secure/science{
+	req_access_txt = "19";
+	anchored = 1
+	},
+/obj/item/storage/box/syndie_kit/kansatsu/chameleon,
+/obj/item/storage/box/syndie_kit/kansatsu/chameleon,
+/obj/item/storage/box/syndie_kit/kansatsu/pens,
+/obj/item/storage/box/syndie_kit/kansatsu/pens,
+/obj/item/storage/box/syndie_kit/kansatsu/tracking_beacons,
+/turf/open/floor/plasteel/patterned/grid{
+	color = "#777777"
+	},
+/area/ship/storage)
+"gP" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 2;
+	color = "#FFFFFF"
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+	dir = 8
+	},
+/obj/structure/closet/crate/internals,
+/obj/item/tank/internals/oxygen/red,
+/obj/item/tank/internals/oxygen/red,
+/obj/item/tank/internals/oxygen/red,
+/obj/item/tank/internals/oxygen/red,
+/obj/item/tank/internals/oxygen/red,
+/obj/item/tank/internals/oxygen/red,
+/turf/open/floor/plasteel/mono/white,
 /area/ship/cargo)
 "hr" = (
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1;
+	color = "#555555"
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/structure/closet/firecloset/wall/directional/east,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/mono/white,
 /area/ship/engineering)
 "hT" = (
-/obj/structure/curtain/cloth,
 /obj/machinery/shower{
 	pixel_y = 16
 	},
-/obj/structure/mirror{
-	pixel_x = -28
-	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/crew/dorm)
-"ii" = (
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/structure/catwalk/over/plated_catwalk/white,
+/obj/structure/curtain,
+/obj/item/soap/syndie,
+/obj/machinery/light/small/directional/south,
+/obj/machinery/camera{
+	dir = 4;
+	c_tag = "Bathroom";
+	layer = 3.39
 	},
-/obj/structure/cable{
-	icon_state = "0-8"
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew)
+"if" = (
+/obj/effect/turf_decal/box/white,
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/syndicate/black,
+/obj/item/clothing/head/helmet/space/syndicate/black,
+/obj/item/clothing/mask/gas/syndicate,
+/obj/item/tank/jetpack/oxygen/harness,
+/obj/machinery/button/shieldwallgen{
+	dir = 1;
+	id = "kansatsu_holo";
+	pixel_x = -10;
+	pixel_y = -19
 	},
-/obj/effect/decal/cleanable/oil,
-/obj/effect/turf_decal/spline/fancy/transparent/grey{
-	dir = 6
+/obj/structure/sign/poster/contraband/cybersun_borg{
+	pixel_x = 32
 	},
-/obj/structure/extinguisher_cabinet/directional/south,
-/turf/open/floor/plating,
-/area/ship/engineering)
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
 "im" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1;
+	color = "#FFFFFF"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
+/obj/structure/cable/orange{
+	icon_state = "1-8"
+	},
+/obj/structure/cable/orange{
+	icon_state = "6-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
 "in" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{
-	dir = 8
-	},
-/obj/machinery/camera/autoname{
-	dir = 8
+/obj/structure/table/chem{
+	name = "kitchen counter"
 	},
-/obj/machinery/light_switch{
-	pixel_y = 23;
-	pixel_x = -12
+/obj/machinery/microwave{
+	pixel_y = 6
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
@@ -360,175 +506,212 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+/obj/effect/turf_decal/isf_small{
+	color = "#000000";
+	dir = 4
 	},
-/obj/structure/cable{
+/obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{
-	dir = 8
-	},
-/obj/machinery/door/firedoor/border_only{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/engineering)
 "iN" = (
-/obj/effect/turf_decal/industrial/stand_clear{
-	dir = 1
+/obj/structure/closet/crate/science,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
 	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/item/modular_computer/tablet/preset/advanced{
+	device_theme = "syndicate"
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/item/modular_computer/tablet/preset/advanced{
+	device_theme = "syndicate"
 	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo)
-"iY" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
+/obj/item/modular_computer/tablet/preset/advanced{
+	device_theme = "syndicate"
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/item/modular_computer/tablet/preset/advanced{
+	device_theme = "syndicate"
 	},
-/obj/machinery/light/small/directional/south,
-/obj/effect/turf_decal/spline/fancy/transparent/grey,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"jj" = (
-/turf/closed/wall/mineral/plastitanium,
+/obj/item/modular_computer/tablet/preset/advanced{
+	device_theme = "syndicate"
+	},
+/obj/item/modular_computer/tablet/preset/advanced{
+	device_theme = "syndicate"
+	},
+/obj/item/disk/holodisk/kansatsu/gear/tablets,
+/turf/open/floor/plasteel/mono/white,
 /area/ship/cargo)
+"jj" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/syndicate/black/engie,
+/obj/item/clothing/head/helmet/space/syndicate/black/engie,
+/obj/item/clothing/mask/gas/syndicate,
+/obj/item/clothing/shoes/magboots/syndie,
+/turf/open/floor/plasteel/patterned/grid{
+	color = "#777777"
+	},
+/area/ship/engineering)
 "jH" = (
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/machinery/power/terminal{
+	dir = 8
 	},
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
+/obj/structure/cable/orange{
+	icon_state = "0-4"
 	},
-/obj/item/storage/secure/safe/intel/stechkin{
-	pixel_x = -30;
-	dir = 8
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8;
+	color = "#555555"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/office)
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/white,
+/area/ship/engineering)
 "jW" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 8
 	},
-/obj/effect/turf_decal/trimline/opaque/bar/filled/corner,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/effect/turf_decal/trimline/opaque/bar/filled/warning{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/white,
-/area/ship/hallway/central)
+/area/ship/crew)
 "kb" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/structure/table/wood,
-/turf/open/floor/carpet/red,
+/turf/open/floor/plasteel/dark,
 /area/ship/crew)
+"kd" = (
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom/table{
+	dir = 4;
+	pixel_x = 6;
+	pixel_y = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/line,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
 "km" = (
-/obj/machinery/light/small/directional/west,
-/obj/structure/table,
-/obj/item/chair/plastic,
-/obj/item/chair/plastic{
-	pixel_y = 8
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8;
+	color = "#FFFFFF"
 	},
-/obj/item/chair/plastic{
-	pixel_y = 16
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/structure/cable/white{
+	icon_state = "0-2"
 	},
-/obj/item/stack/sheet/mineral/wood{
-	amount = 3
+/obj/structure/closet/secure_closet/wall/directional/west{
+	icon_state = "cargo_wall";
+	name = "fuel storage";
+	req_one_access = list(11, 19)
 	},
-/obj/item/stack/sheet/metal/ten,
-/obj/item/stack/sheet/metal/ten,
-/obj/item/stack/sheet/glass/five,
-/obj/item/stack/sheet/glass/five,
+/obj/item/stack/sheet/mineral/diamond/five,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "kL" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/airlock/glass{
-	name = "Crew Quarters"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning,
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
+/obj/structure/chair/bench/red/directional/west,
+/obj/structure/railing,
 /obj/machinery/door/firedoor/border_only,
 /turf/open/floor/plasteel/tech,
 /area/ship/crew)
 "kM" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/crew)
-"lJ" = (
-/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{
-	dir = 4
+"lh" = (
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 1
 	},
+/obj/machinery/computer/cryopod/directional/north,
 /turf/open/floor/plasteel/dark,
-/area/ship/crew)
+/area/ship/crew/dorm)
+"lJ" = (
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+	dir = 10
+	},
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable/orange,
+/obj/structure/closet/secure_closet{
+	anchored = 1;
+	icon_state = "tac";
+	name = "Captain's Locker";
+	req_access_txt = "20"
+	},
+/obj/item/storage/backpack/messenger/sec,
+/obj/item/storage/backpack/security,
+/obj/item/clothing/shoes/jackboots{
+	pixel_y = -7
+	},
+/obj/item/clothing/under/syndicate/cybersun/officer,
+/obj/item/clothing/suit/armor/vest/capcarapace/cybersun,
+/obj/item/clothing/gloves/combat,
+/obj/item/clothing/mask/gas/syndicate,
+/obj/item/clothing/head/HoS/cybersun,
+/obj/item/pen/edagger,
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/bridge)
 "lP" = (
-/obj/effect/turf_decal/box,
-/obj/machinery/light/directional/east,
-/obj/machinery/atmospherics/components/unary/tank/air{
+/obj/structure/chair/office/light{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning{
 	dir = 8;
-	piping_layer = 2
+	color = "#FFFFFF"
 	},
-/obj/effect/turf_decal/spline/fancy/transparent/grey{
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
 	dir = 4
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/patterned/grid{
+	color = "#777777"
+	},
 /area/ship/engineering)
 "lZ" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew/office)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/crew)
 "mD" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/trimline/opaque/syndiered/corner{
+	dir = 8
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "thefunny"
+/obj/machinery/light_switch{
+	pixel_y = -19;
+	dir = 1;
+	pixel_x = -8
 	},
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/machinery/door/airlock/grunge{
-	name = "Office"
+/obj/structure/cable/orange{
+	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/white,
-/area/ship/crew/office)
+/area/ship/crew)
 "ni" = (
 /obj/machinery/power/shuttle/engine/electric{
 	dir = 4
@@ -538,1505 +721,2194 @@
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
+"nq" = (
+/obj/machinery/camera{
+	dir = 10;
+	c_tag = "Airlock - External"
+	},
+/obj/effect/turf_decal/corner_techfloor_grid{
+	dir = 6
+	},
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
 "nu" = (
-/obj/structure/sign/departments/engineering,
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/engineering)
-"nA" = (
-/obj/item/paper_bin,
-/obj/structure/table/glass,
-/obj/effect/turf_decal/corner/opaque/syndiered/border{
+/obj/effect/turf_decal/isf_small/right{
+	color = "#000000";
 	dir = 4
 	},
-/obj/item/storage/box/rxglasses/spyglasskit,
-/obj/item/melee/knife/letter_opener,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/office)
-"nF" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/structure/cable/orange{
+	icon_state = "0-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/light_switch{
+	pixel_x = 12;
+	pixel_y = 19
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/turf/open/floor/plasteel/white,
+/area/ship/engineering)
+"nA" = (
+/obj/structure/cable/orange{
+	icon_state = "1-8"
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered,
-/obj/effect/turf_decal/trimline/opaque/bar/filled/warning{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
 	},
-/obj/machinery/light_switch{
-	pixel_y = 22
+/turf/open/floor/carpet/nanoweave,
+/area/ship/crew/dorm)
+"nF" = (
+/obj/docking_port/stationary{
+	dwidth = 7;
+	width = 30;
+	height = 15;
+	dir = 2
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/central)
+/turf/template_noop,
+/area/template_noop)
 "nO" = (
-/obj/machinery/atmospherics/components/unary/passive_vent/layer4{
-	dir = 1
+/obj/machinery/camera{
+	dir = 5;
+	c_tag = "Exterior - Aft-Starboard"
 	},
-/obj/effect/turf_decal/box/red,
-/obj/machinery/camera,
-/turf/open/floor/plating,
-/area/ship/external)
+/obj/machinery/porta_turret/ship/syndicate/weak{
+	dir = 6;
+	pixel_y = 12;
+	pixel_x = -8;
+	desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent.";
+	id = "kansatsu_grid"
+	},
+/obj/effect/turf_decal/corner_techfloor_grid{
+	dir = 5
+	},
+/turf/open/floor/plating/airless,
+/area/ship/engineering)
+"oC" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/obj/item/radio/intercom/directional/south,
+/obj/structure/cable/orange{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/crew)
 "oN" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/door/airlock{
-	name = "Cryopod Room"
+/obj/structure/railing,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/holopad/secure,
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+	dir = 8
 	},
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{
+/obj/effect/turf_decal/trimline/opaque/syndiered,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew)
+"oW" = (
+/obj/structure/chair/office{
 	dir = 1
 	},
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning,
-/obj/machinery/door/firedoor/border_only{
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"pa" = (
+/obj/structure/dresser{
 	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/spawner/random/entertainment/plushie/moth{
+	pixel_y = 11
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/carpet/nanoweave,
 /area/ship/crew/dorm)
-"pa" = (
-/obj/machinery/fax/syndicate,
-/obj/item/toy/figure/detective{
-	name = "Intel Buddy";
-	pixel_x = 5;
-	pixel_y = 10;
-	toysay = "Let's see what Command thinks of this..."
+"pE" = (
+/obj/effect/turf_decal/corner_techfloor_grid{
+	dir = 5
 	},
-/obj/structure/table/glass,
-/obj/effect/turf_decal/corner/opaque/syndiered/border{
-	dir = 4
+/obj/machinery/porta_turret/ship/syndicate/weak{
+	dir = 6;
+	pixel_y = 12;
+	pixel_x = -8;
+	desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent.";
+	id = "kansatsu_grid"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/office)
+/obj/machinery/camera{
+	dir = 5;
+	c_tag = "Exterior - Starboard"
+	},
+/turf/open/floor/plating/airless,
+/area/ship/crew/dorm)
 "pM" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/crew/office)
-"qa" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
+/obj/effect/turf_decal/trimline/opaque/syndiered/corner,
+/obj/structure/extinguisher_cabinet/directional/south{
+	pixel_x = 7
+	},
+/obj/machinery/firealarm/directional/south{
+	pixel_x = -5
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/crew)
+"pY" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8;
+	color = "#555555"
+	},
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable/orange{
+	icon_state = "0-4"
 	},
 /obj/structure/reagent_dispensers/fueltank,
-/obj/effect/turf_decal/box,
-/obj/effect/turf_decal/spline/fancy/transparent/grey{
-	dir = 6
+/turf/open/floor/plasteel/white,
+/area/ship/engineering)
+"qa" = (
+/obj/structure/closet/secure_closet/wall/directional/south{
+	name = "Engineer's Locker";
+	icon_state = "sec_wall";
+	req_one_access = list(11, 19)
+	},
+/obj/item/storage/backpack/security,
+/obj/item/storage/backpack/messenger/sec,
+/obj/item/clothing/shoes/jackboots{
+	pixel_y = -7
+	},
+/obj/item/clothing/under/syndicate/gec,
+/obj/item/clothing/under/syndicate/cybersun/research,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/head/soft/cybersun,
+/obj/item/storage/belt/utility/full/engi,
+/obj/item/clothing/glasses/meson/engine,
+/obj/item/clothing/glasses/welding,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8;
+	color = "#FFFFFF"
+	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/grid{
+	color = "#777777"
 	},
-/turf/open/floor/plating,
 /area/ship/engineering)
 "qf" = (
-/obj/machinery/door/poddoor{
-	id = "scbay"
+/obj/effect/turf_decal/industrial/warning{
+	dir = 2;
+	color = "#FFFFFF"
 	},
-/obj/structure/cable,
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 8;
-	id = "scholo"
+/obj/structure/cable/orange{
+	icon_state = "1-2"
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/structure/closet/crate{
+	name = "custodial crate"
 	},
-/turf/open/floor/plating,
+/obj/item/mop,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/pushbroom,
+/obj/item/storage/bag/trash,
+/turf/open/floor/plasteel/mono/white,
 /area/ship/cargo)
 "ql" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/effect/turf_decal/trimline/opaque/syndiered/corner{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/sign/warning/securearea{
-	pixel_y = 32
-	},
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
-	dir = 1
+/obj/machinery/button/door{
+	id = "kansatsu_bathroom";
+	name = "Door Lockdown Override";
+	dir = 2;
+	pixel_y = 20;
+	pixel_x = 7;
+	normaldoorcontrol = 1;
+	specialfunctions = 4;
+	req_access_txt = "19"
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered,
-/obj/machinery/light/small/directional/south,
 /turf/open/floor/plasteel/white,
-/area/ship/hallway/central)
+/area/ship/crew)
 "qo" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/dorm)
+"qv" = (
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
+	},
 /obj/structure/cable{
-	icon_state = "1-8"
+	icon_state = "0-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+/obj/machinery/door/poddoor{
+	dir = 8;
+	id = "kansatsu_engine"
 	},
-/obj/structure/sign/poster/official/here_for_your_safety{
-	pixel_x = 28
+/obj/structure/window/plasma/reinforced{
+	dir = 8
 	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/engineering)
+"qz" = (
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 1
+	},
+/obj/structure/chair/handrail,
 /turf/open/floor/plasteel/white,
-/area/ship/crew/office)
-"qv" = (
-/obj/machinery/power/smes/shuttle/precharged{
+/area/ship/crew)
+"qA" = (
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"qJ" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
 	dir = 4
 	},
-/obj/structure/window/reinforced{
-	dir = 8
+/obj/effect/turf_decal/corner_techfloor_grid{
+	dir = 6
 	},
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
+"qM" = (
+/obj/structure/table/glass,
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
 	dir = 4
 	},
-/obj/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/effect/turf_decal/corner/opaque/syndiered{
+	dir = 10
 	},
-/obj/item/clothing/mask/fakemoustache,
-/obj/machinery/door/poddoor/shutters{
-	dir = 4;
-	id = "scengine"
+/obj/item/paper_bin{
+	pixel_y = 4;
+	pixel_x = 8
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"qz" = (
-/obj/structure/window/reinforced{
-	dir = 4
+/obj/item/flashlight/lamp{
+	pixel_x = -7;
+	pixel_y = 2
 	},
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/syndicate/black/red,
-/obj/item/clothing/head/helmet/space/syndicate/black/red,
-/obj/item/tank/jetpack/oxygen/harness,
-/obj/machinery/light/small/directional/north,
-/obj/item/clothing/mask/gas/syndicate,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/hallway/central)
-"qA" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/crew/dorm)
+/obj/item/pen/fourcolor,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/patterned/grid{
+	color = "#777777"
+	},
+/area/ship/storage)
 "qR" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/door/airlock/hatch{
+	name = "Dormitory"
 	},
-/obj/machinery/light/small/directional/north,
-/obj/effect/turf_decal/corner/opaque/syndiered/border{
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/dorm)
+"qS" = (
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/effect/turf_decal/trimline/opaque/syndiered/line,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/door/window{
-	dir = 4
-	},
-/obj/machinery/light_switch{
-	pixel_y = 22;
-	pixel_x = -11
+/obj/structure/cable/orange{
+	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/office)
-"qS" = (
-/obj/effect/turf_decal/trimline/opaque/bar/filled/warning,
-/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/radio/intercom/directional/south,
 /turf/open/floor/plasteel/white,
-/area/ship/hallway/central)
+/area/ship/crew)
 "re" = (
-/obj/docking_port/stationary{
-	dwidth = 3;
-	width = 7;
-	height = 15;
-	dir = 2
+/obj/machinery/door/poddoor{
+	dir = 2;
+	id = "kansatsu_cargo"
 	},
-/turf/template_noop,
-/area/template_noop)
-"rh" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/door/firedoor/heavy,
+/obj/structure/cable/orange{
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"rj" = (
-/obj/structure/cable{
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"rh" = (
+/obj/structure/cable/orange{
 	icon_state = "1-2"
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 8
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
+/obj/structure/cable/orange{
+	icon_state = "2-4"
 	},
-/obj/effect/turf_decal/trimline/opaque/bar/filled/warning{
+/obj/structure/catwalk/over/plated_catwalk/white,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"rj" = (
+/obj/effect/turf_decal/corner/opaque/white/half{
 	dir = 1
 	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/plasteel/white,
-/area/ship/hallway/central)
+/area/ship/crew)
 "ru" = (
-/turf/closed/wall/mineral/plastitanium,
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/oil/streak,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/white,
 /area/ship/engineering)
 "rF" = (
-/obj/machinery/button/door{
-	dir = 8;
-	id = "scengine";
-	name = "Engine Blast Shutters";
-	pixel_x = -8
+/obj/effect/turf_decal/isf_small/left{
+	color = "#000000";
+	dir = 4
 	},
-/turf/closed/wall/mineral/plastitanium,
+/turf/open/floor/plasteel/white,
 /area/ship/engineering)
 "rR" = (
-/obj/structure/table,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"so" = (
+/obj/structure/sink/kitchen{
+	pixel_y = 16;
+	layer = 3.09;
+	name = "large sink"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 4
 	},
-/obj/item/stack/sheet/mineral/plasma/twenty{
-	pixel_x = 5;
-	pixel_y = 6
+/obj/effect/turf_decal/industrial/warning{
+	dir = 9;
+	color = "#FFFFFF"
+	},
+/turf/open/floor/plasteel/patterned/grid{
+	color = "#777777"
 	},
-/obj/item/wrench,
-/turf/open/floor/plating,
 /area/ship/engineering)
-"so" = (
-/obj/effect/decal/cleanable/oil/streak,
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/turf_decal/box,
-/obj/effect/turf_decal/spline/fancy/transparent/grey{
-	dir = 5
+"sF" = (
+/obj/structure/table/glass,
+/obj/effect/turf_decal/corner/opaque/syndiered{
+	dir = 10
 	},
-/obj/structure/sign/poster/contraband/smoke{
-	pixel_x = 32
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = 10
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
+/obj/item/clipboard{
+	pixel_x = -5;
+	pixel_y = 3
+	},
+/obj/machinery/camera{
+	dir = 1;
+	c_tag = "Secure Storage"
+	},
+/obj/item/reagent_containers/food/drinks/mug{
+	pixel_y = 10;
+	pixel_x = 9;
+	list_reagents = list(/datum/reagent/consumable/icecoffee = 30)
+	},
+/obj/item/stamp/cybersun{
+	pixel_x = 9;
+	pixel_y = 0
+	},
+/obj/machinery/firealarm/directional/south,
+/obj/machinery/button/door{
+	id = "kansatsu_secure_storage";
+	name = "Window Access";
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = 1;
+	req_access_txt = "19"
+	},
+/turf/open/floor/plasteel/patterned/grid{
+	color = "#777777"
+	},
+/area/ship/storage)
 "sR" = (
-/obj/structure/chair/office{
+/obj/structure/closet/wall/directional/north{
+	name = "Agent Wardrobe"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/obj/item/storage/backpack/satchel,
+/obj/item/storage/backpack/satchel,
+/obj/item/clothing/shoes/jackboots{
+	pixel_y = -7
+	},
+/obj/item/clothing/shoes/jackboots{
+	pixel_y = -7
+	},
+/obj/item/clothing/under/syndicate/cybersun,
+/obj/item/clothing/under/syndicate/cybersun,
+/obj/item/clothing/gloves/color/black,
+/obj/item/clothing/gloves/color/black,
+/obj/item/clothing/head/soft/cybersun,
+/obj/item/clothing/head/soft/cybersun,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/crew/dorm)
+"sZ" = (
+/obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/corner/opaque/syndiered{
+	dir = 5
+	},
+/obj/structure/closet/secure_closet/wall/directional/north{
+	name = "Intelligence Officer's Locker";
+	icon_state = "sec_wall";
+	req_access_txt = "19"
+	},
+/obj/item/storage/backpack/messenger/sec,
+/obj/item/storage/backpack/security,
+/obj/item/clothing/shoes/jackboots{
+	pixel_y = -7
+	},
+/obj/item/clothing/under/syndicate/cybersun/officer,
+/obj/item/clothing/suit/cybersun_suit,
+/obj/item/clothing/gloves/combat,
+/obj/item/clothing/mask/gas/syndicate,
+/obj/item/clothing/glasses/sunglasses,
+/obj/item/clothing/head/HoS/cybersun,
+/obj/item/pen/edagger,
+/turf/open/floor/plasteel/patterned/grid{
+	color = "#777777"
+	},
+/area/ship/storage)
+"th" = (
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/bridge)
+"tk" = (
+/obj/effect/turf_decal/trimline/opaque/syndiered/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/white/half{
 	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 8
 	},
-/obj/machinery/firealarm/directional/east,
-/obj/structure/sign/poster/contraband/stechkin{
-	pixel_y = -32
+/obj/item/kirbyplants/fullysynthetic{
+	pixel_y = 20;
+	pixel_x = 6
+	},
+/obj/structure/sign/warning/electricshock{
+	pixel_y = 24;
+	pixel_x = -8
 	},
 /turf/open/floor/plasteel/white,
-/area/ship/crew/office)
-"tk" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
-	icon_state = "0-2"
+/area/ship/crew)
+"tm" = (
+/obj/machinery/firealarm/directional/east{
+	pixel_y = 5
 	},
-/obj/machinery/airalarm/directional/north,
-/obj/effect/turf_decal/trimline/opaque/bar/filled/corner{
-	dir = 8
+/obj/structure/extinguisher_cabinet/directional/east{
+	pixel_y = -7
 	},
-/obj/item/kirbyplants/fullysynthetic,
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/central)
+/obj/effect/spawner/bunk_bed,
+/obj/structure/curtain/cloth/grey,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/crew/dorm)
 "tv" = (
-/obj/structure/sign/warning/securearea,
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/engineering)
-"ty" = (
-/obj/structure/window/reinforced/spawner/north,
-/obj/structure/rack,
-/obj/effect/turf_decal/box,
-/obj/structure/railing{
+/obj/structure/sign/poster/contraband/stechkin{
+	pixel_x = -32
+	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
 	dir = 4
 	},
-/obj/effect/spawner/random/maintenance/five,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/item/stack/marker_beacon/thirty,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo)
-"tD" = (
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/structure/closet/secure_closet{
+	anchored = 1;
+	icon_state = "syndicate";
+	name = "weapon storage";
+	req_access_txt = "19"
+	},
+/obj/item/storage/guncase/pistol/himehabu,
+/obj/item/storage/guncase/pistol/himehabu,
+/obj/item/storage/box/ammo/c22lr,
+/obj/item/storage/box/ammo/c22lr,
+/obj/item/attachment/silencer,
+/obj/item/attachment/silencer,
+/turf/open/floor/plasteel/patterned/grid{
+	color = "#777777"
+	},
+/area/ship/storage)
+"ty" = (
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 8
 	},
-/obj/structure/cable{
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/dorm/dormtwo)
+"tD" = (
+/obj/structure/cable/orange{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+/obj/structure/cable/orange{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
 	},
-/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/catwalk/over/plated_catwalk/white,
 /turf/open/floor/plating,
 /area/ship/engineering)
+"tE" = (
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 1;
+	color = "#FFFFFF"
+	},
+/obj/structure/table/chem,
+/obj/item/storage/toolbox/syndicate{
+	name = "syndicate toolbox";
+	pixel_x = -1;
+	pixel_y = 6
+	},
+/obj/item/reagent_containers/glass/beaker/plastic{
+	pixel_x = 5;
+	pixel_y = -10
+	},
+/obj/machinery/airalarm/directional/east,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/plasteel/patterned/grid{
+	color = "#777777"
+	},
+/area/ship/engineering)
+"tH" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor{
+	id = "kansatsu_observation"
+	},
+/obj/machinery/door/firedoor/window,
+/obj/structure/cable/orange{
+	icon_state = "2-8"
+	},
+/obj/structure/cable/orange{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating,
+/area/ship/bridge)
 "tJ" = (
+/obj/effect/turf_decal/corner/opaque/syndiered{
+	dir = 5
+	},
+/obj/structure/filingcabinet/double/grey,
+/obj/item/folder/syndicate,
+/obj/item/folder,
+/obj/item/folder/red,
+/obj/item/folder/white,
+/obj/item/disk/holodisk,
+/obj/item/disk/holodisk,
+/obj/item/disk/holodisk,
+/obj/item/pen/fourcolor,
+/obj/item/pen/fourcolor,
+/obj/item/pen/fourcolor,
+/obj/item/clipboard,
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"tO" = (
+/obj/effect/turf_decal/corner/opaque/syndiered{
+	dir = 5
+	},
+/obj/machinery/photocopier,
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"tV" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew)
+"uj" = (
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = -12
+	},
+/obj/machinery/camera{
+	dir = 4;
+	c_tag = "Command Quarters"
+	},
+/obj/structure/cable/orange{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/closet/wall/red/directional/north,
+/obj/item/clothing/under/misc/pj/red,
+/obj/item/clothing/under/misc/pj/red,
+/obj/effect/spawner/random/entertainment/plushie,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/crew/dorm/dormtwo)
+"uq" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+	dir = 9
 	},
-/obj/machinery/camera/autoname,
-/obj/effect/turf_decal/trimline/opaque/bar/filled/corner{
-	dir = 1
+/obj/structure/cable/orange{
+	icon_state = "5-8"
 	},
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/effect/landmark/observer_start,
 /turf/open/floor/plasteel/white,
-/area/ship/hallway/central)
-"uq" = (
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
-	dir = 10
-	},
-/turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "uR" = (
 /obj/machinery/porta_turret/ship/syndicate/weak{
 	dir = 9;
+	desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent.";
 	id = "kansatsu_grid"
 	},
-/turf/closed/wall/mineral/plastitanium,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/engineering)
 "vk" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/effect/turf_decal/trimline/opaque/syndiered/corner{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/structure/closet/emcloset/wall/directional/north{
+	populate = 0;
+	pixel_x = 3
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/item/storage/toolbox/emergency,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/clothing/mask/breath,
+/turf/open/floor/plasteel/white,
+/area/ship/crew)
+"vB" = (
+/obj/effect/turf_decal/trimline/opaque/syndiered/line,
+/obj/structure/cable/orange{
+	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"vK" = (
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/effect/turf_decal/trimline/opaque/syndiered/line,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/central)
-"vL" = (
-/obj/structure/cable{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/orange{
 	icon_state = "2-8"
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/turf/open/floor/plasteel/white,
+/area/ship/crew)
+"vL" = (
+/obj/structure/cable/orange{
+	icon_state = "2-9"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
+/obj/structure/cable/orange{
+	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
 	},
+/obj/machinery/light/small/directional/east,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/catwalk/over/plated_catwalk/white,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "vN" = (
-/obj/structure/table/reinforced,
-/obj/item/binoculars,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/structure/cable{
-	icon_state = "0-2"
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor{
+	id = "kansatsu_observation"
 	},
-/obj/machinery/button/door{
-	desc = "A remote control switch.";
-	id = "scbay";
-	name = "Cargo Bay Doors";
-	pixel_x = -7;
-	pixel_y = 9
+/obj/machinery/door/firedoor/window,
+/obj/structure/cable/orange{
+	icon_state = "1-4"
 	},
-/obj/machinery/button/door{
-	id = "scbridge";
-	name = "Bridge Blast Shutters";
-	pixel_x = 5;
-	pixel_y = 9
+/obj/structure/cable/orange{
+	icon_state = "0-1"
 	},
-/obj/machinery/button/shieldwallgen{
-	id = "scholo";
-	name = "Holofield Controls";
-	pixel_x = -9;
-	pixel_y = -3
+/turf/open/floor/plating,
+/area/ship/bridge)
+"wz" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4;
+	color = "#555555"
 	},
-/obj/machinery/light_switch{
-	pixel_x = -20;
-	pixel_y = 12;
-	dir = 4
+/obj/structure/cable/orange{
+	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/mono/dark,
+/turf/open/floor/plasteel/white,
 /area/ship/bridge)
 "xf" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/effect/turf_decal/industrial/warning/corner,
-/obj/machinery/button/shieldwallgen{
-	dir = 1;
-	id = "scholo";
-	name = "Holofield Controls";
-	pixel_x = -6;
-	pixel_y = -33
-	},
-/obj/machinery/button/door{
-	desc = "A remote control switch.";
-	dir = 1;
-	id = "scbay";
-	name = "Cargo Bay Doors";
-	pixel_x = 3;
-	pixel_y = -35
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/effect/turf_decal/box/white,
+/obj/machinery/light/directional/west,
+/obj/structure/crate_shelf,
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "yl" = (
-/obj/effect/turf_decal/trimline/opaque/bar/filled/corner{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8;
+	color = "#555555"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/machinery/power/terminal{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/central)
-"yn" = (
-/obj/structure/rack,
-/obj/item/clothing/glasses/heat,
-/obj/item/clothing/glasses/heat,
-/obj/item/clothing/glasses/cold,
-/obj/item/clothing/glasses/cold,
-/obj/effect/turf_decal/box,
-/obj/item/clothing/under/color/black,
-/obj/item/clothing/under/color/black,
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/head/beanie/black,
-/obj/item/clothing/head/beanie/black,
-/obj/machinery/light/directional/west,
-/obj/item/clothing/mask/fakemoustache/italian,
-/obj/item/clothing/mask/fakemoustache/italian,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo)
-"yw" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
+/obj/structure/cable/orange{
+	icon_state = "0-4"
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/engineering)
-"yF" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+"yn" = (
+/obj/structure/filingcabinet{
+	dir = 4;
+	pixel_x = -10
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/item/clipboard,
+/obj/item/taperecorder,
+/obj/item/binoculars,
+/obj/effect/turf_decal/trimline/opaque/syndiered/line,
+/obj/machinery/light/small/directional/south,
+/obj/machinery/camera{
+	dir = 10;
+	c_tag = "Observation Deck"
 	},
-/obj/machinery/door/airlock/engineering{
-	dir = 4;
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"yw" = (
+/obj/structure/chair/bench/red/directional/east,
+/obj/structure/railing,
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/tech,
+/area/ship/crew)
+"yF" = (
+/obj/machinery/door/airlock/hatch{
+	dir = 8;
 	name = "Engineering"
 	},
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{
+/obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{
-	dir = 4
-	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
-"yG" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/structure/cable{
+/obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering)
+"yG" = (
+/obj/effect/turf_decal/corner_techfloor_grid{
+	dir = 6
 	},
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
+"yH" = (
 /obj/effect/turf_decal/spline/fancy/opaque/syndiered{
-	dir = 5
+	dir = 4
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
-	dir = 6
+/obj/structure/cable/orange{
+	icon_state = "0-8"
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/central)
-"yH" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+/obj/machinery/light_switch{
+	pixel_x = -13;
+	pixel_y = 19
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/effect/turf_decal/trimline/opaque/syndiered/corner{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/mono/white,
 /area/ship/cargo)
 "zH" = (
-/obj/machinery/atmospherics/components/binary/pump/on/layer4{
-	dir = 4
+/obj/structure/sign/poster/contraband/gec{
+	pixel_y = -32
 	},
-/obj/machinery/camera/autoname{
-	dir = 1
+/obj/structure/cable/orange{
+	icon_state = "0-9"
 	},
-/obj/machinery/light/small/directional/south,
-/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/power/ship_gravity,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "zO" = (
-/obj/effect/turf_decal/industrial/warning/corner{
-	dir = 8
-	},
-/obj/machinery/camera/autoname{
-	dir = 1
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light_switch{
-	pixel_y = -20;
-	dir = 1;
-	pixel_x = 6
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/mono/white,
 /area/ship/cargo)
 "zY" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/structure/closet/crate/freezer{
+	name = "fridge"
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/food/drinks/bottle/absinthe,
+/obj/item/reagent_containers/food/snacks/canned/beans,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/item/reagent_containers/food/drinks/dry_ramen,
+/obj/item/reagent_containers/food/drinks/dry_ramen,
+/obj/item/reagent_containers/food/drinks/dry_ramen,
+/turf/open/floor/plasteel/mono/white,
 /area/ship/cargo)
 "Ah" = (
-/obj/machinery/porta_turret/ship/syndicate/weak{
-	dir = 6;
-	id = "kansatsu_grid"
+/obj/structure/table/glass,
+/obj/item/radio{
+	pixel_y = 6
 	},
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/engineering)
-"AM" = (
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning,
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{
+/obj/item/radio{
+	pixel_y = 6
+	},
+/obj/item/radio{
+	pixel_y = 6
+	},
+/obj/item/radio{
+	pixel_y = 6
+	},
+/obj/item/radio{
+	pixel_y = 6
+	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
 	dir = 1
 	},
-/obj/machinery/door/airlock/grunge{
-	name = "Bathroom"
+/obj/machinery/camera{
+	dir = 2;
+	c_tag = "Cryogenics"
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/dark,
 /area/ship/crew/dorm)
-"Bt" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
+"Ap" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/turf/open/floor/plasteel/patterned/grid{
+	color = "#777777"
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"BS" = (
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
-"Cr" = (
-/obj/machinery/door/poddoor{
-	id = "scbay"
+/area/ship/storage)
+"AM" = (
+/obj/machinery/door/airlock/grunge{
+	name = "Bathroom";
+	id_tag = "kansatsu_bathroom"
 	},
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew)
+"Bt" = (
+/obj/machinery/atmospherics/components/binary/pump/on/layer2{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/greenglow,
 /turf/open/floor/plating,
-/area/ship/cargo)
-"CP" = (
-/obj/machinery/cryopod{
-	dir = 8
+/area/ship/engineering)
+"BI" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor{
+	id = "kansatsu_observation"
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
+/obj/machinery/door/firedoor/window,
+/obj/structure/cable/orange{
+	icon_state = "1-8"
 	},
-/obj/effect/turf_decal/industrial/hatch/red,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
+/obj/structure/cable/orange{
 	icon_state = "0-8"
 	},
-/obj/item/radio/intercom/directional/north,
-/obj/machinery/light_switch{
-	pixel_y = 23;
-	pixel_x = -12
+/turf/open/floor/plating,
+/area/ship/bridge)
+"BS" = (
+/obj/structure/chair/bench/red/directional/east,
+/turf/open/floor/plasteel/tech,
+/area/ship/crew)
+"Cr" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 2;
+	color = "#FFFFFF"
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew/dorm)
+/turf/open/floor/plasteel/mono/white,
+/area/ship/cargo)
+"CP" = (
+/obj/item/kirbyplants/fullysynthetic{
+	pixel_y = 20
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew)
 "CR" = (
 /obj/machinery/porta_turret/ship/syndicate/weak{
 	dir = 10;
+	desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent.";
 	id = "kansatsu_grid"
 	},
-/turf/closed/wall/mineral/plastitanium,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/engineering)
 "CU" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
+/obj/machinery/door/poddoor{
+	dir = 2;
+	id = "kansatsu_cargo"
 	},
-/obj/structure/window/reinforced{
-	dir = 8
+/obj/machinery/door/firedoor/heavy,
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "kansatsu_holo"
 	},
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{
-	dir = 4
+/obj/structure/cable/orange{
+	icon_state = "0-4"
 	},
-/obj/structure/cable{
-	icon_state = "0-8"
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"DB" = (
+/obj/machinery/light_switch{
+	pixel_y = -19;
+	dir = 1;
+	pixel_x = -8
 	},
-/obj/machinery/door/poddoor/shutters{
-	dir = 4;
-	id = "scengine"
+/obj/machinery/firealarm/directional/south{
+	pixel_x = 5
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"DB" = (
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
-	dir = 6
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 8
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/bridge)
 "DL" = (
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
-	dir = 5
+/obj/machinery/modular_computer/console/preset/command{
+	dir = 4
+	},
+/obj/structure/railing,
+/obj/effect/turf_decal/corner/opaque/syndiered{
+	dir = 9
+	},
+/obj/machinery/light/directional/west,
+/obj/machinery/camera{
+	dir = 6;
+	c_tag = "Bridge"
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/bridge)
 "DU" = (
-/obj/structure/chair/office{
-	dir = 4;
-	name = "Intel Officer's Chair"
+/obj/machinery/camera{
+	dir = 5;
+	c_tag = "Exterior - Fore-Starboard"
 	},
-/obj/item/radio/intercom/wideband/directional/south{
-	reach = 2
+/obj/machinery/porta_turret/ship/syndicate/weak{
+	dir = 6;
+	pixel_y = 12;
+	pixel_x = -8;
+	desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent.";
+	id = "kansatsu_grid"
 	},
-/obj/effect/turf_decal/trimline/opaque/bar,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/corner_techfloor_grid{
+	dir = 5
+	},
+/turf/open/floor/plating/airless,
 /area/ship/bridge)
-"EX" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+"EB" = (
+/obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
+/obj/machinery/door/airlock/hatch{
+	dir = 8;
+	name = "Engineering"
 	},
-/obj/structure/chair/comfy/grey/directional/west,
-/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering)
+"EX" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{
-	dir = 1
-	},
-/obj/machinery/light/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "Fw" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/item/toy/cards/deck,
-/obj/structure/table/wood,
-/turf/open/floor/carpet/red,
+/turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "FH" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "scbridge"
+/obj/structure/table/glass,
+/obj/item/flashlight/lamp{
+	pixel_x = -7;
+	pixel_y = 2
 	},
-/turf/open/floor/plating,
+/obj/item/reagent_containers/food/snacks/meat/steak/chicken{
+	pixel_x = 12;
+	pixel_y = 7
+	},
+/obj/machinery/light/directional/south,
+/obj/item/stamp/cybersun{
+	pixel_x = 7
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/bridge)
 "FJ" = (
-/obj/structure/chair{
+/obj/machinery/holopad/secure,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
-	dir = 6
-	},
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/trimline/opaque/syndiered/corner,
+/turf/open/floor/plasteel/white,
 /area/ship/bridge)
 "FT" = (
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
 	},
-/obj/structure/cable{
+/obj/structure/cable/orange{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/structure/cable/orange{
+	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+/obj/structure/chair/handrail{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/catwalk/over/plated_catwalk/white,
 /turf/open/floor/plating,
 /area/ship/engineering)
+"Gn" = (
+/obj/machinery/vending/cigarette{
+	shut_up = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
 "GG" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/computer/security{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/effect/turf_decal/industrial/outline/red,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/bridge)
-"GV" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 4
+	},
+/obj/structure/cable/orange{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/crew)
+"GV" = (
+/obj/effect/turf_decal/industrial/hatch{
+	color = "#730622";
+	alpha = 255
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1;
+	color = "#FFFFFF"
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/dorm)
+"Hd" = (
+/obj/structure/chair/office/dark{
+	dir = 8
+	},
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew)
+"Hz" = (
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/airlock/hatch{
+	name = "Cargo Bay"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"HO" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor{
+	id = "kansatsu_observation"
+	},
+/obj/machinery/door/firedoor/window,
+/obj/structure/cable/orange{
+	icon_state = "2-4"
+	},
+/obj/structure/cable/orange{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plating,
+/area/ship/bridge)
+"Ig" = (
+/obj/effect/turf_decal/corner_techfloor_grid{
+	dir = 10
+	},
+/obj/machinery/camera{
+	dir = 4;
+	c_tag = "Exterior - Fore-Port"
+	},
 /obj/machinery/porta_turret/ship/syndicate/weak{
-	dir = 4;
-	pixel_x = 8;
+	dir = 5;
+	pixel_y = -4;
+	pixel_x = -6;
+	desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent.";
 	id = "kansatsu_grid"
 	},
-/turf/closed/wall/mineral/plastitanium,
+/turf/open/floor/plating/airless,
 /area/ship/bridge)
-"Hd" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
-	},
-/obj/item/bedsheet/blue,
-/obj/structure/bed/pod,
-/obj/structure/curtain,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew/dorm)
-"Hz" = (
-/obj/structure/window/reinforced/spawner/north,
-/obj/effect/turf_decal/box,
-/obj/structure/closet/crate{
-	name = "recreation package"
-	},
-/obj/structure/railing{
-	dir = 4
+"ID" = (
+/obj/machinery/button/door{
+	id = "kansatsu_cargo";
+	name = "External Access";
+	pixel_y = -20;
+	dir = 1;
+	pixel_x = 9
 	},
-/obj/item/circuitboard/machine/microwave,
-/obj/item/vending_refill/boozeomat,
-/obj/item/circuitboard/machine/vendor,
-/turf/open/floor/plasteel/tech/grid,
+/obj/effect/turf_decal/box/white,
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/syndicate/black,
+/obj/item/clothing/head/helmet/space/syndicate/black,
+/obj/item/clothing/mask/gas/syndicate,
+/obj/item/tank/jetpack/oxygen/harness,
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo)
-"Ig" = (
-/obj/structure/cable{
-	icon_state = "0-2"
+"IJ" = (
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
 	},
-/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/spline/fancy/transparent/grey{
-	dir = 4
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 1
 	},
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/power/smes/engineering,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"IJ" = (
-/obj/structure/window/reinforced{
-	dir = 8
+/turf/open/floor/plasteel/white,
+/area/ship/crew)
+"Jp" = (
+/obj/structure/table/reinforced,
+/obj/item/flashlight/lamp{
+	pixel_x = -5;
+	pixel_y = 13
 	},
-/obj/structure/window/reinforced{
-	dir = 4
+/obj/item/radio/intercom/table{
+	dir = 8;
+	pixel_x = -6;
+	pixel_y = -9
 	},
-/obj/structure/rack,
-/obj/item/chameleon,
-/obj/item/chameleon,
-/obj/machinery/door/window/brigdoor{
-	name = "Gear Stowage";
-	req_access_txt = "1"
+/obj/item/reagent_containers/food/drinks/mug{
+	pixel_y = 10;
+	pixel_x = 11;
+	list_reagents = list(/datum/reagent/consumable/icecoffee = 30)
 	},
-/obj/structure/sign/poster/contraband/masked_men{
-	pixel_y = 32
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+	dir = 8
 	},
-/obj/item/storage/box/syndie_kit/chameleon,
-/obj/item/storage/box/syndie_kit/chameleon,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/hallway/central)
-"Jp" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew)
+"Js" = (
+/obj/machinery/cryopod/syndicate{
+	dir = 1
 	},
-/obj/structure/closet/wall/directional/north,
-/obj/machinery/computer/cryopod/directional/west,
-/obj/machinery/camera/autoname{
-	dir = 4
+/obj/effect/turf_decal/industrial/hatch{
+	color = "#730622";
+	alpha = 255
 	},
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/shoes/combat,
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1;
+	color = "#FFFFFF"
 	},
-/obj/item/clothing/under/syndicate,
-/obj/item/clothing/under/syndicate,
-/obj/item/clothing/under/syndicate,
-/obj/item/clothing/under/syndicate,
-/obj/item/clothing/under/syndicate/skirt,
-/obj/item/clothing/under/syndicate/skirt,
-/obj/item/clothing/under/syndicate/skirt,
-/obj/item/clothing/under/syndicate/skirt,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/turf/open/floor/plasteel/white,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = 10
+	},
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel/mono/white,
 /area/ship/crew/dorm)
 "JI" = (
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
-	dir = 9
-	},
-/turf/open/floor/plasteel/dark,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/plasteel/white,
 /area/ship/bridge)
 "KA" = (
-/obj/machinery/porta_turret/ship/syndicate/weak{
-	dir = 5;
-	id = "kansatsu_grid"
+/obj/machinery/computer/helm{
+	dir = 8;
+	icon_state = "computer-right"
 	},
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/engineering)
+/obj/structure/railing/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+	dir = 6
+	},
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/bridge)
 "KP" = (
-/obj/structure/closet/wall/directional/north{
-	name = "emergency rum cabinet"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/obj/item/kirbyplants/fullysynthetic{
+	pixel_y = 20;
+	pixel_x = 12
 	},
-/obj/item/reagent_containers/food/drinks/bottle/rum,
-/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
 	dir = 8
 	},
-/obj/item/reagent_containers/food/drinks/bottle/rum,
-/obj/item/reagent_containers/food/drinks/bottle/rum,
-/obj/item/reagent_containers/food/drinks/bottle/rum,
-/obj/item/reagent_containers/food/drinks/bottle/rum,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "Ld" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/mono/white,
 /area/ship/cargo)
 "Lr" = (
 /obj/structure/toilet{
-	pixel_y = 12
+	pixel_y = 15;
+	pixel_x = -5
 	},
 /obj/structure/sink{
 	dir = 8;
+	pixel_y = 4;
 	pixel_x = 12
 	},
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/crew/dorm)
+/obj/structure/mirror{
+	pixel_x = 22;
+	pixel_y = 5;
+	layer = 2.89
+	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 8
+	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = -10
+	},
+/obj/machinery/button/door{
+	id = "kansatsu_bathroom";
+	name = "Door Lockdown";
+	dir = 2;
+	pixel_y = 20;
+	pixel_x = 9;
+	normaldoorcontrol = 1;
+	specialfunctions = 4
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew)
+"LE" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor{
+	id = "kansatsu_observation"
+	},
+/obj/machinery/door/firedoor/window,
+/obj/structure/cable/orange{
+	icon_state = "0-8"
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/ship/bridge)
 "Mb" = (
-/obj/structure/chair/office{
-	dir = 4;
-	name = "Captain's Chair"
+/obj/structure/table/reinforced,
+/obj/item/paper_bin{
+	pixel_y = 7;
+	pixel_x = 8
 	},
-/obj/effect/turf_decal/trimline/opaque/bar,
-/obj/machinery/turretid/ship{
-	pixel_y = 26;
-	id = "kansatsu_grid"
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"Mn" = (
+/obj/machinery/computer/cargo{
+	dir = 8;
+	icon_keyboard = "syndie_key";
+	icon_state = "computer-left"
 	},
-/turf/open/floor/plasteel/dark,
+/obj/structure/railing{
+	dir = 5;
+	layer = 2.89
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+	dir = 5
+	},
+/turf/open/floor/plasteel/patterned/brushed,
 /area/ship/bridge)
 "MH" = (
-/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/firealarm/directional/north,
-/obj/item/kirbyplants/fullysynthetic,
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/door/airlock/hatch{
+	dir = 4;
+	name = "Secure Storage";
+	req_access_txt = "19"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/storage)
+"No" = (
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 8
+	},
+/obj/machinery/door/airlock/external{
+	dir = 4
+	},
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/firedoor/heavy,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering)
 "Nu" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/engineering)
 "NR" = (
-/obj/structure/window/reinforced{
-	dir = 8
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
 	},
-/obj/machinery/light/small/directional/north,
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/head/helmet/space/syndicate/black/red,
-/obj/item/clothing/suit/space/syndicate/black/red,
-/obj/item/tank/jetpack/oxygen/harness,
-/obj/item/clothing/mask/gas/syndicate,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/hallway/central)
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/crew)
 "NU" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
+/obj/structure/railing{
+	dir = 1;
+	layer = 2.89
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+	dir = 9
 	},
-/obj/structure/window/reinforced{
+/obj/item/storage/secure/safe/cybersun/solutions{
+	pixel_x = -31;
+	pixel_y = -4;
 	dir = 8
 	},
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{
-	dir = 4
+/obj/structure/cable/orange{
+	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/industrial/warning/corner,
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/structure/bed/dogbed{
+	anchored = 1;
+	desc = "A comfy-looking snake bed. There's bits of shed scales stuck in the bedding.";
+	name = "snake bed"
 	},
-/obj/machinery/door/poddoor/shutters{
-	dir = 4;
-	id = "scengine"
+/mob/living/simple_animal/hostile/retaliate/poison/snake{
+	icon = 'icons/mob/pets.dmi';
+	icon_dead = "bookworm_dead";
+	icon_living = "bookworm";
+	icon_state = "bookworm";
+	name = "Agent Berry";
+	desc = "A red, slithery snake. This one is trained in corporate espionage. Allegedly, at least."
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/bridge)
 "NW" = (
-/obj/structure/table,
-/obj/machinery/airalarm/directional/west,
-/obj/item/storage/toolbox/mechanical{
-	pixel_y = 8
+/obj/machinery/button/door{
+	id = "kansatsu_engine";
+	name = "Engine Access";
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = -6
 	},
-/obj/item/storage/toolbox/electrical,
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/industrial/warning/corner{
-	dir = 8
+/obj/machinery/firealarm/directional/west{
+	pixel_y = 7
 	},
-/obj/effect/turf_decal/industrial/warning/corner{
-	dir = 1
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8;
+	color = "#555555"
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plating,
+/obj/effect/decal/cleanable/oil,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/engineering)
 "Od" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/engineering)
-"Oi" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+/obj/machinery/camera{
+	dir = 4;
+	c_tag = "Exterior - Aft-Port"
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
+/obj/machinery/porta_turret/ship/syndicate/weak{
+	dir = 5;
+	pixel_y = -4;
+	pixel_x = -6;
+	desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent.";
+	id = "kansatsu_grid"
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo)
-"Or" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/effect/turf_decal/corner_techfloor_grid{
 	dir = 10
 	},
-/obj/structure/cable{
+/turf/open/floor/plating/airless,
+/area/ship/crew)
+"Oi" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable/orange{
+	icon_state = "1-4"
+	},
+/obj/structure/cable/orange{
 	icon_state = "1-2"
 	},
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{
+/obj/effect/turf_decal/corner/opaque/white/half{
 	dir = 1
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/cargo)
+"Or" = (
+/obj/structure/chair/bench/red/directional/west,
+/turf/open/floor/plasteel/tech,
 /area/ship/crew)
 "Ox" = (
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/computer/crew/syndie{
+	icon_state = "computer-left"
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/effect/turf_decal/corner/opaque/syndiered{
+	dir = 5
 	},
 /turf/open/floor/plasteel/white,
-/area/ship/hallway/central)
-"OD" = (
-/obj/machinery/light/small/directional/south,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+/area/ship/bridge)
+"OD" = (
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer2{
+/obj/structure/chair/handrail{
 	dir = 8
 	},
-/turf/open/floor/plating,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "OP" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/effect/turf_decal/trimline/opaque/syndiered/line,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/white,
-/area/ship/hallway/central)
+/area/ship/crew)
 "OW" = (
-/obj/structure/window/reinforced/spawner/north,
-/obj/structure/railing{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/tank_dispenser/oxygen,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo)
-"Pk" = (
-/obj/machinery/airalarm/directional/east,
 /obj/structure/table,
-/obj/item/storage/toolbox/ammo{
+/obj/structure/railing,
+/obj/machinery/door/firedoor/border_only,
+/obj/item/folder/red{
+	pixel_x = -5;
 	pixel_y = 4
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/item/pen{
+	pixel_x = -5;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/food/drinks/coffee{
+	pixel_x = 8;
+	pixel_y = 14
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/crew)
+"Pk" = (
+/obj/effect/turf_decal/box/white,
+/obj/structure/crate_shelf,
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "Qa" = (
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
-	dir = 1
+/obj/machinery/computer/security{
+	icon_state = "computer-right";
+	icon_keyboard = "syndie_key"
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered/corner{
-	dir = 8
+/obj/effect/turf_decal/corner/opaque/syndiered{
+	dir = 5
+	},
+/obj/structure/sign/poster/contraband/cybersun{
+	pixel_y = 32
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/bridge)
 "Ql" = (
-/obj/effect/turf_decal/atmos/air,
-/obj/machinery/atmospherics/components/binary/pump/on/layer2{
-	dir = 8
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1;
+	color = "#FFFFFF"
 	},
+/obj/effect/decal/cleanable/oil,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Qx" = (
-/obj/machinery/door/window{
-	dir = 1
+/obj/structure/sign/warning/docking{
+	pixel_y = -8
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/cargo)
+"Qy" = (
+/obj/machinery/button/door{
+	id = "kansatsu_lockdown";
+	name = "Observation Lockdown";
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = 6;
+	req_access_txt = "19"
+	},
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 4;
+	color = "#555555"
+	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/line,
+/obj/machinery/newscaster/directional/east{
+	pixel_y = -7
+	},
+/obj/item/kirbyplants/fullysynthetic{
+	pixel_x = 10
 	},
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"QL" = (
+/obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/turf/open/floor/plasteel/stairs,
-/area/ship/cargo)
-"Qy" = (
-/obj/structure/sign/poster/official/wtf_is_co2,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/engineering)
-"QN" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
+/obj/machinery/door/airlock/hatch{
+	name = "Command Quarters";
+	req_access_txt = "19"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
+/obj/structure/cable/orange{
 	icon_state = "1-2"
 	},
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/plasteel/white,
-/area/ship/crew/dorm)
-"QO" = (
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/dorm/dormtwo)
+"QN" = (
 /obj/structure/table/reinforced,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
+/obj/effect/spawner/random/kansatsu_missions{
+	pixel_y = 6
 	},
-/obj/machinery/airalarm/directional/west,
-/obj/item/paper_bin{
-	pixel_x = -4
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+	dir = 8
 	},
-/obj/item/pen/fountain,
-/obj/item/folder/syndicate{
-	icon_state = "folder_sred";
-	pixel_x = 8;
-	pixel_y = -2
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew)
+"QO" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/structure/cable/orange{
+	icon_state = "4-8"
 	},
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/plasteel/mono/dark,
+/turf/open/floor/plasteel/white,
 /area/ship/bridge)
-"Ri" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/hallway/central)
 "Rj" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
+/obj/effect/turf_decal/box/white,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/camera{
+	dir = 6;
+	c_tag = "Cargo Bay"
 	},
-/obj/machinery/light/directional/east,
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "Rr" = (
-/obj/effect/turf_decal/trimline/opaque/bar/filled/corner,
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/effect/turf_decal/corner/opaque/white/half,
+/obj/effect/turf_decal/trimline/opaque/syndiered/line,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/obj/structure/cable/orange{
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+/obj/structure/cable/orange{
+	icon_state = "2-8"
 	},
-/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/white,
-/area/ship/hallway/central)
+/area/ship/crew)
 "Rv" = (
-/obj/machinery/power/terminal,
-/obj/effect/turf_decal/box,
-/obj/structure/sign/poster/contraband/energy_swords{
-	pixel_x = 31
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "0-2"
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable/orange{
+	icon_state = "0-4"
 	},
-/obj/machinery/power/port_gen/pacman,
-/turf/open/floor/plating,
-/area/ship/engineering)
+/obj/structure/closet/secure_closet{
+	anchored = 1;
+	icon_state = "syndicate";
+	name = "equipment storage";
+	req_access_txt = "19"
+	},
+/obj/item/storage/box/zipties,
+/obj/item/camera{
+	pictures_left = 20;
+	pictures_max = 20;
+	desc = "A polaroid camera upgraded by Cybersun Virtual Solutions."
+	},
+/obj/item/camera{
+	pictures_left = 20;
+	pictures_max = 20;
+	desc = "A polaroid camera upgraded by Cybersun Virtual Solutions."
+	},
+/obj/item/taperecorder,
+/obj/item/taperecorder,
+/obj/item/binoculars,
+/obj/item/binoculars,
+/obj/item/clothing/glasses/night,
+/obj/item/clothing/glasses/night,
+/obj/item/storage/pill_bottle/cyanide,
+/turf/open/floor/plasteel/patterned/grid{
+	color = "#777777"
+	},
+/area/ship/storage)
 "Rz" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor{
-	id = "scbridge"
+/obj/structure/cable/orange{
+	icon_state = "4-10"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/white,
 /area/ship/bridge)
+"RO" = (
+/obj/machinery/camera{
+	dir = 8;
+	c_tag = "Exterior - Aft"
+	},
+/obj/effect/turf_decal/corner_techfloor_grid{
+	dir = 6
+	},
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
 "RX" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/structure/window/plasma/reinforced{
+	dir = 1
 	},
-/obj/structure/chair/comfy/grey/directional/east,
-/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner,
-/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{
+/obj/machinery/door/poddoor/shutters{
+	id = "kansatsu_secure_storage";
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/storage)
 "RY" = (
 /obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/obj/structure/chair/office{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
+/obj/structure/cable/orange{
+	icon_state = "0-4"
 	},
-/obj/item/stack/tile/plasteel/dark{
-	pixel_x = -11;
-	pixel_y = -16
+/obj/machinery/light/small/directional/north,
+/obj/machinery/light_switch{
+	pixel_x = 8;
+	pixel_y = 19
 	},
-/obj/item/clothing/neck/stethoscope{
-	pixel_x = 9;
-	pixel_y = -15
+/obj/machinery/camera{
+	dir = 5;
+	c_tag = "Dormitory"
 	},
-/obj/item/crowbar{
-	pixel_x = -8;
-	pixel_y = -11
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/office)
+/turf/open/floor/carpet/nanoweave,
+/area/ship/crew/dorm)
 "Sx" = (
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8;
+	color = "#555555"
 	},
 /obj/machinery/power/terminal{
 	dir = 8
 	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
+/obj/structure/cable/orange{
+	icon_state = "0-4"
 	},
-/turf/open/floor/plating,
+/obj/structure/railing,
+/obj/structure/rack,
+/obj/item/stack/sheet/glass/twenty,
+/obj/item/stack/sheet/plastic/five,
+/obj/item/stack/sheet/metal/twenty,
+/turf/open/floor/plasteel/white,
 /area/ship/engineering)
 "SH" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
-	},
-/obj/machinery/light/small/directional/south,
-/obj/structure/closet/secure_closet/engineering_personal,
-/obj/item/clothing/glasses/welding,
-/obj/item/clothing/glasses/welding,
-/obj/item/storage/belt/utility/full,
-/obj/item/storage/belt/utility/full,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/machinery/atmospherics/components/unary/tank/air{
+	dir = 1;
+	piping_layer = 2
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
+"SK" = (
+/obj/machinery/porta_turret/ship/syndicate/weak{
+	dir = 5;
+	pixel_y = -4;
+	pixel_x = -6;
+	desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent.";
+	id = "kansatsu_grid"
+	},
+/obj/effect/turf_decal/corner_techfloor_grid{
+	dir = 10
+	},
+/obj/machinery/camera{
+	dir = 4;
+	c_tag = "Exterior - Port"
+	},
+/turf/open/floor/plating/airless,
+/area/ship/crew)
 "SL" = (
-/obj/structure/table/reinforced,
-/obj/item/binoculars{
-	pixel_x = 4
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8;
+	color = "#555555"
 	},
-/obj/item/clipboard,
-/obj/item/pen,
-/obj/item/clothing/glasses/night{
-	pixel_x = -3;
-	pixel_y = 9
+/obj/machinery/power/terminal{
+	dir = 8
 	},
-/obj/item/camera{
-	pixel_x = -1;
-	pixel_y = -6
+/obj/structure/cable/orange{
+	icon_state = "0-4"
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
-	dir = 5
+/obj/effect/decal/cleanable/oil/streak,
+/turf/open/floor/plasteel/white,
+/area/ship/engineering)
+"ST" = (
+/obj/structure/chair/office/light{
+	dir = 4
 	},
-/turf/open/floor/plasteel/mono/dark,
+/obj/structure/cable/orange{
+	icon_state = "2-8"
+	},
+/obj/structure/cable/orange{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/bridge)
+"Tv" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
 "Ue" = (
-/obj/structure/sign/warning/vacuum/external,
-/turf/closed/wall/mineral/plastitanium,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/door/airlock/external,
+/obj/machinery/door/firedoor/heavy,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "Ul" = (
-/obj/effect/decal/cleanable/oil,
-/obj/machinery/power/ship_gravity,
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/machinery/power/port_gen/pacman/mrs{
+	anchored = 1
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8;
+	color = "#FFFFFF"
 	},
+/obj/structure/cable/white,
 /turf/open/floor/plating,
 /area/ship/engineering)
-"UZ" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+"Ur" = (
+/obj/structure/table/reinforced,
+/obj/machinery/fax/syndicate{
+	pixel_y = 6
+	},
+/obj/effect/turf_decal/corner/opaque/syndiered{
+	dir = 5
+	},
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 2;
+	color = "#555555"
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"UE" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered,
+/obj/item/radio/intercom/wideband/directional/south{
+	pixel_x = 7
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/machinery/turretid{
+	pixel_y = -22;
+	pixel_x = -13;
+	id = "kansatsu_grid"
+	},
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/bridge)
+"UZ" = (
+/obj/effect/turf_decal/box/white,
+/obj/machinery/airalarm/directional/west,
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "Va" = (
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/effect/turf_decal/industrial/warning{
+	dir = 9;
+	color = "#555555"
 	},
 /obj/machinery/power/terminal{
 	dir = 8
 	},
-/obj/machinery/camera/autoname,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
+/obj/structure/cable/orange{
+	icon_state = "0-6"
 	},
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/plating,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/sign/warning/vacuum/external{
+	pixel_y = 24
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/engineering)
+"Vg" = (
+/obj/structure/railing,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew)
 "Vo" = (
-/obj/machinery/light/small/directional/west,
-/obj/machinery/button/door{
-	dir = 4;
-	id = "thefunny";
-	pixel_x = -23;
-	pixel_y = 9
+/obj/structure/sign/poster/contraband/cybersun_med{
+	pixel_x = -32
 	},
-/obj/machinery/button/door{
-	dir = 4;
-	id = "intelwindow";
-	name = "Window Shutters";
-	pixel_x = -23;
-	pixel_y = -6
+/obj/machinery/airalarm/directional/south,
+/obj/structure/curtain/cloth/grey,
+/obj/effect/spawner/bunk_bed{
+	dir = 4
 	},
-/obj/structure/safe/floor{
-	number_of_tumblers = 3
-	},
-/obj/item/implanter/stealth,
-/obj/item/implanter/stealth,
-/obj/item/modular_computer/laptop/preset/civilian,
-/obj/item/clothing/mask/chameleon,
-/obj/item/melee/knife/combat,
-/obj/item/reagent_containers/pill/cyanide,
-/obj/item/reagent_containers/pill/cyanide,
-/obj/item/reagent_containers/pill/cyanide,
-/obj/item/reagent_containers/pill/cyanide,
-/obj/item/reagent_containers/pill/cyanide,
-/obj/item/reagent_containers/pill/cyanide,
-/obj/item/paper/crumpled{
-	default_raw_text = "Hand this stuff out to the field agents. They'll have a blast."
-	},
-/obj/item/clothing/mask/chameleon,
-/obj/item/card/id/syndicate/anyone,
-/obj/item/card/id/syndicate/anyone,
-/obj/effect/turf_decal/box,
-/turf/open/floor/plating,
-/area/ship/crew/office)
+/turf/open/floor/carpet/nanoweave,
+/area/ship/crew/dorm)
 "Vw" = (
-/obj/structure/chair/comfy/grey/directional/south,
-/obj/machinery/light/small/directional/north,
-/obj/structure/sign/poster/contraband/red_rum{
-	pixel_y = 32
+/obj/machinery/camera{
+	dir = 6;
+	c_tag = "Briefing Room"
 	},
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/box/white,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "VJ" = (
-/obj/structure/chair/comfy/grey/directional/south,
-/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner,
-/obj/structure/closet/wall/directional/north,
+/obj/structure/table/chem{
+	name = "kitchen counter"
+	},
+/obj/structure/sink/chem{
+	name = "kitchen sink"
+	},
+/obj/structure/sign/poster/contraband/cybersun{
+	pixel_y = 32
+	},
+/obj/item/trash/plate{
+	pixel_y = 2;
+	pixel_x = 9
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
-"Xa" = (
-/obj/structure/cable{
-	icon_state = "1-4"
+"VM" = (
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/structure/curtain/cloth{
+	color = "#730622";
+	icon_state = "bathroom-closed";
+	open = 0;
+	opacity = 1;
+	layer = 4.25
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"WY" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor{
+	dir = 4;
+	id = "kansatsu_observation"
+	},
+/obj/machinery/door/firedoor/window,
+/obj/structure/cable/orange{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plating,
+/area/ship/bridge)
+"Xa" = (
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/orange{
+	icon_state = "2-8"
+	},
+/obj/structure/cable/orange{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
 	},
+/obj/structure/catwalk/over/plated_catwalk/white,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Xc" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 4;
-	id = "intelfucky"
+/obj/structure/cable/orange{
+	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel/stairs{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/bridge)
+"Xr" = (
+/obj/structure/bed,
+/obj/item/bedsheet/black,
+/obj/machinery/firealarm/directional/south{
+	pixel_x = -7
+	},
+/obj/machinery/light/small/directional/east,
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/crew/dorm/dormtwo)
 "Xw" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "XJ" = (
-/obj/effect/decal/cleanable/glass,
-/obj/machinery/advanced_airlock_controller{
-	pixel_x = -27
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/layer_manifold{
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
 	dir = 8
 	},
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
+"XX" = (
+/obj/machinery/light/directional/east,
+/obj/machinery/camera{
+	dir = 8;
+	c_tag = "Hallway"
+	},
+/obj/effect/turf_decal/corner/opaque/white/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/corner,
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/crew)
 "YE" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/structure/cable/orange{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+	dir = 8
 	},
-/obj/structure/table/wood,
-/turf/open/floor/carpet/red,
+/turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "YG" = (
-/obj/machinery/atmospherics/pipe/layer_manifold{
-	dir = 8
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/layer2{
+	dir = 4
 	},
-/turf/open/floor/plating,
+/obj/structure/sign/poster/contraband/cybersun{
+	pixel_x = -32
+	},
+/obj/structure/closet/emcloset/wall/directional/south,
+/obj/item/clothing/suit/space/eva,
+/obj/item/clothing/head/helmet/space/eva,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "YQ" = (
 /turf/template_noop,
 /area/template_noop)
 "YU" = (
-/obj/structure/cable{
+/obj/structure/cable/orange{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/structure/cable/orange{
+	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/structure/catwalk/over/plated_catwalk/white,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Zs" = (
-/obj/structure/window/reinforced/spawner/north,
-/obj/structure/railing{
-	dir = 8;
-	layer = 2.91
-	},
-/obj/effect/turf_decal/box,
-/obj/item/melee/knife/survival,
-/obj/item/melee/knife/survival,
-/obj/item/melee/knife/survival,
-/obj/item/melee/knife/survival,
-/obj/item/pickaxe,
-/obj/item/pickaxe,
-/obj/item/pickaxe,
-/obj/item/pickaxe,
-/obj/structure/closet/crate/wooden{
-	name = "survival kit"
-	},
-/obj/item/survivalcapsule,
-/obj/item/survivalcapsule,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo)
+/obj/structure/chair/office,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/effect/turf_decal/trimline/opaque/syndiered/line,
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
 "Zv" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
-/obj/machinery/light/small/directional/north,
-/obj/effect/turf_decal/spline/fancy/transparent/grey{
-	dir = 1
-	},
-/obj/machinery/space_heater,
-/turf/open/floor/plating,
+/obj/effect/decal/cleanable/oil/streak,
+/turf/open/floor/plasteel/white,
 /area/ship/engineering)
 "ZI" = (
-/obj/machinery/computer/helm{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/outline/red,
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/light/directional/east,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/bridge)
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/dorm/dormtwo)
 "ZQ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plating,
-/area/ship/engineering)
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/obj/structure/chair/office/light{
+	dir = 4
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/patterned/grid{
+	color = "#777777"
+	},
+/area/ship/storage)
 
 (1,1,1) = {"
 uR
-YQ
-YQ
-ru
+qJ
+nq
+Nu
 ni
 ni
 ni
-ru
+Nu
 ni
 ni
 ni
-ru
-YQ
-YQ
+Nu
+RO
+yG
 CR
 "}
 (2,1,1) = {"
-ru
-ru
-ru
-ru
-NU
-CU
-CU
-ru
-CU
-CU
+Nu
+No
+Nu
+Nu
+qv
+qv
 qv
 Nu
-ru
-ru
-ru
+qv
+qv
+qv
+Nu
+Nu
+Nu
+Nu
 "}
 (3,1,1) = {"
-ru
+Nu
 XJ
 YG
-ru
+Nu
 Va
-Sx
-Sx
+SL
+jH
 NW
-Sx
-Sx
+yl
+pY
 Sx
 bI
 km
 Ul
-ru
+Nu
 "}
 (4,1,1) = {"
-ru
+Nu
 dj
 OD
 Ue
@@ -2050,118 +2922,118 @@ tD
 im
 Bt
 SH
-ru
+Nu
 "}
 (5,1,1) = {"
 cu
-yw
 aQ
-ah
-ZQ
-rR
-iY
+aQ
+aQ
+aQ
+aQ
+Nu
 nu
 iL
 rF
 Zv
 Ql
 zH
-Qy
-ru
+Nu
+Nu
 "}
 (6,1,1) = {"
-ru
-ru
+YQ
+aQ
 gj
 tv
 Rv
-Ig
-ii
+qM
+Nu
 ru
 cL
-ru
+bn
 so
 lP
 qa
-Od
+Nu
 nO
 "}
 (7,1,1) = {"
 YQ
-KA
-kM
-kM
-kM
-kM
-kM
-Ri
+aQ
+sZ
+Ap
+ZQ
+sF
+Nu
+EB
 yF
-cZ
-jj
-jj
+Nu
+tE
+aZ
 jj
-Ah
+Nu
 YQ
 "}
 (8,1,1) = {"
 YQ
-YQ
-kM
+aQ
+aQ
 MH
 RX
-lJ
-kM
+aQ
+tV
 tk
 jW
-ty
-yn
-aZ
-jj
-YQ
+cZ
+cZ
+cZ
+cZ
+cZ
 YQ
 "}
 (9,1,1) = {"
 YQ
-YQ
-kM
+Od
+tV
 KP
 YE
 co
-kM
+ev
 NR
 df
-ev
+cZ
 UZ
 xf
-jj
-YQ
+ID
+Qx
 YQ
 "}
 (10,1,1) = {"
 YQ
 YQ
-kM
+tV
 Vw
 Fw
 BS
-kM
+yw
 IJ
-yl
-Zs
+qS
+cZ
 cw
 zY
 gP
-YQ
+CU
 YQ
 "}
 (11,1,1) = {"
 YQ
 YQ
-kM
+tV
 VJ
 kb
 dx
-kM
+OW
 qz
 OP
 dq
@@ -2174,7 +3046,7 @@ YQ
 (12,1,1) = {"
 YQ
 YQ
-kM
+tV
 in
 EX
 Or
@@ -2185,91 +3057,91 @@ Hz
 Oi
 eu
 qf
-YQ
-YQ
+eL
+nF
 "}
 (13,1,1) = {"
 YQ
 YQ
-kM
-qA
-qA
-qA
+tV
+Gn
+Tv
+rR
 qA
-tJ
-qS
-Qx
+IJ
+fC
+cZ
 yH
 zO
-jj
-YQ
+ah
+cd
 YQ
 "}
 (14,1,1) = {"
 YQ
 YQ
-YQ
-qA
+kM
+tV
 Jp
 QN
 oN
-Ox
+IJ
 ej
-OW
+cZ
 Rj
 Pk
-jj
-YQ
+if
+Qx
 YQ
 "}
 (15,1,1) = {"
 YQ
 YQ
 YQ
-qA
+tV
 CP
 Hd
-qA
-nF
+Vg
+IJ
 lZ
-pM
-pM
-pM
-pM
-YQ
+cZ
+cZ
+cZ
+cZ
+cZ
 YQ
 "}
 (16,1,1) = {"
 YQ
 YQ
 YQ
-qA
-qA
-qA
-qA
+tV
+tV
+tV
+tV
 vk
 pM
-jH
+qo
 RY
 Vo
-dZ
-YQ
+qo
+pE
 YQ
 "}
 (17,1,1) = {"
 YQ
 YQ
 YQ
-YQ
-qA
+SK
+tV
 hT
-qA
+tV
 ql
-pM
+vK
 qR
 nA
 pa
-dZ
+qo
 YQ
 YQ
 "}
@@ -2278,15 +3150,15 @@ YQ
 YQ
 YQ
 YQ
-qA
+tV
 Lr
 AM
-yG
+IJ
 mD
 qo
 sR
-lZ
-pM
+tm
+qo
 YQ
 YQ
 "}
@@ -2295,15 +3167,15 @@ YQ
 YQ
 YQ
 YQ
-GV
-bO
-bO
+ZI
+ty
+ZI
 dA
-bO
-bO
-bO
+oC
+qo
+VM
 GV
-YQ
+qo
 YQ
 YQ
 "}
@@ -2312,15 +3184,15 @@ YQ
 YQ
 YQ
 YQ
-YQ
-bn
-vN
-aa
+ZI
+uj
+QL
+XX
 GG
-QO
-bO
-YQ
-YQ
+qo
+lh
+Js
+qo
 YQ
 YQ
 "}
@@ -2329,15 +3201,15 @@ YQ
 YQ
 YQ
 YQ
-YQ
-bO
-Mb
-Qa
+ZI
+Xr
+ZI
+Xw
 aT
-DU
-bO
-YQ
-YQ
+Xw
+Ah
+qo
+qo
 YQ
 YQ
 "}
@@ -2346,15 +3218,15 @@ YQ
 YQ
 YQ
 YQ
-YQ
-bO
+ZI
+ZI
 ZI
 DL
 DB
-fk
-bO
-YQ
-YQ
+Xw
+Xw
+Xw
+DU
 YQ
 YQ
 "}
@@ -2363,14 +3235,14 @@ YQ
 YQ
 YQ
 YQ
-YQ
-bO
 Xw
+Xw
+Ox
+oW
 Xc
-Xc
+NU
+lJ
 Xw
-bO
-YQ
 YQ
 YQ
 YQ
@@ -2380,63 +3252,148 @@ YQ
 YQ
 YQ
 YQ
-YQ
-YQ
-Rz
+Ig
+Xw
+Qa
 JI
 uq
+th
+UE
+Xw
+YQ
+YQ
+YQ
+"}
+(25,1,1) = {"
+YQ
+YQ
+YQ
+YQ
+YQ
+Xw
+tJ
 Rz
+FJ
+Mn
+KA
+Xw
+YQ
+YQ
+YQ
+"}
+(26,1,1) = {"
+YQ
 YQ
 YQ
 YQ
 YQ
+Xw
+tO
+QO
+Zs
+FH
+Xw
+bO
+YQ
+YQ
 YQ
 "}
-(25,1,1) = {"
+(27,1,1) = {"
 YQ
 YQ
 YQ
 YQ
 YQ
+Xw
+Ur
+wz
+Qy
+dZ
+Xw
+YQ
+YQ
+YQ
+YQ
+"}
+(28,1,1) = {"
+YQ
+YQ
+YQ
+YQ
+YQ
+bO
+Xw
+aa
+Xw
+Xw
+Xw
+YQ
+YQ
+YQ
+YQ
+"}
+(29,1,1) = {"
+YQ
 YQ
-Rz
-SL
-FJ
-Rz
 YQ
 YQ
 YQ
 YQ
+Xw
+fk
+yn
+Xw
+bO
+YQ
+YQ
+YQ
 YQ
 "}
-(26,1,1) = {"
+(30,1,1) = {"
 YQ
 YQ
 YQ
 YQ
 YQ
 YQ
-Rz
-FH
-FH
-Rz
+HO
+ST
+vB
+vN
 YQ
 YQ
 YQ
 YQ
 YQ
 "}
-(27,1,1) = {"
+(31,1,1) = {"
+YQ
 YQ
 YQ
 YQ
 YQ
 YQ
+LE
+Mb
+kd
+LE
+YQ
+YQ
+YQ
+YQ
+YQ
+"}
+(32,1,1) = {"
+YQ
 YQ
 YQ
 YQ
 YQ
 YQ
+tH
+aj
+WY
+BI
 YQ
 YQ
 YQ
diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm
index 065a398c3230..e51d9aef327b 100644
--- a/code/datums/components/storage/concrete/pockets.dm
+++ b/code/datums/components/storage/concrete/pockets.dm
@@ -139,3 +139,18 @@
 		/obj/item/gun/energy/dueling,
 		/obj/item/gun/ballistic/shotgun,
 		/obj/item/gun/ballistic/rocketlauncher))
+
+/datum/component/storage/concrete/pockets/holster/chameleon
+	max_items = 1
+
+/datum/component/storage/concrete/pockets/holster/chameleon/Initialize()
+	original_parent = parent
+	. = ..()
+	can_hold = typecacheof(list(
+		/obj/item/gun/ballistic/automatic/pistol/himehabu,
+		/obj/item/gun/ballistic/automatic/pistol/ringneck,
+		/obj/item/gun/ballistic/revolver,
+		/obj/item/gun/energy/e_gun/mini,
+		/obj/item/gun/energy/disabler,
+		/obj/item/gun/energy/pulse/carbine,
+		/obj/item/gun/energy/dueling))
diff --git a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm
new file mode 100644
index 000000000000..d673dd9c59bc
--- /dev/null
+++ b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm
@@ -0,0 +1,286 @@
+/datum/preset_holoimage/cybersun_intel_director
+	species_type = /datum/species/ipc
+	outfit_type = /datum/outfit/job/syndicate/captain/cybersun
+
+/obj/item/disk/holodisk/kansatsu/mission
+	desc = "A classified holodisk containing a mission for the Cybersun Industries Intelligence Division."
+	preset_image_type = /datum/preset_holoimage/cybersun_intel_director
+
+/obj/item/disk/holodisk/kansatsu/mission/New(obj/L)
+	..()
+	pixel_x = base_pixel_x + rand(-5, 5) // Must still fit on the table.
+	pixel_y = base_pixel_y + rand(-3, 2)
+
+/obj/item/disk/holodisk/kansatsu/mission/safety
+	name = "\improper IG-I-296" // Information Gathering - Infiltration - Random Number
+	preset_record_text = {"
+	NAME Intelligence Director Torch-3
+	SAY Agents.	Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest.
+	DELAY 40
+	SAY You must gather information about the safety measures on board. You are to look for any potential flaws and exploits.
+	DELAY 40
+	SAY You must avoid recognition while performing this mission.
+	DELAY 40
+	SAY Your officers must then prepare an official report on this.
+	DELAY 40
+	SAY This mission will be considered completed with at least three reports. Do not disappoint us.
+	DELAY 40
+	"}
+
+/obj/item/disk/holodisk/kansatsu/mission/crew
+	name = "\improper IG-I-138" // Information Gathering - Infiltration - Random Number
+	preset_record_text = {"
+	NAME Intelligence Director Torch-3
+	SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest.
+	DELAY 40
+	SAY You must profile five members of the crew. Their profile must include credentials, habits and skills. Any further information is optional, but advised.
+	DELAY 40
+	SAY You must avoid recognition while performing this mission.
+	DELAY 40
+	SAY Your officers must then prepare an official report on this.
+	DELAY 40
+	SAY This mission will be considered completed with at least five reports. Do not disappoint us.
+	DELAY 40
+	"}
+
+/obj/item/disk/holodisk/kansatsu/mission/valueables
+	name = "\improper IG-I-271" // Information Gathering - Infiltration - Random Number
+	preset_record_text = {"
+	NAME Intelligence Director Torch-3
+	SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest.
+	DELAY 40
+	SAY On board, you must locate and catalogue all the objects of value. You may not seize them, unless you are tasked to by another mission.
+	DELAY 40
+	SAY You must avoid recognition while performing this mission.
+	DELAY 40
+	SAY Your officers must then prepare an official report on this.
+	DELAY 40
+	SAY This mission will be considered completed with at least three reports. Do not disappoint us.
+	DELAY 40
+	"}
+
+/obj/item/disk/holodisk/kansatsu/mission/ruins
+	name = "\improper IG-S-290" // Information Gathering - Scouting - Random Number
+	preset_record_text = {"
+	NAME Intelligence Director Torch-3
+	SAY Agents. Your vessel has been assigned a mission to scout your current sector.
+	DELAY 40
+	SAY You are to locate war-era derelicts. You must explore them and take note of all the relevant details.
+	DELAY 40
+	SAY Your officers must then prepare an official report on this.
+	DELAY 40
+	SAY This mission will be considered completed with at least five reports. Do not disappoint us.
+	DELAY 40
+	"}
+
+/obj/item/disk/holodisk/kansatsu/mission/bugging
+	name = "\improper SD-I-085" // Special Delivery - Infiltration - Random Number
+	preset_record_text = {"
+	NAME Intelligence Director Torch-3
+	SAY Agents.	Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest.
+	DELAY 40
+	SAY You are to plant a tracking beacon on board, in a secure location.
+	DELAY 40
+	SAY You must avoid recognition while performing this mission.
+	DELAY 40
+	SAY This mission will be considered completed with at least four beacons planted.
+	DELAY 40
+	SAY Do not disappoint us.
+	DELAY 20
+	"}
+
+/obj/item/storage/box/syndie_kit/kansatsu/tracking_beacons
+	name = "box of tracking beacons"
+	illustration = "sparkler"
+
+/obj/item/storage/box/syndie_kit/kansatsu/tracking_beacons/PopulateContents()
+	for(var/i in 1 to 7)
+		new /obj/item/beacon(src)
+
+/obj/item/disk/holodisk/kansatsu/mission/advertisement
+	name = "\improper SD-I-202" // Special Delivery - Infiltration - Random Number
+	preset_record_text = {"
+	NAME Intelligence Director Torch-3
+	SAY Agents.	Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest.
+	DELAY 40
+	SAY You are to leave a Cybersun Virtual Solutions advertisement in a crew area.
+	DELAY 40
+	SAY You must avoid recognition while performing this mission.
+	DELAY 40
+	SAY This mission will be considered completed with at least four advertisements distributed.
+	DELAY 40
+	SAY Do not disappoint us.
+	DELAY 20
+	"}
+
+/obj/item/disk/holodisk/kansatsu/mission/documents
+	name = "\improper E-019" // Extraction - Random Number
+	preset_record_text = {"
+	NAME Intelligence Director Torch-3
+	SAY Agents. Your vessel has been assigned a mission to locate and retrieve an asset belonging to any group of interest that is not friendly to us.
+	DELAY 40
+	SAY To be precise, you are after a bundle of classified documents.
+	DELAY 40
+	SAY You must avoid recognition while performing this mission.
+	DELAY 40
+	SAY Do not disappoint us.
+	DELAY 20
+	"}
+
+/obj/item/disk/holodisk/kansatsu/mission/pet
+	name = "\improper E-271" // Extraction - Random Number
+	preset_record_text = {"
+	NAME Intelligence Director Torch-3
+	SAY Agents. Your vessel has been assigned a mission to locate and retrieve an asset belonging to any group of interest that is not friendly to us.
+	DELAY 40
+	SAY To be precise, you are after a domesticated animal. The cutest you can possibly find.
+	DELAY 40
+	SAY You must avoid recognition while performing this mission.
+	DELAY 40
+	SAY Do not disappoint us.
+	DELAY 20
+	"}
+
+/obj/item/disk/holodisk/kansatsu/mission/gem
+	name = "\improper E-147" // Extraction - Random Number
+	preset_record_text = {"
+	NAME Intelligence Director Torch-3
+	SAY Agents. Your vessel has been assigned a mission to locate and retrieve an asset.
+	DELAY 40
+	SAY To be precise, you are after a rare gem.
+	DELAY 40
+	SAY They can be found in derelicts and remains of certain fauna.
+	DELAY 40
+	SAY You are also permitted to retrieve it from any group of interest that is not friendly to us. You must avoid recognition if you do so.
+	DELAY 40
+	SAY Do not disappoint us.
+	DELAY 20
+	"}
+
+/obj/item/disk/holodisk/kansatsu/mission/anomalies
+	name = "\improper RD-166" // Research Division - Random Number
+	preset_record_text = {"
+	NAME Intelligence Director Torch-3
+	SAY Agents. Your vessel has been assigned a mission to assist our research department.
+	DELAY 40
+	SAY You are to collect at least four anomaly cores.
+	DELAY 40
+	SAY They are scattered around the planetoids in your sector. You are also permitted to retrieve them from other vessels.
+	DELAY 40
+	SAY The anomaly cores must be stored in your armory, in the company-issued secure crate.
+	DELAY 40
+	SAY Do not disappoint us.
+	DELAY 20
+	"}
+
+
+/obj/effect/spawner/random/kansatsu_missions
+	name = "Kansatsu Missions"
+	spawn_loot_double = FALSE
+	loot = list(
+		/obj/item/disk/holodisk/kansatsu/mission/safety = 3,
+		/obj/item/disk/holodisk/kansatsu/mission/crew = 5,
+		/obj/item/disk/holodisk/kansatsu/mission/valueables = 4,
+		/obj/item/disk/holodisk/kansatsu/mission/ruins = 5,
+		/obj/item/disk/holodisk/kansatsu/mission/documents = 4,
+		/obj/item/disk/holodisk/kansatsu/mission/pet = 3,
+		/obj/item/disk/holodisk/kansatsu/mission/gem = 3,
+		/obj/item/disk/holodisk/kansatsu/mission/anomalies = 2, // Lower because it doesn't really use much of the spy gimmick. Still fits though so it stays.
+		/obj/item/disk/holodisk/kansatsu/mission/bugging = 4,
+		/obj/item/disk/holodisk/kansatsu/mission/advertisement = 3
+	)
+	spawn_loot_count = 2
+
+/datum/preset_holoimage/cybersun_researcher
+	outfit_type = /datum/outfit/job/syndicate/science/cybersun
+	species_type = /datum/species/elzuose
+
+/obj/item/disk/holodisk/kansatsu/gear
+	preset_image_type = /datum/preset_holoimage/cybersun_researcher
+
+/obj/item/disk/holodisk/kansatsu/gear/tablets
+	name = "\improper IR-241" // Introductory Recording - Random Number
+	desc = "A classified holodisk containing an introduction to the Syndix tablets."
+	preset_record_text = {"
+	NAME Researcher Meenus-Seeba
+	SAY You have been issued a set of Cybersun Virtual Solutions Syndix Tablets.
+	DELAY 40
+	SAY They will allow you to maintain communications over a long range, via the Chatting feature.
+	DELAY 40
+	SAY We advise you to create a private channel where you maintain contact with personnel on missions.
+	DELAY 40
+	SAY Good luck.
+	DELAY 20
+	"}
+
+/obj/item/disk/holodisk/kansatsu/gear/chameleon
+	name = "\improper IR-174" // Introductory Recording - Random Number
+	desc = "A classified holodisk containing an introduction to the Chameleon gear."
+	preset_record_text = {"
+	NAME Researcher Meenus-Seeba
+	SAY You have been issued a Cybersun Industries Chameleon Gear Kit.
+	DELAY 40
+	SAY It contains three pieces of advanced gear used for espionage.
+	DELAY 40
+	SAY The most exciting gadget included is the Chameleon kit - the Chameleon projector. It is a personal cloaking device that is excellent for getting in and out unnoticed.
+	DELAY 40
+	The rest of
+	DELAY 40
+	SAY Second piece of gear is the Chameleon holster. It allows you to smuggle a firearm past any security checkpoint, which will prove vital for self-defense and assassination missions.
+	DELAY 40
+	SAY Good luck.
+	DELAY 20
+	"}
+
+/obj/item/storage/box/syndie_kit/kansatsu/chameleon
+	name = "chameleon gear kit"
+	illustration = "glasses"
+
+/obj/item/storage/box/syndie_kit/kansatsu/chameleon/PopulateContents() // Same as normal, but instead of stamp and PDA, it gets a holster, a projector and a holodisk.
+	new /obj/item/clothing/under/chameleon(src)
+	new /obj/item/clothing/suit/chameleon(src)
+	new /obj/item/clothing/gloves/chameleon(src)
+	new /obj/item/clothing/shoes/chameleon(src)
+	new /obj/item/clothing/glasses/chameleon(src)
+	new /obj/item/clothing/head/chameleon(src)
+	new /obj/item/clothing/mask/chameleon(src)
+	new /obj/item/clothing/neck/chameleon(src)
+	new /obj/item/storage/backpack/chameleon(src)
+	new /obj/item/storage/belt/chameleon(src)
+	new /obj/item/radio/headset/chameleon(src)
+	new /obj/item/clothing/accessory/holster/chameleon(src)
+	new /obj/item/chameleon(src)
+	new /obj/item/disk/holodisk/kansatsu/gear/chameleon(src)
+
+
+/obj/item/disk/holodisk/kansatsu/gear/pens
+	name = "\improper IR-304" // Introductory Recording - Random Number
+	desc = "A classified holodisk containing an introduction to the modified pens."
+	preset_record_text = {"
+	NAME Researcher Meenus-Seeba
+	SAY You have been issued a set of Cybersun Biodynamics Modified Pen Kit.
+	DELAY 40
+	SAY It contains three advanced pens with utility in espionage.
+	DELAY 40
+	SAY First of the pens doubles as a tiny energy knife. Extremely useful in combat and for utility, while being practically unrecognizable.
+	DELAY 40
+	SAY Second pen is equipped with a hidden chemical injector at the tip. After stabbing a target with it, they will be subdued shortly. Perfect for target extraction.
+	DELAY 40
+	SAY Third pen, and the most visually distinctive one, has a diamond tip that can be used to mine. Not the fastest way to move around, but can certainly prove useful in emergencies.
+	DELAY 40
+	SAY The Cybersun Industries Modified Pen Kit also contains a complimentraty pocket protector to carry the pens in without drawing too much suspicion.
+	DELAY 40
+	SAY Good luck.
+	DELAY 20
+	"}
+
+/obj/item/storage/box/syndie_kit/kansatsu/pens
+	name = "modified pen kit"
+	illustration = "fpen"
+
+/obj/item/storage/box/syndie_kit/kansatsu/pens/PopulateContents()
+	new /obj/item/pen/edagger(src)
+	new /obj/item/pen/sleepy(src)
+	new /obj/item/pen/survival(src)
+	new /obj/item/clothing/accessory/pocketprotector(src)
+	new /obj/item/disk/holodisk/kansatsu/gear/pens(src)
diff --git a/code/game/objects/items/documents.dm b/code/game/objects/items/documents.dm
index c58d4223ca3c..a71fba8d0e9c 100644
--- a/code/game/objects/items/documents.dm
+++ b/code/game/objects/items/documents.dm
@@ -41,6 +41,11 @@
 	desc = "\"Top Secret\" documents detailing sensitive Syndicate operational intelligence. These documents are verified with a red wax seal."
 	icon_state = "docs_red"
 
+/obj/item/documents/syndicate/cybersun
+	name = "Cybersun classified documents"
+	desc = "\"Top Secret\" documents detailing sensitive Cybersun operational intelligence. These documents are verified with a red wax seal."
+	icon_state = "docs_red"
+
 /obj/item/documents/syndicate/blue
 	name = "blue secret documents"
 	desc = "\"Top Secret\" documents detailing sensitive Syndicate operational intelligence. These documents are verified with a blue wax seal."
diff --git a/code/game/objects/items/storage/filled_guncases.dm b/code/game/objects/items/storage/filled_guncases.dm
index cc432f85b0b3..a3a5d50aaa95 100644
--- a/code/game/objects/items/storage/filled_guncases.dm
+++ b/code/game/objects/items/storage/filled_guncases.dm
@@ -66,6 +66,10 @@
 	gun_type = /obj/item/gun/ballistic/automatic/pistol/ringneck/indie
 	mag_type = /obj/item/ammo_box/magazine/m10mm_ringneck
 
+/obj/item/storage/guncase/pistol/himehabu
+	gun_type = /obj/item/gun/ballistic/automatic/pistol/himehabu
+	mag_type = /obj/item/ammo_box/magazine/m22lr_himehabu
+
 /obj/item/storage/guncase/pistol/pc76
 	gun_type = /obj/item/gun/ballistic/automatic/pistol/ringneck
 	mag_type = /obj/item/ammo_box/magazine/m10mm_ringneck
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index bac896c0b8d5..2fccc6df9b19 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -472,3 +472,11 @@
 /obj/item/storage/pill_bottle/trophazole/PopulateContents()
 	for(var/i in 1 to 4)
 		new /obj/item/reagent_containers/pill/trophazole(src)
+
+/obj/item/storage/pill_bottle/cyanide
+	name = "bottle of cyanide pills"
+	desc = "Contains pills used to quickly and quietly kill people. Consume at your own risk."
+
+/obj/item/storage/pill_bottle/cyanide/PopulateContents()
+	for(var/i in 1 to 5)
+		new /obj/item/reagent_containers/pill/cyanide(src)
diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm
index f46d6eb4c2c9..6b7814e617b9 100644
--- a/code/game/objects/items/storage/secure.dm
+++ b/code/game/objects/items/storage/secure.dm
@@ -195,15 +195,6 @@
 		. = ..()
 		new /obj/item/documents/syndicate(src)
 
-/obj/item/storage/secure/safe/intel/stechkin
-	name = "Sensitive Data Safe"
-
-/obj/item/storage/secure/safe/intel/stechkin/PopulateContents()
-		. = ..()
-		new /obj/item/gun/ballistic/automatic/pistol/ringneck(src)
-		new /obj/item/ammo_box/magazine/m10mm_ringneck(src)
-		new /obj/item/ammo_box/magazine/m10mm_ringneck(src)
-
 /obj/item/storage/secure/safe/suns
 	name = "Captain's Secure Safe"
 	desc = "The most important part of a SUNS vessel is the spare dueling sword."
diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm
index af3bc97ac2e9..bb269458866a 100644
--- a/code/modules/clothing/outfits/factions/syndicate.dm
+++ b/code/modules/clothing/outfits/factions/syndicate.dm
@@ -541,7 +541,7 @@
 	head = /obj/item/clothing/head/HoS/cybersun
 	gloves = /obj/item/clothing/gloves/combat
 	id = /obj/item/card/id/syndicate_command/crew_id
-	r_pocket = /obj/item/melee/knife/survival
+	r_pocket = null
 	glasses = /obj/item/clothing/glasses/sunglasses
 
 /datum/outfit/job/syndicate/head_of_personnel/suns
@@ -885,6 +885,17 @@
 	suit = /obj/item/clothing/suit/toggle/labcoat/science
 	dcoat = /obj/item/clothing/suit/hooded/wintercoat/science
 
+
+/datum/outfit/job/syndicate/science/cybersun
+	name = "Syndicate - Researcher (Cybersun)"
+
+	uniform = /obj/item/clothing/under/syndicate/cybersun/research
+	suit = /obj/item/clothing/suit/toggle/labcoat/raincoat
+	shoes = /obj/item/clothing/shoes/jackboots
+	glasses = /obj/item/clothing/glasses/science
+	accessory = /obj/item/clothing/accessory/armband/science
+	gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
+
 /datum/outfit/job/syndicate/science/suns
 	name = "Syndicate - Scientist (SUNS)"
 //more futureproofing than anything, the Aegis currently uses /datum/outfit/job/syndicate/botanist/suns for a similar role
@@ -1087,9 +1098,15 @@
 	ears = /obj/item/radio/headset
 	uniform = /obj/item/clothing/under/syndicate/cybersun
 	accessory = /obj/item/clothing/accessory/armband/cargo
+	shoes = /obj/item/clothing/shoes/jackboots
+	gloves = /obj/item/clothing/gloves/color/black
 	head = /obj/item/clothing/head/soft/cybersun
+	l_pocket = null
 	r_pocket = /obj/item/radio
 
+	box = /obj/item/storage/box/survival/security
+	backpack_contents = null
+
 /datum/outfit/job/syndicate/miner/gec
 	name = "Syndicate - Shaft Miner (GEC)"
 
@@ -1190,10 +1207,10 @@
 	name = "Syndicate - Engineer (Cybersun)"
 
 	uniform = /obj/item/clothing/under/syndicate/cybersun/research
-	shoes = /obj/item/clothing/shoes/workboots
 	r_pocket = /obj/item/radio
 	head = /obj/item/clothing/head/soft/cybersun
 	accessory = /obj/item/clothing/accessory/armband/engine
+	belt = null
 
 /datum/outfit/job/syndicate/engineer/suns
 	name = "Syndicate - Ship Engineer (SUNS)"
diff --git a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
index 3731b349cfe0..ddab7f9b49b6 100644
--- a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
+++ b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
@@ -353,6 +353,9 @@ NO_MAG_GUN_HELPER(automatic/pistol/himehabu)
 	w_class = WEIGHT_CLASS_TINY
 	multiple_sprites = AMMO_BOX_PER_BULLET
 
+/obj/item/ammo_box/magazine/m22lr_himehabu/empty
+	start_empty = TRUE
+
 //########### SMGS ###########//
 
 
diff --git a/shiptest.dme b/shiptest.dme
index 66f2020bebbe..7e95c69f8b2f 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -1037,6 +1037,7 @@
 #include "code\game\MapData\shuttles\pgf_crying_sun.dm"
 #include "code\game\MapData\shuttles\pgf_woeful_cthonian.dm"
 #include "code\game\MapData\shuttles\srm_elder.dm"
+#include "code\game\MapData\shuttles\syndicate_cybersun_kansatsu.dm"
 #include "code\game\mecha\mech_bay.dm"
 #include "code\game\mecha\mech_fabricator.dm"
 #include "code\game\mecha\mecha.dm"