diff --git a/_maps/configs/nanotrasen_skipper.json b/_maps/configs/nanotrasen_skipper.json
index 501ddf7b1afa..86e8ec7c8f49 100644
--- a/_maps/configs/nanotrasen_skipper.json
+++ b/_maps/configs/nanotrasen_skipper.json
@@ -16,7 +16,7 @@
 	"Engineering",
 	"Mining"
 	],
-	"starting_funds": 4000,
+	"starting_funds": 4500,
 	"roundstart": true,
 	"job_slots": {
 		"Captain": {
@@ -36,13 +36,25 @@
 		"Medical Doctor": 1,
 		"Engineer": {
 			"outfit": "/datum/outfit/job/engineer/nt",
-			"slots": 3
+			"slots": 1
+		},
+		"Atmospheric Technician": {
+			"outfit": "/datum/outfit/job/atmos",
+			"slots": 1
 		},
 		"Shaft Miner": 2,
+		"Cargo Technician": {
+		"outfit": "/datum/outfit/job/cargo_tech",
+		"slots": 1
+		},
 		"Security Officer": {
 			"outfit": "/datum/outfit/job/security/nanotrasen",
 			"slots": 1
 		},
+		"Cook": {
+			"outfit": "/datum/outfit/job/cook",
+			"slots": 1
+		},
 		"Assistant": {
 			"outfit": "/datum/outfit/job/assistant",
 			"slots": 3
diff --git a/_maps/deprecated/Ruins/forgottenship.dmm b/_maps/deprecated/Ruins/forgottenship.dmm
index a692377b9a76..ccc0042f2280 100644
--- a/_maps/deprecated/Ruins/forgottenship.dmm
+++ b/_maps/deprecated/Ruins/forgottenship.dmm
@@ -420,7 +420,7 @@
 /obj/structure/closet/crate/secure/gear{
 	req_one_access_txt = "150"
 	},
-/obj/item/clothing/suit/space/hardsuit/cybersun,
+,
 /turf/open/floor/pod/dark,
 /area/ruin/space/has_grav/powered/syndicate_forgotten_vault)
 "bB" = (
diff --git a/_maps/shuttles/shiptest/inteq_colossus.dmm b/_maps/shuttles/shiptest/inteq_colossus.dmm
index 04c52ce9626f..9aec48334728 100644
--- a/_maps/shuttles/shiptest/inteq_colossus.dmm
+++ b/_maps/shuttles/shiptest/inteq_colossus.dmm
@@ -4,6 +4,10 @@
 	dir = 1
 	},
 /obj/item/trash/raisins,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "ai" = (
@@ -110,24 +114,26 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/fore)
 "bJ" = (
+/obj/structure/table/reinforced,
+/obj/machinery/fax,
+/obj/machinery/light/directional/north,
 /obj/structure/cable{
-	icon_state = "2-4"
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/borderfloor{
-	dir = 5
+	dir = 4
 	},
-/obj/item/radio/intercom/directional/north{
-	freerange = 1;
-	freqlock = 1;
-	frequency = 1347;
-	name = "IRMG shortwave intercom"
+/obj/effect/turf_decal/corner/opaque/yellow{
+	dir = 1
 	},
-/obj/machinery/telecomms/relay/preset/mining{
-	autolinkers = list("relay","hub");
-	freq_listening = list(1347);
-	id = "IRMG Relay";
-	name = "IRMG Relay";
-	network = "irmg_commnet"
+/obj/machinery/button/door{
+	id = "colossus_windows";
+	name = "Window Lockdown";
+	pixel_x = -4;
+	pixel_y = 21
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
@@ -167,21 +173,12 @@
 /obj/machinery/atmospherics/components/unary/shuttle/heater{
 	dir = 4
 	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
 /obj/machinery/door/poddoor{
 	dir = 4;
 	id = "colossus_thrusters"
 	},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/maintenance/starboard)
 "cd" = (
 /obj/item/storage/backpack/messenger/inteq,
@@ -199,7 +196,7 @@
 	pixel_y = 28
 	},
 /obj/machinery/firealarm/directional/east,
-/turf/open/floor/carpet/black,
+/turf/open/floor/plasteel/grimy,
 /area/ship/crew)
 "cq" = (
 /obj/structure/cable{
@@ -208,7 +205,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/item/radio/intercom/directional/west,
-/turf/open/floor/carpet/black,
+/turf/open/floor/plasteel/grimy,
 /area/ship/crew)
 "ct" = (
 /obj/structure/cable{
@@ -222,11 +219,25 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/obj/effect/turf_decal/borderfloor{
+/obj/structure/table/reinforced,
+/obj/item/gps{
+	pixel_x = 12
+	},
+/obj/item/paper_bin,
+/obj/item/pen/fountain,
+/obj/item/toy/figure/vanguard{
+	pixel_x = -10;
+	pixel_y = 5
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 1
 	},
-/obj/structure/table/reinforced,
-/obj/machinery/fax,
+/obj/effect/turf_decal/corner/opaque/brown{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "cM" = (
@@ -379,6 +390,13 @@
 /obj/machinery/vending/cigarette,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
+"eC" = (
+/obj/structure/marker_beacon{
+	picked_color = "Lime"
+	},
+/obj/structure/catwalk,
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
 "eI" = (
 /obj/effect/turf_decal/box/corners,
 /obj/structure/cable{
@@ -556,6 +574,10 @@
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
+"fU" = (
+/obj/structure/catwalk,
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
 "fW" = (
 /obj/effect/turf_decal/siding/thinplating/corner,
 /obj/effect/turf_decal/siding/thinplating/corner{
@@ -622,15 +644,8 @@
 /obj/machinery/modular_computer/console/preset/command{
 	dir = 8
 	},
-/obj/machinery/button/door{
-	dir = 1;
-	id = "colossus_windows";
-	name = "Window Lockdown";
-	pixel_x = -4;
-	pixel_y = -21
-	},
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "gJ" = (
 /obj/effect/turf_decal/siding/thinplating/corner{
@@ -707,13 +722,13 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/hallway/port)
 "hO" = (
-/obj/machinery/door/airlock/external,
-/obj/effect/turf_decal/borderfloor{
+/obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/tech,
+/obj/structure/sign/warning/vacuum/external{
+	pixel_x = 32
+	},
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/port)
 "hQ" = (
 /obj/machinery/power/shuttle/engine/electric{
@@ -722,7 +737,7 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/engine/hull/reinforced,
 /area/ship/maintenance/port)
 "hU" = (
 /obj/item/radio/intercom/directional/east,
@@ -737,13 +752,11 @@
 /obj/effect/turf_decal/box/corners{
 	dir = 8
 	},
-/obj/machinery/status_display/shuttle{
-	pixel_x = -32
-	},
 /obj/structure/sign/poster/official/no_erp{
 	pixel_y = -32
 	},
 /obj/machinery/light/directional/south,
+/obj/machinery/computer/helm/viewscreen/directional/west,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "ie" = (
@@ -829,6 +842,7 @@
 	},
 /obj/item/storage/belt/security/webbing/inteq,
 /obj/item/storage/belt/military/assault,
+/obj/item/reagent_containers/spray/pepper,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "iT" = (
@@ -844,7 +858,17 @@
 /obj/machinery/computer/cargo/express{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
+/obj/effect/turf_decal/borderfloor,
+/obj/item/radio/intercom/directional/north{
+	dir = 4;
+	freerange = 1;
+	freqlock = 1;
+	frequency = 1347;
+	name = "IRMG shortwave intercom";
+	pixel_x = 31;
+	pixel_y = 0
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "iY" = (
 /obj/machinery/power/apc/auto_name/directional/east,
@@ -861,8 +885,8 @@
 /obj/item/stack/sheet/mineral/plasma/twenty,
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/machinery/light_switch{
-	pixel_x = 20;
 	dir = 8;
+	pixel_x = 20;
 	pixel_y = 11
 	},
 /turf/open/floor/plating,
@@ -1128,7 +1152,6 @@
 	dir = 4
 	},
 /obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
-/obj/item/clothing/head/helmet/space/inteq,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "mY" = (
@@ -1150,32 +1173,37 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/firealarm/directional/west,
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "nm" = (
 /obj/machinery/atmospherics/pipe/layer_manifold,
-/obj/effect/turf_decal/techfloor{
-	dir = 1
-	},
-/obj/structure/sign/warning/vacuum/external{
-	pixel_x = 32
-	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/east,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/port)
 "ny" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
 	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/corner/opaque/brown{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/yellow{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "ob" = (
@@ -1191,7 +1219,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/carpet/black,
+/turf/open/floor/plasteel/grimy,
 /area/ship/crew)
 "og" = (
 /obj/effect/turf_decal/corner/opaque/yellow{
@@ -1230,7 +1258,6 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "on" = (
-/obj/effect/turf_decal/industrial/warning,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/power/shieldwallgen/atmos{
 	anchored = 1;
@@ -1241,10 +1268,11 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/effect/turf_decal/industrial/warning/fulltile,
 /obj/machinery/door/poddoor{
 	id = "colossus_port"
 	},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/cargo)
 "oq" = (
 /obj/effect/turf_decal/borderfloorblack{
@@ -1261,7 +1289,7 @@
 /obj/machinery/power/shuttle/engine/fueled/plasma{
 	dir = 4
 	},
-/turf/open/floor/plating,
+/turf/open/floor/engine/hull/reinforced,
 /area/ship/maintenance/port)
 "oY" = (
 /obj/machinery/suit_storage_unit/inherit{
@@ -1277,7 +1305,6 @@
 	pixel_x = 32
 	},
 /obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
-/obj/item/clothing/head/helmet/space/inteq,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "pa" = (
@@ -1380,13 +1407,11 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "pX" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
+/obj/effect/turf_decal/industrial/warning/fulltile,
 /obj/machinery/door/poddoor{
 	id = "colossus_starboard"
 	},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/cargo)
 "qu" = (
 /obj/machinery/cryopod{
@@ -1435,7 +1460,7 @@
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable,
 /obj/machinery/airalarm/directional/south,
-/turf/open/floor/carpet/black,
+/turf/open/floor/plasteel/grimy,
 /area/ship/crew)
 "qX" = (
 /obj/structure/rack,
@@ -1461,7 +1486,6 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "rb" = (
-/obj/effect/turf_decal/industrial/warning,
 /obj/machinery/power/shieldwallgen/atmos{
 	anchored = 1;
 	dir = 8;
@@ -1471,30 +1495,12 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/effect/turf_decal/industrial/warning/fulltile,
 /obj/machinery/door/poddoor{
 	id = "colossus_port"
 	},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/cargo)
-"re" = (
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/machinery/door/window/eastleft{
-	name = "Engine Access"
-	},
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "colossus_thrusters"
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
 "rh" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/cargo)
@@ -1556,8 +1562,13 @@
 	},
 /obj/machinery/light/small/directional/north,
 /obj/machinery/door/window/brigdoor/eastright{
+	name = "Weapons Lockup";
 	req_access_txt = "3"
 	},
+/obj/machinery/light_switch{
+	pixel_x = -12;
+	pixel_y = 23
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/security/armory)
 "rS" = (
@@ -1606,11 +1617,9 @@
 /obj/item/reagent_containers/food/drinks/waterbottle/large,
 /obj/item/reagent_containers/food/drinks/waterbottle/large,
 /obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/machinery/status_display/shuttle{
-	pixel_x = -32
-	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/directional/north,
+/obj/machinery/computer/helm/viewscreen/directional/west,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "sc" = (
@@ -1621,25 +1630,6 @@
 /obj/item/toy/figure/inteq,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
-"sj" = (
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/machinery/door/window/eastright{
-	name = "Engine Access"
-	},
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "colossus_thrusters"
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
 "sp" = (
 /obj/effect/turf_decal/box/corners{
 	dir = 1
@@ -1659,12 +1649,14 @@
 	dir = 6
 	},
 /obj/item/radio/intercom/directional/east,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -5;
+	pixel_y = -19
+	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/fore)
 "sD" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/power/shieldwallgen/atmos{
 	anchored = 1;
@@ -1673,10 +1665,11 @@
 	locked = 1
 	},
 /obj/structure/cable,
+/obj/effect/turf_decal/industrial/warning/fulltile,
 /obj/machinery/door/poddoor{
 	id = "colossus_starboard"
 	},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/cargo)
 "sF" = (
 /obj/structure/cable{
@@ -1685,17 +1678,12 @@
 /obj/machinery/power/smes/shuttle/precharged{
 	dir = 4
 	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/machinery/door/window/eastleft{
-	name = "Engine Access"
-	},
 /obj/machinery/door/poddoor{
 	dir = 4;
 	id = "colossus_thrusters"
 	},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/maintenance/port)
 "sP" = (
 /obj/structure/chair{
@@ -1752,17 +1740,12 @@
 /obj/machinery/power/smes/shuttle/precharged{
 	dir = 4
 	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/machinery/door/window/eastright{
-	name = "Engine Access"
-	},
 /obj/machinery/door/poddoor{
 	dir = 4;
 	id = "colossus_thrusters"
 	},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/maintenance/starboard)
 "tt" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -1802,12 +1785,6 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/port)
 "tI" = (
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/machinery/holopad/emergency/command,
 /turf/open/floor/carpet/orange,
 /area/ship/bridge)
@@ -1869,9 +1846,6 @@
 	dir = 4;
 	name = "Helm"
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/effect/landmark/start/head_of_security,
 /turf/open/floor/carpet/orange,
 /area/ship/bridge)
@@ -1914,22 +1888,19 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
 "uy" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/effect/turf_decal/borderfloor{
 	dir = 4
 	},
 /obj/machinery/computer/helm{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "uE" = (
 /obj/structure/cable{
@@ -1987,8 +1958,10 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "va" = (
-/obj/machinery/computer/rdconsole/core{
-	dir = 4
+/obj/structure/table/reinforced,
+/obj/item/flashlight/lamp{
+	pixel_x = -5;
+	pixel_y = 13
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
@@ -2059,11 +2032,11 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/cargo)
 "vZ" = (
-/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning/fulltile,
 /obj/machinery/door/poddoor{
 	id = "colossus_port"
 	},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/cargo)
 "wb" = (
 /obj/structure/table,
@@ -2179,8 +2152,8 @@
 	},
 /obj/effect/turf_decal/steeldecal/steel_decals_central7,
 /obj/machinery/light_switch{
-	pixel_y = 23;
-	pixel_x = 11
+	pixel_x = 11;
+	pixel_y = 23
 	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
@@ -2230,9 +2203,7 @@
 /obj/effect/turf_decal/corner/opaque/brown{
 	dir = 4
 	},
-/obj/machinery/status_display/shuttle{
-	pixel_x = 32
-	},
+/obj/machinery/computer/helm/viewscreen/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
 "xO" = (
@@ -2329,7 +2300,7 @@
 	name = "uniform closet";
 	pixel_y = 28
 	},
-/turf/open/floor/carpet/black,
+/turf/open/floor/plasteel/grimy,
 /area/ship/crew)
 "zW" = (
 /obj/structure/cable{
@@ -2373,9 +2344,6 @@
 /turf/open/floor/carpet/black,
 /area/ship/crew)
 "Ae" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
@@ -2446,6 +2414,15 @@
 	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
+"Bn" = (
+/obj/docking_port/stationary{
+	dir = 2;
+	dwidth = 15;
+	height = 15;
+	width = 30
+	},
+/turf/template_noop,
+/area/template_noop)
 "Br" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -2469,7 +2446,6 @@
 	},
 /obj/machinery/airalarm/directional/west,
 /obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
-/obj/item/clothing/head/helmet/space/inteq,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "BA" = (
@@ -2503,7 +2479,7 @@
 	pixel_y = -5
 	},
 /obj/machinery/light/small/directional/west,
-/turf/open/floor/carpet/black,
+/turf/open/floor/plasteel/grimy,
 /area/ship/crew)
 "BK" = (
 /obj/effect/turf_decal/box/corners{
@@ -2520,7 +2496,6 @@
 	},
 /obj/structure/closet/cardboard,
 /obj/item/radio/intercom/directional/south,
-/obj/item/storage/box/inteqmaid,
 /obj/effect/spawner/lootdrop/maintenance/seven,
 /obj/effect/turf_decal/corner_techfloor_gray{
 	dir = 4
@@ -2566,6 +2541,11 @@
 /obj/effect/turf_decal/siding/thinplating{
 	dir = 9
 	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = -5
+	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "Ck" = (
@@ -2621,10 +2601,10 @@
 /turf/open/floor/plating,
 /area/ship/crew/office)
 "CA" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/cable{
-	icon_state = "2-8"
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/carpet/orange,
 /area/ship/bridge)
 "CG" = (
@@ -2639,7 +2619,6 @@
 	},
 /obj/machinery/light/directional/west,
 /obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
-/obj/item/clothing/head/helmet/space/inteq,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "Da" = (
@@ -2663,7 +2642,6 @@
 /obj/item/clothing/under/syndicate/inteq,
 /obj/item/clothing/suit/armor/hos/inteq,
 /obj/item/clothing/head/beret/sec/hos/inteq,
-/obj/item/radio/headset/inteq/alt/captain,
 /obj/item/areaeditor/shuttle,
 /obj/item/shield/riot/tele,
 /obj/structure/cable{
@@ -2737,6 +2715,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	pixel_x = 11;
+	pixel_y = 23
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/security/armory)
 "DW" = (
@@ -2854,13 +2836,16 @@
 /obj/machinery/atmospherics/pipe/simple/orange/hidden/layer1{
 	dir = 9
 	},
-/obj/structure/table/rolling,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/mop,
 /obj/structure/sign/warning/nosmoking/circle{
 	pixel_x = 32
 	},
-/obj/item/pushbroom,
+/obj/machinery/telecomms/relay/preset/mining{
+	autolinkers = list("relay","hub");
+	freq_listening = list(1347);
+	id = "IRMG Relay";
+	name = "IRMG Relay";
+	network = "irmg_commnet"
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "FR" = (
@@ -2906,8 +2891,8 @@
 /obj/machinery/light/small/directional/east,
 /obj/machinery/airalarm/directional/south,
 /obj/machinery/light_switch{
-	pixel_y = 23;
-	pixel_x = 11
+	pixel_x = 11;
+	pixel_y = 23
 	},
 /turf/open/floor/plasteel/showroomfloor,
 /area/ship/crew/toilet)
@@ -2995,8 +2980,8 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/trash/sosjerky,
 /obj/machinery/light_switch{
-	pixel_y = 23;
-	pixel_x = -12
+	pixel_x = -12;
+	pixel_y = 23
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
@@ -3110,23 +3095,29 @@
 /obj/item/clothing/head/helmet/space/inteq,
 /obj/machinery/suit_storage_unit/inherit,
 /obj/machinery/light_switch{
-	pixel_x = 20;
 	dir = 8;
+	pixel_x = 20;
 	pixel_y = 11
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/port)
+"Ii" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/hallway/port)
 "Il" = (
-/obj/machinery/power/apc/auto_name/directional/west,
 /obj/effect/turf_decal/steeldecal/steel_decals_central7{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
 /obj/machinery/suit_storage_unit/inherit,
 /obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
 /obj/item/tank/jetpack/oxygen,
+/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/corner/opaque/yellow{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/brown{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "It" = (
@@ -3245,8 +3236,8 @@
 	},
 /obj/effect/turf_decal/steeldecal/steel_decals_central7,
 /obj/machinery/light_switch{
-	pixel_y = 23;
-	pixel_x = 11
+	pixel_x = 11;
+	pixel_y = 23
 	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/fore)
@@ -3256,10 +3247,20 @@
 	name = "vanguard's bedsheet"
 	},
 /obj/structure/curtain/bounty,
-/obj/effect/turf_decal/borderfloor{
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/effect/turf_decal/corner/opaque/brown{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/brown{
 	dir = 8
 	},
-/obj/machinery/airalarm/directional/north,
+/obj/effect/turf_decal/corner/opaque/yellow{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "KM" = (
@@ -3318,21 +3319,12 @@
 /obj/machinery/atmospherics/components/unary/shuttle/heater{
 	dir = 4
 	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
 /obj/machinery/door/poddoor{
 	dir = 4;
 	id = "colossus_thrusters"
 	},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/maintenance/port)
 "Lx" = (
 /obj/structure/closet/crate,
@@ -3377,7 +3369,7 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/engine/hull/reinforced,
 /area/ship/maintenance/starboard)
 "Mg" = (
 /obj/effect/turf_decal/corner/opaque/yellow,
@@ -3499,32 +3491,20 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
 "NH" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
-/obj/machinery/light/directional/north,
-/obj/item/storage/fancy/cigarettes/cigars/havana,
-/obj/item/lighter{
-	pixel_y = 5
+/obj/machinery/turretid/lethal{
+	pixel_y = 22
 	},
-/obj/item/toy/figure/vanguard{
-	pixel_x = -10;
-	pixel_y = 5
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/machinery/turretid/lethal{
-	pixel_y = 32
+/obj/effect/turf_decal/corner/opaque/brown{
+	dir = 4
 	},
-/obj/structure/table/reinforced,
-/obj/item/paper_bin,
-/obj/item/pen/fountain,
-/obj/item/gps{
-	pixel_x = 12
+/obj/effect/turf_decal/corner/opaque/yellow{
+	dir = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
@@ -3608,9 +3588,12 @@
 /turf/open/floor/carpet/black,
 /area/ship/crew)
 "Ou" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/external/dark)
+/obj/machinery/door/airlock/external,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/port)
 "Ow" = (
 /obj/structure/sign/number/nine{
 	dir = 1
@@ -3624,13 +3607,13 @@
 /obj/machinery/atmospherics/pipe/simple/dark/visible/layer5{
 	dir = 5
 	},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced,
 /area/ship/engineering)
 "OG" = (
 /obj/machinery/power/shuttle/engine/fueled/plasma{
 	dir = 4
 	},
-/turf/open/floor/plating,
+/turf/open/floor/engine/hull/reinforced,
 /area/ship/maintenance/starboard)
 "OV" = (
 /obj/structure/cable{
@@ -3641,10 +3624,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/turf_decal/corner/opaque/yellow,
-/obj/effect/turf_decal/corner/opaque/brown{
-	dir = 8
-	},
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
 "Pb" = (
@@ -3706,8 +3686,12 @@
 /obj/machinery/light_switch{
 	dir = 1;
 	pixel_x = 11;
-	pixel_y = -17
+	pixel_y = -19
 	},
+/obj/item/pushbroom,
+/obj/item/mop,
+/obj/item/reagent_containers/glass/bucket,
+/obj/structure/table,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "Pq" = (
@@ -3744,7 +3728,7 @@
 /obj/machinery/light_switch{
 	dir = 1;
 	pixel_x = 5;
-	pixel_y = -20
+	pixel_y = -19
 	},
 /obj/effect/turf_decal/corner/opaque/yellow,
 /obj/effect/turf_decal/corner/opaque/brown{
@@ -3798,7 +3782,6 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/borderfloor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -3808,12 +3791,13 @@
 	dir = 1
 	},
 /obj/machinery/door/firedoor/border_only,
+/obj/effect/turf_decal/industrial/warning/fulltile,
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/port)
 "QL" = (
 /obj/machinery/door/airlock/command/glass{
 	name = "Bridge";
-	req_access_txt = "58"
+	req_access_txt = "20"
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3850,7 +3834,7 @@
 /obj/machinery/atmospherics/components/unary/outlet_injector/on{
 	name = "exhaust injector"
 	},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced,
 /area/ship/engineering)
 "Rq" = (
 /obj/structure/cable{
@@ -3884,14 +3868,12 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "RH" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/industrial/warning/fulltile,
 /obj/machinery/door/poddoor{
 	id = "colossus_starboard"
 	},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/cargo)
 "RI" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
@@ -3983,9 +3965,6 @@
 /area/ship/cargo)
 "Sj" = (
 /obj/structure/table/reinforced,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /obj/machinery/light/directional/south,
 /obj/item/radio/intercom/directional/south,
 /obj/item/storage/lockbox/medal/sec{
@@ -3996,6 +3975,10 @@
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
+/obj/effect/turf_decal/corner/opaque/brown{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/yellow,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "Sp" = (
@@ -4005,9 +3988,7 @@
 /obj/effect/turf_decal/siding/thinplating{
 	dir = 1
 	},
-/obj/machinery/status_display/shuttle{
-	pixel_y = 32
-	},
+/obj/machinery/computer/helm/viewscreen/directional/north,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "Ss" = (
@@ -4094,7 +4075,7 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/corner/opaque/yellow,
-/obj/machinery/rnd/production/techfab/department/security,
+/obj/machinery/autolathe,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "TF" = (
@@ -4102,7 +4083,7 @@
 	dir = 1;
 	name = "environmental siphon"
 	},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced,
 /area/ship/engineering)
 "TZ" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
@@ -4221,17 +4202,14 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "Wb" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/warning{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 1
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/fore)
 "Wl" = (
@@ -4245,8 +4223,8 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light_switch{
-	pixel_x = 20;
 	dir = 8;
+	pixel_x = 20;
 	pixel_y = 11
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
@@ -4328,13 +4306,13 @@
 /obj/item/storage/belt/security/webbing/inteq/alt,
 /obj/item/storage/belt/security/webbing/inteq/alt,
 /obj/item/storage/belt/security/webbing/inteq/alt,
+/obj/item/reagent_containers/spray/pepper,
+/obj/item/reagent_containers/spray/pepper,
+/obj/item/reagent_containers/spray/pepper,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "WG" = (
 /obj/effect/turf_decal/box/corners,
-/obj/machinery/status_display/shuttle{
-	pixel_x = 32
-	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/storage/firstaid/regular{
 	pixel_x = 5
@@ -4344,6 +4322,7 @@
 	},
 /obj/structure/table/rolling,
 /obj/machinery/light/directional/south,
+/obj/machinery/computer/helm/viewscreen/directional/east,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "WS" = (
@@ -4445,9 +4424,6 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "XF" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/power/shieldwallgen/atmos{
 	anchored = 1;
@@ -4456,10 +4432,11 @@
 	locked = 1
 	},
 /obj/structure/cable,
+/obj/effect/turf_decal/industrial/warning/fulltile,
 /obj/machinery/door/poddoor{
 	id = "colossus_starboard"
 	},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/cargo)
 "XJ" = (
 /turf/template_noop,
@@ -4505,7 +4482,7 @@
 /area/ship/security/armory)
 "Yx" = (
 /obj/machinery/atmospherics/pipe/layer_manifold/visible,
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced,
 /area/ship/engineering)
 "Yy" = (
 /obj/docking_port/stationary{
@@ -4655,7 +4632,7 @@ XJ
 bo
 sF
 Ls
-sj
+sF
 bo
 XJ
 XJ
@@ -4665,7 +4642,7 @@ XJ
 XJ
 XJ
 rl
-re
+tp
 bS
 tp
 rl
@@ -4805,7 +4782,7 @@ XJ
 "}
 (9,1,1) = {"
 XJ
-XJ
+Yy
 XJ
 XJ
 rh
@@ -4823,7 +4800,7 @@ vH
 rh
 XJ
 XJ
-XJ
+Bn
 "}
 (10,1,1) = {"
 XJ
@@ -5201,7 +5178,7 @@ XA
 "}
 (27,1,1) = {"
 XJ
-xh
+Ii
 hD
 hD
 hD
@@ -5245,7 +5222,7 @@ XJ
 "}
 (29,1,1) = {"
 XJ
-XJ
+Ll
 hD
 hD
 hD
@@ -5397,3 +5374,91 @@ xT
 Hu
 XJ
 "}
+(36,1,1) = {"
+XJ
+XJ
+XJ
+fU
+XJ
+fU
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+"}
+(37,1,1) = {"
+XJ
+XJ
+XJ
+fU
+XJ
+fU
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+"}
+(38,1,1) = {"
+XJ
+XJ
+XJ
+eC
+XJ
+fU
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+"}
+(39,1,1) = {"
+XJ
+XJ
+XJ
+XJ
+XJ
+eC
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+"}
diff --git a/_maps/shuttles/shiptest/nanotrasen_skipper.dmm b/_maps/shuttles/shiptest/nanotrasen_skipper.dmm
index 75215dc349a9..27eec1aa822e 100644
--- a/_maps/shuttles/shiptest/nanotrasen_skipper.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_skipper.dmm
@@ -1,122 +1,101 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"ah" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/computer/atmos_control/tank/oxygen_tank{
-	dir = 1
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/engineering/atmospherics)
 "ai" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+/obj/effect/turf_decal/industrial/warning{
+	dir = 9
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/industrial/warning{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 1;
-	pixel_y = -32
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
 	},
 /turf/open/floor/plasteel,
-/area/ship/engineering)
+/area/ship/engineering/atmospherics)
 "al" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
-	dir = 4
+/turf/open/floor/wood,
+/area/ship/hallway/central)
+"ao" = (
+/obj/machinery/airalarm/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/cryo)
-"as" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input,
-/turf/open/floor/engine/n2,
-/area/ship/engineering/atmospherics)
-"aF" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/carpet/royalblue,
+/area/ship/crew/crewtwo)
+"aA" = (
+/obj/structure/railing/corner{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"aI" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/bridge)
+"aF" = (
+/obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/turf/closed/wall,
-/area/ship/crew/cryo)
-"aL" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/structure/sign/poster/official/random{
+	pixel_y = -32
 	},
-/obj/machinery/button/door{
-	dir = 1;
-	id = "coolingshutdown";
-	name = "Shutdown Cooling";
-	pixel_y = -22
+/obj/structure/chair{
+	dir = 8
 	},
-/obj/machinery/atmospherics/components/binary/pump{
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"aL" = (
+/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
 	dir = 4
 	},
+/obj/item/radio/intercom/directional/east,
 /turf/open/floor/engine,
 /area/ship/engineering/engine)
-"aZ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"ba" = (
-/obj/structure/table,
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 10
-	},
-/obj/item/folder/yellow,
-/obj/item/stamp/qm,
-/obj/machinery/button/shieldwallgen{
-	dir = 1;
-	id = "skippyshieldywalle";
-	pixel_y = -24
-	},
+"aN" = (
+/obj/structure/catwalk/over,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating/rust,
+/area/ship/crew/toilet)
+"aQ" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
-"bd" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/structure/sign/poster/official/random{
-	pixel_y = 32
-	},
+/area/ship/cargo)
+"aR" = (
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
-/obj/machinery/light/small/directional/north,
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"aZ" = (
+/turf/open/floor/carpet/blue,
+/area/ship/crew/dorm)
+"bd" = (
+/obj/item/kirbyplants/random,
 /turf/open/floor/carpet/nanoweave/blue,
 /area/ship/medical)
 "bf" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 10
 	},
-/turf/open/floor/plating,
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
 "bk" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{
@@ -124,485 +103,609 @@
 	},
 /turf/open/floor/engine/airless,
 /area/ship/engineering/engine)
+"bo" = (
+/obj/structure/dresser,
+/obj/item/flashlight/lamp{
+	pixel_x = -5;
+	pixel_y = 9
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
 "bq" = (
-/obj/structure/railing{
-	dir = 4
+/obj/structure/dresser,
+/obj/item/storage/lockbox/medal{
+	pixel_y = 13
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/wood,
+/area/ship/crew/crewtwo)
+"bs" = (
+/obj/structure/holosign/barrier/engineering/infinite{
+	name = "maintenance barrier"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
+/obj/structure/catwalk/over,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel/stairs,
-/area/ship/bridge)
-"bz" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating/rust,
+/area/ship/crew/toilet)
+"bw" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/turf_decal/techfloor{
-	dir = 8
-	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"bA" = (
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/effect/turf_decal/techfloor{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
 	},
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"bD" = (
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/structure/sign/poster/retro/nanotrasen_logo_80s{
+	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"bE" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"bz" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"bA" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 6
+	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"bI" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 8
+/turf/open/floor/engine,
+/area/ship/engineering/atmospherics)
+"bG" = (
+/obj/machinery/atmospherics/components/unary/shuttle/heater{
+	dir = 4
 	},
-/obj/effect/turf_decal/techfloor/hole/right,
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"bO" = (
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = 25;
-	pixel_y = -25
+/obj/structure/window/reinforced/spawner/west,
+/obj/machinery/door/poddoor{
+	dir = 4;
+	id = "enginelockdown"
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/machinery/door/window/eastleft{
+	name = "Engine Access"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"bI" = (
+/obj/machinery/atmospherics/pipe/simple/purple/visible,
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/fulltile,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"bO" = (
+/obj/structure/table/reinforced,
+/obj/item/flashlight/lamp{
+	pixel_x = -9;
+	pixel_y = 13
 	},
+/obj/machinery/recharger,
 /turf/open/floor/carpet/nanoweave/red,
 /area/ship/crew/crewthree)
+"bR" = (
+/obj/structure/catwalk/over,
+/obj/machinery/firealarm/directional/west,
+/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/glass,
+/obj/effect/decal/cleanable/garbage,
+/turf/open/floor/plating,
+/area/ship/crew/toilet)
 "bW" = (
-/obj/effect/turf_decal/corner/opaque/white/mono,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"ca" = (
-/obj/effect/turf_decal/corner/opaque/red/mono,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/structure/displaycase/captain{
+	req_access = null;
+	req_access_txt = "20"
 	},
+/turf/open/floor/wood,
+/area/ship/crew/crewtwo)
+"bY" = (
+/obj/machinery/vending/cola/space_up,
+/turf/open/floor/wood,
+/area/ship/hallway/central)
+"bZ" = (
 /obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"cp" = (
-/obj/structure/sign/directions/medical{
-	dir = 4
+	icon_state = "1-2"
 	},
-/obj/structure/sign/directions/command{
-	dir = 4;
-	pixel_y = -6
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
 	},
-/turf/closed/wall,
-/area/ship/crew/cryo)
-"cC" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/light/small/directional/west,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"cd" = (
+/obj/machinery/light/dim/directional/south,
+/obj/structure/chair{
+	dir = 1
+	},
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
-"cF" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
-	dir = 4
+"cp" = (
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/closed/wall/r_wall,
-/area/ship/crew/cryo)
-"cL" = (
-/obj/machinery/atmospherics/components/binary/valve/digital{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/turf/open/floor/wood,
+/area/ship/hallway/central)
+"cq" = (
+/obj/effect/turf_decal/siding/wood/corner{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/effect/turf_decal/techfloor{
-	dir = 8
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"cF" = (
+/obj/structure/chair/comfy/black{
+	dir = 4
 	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"cQ" = (
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 9
+/turf/open/floor/wood,
+/area/ship/hallway/central)
+"cJ" = (
+/obj/structure/sign/nanotrasen{
+	pixel_y = -30
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"cL" = (
+/obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
+/obj/machinery/door/firedoor/border_only,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/effect/turf_decal/techfloor/corner,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"cQ" = (
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
-/area/ship/cargo/office)
-"cY" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 9
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/item/pipe_dispenser,
-/obj/structure/closet/crate{
-	name = "Atmospherics Equipment Crate"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2{
+	dir = 1
 	},
-/obj/item/extinguisher/advanced,
-/obj/item/holosign_creator/atmos,
-/obj/item/storage/toolbox/mechanical,
-/obj/effect/turf_decal/techfloor{
-	dir = 4
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
-/obj/machinery/light/directional/east,
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/atmospherics)
+"cS" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
 "de" = (
-/obj/structure/chair/comfy/black{
-	dir = 4
+/obj/machinery/light/dim/directional/north,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"dj" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/fulltile,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"dl" = (
+/obj/structure/sign/poster/official/obey{
+	pixel_x = -30
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/carpet,
-/area/ship/crew/office)
-"di" = (
-/obj/structure/table/wood,
-/obj/item/phone{
-	desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
-	pixel_x = -3;
-	pixel_y = 3
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
 	},
-/obj/item/cigbutt/cigarbutt{
-	pixel_x = 7
+/obj/structure/table/reinforced,
+/obj/item/paper_bin{
+	pixel_x = 6;
+	pixel_y = 2
 	},
-/turf/open/floor/carpet,
-/area/ship/crew/office)
-"dl" = (
-/obj/machinery/door/airlock/command{
-	name = "Requests Office";
-	req_one_access_txt = "57, 41"
+/obj/item/pen{
+	pixel_y = 4;
+	pixel_x = 5
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/item/folder/blue{
+	pixel_x = -8;
+	pixel_y = 7
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
+/obj/item/stamp/head_of_personnel{
+	pixel_x = -7;
+	pixel_y = -3
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/item/folder/red{
+	pixel_x = -8;
+	pixel_y = 11
 	},
-/obj/machinery/door/firedoor/border_only,
 /turf/open/floor/wood,
 /area/ship/crew/crewthree)
 "dp" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2{
-	dir = 8
+/obj/structure/table,
+/obj/machinery/chem_dispenser/drinks/beer,
+/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/corner/opaque/green/mono,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen/kitchen)
+"dq" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/structure/sign/poster/official/random{
+	pixel_y = 32
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
-"dt" = (
-/obj/effect/turf_decal/corner/opaque/yellow/border{
-	dir = 1
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
+"du" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/yellow/half,
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
+/obj/machinery/holopad/emergency/command,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
 "dy" = (
 /turf/open/floor/carpet/nanoweave/blue,
 /area/ship/medical)
 "dB" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
+/obj/machinery/airalarm/directional/west,
+/obj/effect/turf_decal/corner/opaque/ntblue/diagonal,
+/obj/effect/turf_decal/corner/opaque/neutral/diagonal{
 	dir = 4
 	},
-/obj/effect/turf_decal/techfloor{
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"dG" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
-/area/ship/engineering/atmospherics)
-"dJ" = (
-/obj/machinery/power/terminal{
-	dir = 8
+/obj/machinery/light/small/directional/east,
+/obj/machinery/firealarm/directional/south,
+/obj/item/gun/energy/laser{
+	pixel_y = -6
 	},
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/item/gun/energy/e_gun/mini{
+	pixel_y = -2;
+	pixel_x = 6
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer4{
-	dir = 1
+/obj/item/gun/energy/e_gun/mini{
+	pixel_x = -8;
+	pixel_y = -2
 	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 6
+/obj/structure/closet/secure_closet{
+	anchored = 1;
+	can_be_unanchored = 1;
+	icon_state = "sec";
+	name = "firearm locker";
+	req_access_txt = "1"
+	},
+/obj/item/gun/ballistic/automatic/pistol/commander,
+/obj/item/gun/ballistic/automatic/pistol/commander,
+/turf/open/floor/wood,
+/area/ship/crew/crewthree)
+"dJ" = (
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_x = -24;
+	id = "enginelockdown";
+	name = "Lockdown Engines"
+	},
+/obj/machinery/atmospherics/components/binary/volume_pump{
+	dir = 8;
+	name = "Activate Exhaust"
 	},
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "dM" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/office)
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
 "dO" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
+	dir = 4
 	},
-/obj/effect/turf_decal/techfloor{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
+	dir = 10
 	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
 "dS" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
-	dir = 5
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"dW" = (
+/obj/structure/filingcabinet/employment,
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/crew/office)
+"dX" = (
+/obj/structure/table/chem,
+/obj/item/clothing/glasses/hud/health,
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/corner/opaque/blue/mono,
+/obj/item/reagent_containers/glass/beaker{
+	pixel_y = 12;
+	pixel_x = -9
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/structure/sink/chem{
+	pixel_x = 2;
+	pixel_y = 3
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "dZ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
-	dir = 1
+/obj/structure/fireaxecabinet{
+	pixel_y = -29
 	},
-/obj/structure/catwalk/over,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "ed" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
-/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/door/window/eastleft,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/door/poddoor{
-	id = "windowlockdown";
-	dir = 4
+/obj/structure/table,
+/obj/machinery/fax,
+/obj/structure/sign/poster/official/random{
+	pixel_y = 32
 	},
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/crew/office)
+"eg" = (
+/obj/machinery/vending/cigarette,
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"ek" = (
+/obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
-"em" = (
-/obj/machinery/suit_storage_unit/cmo{
-	suit_type = /obj/item/clothing/suit/space/hardsuit/medical
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-2"
 	},
-/obj/machinery/light/small/directional/south,
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/medical)
+/obj/machinery/light_switch{
+	pixel_x = -14;
+	pixel_y = 24
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/cryo)
 "er" = (
 /obj/machinery/door/airlock/engineering{
 	dir = 4;
 	name = "Engineering"
 	},
-/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 = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/engineering)
-"eu" = (
-/obj/structure/sign/departments/cargo{
-	pixel_y = -32
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/atmospherics)
+"eu" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 6
+	},
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
-"ex" = (
-/obj/structure/table/wood,
-/obj/item/folder/red,
-/obj/item/folder/red,
-/obj/item/lighter,
-/obj/item/pen,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/carpet,
-/area/ship/crew/office)
 "eB" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/corner/opaque/red/mono,
-/obj/machinery/reagentgrinder{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/machinery/light_switch{
+	dir = 1;
 	pixel_x = 6;
-	pixel_y = 13
+	pixel_y = -24
 	},
-/obj/structure/extinguisher_cabinet/directional/east,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
 "eC" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/brigdoor/southright{
-	name = "Requests Desk";
-	req_one_access_txt = "57, 41"
-	},
-/obj/machinery/door/window/northleft{
-	name = "Requests Desk"
-	},
-/obj/machinery/door/poddoor/shutters{
-	id = "noiwillnotgiveyouaa";
-	name = "Closing Shutters"
-	},
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
 /turf/open/floor/plating,
 /area/ship/crew/crewthree)
-"eL" = (
-/obj/effect/turf_decal/corner/opaque/red/mono,
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = 25;
-	pixel_y = -25
+"eD" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/structure/sign/poster/contraband/syndicate_recruitment{
+	pixel_x = 30
+	},
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/plating/rust,
+/area/ship/crew/toilet)
+"eL" = (
+/obj/machinery/door/airlock/command{
+	name = "Internal Affairs Office"
 	},
 /obj/structure/cable{
-	icon_state = "2-4"
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/crew/office)
 "eP" = (
+/obj/structure/chair/comfy/black{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
+"eQ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
+"eY" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"eQ" = (
-/obj/item/storage/box/ingredients/carnivore,
-/obj/item/storage/box/ingredients/delights,
-/obj/item/storage/box/ingredients/grains,
-/obj/item/storage/box/ingredients/vegetarian,
-/obj/structure/closet/secure_closet/freezer/fridge,
-/turf/open/floor/plasteel/freezer,
-/area/ship/crew/canteen/kitchen)
-"eT" = (
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/effect/spawner/xmastree,
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"ff" = (
-/obj/effect/turf_decal/corner/opaque/blue/bordercorner,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/light/directional/south,
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
-	dir = 9
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"fa" = (
+/obj/structure/table,
+/obj/item/storage/pill_bottle/dice{
+	pixel_x = 5;
+	pixel_y = 6
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
+/obj/item/spacecash/bundle/c5,
+/turf/open/floor/carpet/red,
+/area/ship/hallway/central)
+"fc" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/engine,
 /area/ship/engineering/atmospherics)
 "fg" = (
-/obj/machinery/shower{
-	pixel_y = 18
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 10
 	},
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/noslip,
-/area/ship/engineering)
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/door/poddoor/preopen{
+	dir = 4;
+	id = "coolingshutdown"
+	},
+/turf/open/floor/engine/airless,
+/area/ship/external)
 "fi" = (
-/obj/machinery/door/poddoor{
+/obj/machinery/door/airlock/command{
 	dir = 4;
-	id = "bridgelockdown"
+	name = "Personal Quarters";
+	req_one_access_txt = "57"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/effect/spawner/structure/window/reinforced/shutters,
-/turf/open/floor/plating,
-/area/ship/bridge)
-"fo" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/carpet/blue,
+/area/ship/crew/crewthree)
+"fl" = (
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 9
+	},
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"fn" = (
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/wood,
+/area/ship/hallway/central)
+"fo" = (
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
 	},
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
@@ -630,592 +733,618 @@
 /area/ship/cargo)
 "ft" = (
 /obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 8
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 8;
+	name = "TEG to Exhaust"
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering)
+/turf/open/floor/engine,
+/area/ship/engineering/engine)
 "fu" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
-	dir = 4
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/structure/sign/poster/official/random{
+	pixel_x = 30
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
 "fw" = (
-/obj/machinery/atmospherics/components/unary/tank/toxins{
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
+	},
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
-/obj/effect/turf_decal/industrial/warning/full,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/item/paper{
+	default_raw_text = "The igniter in the chamber does not work very well. I suggest throwing lit welders down the disposal chute over there to ignite the chamber."
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/light/directional/east,
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering)
+/obj/item/weldingtool,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/atmospherics)
+"fx" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1
+	},
+/turf/closed/wall,
+/area/ship/hallway/central)
 "fz" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 9
+/obj/machinery/shower{
+	pixel_y = 18
 	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -25;
-	pixel_y = 25
+/obj/machinery/firealarm/directional/west,
+/obj/effect/turf_decal/corner_techfloor_grid{
+	dir = 1
 	},
-/turf/open/floor/plasteel,
-/area/ship/engineering)
+/turf/open/floor/noslip,
+/area/ship/engineering/atmospherics)
 "fD" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
 /turf/open/floor/engine,
 /area/ship/engineering/engine)
 "fG" = (
-/obj/structure/chair/office{
-	dir = 8
-	},
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = 25;
-	pixel_y = -25
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
-/obj/structure/sign/poster/official/random{
-	pixel_x = 32
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
-	},
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/crew/office)
-"fI" = (
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
-	icon_state = "sec_wall";
-	name = "firearms locker";
-	pixel_x = -28;
-	req_one_access_txt = "57, 41"
-	},
-/obj/item/gun/energy/e_gun/mini{
-	pixel_x = -8;
-	pixel_y = 8
-	},
-/obj/item/gun/energy/e_gun/mini{
-	pixel_y = 8
-	},
-/obj/item/gun/energy/e_gun/mini{
-	pixel_x = 8;
-	pixel_y = 8
-	},
-/obj/item/gun/energy/laser,
-/obj/item/gun/energy/laser,
-/obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
-/obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/power/apc/auto_name/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/crewthree)
-"fJ" = (
-/obj/effect/turf_decal/corner/opaque/blue/half,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/effect/turf_decal/techfloor/hole/right{
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering/atmospherics)
-"fS" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/turf/open/floor/plasteel/freezer,
-/area/ship/crew/canteen/kitchen)
-"fT" = (
-/obj/effect/turf_decal/industrial/warning{
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"fI" = (
+/obj/structure/chair/sofa/left{
 	dir = 8
 	},
+/obj/machinery/newscaster/directional/east,
+/turf/open/floor/carpet/red,
+/area/ship/hallway/central)
+"fT" = (
 /obj/machinery/atmospherics/pipe/simple/dark/visible{
-	dir = 8
+	dir = 9
 	},
 /turf/open/floor/engine,
 /area/ship/engineering/engine)
+"fU" = (
+/obj/machinery/cryopod{
+	dir = 4
+	},
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/crew/cryo)
 "fW" = (
 /turf/template_noop,
 /area/template_noop)
 "fY" = (
-/obj/machinery/door/window/brigdoor/southright{
-	name = "The Captain's Personal Lavatory";
-	opacity = 1
-	},
-/obj/structure/toilet{
-	dir = 8;
-	pixel_x = 4;
-	pixel_y = 16
-	},
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = 12
-	},
-/obj/structure/mirror{
-	pixel_x = 25
-	},
-/obj/item/soap/nanotrasen,
-/obj/item/stack/medical/bruise_pack{
-	amount = 3
-	},
-/obj/item/stack/medical/ointment{
-	amount = 5;
-	desc = "Used to treat...... well, it's topical, and it's clearly been used....."
-	},
-/obj/item/storage/pill_bottle/psicodine,
-/obj/item/storage/pill_bottle/stimulant,
-/obj/item/storage/pill_bottle/neurine,
-/obj/item/storage/pill_bottle/charcoal/less,
-/obj/item/razor,
-/obj/item/lipstick/random,
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
-	name = "The Captain's Personal Medicine Cabinet And Soap Holder";
-	pixel_x = -32;
-	req_access_txt = "20"
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/freezer,
-/area/ship/crew/crewtwo)
+/obj/structure/table,
+/obj/item/trash/raisins,
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/wood,
+/area/ship/hallway/central)
 "ga" = (
-/obj/effect/spawner/structure/window,
+/obj/structure/grille,
+/obj/structure/window/fulltile,
 /turf/open/floor/plating,
 /area/ship/medical)
-"gb" = (
-/obj/machinery/power/shuttle/engine/electric{
+"gc" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
+	},
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"gh" = (
+/obj/machinery/power/smes/shuttle/precharged{
 	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "0-4"
+	icon_state = "0-8"
 	},
-/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
+/obj/structure/window/reinforced/spawner/west,
+/obj/machinery/door/poddoor{
 	dir = 4;
-	name = "atmos waste outlet injector"
+	id = "enginelockdown"
 	},
-/turf/open/floor/plating/airless,
-/area/ship/external)
-"gh" = (
-/turf/closed/wall/r_wall,
-/area/ship/engineering)
+/obj/machinery/door/window/eastleft{
+	name = "Engine Access"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
 "gi" = (
-/obj/structure/sign/warning/chemdiamond{
-	pixel_x = 32
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
 	},
-/obj/structure/closet/firecloset/full{
-	anchored = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
 	},
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plasteel/tech/grid,
+/obj/effect/turf_decal/corner/opaque/ntblue/diagonal,
+/obj/effect/turf_decal/corner/opaque/neutral/diagonal{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"gk" = (
+/obj/structure/sign/poster/official/safety_internals{
+	pixel_x = -32
+	},
+/obj/structure/tank_dispenser,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
 "gm" = (
-/obj/structure/closet/secure_closet/wall{
-	dir = 1;
-	icon_state = "sec_wall";
-	name = "ammunition locker";
-	pixel_y = -28;
-	req_one_access_txt = "57, 41"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/item/ammo_box/magazine/co9mm,
-/obj/item/ammo_box/magazine/co9mm,
-/obj/item/stock_parts/cell/gun,
-/obj/item/stock_parts/cell/gun,
-/obj/item/stock_parts/cell/gun/mini,
-/obj/item/stock_parts/cell/gun/mini,
-/obj/item/stock_parts/cell/gun/mini,
+/obj/structure/railing/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/arrows{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/office)
+"gr" = (
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "2-4"
 	},
-/turf/open/floor/carpet/nanoweave/red,
-/area/ship/crew/crewthree)
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 6
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
 "gu" = (
-/obj/structure/closet/secure_closet/freezer/kitchen{
-	name = "kitchen freezer"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/structure/sign/poster/contraband/random{
-	pixel_x = 32
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
 	},
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/plasteel/freezer,
-/area/ship/crew/canteen/kitchen)
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
 "gx" = (
-/obj/machinery/door/firedoor/window,
-/obj/structure/window/plasma/reinforced/fulltile,
-/obj/structure/grille,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/layer4,
 /turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
+/area/ship/hallway/central)
 "gB" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
-	dir = 6
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 8;
+	name = "Cooling to TEG"
 	},
 /turf/open/floor/engine,
 /area/ship/engineering/engine)
 "gM" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/item/radio/intercom/directional/north,
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
 "gN" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/green/visible,
-/obj/machinery/atmospherics/components/binary/pump/on{
-	dir = 8;
-	name = "Air to Holding Tank";
-	target_pressure = 1000
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/structure/catwalk/over,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
 "gO" = (
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 8;
+	name = "engine fuel pump"
 	},
-/obj/machinery/light/small/directional/north,
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "gP" = (
-/obj/machinery/cryopod{
-	dir = 8
+/obj/effect/landmark/observer_start,
+/obj/machinery/holopad,
+/turf/open/floor/wood,
+/area/ship/hallway/central)
+"gQ" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/machinery/light/directional/east,
-/obj/structure/sign/nanotrasen{
-	pixel_x = 32
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/cryo)
-"gQ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"hb" = (
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
 	},
-/turf/open/floor/carpet/nanoweave,
+/turf/open/floor/wood,
 /area/ship/hallway/central)
-"gR" = (
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
-	dir = 4
+"hc" = (
+/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/corner/opaque/red/diagonal,
-/obj/structure/chair{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"hb" = (
-/obj/structure/table,
-/obj/machinery/microwave{
-	pixel_x = -1;
-	pixel_y = 8
-	},
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/effect/turf_decal/techfloor{
+	dir = 5
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/cryo)
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/atmospherics)
 "hi" = (
-/obj/machinery/computer/communications{
-	dir = 8
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/corner/opaque/purple,
-/obj/effect/turf_decal/corner/opaque/purple{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
+/turf/open/floor/carpet/royalblue,
+/area/ship/crew/crewtwo)
 "hr" = (
 /turf/closed/wall/r_wall,
 /area/ship/hallway/central)
-"ht" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 9
+"hz" = (
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"hA" = (
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 6
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/effect/turf_decal/siding/wood/corner{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/effect/turf_decal/siding/wood/corner{
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 4
 	},
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"hC" = (
 /obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 9
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"hG" = (
+/obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
-/obj/structure/sign/poster/retro/nanotrasen_logo_70s{
-	pixel_x = -32
-	},
-/turf/open/floor/goonplaque{
-	desc = "\"This is a plaque in honour of our comrades on the TG4407 Stations. It is our hope that the crews of these ST13XX-class ships can live up to your fame and fortune.\" Scratched in beneath that is a crude image of two spacemen. One of them is missing their top half."
-	},
-/area/ship/bridge)
-"hw" = (
-/obj/machinery/door/airlock/public/glass{
-	name = "Canteen"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only,
-/obj/effect/turf_decal/corner/opaque/black/full,
 /turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"hA" = (
-/obj/machinery/door/airlock/command/glass{
-	dir = 4;
-	name = "Office"
+/area/ship/cargo/office)
+"hJ" = (
+/obj/structure/grille,
+/obj/machinery/door/poddoor{
+	id = "windowlockdown"
 	},
-/obj/effect/turf_decal/corner/opaque/black/full,
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/firedoor/window,
+/turf/open/floor/plating,
+/area/ship/medical)
+"hM" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/effect/turf_decal/siding/wood,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
+"hP" = (
+/obj/machinery/computer/helm{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/ntblue/half{
 	dir = 4
 	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"hT" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/office)
-"hJ" = (
-/obj/effect/spawner/structure/window/reinforced/shutters,
-/obj/machinery/door/poddoor{
-	id = "windowlockdown"
-	},
-/turf/open/floor/plating,
-/area/ship/medical)
-"hP" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
-	dir = 9
-	},
-/obj/effect/turf_decal/industrial/warning{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/door/poddoor/preopen{
-	dir = 4;
-	id = "coolingshutdown"
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
 	},
-/turf/open/floor/engine/airless,
-/area/ship/external)
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
 "hZ" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
+/obj/item/extinguisher/advanced,
+/obj/item/clothing/glasses/meson/engine,
+/obj/item/clothing/suit/hooded/wintercoat/engineering,
+/obj/item/clothing/under/rank/engineering/engineer/hazard,
+/obj/item/clothing/under/rank/engineering/engineer/nt,
+/obj/item/clothing/under/rank/engineering/engineer/nt/skirt,
+/obj/item/clothing/under/rank/engineering/atmospheric_technician,
+/obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt,
+/obj/item/clothing/head/beret/atmos,
+/obj/item/clothing/head/beret/eng,
+/obj/item/analyzer,
+/obj/item/storage/belt/utility,
+/obj/item/storage/belt/utility,
+/obj/structure/closet/secure_closet{
+	icon_state = "eng_secure";
+	name = "engineer's locker";
+	req_access = list(11);
+	anchored = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
-	dir = 1
+/obj/item/pipe_dispenser,
+/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos,
+/turf/open/floor/engine,
+/area/ship/engineering/engine)
+"ib" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering)
+/obj/item/kirbyplants/random,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"ic" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/office)
 "id" = (
-/obj/machinery/door/airlock/command{
-	name = "Captain's Quarters";
-	req_access_txt = "20"
+/obj/machinery/shower{
+	dir = 4;
+	pixel_y = 8
+	},
+/obj/structure/curtain,
+/obj/item/bikehorn/rubberducky/plasticducky,
+/obj/effect/turf_decal/techfloor/hole{
+	dir = 8
 	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/crewtwo)
+"ie" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 1
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
-	dir = 4
-	},
 /turf/open/floor/wood,
-/area/ship/crew/crewtwo)
-"ie" = (
+/area/ship/hallway/central)
+"if" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+	dir = 4
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/dorm)
-"if" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/carpet/nanoweave,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
-"im" = (
-/obj/structure/lattice,
-/turf/template_noop,
-/area/ship/external)
-"ip" = (
-/obj/machinery/holopad,
-/obj/effect/turf_decal/siding/wood{
+"ih" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
 	dir = 4
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/office)
-"ix" = (
-/obj/effect/turf_decal/corner/opaque/blue/mono,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/medical)
-"iB" = (
-/obj/effect/spawner/structure/window/reinforced/shutters,
-/obj/machinery/door/poddoor{
+/obj/machinery/door/poddoor/preopen{
 	dir = 4;
 	id = "bridgelockdown"
 	},
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
-	dir = 4
-	},
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/firedoor/window,
 /turf/open/floor/plating,
 /area/ship/bridge)
-"iI" = (
-/obj/machinery/suit_storage_unit/mining/eva,
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 6
+"ik" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+	dir = 9
 	},
-/obj/machinery/light/directional/east,
-/turf/open/floor/plasteel,
-/area/ship/cargo/office)
-"iP" = (
+/obj/machinery/light/broken/directional/south,
+/turf/open/floor/engine,
+/area/ship/engineering/engine)
+"il" = (
+/obj/structure/closet/crate/bin,
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"im" = (
+/obj/structure/lattice,
+/turf/template_noop,
+/area/ship/external)
+"ir" = (
 /obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
+	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
 	dir = 4
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/bridge)
-"iY" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 4
 	},
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"is" = (
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/airlock/mining/glass,
+/obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
-	dir = 8
+	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"iv" = (
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/medical{
-	dir = 4;
-	name = "Infirmary"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/plasteel/stairs{
+	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"ix" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/carpet/nanoweave/blue,
 /area/ship/medical)
-"jc" = (
-/obj/machinery/air_sensor/atmos/nitrogen_tank,
-/turf/open/floor/engine/n2,
-/area/ship/engineering/atmospherics)
+"iB" = (
+/obj/machinery/door/airlock/command{
+	dir = 4;
+	name = "Personal Quarters";
+	req_one_access_txt = "20"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/carpet/royalblue,
+/area/ship/crew/crewtwo)
+"iI" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/autolathe,
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/cargo/office)
+"iP" = (
+/obj/structure/chair/comfy/black{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/wood,
+/area/ship/crew/crewtwo)
+"iY" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/medical)
+"ja" = (
+/obj/machinery/shower{
+	dir = 4
+	},
+/obj/item/soap/nanotrasen,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"jf" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/effect/decal/cleanable/wrapping,
+/obj/item/storage/fancy/donut_box,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/cargo/office)
 "ji" = (
 /turf/closed/wall/r_wall,
 /area/ship/crew/crewthree)
+"jq" = (
+/obj/structure/grille,
+/obj/machinery/door/poddoor{
+	id = "windowlockdown"
+	},
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/firedoor/window,
+/turf/open/floor/plating,
+/area/ship/crew/dorm)
 "jr" = (
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/mug/tea{
-	pixel_x = 9;
-	pixel_y = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
 	},
-/obj/item/reagent_containers/food/drinks/dry_ramen{
-	pixel_x = -3
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 24;
+	pixel_y = -5
 	},
+/obj/effect/turf_decal/corner/opaque/green/mono,
 /turf/open/floor/plasteel,
-/area/ship/crew/canteen)
+/area/ship/crew/canteen/kitchen)
 "js" = (
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
-	name = "medicine cabinet";
-	pixel_x = -28
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/structure/closet/cardboard{
+	name = "janitorial supplies"
 	},
-/obj/item/storage/firstaid/regular,
-/obj/item/stack/medical/gauze,
-/obj/item/reagent_containers/hypospray/medipen/salbutamol,
-/obj/item/storage/pill_bottle/charcoal/less,
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/medical)
+/obj/item/mop,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/soap,
+/obj/item/storage/bag/trash,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/cargo/office)
 "jv" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -1225,44 +1354,26 @@
 	},
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
-"jD" = (
-/obj/effect/turf_decal/corner/opaque/yellow/bordercorner{
-	dir = 8
-	},
-/obj/structure/sign/warning/nosmoking{
-	pixel_x = 32
+"jK" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/effect/turf_decal/techfloor/hole{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/item/radio/intercom/directional/south,
-/obj/machinery/light/directional/east,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering/atmospherics)
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
 "jM" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/machinery/light/directional/west,
-/obj/machinery/atmospherics/components/trinary/mixer/flipped{
-	dir = 1;
-	name = "Chamber Mixer"
-	},
-/obj/item/paper/crumpled{
-	default_raw_text = "A mix of 67/33 ratio of oxygen (node 2) and plasma (node 1) works very well, even at 500 kPa."
-	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
-"jP" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
-	name = "Nitrogen to Air"
+/obj/structure/chair/comfy/shuttle{
+	dir = 4;
+	name = "Helm"
 	},
 /obj/effect/turf_decal/techfloor{
-	dir = 1
+	dir = 4
 	},
-/turf/open/floor/plasteel,
-/area/ship/engineering/atmospherics)
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/bridge)
 "jS" = (
 /turf/closed/wall,
 /area/ship/crew/dorm)
@@ -1282,207 +1393,252 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "jZ" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+/obj/structure/closet/radiation,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 24;
+	pixel_y = 5
 	},
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"ka" = (
-/obj/structure/sign/poster/official/random{
+/obj/structure/sign/warning/incident{
 	pixel_y = 32
 	},
-/obj/machinery/vending/cola/random,
+/turf/open/floor/noslip,
+/area/ship/engineering/atmospherics)
+"kn" = (
+/obj/machinery/button/door/incinerator_vent_atmos_aux{
+	dir = 4;
+	pixel_x = -23;
+	pixel_y = 8
+	},
+/obj/machinery/button/ignition/incinerator/atmos{
+	dir = 4;
+	pixel_x = -23;
+	pixel_y = -3
+	},
 /obj/structure/cable{
-	icon_state = "2-8"
+	icon_state = "2-4"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 5
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/engine)
 "kp" = (
 /obj/structure/cable{
-	icon_state = "1-8"
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
+	dir = 4
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/bridge)
-"kr" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output,
-/turf/open/floor/engine/plasma,
-/area/ship/engineering/atmospherics)
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood,
+/area/ship/crew/crewthree)
+"ky" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/layer2,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
 "kz" = (
 /turf/closed/wall/r_wall,
 /area/ship/engineering/atmospherics)
 "kB" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/binary/pump{
-	name = "Oxygen to Mix"
+	dir = 10
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
-"kM" = (
-/obj/machinery/suit_storage_unit/mining/eva,
-/obj/effect/turf_decal/corner/opaque/black/three_quarters{
-	dir = 8
+"kE" = (
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/medical)
+"kL" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/corner/opaque/green/mono,
+/obj/machinery/reagentgrinder{
+	pixel_y = 11
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
-"kU" = (
+/area/ship/crew/canteen/kitchen)
+"kM" = (
 /obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/effect/turf_decal/corner/transparent/grey/half{
-	dir = 1
+/obj/item/storage/pill_bottle/charcoal/less{
+	pixel_x = -9
 	},
-/obj/item/kitchen/knife/letter_opener{
-	desc = "A military combat utility survival knife, imported from Earth. An expensive paperweight indeed."
+/obj/item/reagent_containers/glass/bottle{
+	list_reagents = list(/datum/reagent/medicine/thializid=30);
+	name = "thializid bottle"
 	},
-/obj/item/pen/fourcolor{
-	pixel_x = 3
+/obj/item/reagent_containers/glass/bottle/formaldehyde{
+	pixel_x = 6;
+	pixel_y = 8
 	},
-/obj/item/pen/fountain{
-	pixel_x = -3
+/obj/item/reagent_containers/syringe{
+	pixel_x = 7
+	},
+/obj/effect/turf_decal/borderfloorwhite{
+	dir = 4
 	},
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/medical)
+"kO" = (
+/obj/item/radio/intercom/directional/north,
 /turf/open/floor/plasteel/dark,
-/area/ship/crew/office)
+/area/ship/hallway/central)
+"kU" = (
+/turf/closed/wall,
+/area/ship/crew/toilet)
+"kW" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/carpet/blue,
+/area/ship/crew/dorm)
+"lf" = (
+/obj/structure/closet/secure_closet{
+	icon_state = "hop";
+	name = "\proper first officer's locker";
+	req_access_txt = "57"
+	},
+/obj/item/storage/backpack/satchel/leather,
+/obj/item/clothing/shoes/laceup,
+/obj/item/clothing/suit/armor/vest/hop,
+/obj/item/clothing/head/hopcap,
+/obj/item/clothing/head/hopcap/nt,
+/obj/item/clothing/under/rank/command/head_of_personnel,
+/obj/item/clothing/under/rank/command/head_of_personnel/skirt,
+/obj/item/storage/box/ids,
+/obj/item/storage/box/PDAs,
+/obj/item/assembly/flash/handheld,
+/obj/item/clothing/head/beret/command,
+/obj/item/door_remote/captain,
+/obj/structure/sign/poster/official/ian{
+	pixel_y = 32
+	},
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood,
+/area/ship/crew/crewthree)
 "lg" = (
-/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
+	dir = 1
 	},
 /obj/structure/disposalpipe/segment{
-	dir = 8
+	dir = 10
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
+	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
-/turf/open/floor/engine,
-/area/ship/engineering/engine)
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/atmospherics)
 "lh" = (
-/obj/structure/table,
-/obj/item/modular_computer/laptop/preset/civilian{
-	pixel_y = 4
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/structure/bedsheetbin,
-/obj/machinery/newscaster/directional/west,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/cryo)
-"lj" = (
-/obj/structure/table/reinforced,
-/obj/item/flashlight/lamp{
-	pixel_x = -8;
-	pixel_y = 10
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
 	},
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/item/folder/blue{
-	pixel_x = -6;
-	pixel_y = -3
-	},
-/obj/item/stamp/captain{
-	pixel_x = -6;
-	pixel_y = 2
-	},
-/obj/item/stamp/head_of_personnel{
-	pixel_x = -5;
-	pixel_y = -1
-	},
-/turf/open/floor/carpet/nanoweave/red,
-/area/ship/crew/crewthree)
+/turf/open/floor/wood,
+/area/ship/hallway/central)
 "lk" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
+/obj/structure/table/wood/reinforced,
+/obj/item/flashlight/lamp/green{
+	pixel_y = 10;
+	pixel_x = -6
 	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
-	dir = 4
+/obj/item/pen/fountain/captain{
+	pixel_x = -10
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/bridge)
-"lr" = (
-/obj/structure/closet/radiation,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/noslip,
-/area/ship/engineering)
+/obj/item/paper{
+	pixel_x = 10;
+	pixel_y = -2
+	},
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/wood,
+/area/ship/crew/crewtwo)
 "ls" = (
 /turf/closed/wall/r_wall,
 /area/ship/medical)
 "lw" = (
 /turf/closed/wall/r_wall,
 /area/ship/crew/canteen/kitchen)
+"lA" = (
+/obj/structure/closet/crate/bin,
+/obj/machinery/light/broken/directional/east,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
 "lE" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
-	dir = 4
-	},
-/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/door/window/eastright,
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "windowlockdown"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+/obj/machinery/suit_storage_unit/industrial/atmos_firesuit,
+/obj/structure/sign/warning/hottemp{
+	pixel_x = -29
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/engine)
 "lR" = (
-/obj/machinery/atmospherics/pipe/layer_manifold{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
+"lU" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/office)
 "lV" = (
-/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior{
-	dir = 4
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/turf/open/floor/engine,
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/fulltile,
+/turf/open/floor/plating,
 /area/ship/engineering/engine)
 "lW" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "1-4"
 	},
-/obj/effect/turf_decal/corner_techfloor_grid{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
 	},
-/obj/effect/turf_decal/techfloor/corner{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
 "lY" = (
 /obj/machinery/atmospherics/pipe/simple/dark/visible{
-	dir = 8
+	dir = 4
 	},
-/turf/closed/wall/r_wall,
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/fulltile,
+/turf/open/floor/plating,
 /area/ship/engineering/engine)
+"mc" = (
+/obj/machinery/atmospherics/pipe/manifold/yellow/visible,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/engine,
+/area/ship/engineering/engine)
+"mf" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/closed/wall,
+/area/ship/hallway/central)
 "mg" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 6
@@ -1490,131 +1646,179 @@
 /turf/open/floor/engine/airless,
 /area/ship/external)
 "mi" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1
+/obj/structure/window/reinforced/tinted,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/steeldecal/steel_decals_central7{
+	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"mw" = (
+/obj/machinery/door/window/southright,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/office)
-"mA" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible,
-/turf/open/floor/engine,
-/area/ship/engineering/engine)
-"mD" = (
-/obj/item/gun/energy/e_gun/mini,
-/turf/closed/wall/r_wall,
-/area/ship/crew/crewtwo)
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "mF" = (
 /obj/machinery/power/shuttle/engine/fueled/plasma{
 	dir = 4
 	},
 /turf/open/floor/plating/airless,
 /area/ship/external)
+"mI" = (
+/obj/structure/bed,
+/obj/item/bedsheet/random,
+/obj/structure/curtain/cloth/grey,
+/obj/structure/sign/poster/official/random{
+	pixel_x = -30
+	},
+/turf/open/floor/carpet/blue,
+/area/ship/crew/dorm)
 "mL" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/airalarm/directional/west,
-/obj/item/clothing/shoes/magboots,
-/obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/item/clothing/suit/space/hardsuit/engine,
-/obj/item/clothing/mask/breath,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
+/obj/structure/table,
+/obj/item/storage/toolbox/electrical{
+	pixel_y = 8
+	},
+/obj/item/storage/toolbox/mechanical,
+/obj/structure/sign/warning/nosmoking/burnt{
+	pixel_y = -30
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
 "mM" = (
-/turf/open/floor/carpet/nanoweave/blue,
+/turf/open/floor/wood,
 /area/ship/crew/office)
+"mN" = (
+/obj/structure/catwalk/over,
+/obj/machinery/light/small/directional/west,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/plating/rust,
+/area/ship/crew/toilet)
+"mQ" = (
+/obj/machinery/firealarm/directional/north,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
 "mS" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner_techfloor_grid{
-	dir = 8
-	},
-/obj/effect/turf_decal/techfloor/corner{
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "mT" = (
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
-	dir = 4
+/obj/structure/table,
+/obj/item/paper_bin{
+	pixel_x = 4;
+	pixel_y = 5
 	},
-/obj/structure/sign/painting{
-	pixel_y = 32
+/obj/item/pen{
+	pixel_x = 4;
+	pixel_y = 5
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/item/pen/fourcolor{
+	pixel_x = 7;
+	pixel_y = 5
 	},
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"mU" = (
-/obj/structure/sign/poster/official/random{
-	pixel_x = 32
+/obj/item/pen/fountain{
+	pixel_x = 1;
+	pixel_y = 5
 	},
-/obj/effect/turf_decal/corner/transparent/grey/half{
-	dir = 8
+/obj/item/kitchen/knife/letter_opener{
+	desc = "A military combat utility survival knife, imported from Earth. An expensive paperweight indeed.";
+	pixel_x = 4;
+	pixel_y = 5
 	},
-/obj/machinery/fax,
-/obj/structure/table,
-/turf/open/floor/plasteel/dark,
+/obj/item/stamp/centcom{
+	pixel_x = -10;
+	pixel_y = 13
+	},
+/obj/item/stamp/law{
+	pixel_x = -10;
+	pixel_y = 7
+	},
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/wood,
 /area/ship/crew/office)
+"mU" = (
+/obj/structure/urinal{
+	pixel_y = 28
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/light/small/directional/east,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 24;
+	pixel_y = -11
+	},
+/obj/effect/decal/cleanable/chem_pile,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "mX" = (
 /obj/machinery/door/poddoor/incinerator_atmos_aux{
 	dir = 4
 	},
+/obj/structure/sign/warning{
+	pixel_y = 28
+	},
 /turf/open/floor/engine/airless,
 /area/ship/engineering/engine)
 "nd" = (
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
+/obj/machinery/light_switch{
+	pixel_x = -5;
+	pixel_y = 24
+	},
+/obj/structure/railing{
+	dir = 4
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/office)
 "ne" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2{
+	dir = 9
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
 	},
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
-	dir = 6
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"ng" = (
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom/wideband/table{
+	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 4
 	},
-/obj/structure/catwalk/over,
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
 "nj" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{
+/obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
+	dir = 1
+	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
-/obj/structure/catwalk/over,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "np" = (
@@ -1627,55 +1831,29 @@
 /turf/closed/wall/r_wall,
 /area/ship/crew/office)
 "nu" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
 /obj/machinery/computer/atmos_control/incinerator{
 	dir = 4;
 	sensors = list("nemo_incinerator_sensor"="Incinerator Chamber")
 	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
 /turf/open/floor/engine,
 /area/ship/engineering/engine)
 "nv" = (
-/obj/structure/table,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
-/obj/item/flashlight/lamp{
-	pixel_x = -8;
-	pixel_y = 10
+	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/structure/railing{
+	dir = 4
 	},
-/obj/item/storage/fancy/donut_box,
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/office)
 "nB" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/structure/bed/roller,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo/office)
-"nE" = (
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
-	dir = 4
-	},
-/obj/structure/chair{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
 "nF" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
 	dir = 4
@@ -1683,28 +1861,44 @@
 /turf/open/floor/engine/airless,
 /area/ship/engineering/engine)
 "nX" = (
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"of" = (
-/obj/item/bedsheet/dorms,
-/obj/structure/bed,
-/obj/structure/curtain/bounty,
-/obj/structure/sign/poster/official/random{
-	pixel_y = 32
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"og" = (
+/obj/machinery/door/airlock/engineering{
+	dir = 4;
+	name = "Engineering"
 	},
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/wood,
-/area/ship/crew/dorm)
-"ok" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 4
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/bridge)
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/atmospherics)
+"ok" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/wood,
+/area/ship/crew/crewtwo)
 "om" = (
 /obj/item/kirbyplants/random,
 /turf/open/floor/carpet/nanoweave,
@@ -1716,142 +1910,93 @@
 /turf/open/floor/carpet/nanoweave/blue,
 /area/ship/medical)
 "oD" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
 	},
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
+/obj/effect/turf_decal/corner/opaque/blue/mono,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "oE" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 4
-	},
-/obj/effect/turf_decal/techfloor{
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
-/area/ship/engineering/atmospherics)
-"oG" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
 	},
-/turf/open/floor/engine,
-/area/ship/engineering/engine)
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
 "oN" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
+/obj/structure/bed/dogbed/ian,
+/mob/living/simple_animal/pet/dog/corgi/Lisa,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -24;
+	pixel_y = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/bridge)
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/carpet/blue,
+/area/ship/crew/crewthree)
 "oT" = (
-/obj/machinery/door/airlock{
-	name = "Kitchen"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/corner/opaque/black/full,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/carpet/nanoweave,
-/area/ship/crew/canteen/kitchen)
+/area/ship/hallway/central)
 "oU" = (
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
-	dir = 4
-	},
-/obj/structure/chair/stool/bar{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"pc" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
-	dir = 1
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 10
+	dir = 4
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"pf" = (
-/obj/structure/chair{
+/obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/medical)
+/turf/open/floor/wood,
+/area/ship/crew/office)
+"pf" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/machinery/portable_atmospherics/scrubber,
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/cargo/office)
 "ph" = (
-/obj/effect/spawner/structure/window/reinforced/shutters,
-/obj/structure/curtain/bounty,
-/obj/machinery/door/poddoor{
-	id = "windowlockdown"
-	},
-/turf/open/floor/plating,
-/area/ship/crew/dorm)
-"pm" = (
-/obj/structure/railing{
+/obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
-/obj/machinery/holopad/emergency/command,
-/obj/machinery/light_switch{
-	pixel_x = -25;
+/obj/machinery/button/door{
+	id = "bridgelockdown";
+	name = "Bridge Lockdown";
+	pixel_x = 8;
 	pixel_y = 25
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
+/obj/machinery/button/door{
+	id = "coolingshutdown";
+	name = "Shutdown Cooling";
+	pixel_x = -5;
+	pixel_y = 25
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
+/obj/machinery/button/door{
+	pixel_y = 25;
+	pixel_x = 21;
+	id = "windowlockdown";
+	name = "Window Lockdown"
 	},
-/turf/open/floor/plasteel/mono/dark,
+/obj/item/cigbutt/cigarbutt,
+/turf/open/floor/carpet/nanoweave/beige,
 /area/ship/bridge)
-"pq" = (
-/obj/machinery/suit_storage_unit/mining,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/black/three_quarters{
-	dir = 1
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/structure/sign/departments/drop{
-	pixel_y = -32
+"pn" = (
+/obj/structure/sign/nanotrasen{
+	pixel_y = 30
 	},
-/turf/open/floor/plasteel,
+/obj/item/kirbyplants/random,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"pq" = (
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/office)
 "pr" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -1860,97 +2005,87 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
 "ps" = (
-/obj/machinery/photocopier,
-/obj/structure/sign/nanotrasen{
-	pixel_y = 32
-	},
-/obj/effect/turf_decal/siding/wood{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/office)
-"pt" = (
-/obj/effect/turf_decal/corner/opaque/yellow/border{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
 	},
-/obj/effect/turf_decal/corner/opaque/yellow/half{
-	dir = 8
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
 	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"pz" = (
+/turf/open/floor/wood,
+/area/ship/crew/crewthree)
+"pt" = (
 /obj/structure/table/reinforced,
-/obj/item/radio/intercom/wideband/table{
-	dir = 4
-	},
+/obj/machinery/door/window/westleft,
+/obj/machinery/door/window/eastright,
+/obj/item/paper_bin,
+/obj/item/pen,
 /turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"pB" = (
+/area/ship/cargo/office)
+"pz" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 4
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"pB" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 1
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering)
+/obj/machinery/portable_atmospherics/canister/toxins,
+/turf/open/floor/engine,
+/area/ship/engineering/engine)
 "pD" = (
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
 "pI" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/structure/table,
+/obj/item/trash/candle{
+	pixel_y = 12
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/carpet/nanoweave,
+/obj/machinery/light/directional/south,
+/obj/item/trash/plate,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
-"pT" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 6
+"pM" = (
+/obj/machinery/door/airlock/engineering{
+	dir = 4;
+	name = "Engineering"
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 4
 	},
-/obj/effect/turf_decal/ntspaceworks_small/right,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
-"pW" = (
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+/obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/atmospherics)
+"pT" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output,
+/turf/open/floor/engine/o2,
 /area/ship/engineering/atmospherics)
 "pZ" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input,
-/turf/open/floor/engine/plasma,
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/fulltile,
+/turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "qa" = (
 /turf/closed/wall/r_wall,
@@ -1961,136 +2096,112 @@
 	},
 /turf/open/floor/engine/airless,
 /area/ship/external)
-"qm" = (
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 5
+"qg" = (
+/obj/structure/toilet{
+	pixel_y = 10
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/airalarm/directional/west,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"qp" = (
+/obj/effect/turf_decal/techfloor/corner{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/effect/decal/cleanable/vomit/old,
+/obj/effect/turf_decal/techfloor/corner{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
-/area/ship/cargo/office)
-"qq" = (
-/obj/machinery/shower{
-	dir = 4;
-	pixel_y = 8
-	},
-/obj/structure/curtain{
-	pixel_y = 4
+/obj/structure/cable{
+	icon_state = "1-4"
 	},
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/plasteel/freezer,
-/area/ship/crew/crewtwo)
-"qs" = (
-/obj/structure/bed,
-/obj/item/bedsheet/captain,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
+/turf/open/floor/wood,
+/area/ship/crew/cryo)
+"qq" = (
+/obj/structure/table,
+/obj/item/newspaper,
+/turf/open/floor/wood,
+/area/ship/hallway/central)
+"qr" = (
+/obj/structure/sign/poster/official/random{
+	pixel_y = 32
 	},
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/carpet/royalblue,
-/area/ship/crew/crewtwo)
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
 "qy" = (
-/obj/effect/turf_decal/corner/opaque/yellow/half{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/yellow/border{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /obj/machinery/light/directional/west,
+/obj/machinery/mineral/ore_redemption,
 /turf/open/floor/plasteel,
 /area/ship/cargo)
-"qz" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+"qF" = (
+/obj/machinery/power/shuttle/engine/fueled/plasma{
+	dir = 4
 	},
-/obj/machinery/airalarm/directional/south,
-/obj/structure/bed/dogbed/ian,
-/mob/living/simple_animal/pet/dog/corgi/Ian,
-/turf/open/floor/carpet/royalblue,
-/area/ship/crew/crewtwo)
+/turf/open/floor/plating,
+/area/ship/external)
 "qK" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 8
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 1;
+	name = "Plasma to Engines and Mix"
 	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"qQ" = (
-/obj/effect/turf_decal/corner/opaque/yellow/border{
-	dir = 9
+/obj/effect/turf_decal/atmos/plasma{
+	dir = 1
 	},
-/obj/effect/turf_decal/corner/opaque/yellow/bordercorner,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
 "qR" = (
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 5
-	},
-/obj/machinery/button/door{
-	id = "sorrywejustclosed";
-	name = "Cargo Hallway Shutters Control";
-	pixel_x = -24;
-	pixel_y = 24
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo/office)
-"qS" = (
-/obj/machinery/light_switch{
-	pixel_x = -25;
-	pixel_y = 25
+/obj/machinery/door/airlock/mining{
+	name = "Cargo Office"
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
-/turf/open/floor/carpet/royalblue,
-/area/ship/crew/crewtwo)
-"qY" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/office)
+"qS" = (
+/obj/structure/closet/secure_closet/wall{
+	dir = 4;
+	name = "The Captain's Personal Medicine Cabinet And Soap Holder";
+	pixel_x = -28;
+	req_access_txt = "20"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
+/obj/item/soap/nanotrasen,
+/obj/item/razor,
+/obj/item/storage/pill_bottle/psicodine,
+/obj/item/storage/pill_bottle/charcoal/less,
+/obj/item/lipstick/random,
+/obj/item/stack/medical/bruise_pack{
+	amount = 3
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/item/stack/medical/ointment{
+	amount = 5;
+	desc = "Used to treat...... well, it's topical, and it's clearly been used....."
 	},
-/turf/open/floor/carpet/nanoweave,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/crewtwo)
+"qY" = (
+/obj/effect/turf_decal/siding/wood/corner,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
 "ra" = (
-/obj/machinery/atmospherics/components/unary/tank/toxins{
+/obj/machinery/atmospherics/components/binary/pump/on{
+	name = "Air to Distro";
+	target_pressure = 1000;
 	dir = 8
 	},
-/obj/effect/turf_decal/industrial/warning/full,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
+/obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/obj/machinery/light/directional/east,
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering)
+/obj/machinery/door/firedoor/border_only,
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/atmospherics)
 "rb" = (
 /obj/machinery/door/poddoor{
 	id = "amogusdoors";
@@ -2104,275 +2215,255 @@
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
+"rc" = (
+/obj/machinery/firealarm/directional/south,
+/obj/machinery/vending/cigarette,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
 "re" = (
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/cryo)
-"rq" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
 	},
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/carpet/royalblue,
-/area/ship/crew/crewtwo)
+/turf/open/floor/wood,
+/area/ship/hallway/central)
+"rq" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/carpet/blue,
+/area/ship/crew/dorm)
 "rw" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4;
-	name = "Operations"
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/bridge)
+/turf/open/floor/carpet/blue,
+/area/ship/crew/crewthree)
 "rx" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/dark/visible{
+	dir = 10
 	},
-/obj/machinery/airalarm/directional/north,
-/obj/structure/closet/radiation,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 9
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/light_switch{
+	pixel_x = 13;
+	pixel_y = 24
 	},
-/turf/open/floor/engine,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
 /area/ship/engineering/engine)
 "rz" = (
-/obj/structure/toilet{
-	dir = 8;
-	pixel_x = 4;
-	pixel_y = 16
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/power/terminal{
+	dir = 1
 	},
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = 12
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
 	},
-/obj/structure/mirror{
-	pixel_x = 25
+/obj/structure/sign/warning/electricshock{
+	pixel_x = 24
 	},
-/obj/structure/sign/poster/contraband/random{
-	pixel_y = -32
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"rF" = (
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen/kitchen)
+"rK" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/ntblue/diagonal,
+/obj/effect/turf_decal/corner/opaque/neutral/diagonal{
+	dir = 4
+	},
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"rM" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output,
+/turf/open/floor/engine/n2,
+/area/ship/engineering/atmospherics)
+"rW" = (
+/obj/structure/table,
+/obj/item/cigbutt,
+/obj/item/cigbutt{
+	pixel_x = -10;
+	pixel_y = 12
 	},
-/turf/open/floor/plasteel/freezer,
-/area/ship/crew/dorm)
-"rB" = (
-/obj/item/radio/intercom/directional/north,
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
-"rF" = (
-/obj/machinery/door/airlock/medical/glass{
-	name = "Infirmary"
+"sc" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4;
+	name = "Operations"
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/effect/turf_decal/techfloor{
+	dir = 4
 	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/bridge)
+"sd" = (
+/obj/effect/turf_decal/siding/wood/corner,
 /obj/machinery/door/firedoor/border_only,
+/turf/open/floor/wood,
+/area/ship/hallway/central)
+"sh" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/obj/effect/decal/cleanable/ash,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"si" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
+	},
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"sk" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/engine/air,
+/area/ship/engineering/atmospherics)
+"sn" = (
+/obj/structure/curtain,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"sz" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/medical)
-"rK" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2{
+	dir = 6
 	},
-/obj/effect/turf_decal/ntspaceworks_small/left,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
-"rM" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output,
-/turf/open/floor/engine/n2,
-/area/ship/engineering/atmospherics)
-"rN" = (
+"sA" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"sC" = (
+/obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/airlock/command{
-	dir = 4;
-	name = "Personal Quarters"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"rW" = (
-/obj/structure/chair{
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 4
 	},
-/obj/structure/sign/departments/engineering{
-	pixel_x = -32
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/plasteel,
+/area/ship/engineering/atmospherics)
+"sD" = (
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/carpet/nanoweave/orange,
-/area/ship/hallway/central)
-"sc" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
 	},
-/obj/effect/turf_decal/techfloor{
-	dir = 1
-	},
-/obj/effect/turf_decal/techfloor/hole/right{
-	dir = 1
-	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"sh" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/closet/crate,
-/obj/item/storage/belt/utility,
-/obj/item/storage/belt/utility,
-/obj/item/storage/belt/utility,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/storage/toolbox/electrical{
-	pixel_x = 1;
-	pixel_y = 6
-	},
-/obj/item/storage/toolbox/mechanical,
-/obj/item/storage/toolbox/electrical{
-	pixel_x = 1;
-	pixel_y = 6
-	},
-/obj/item/storage/toolbox/mechanical,
-/obj/item/storage/box/lights/mixed,
-/obj/item/storage/box/lights/mixed,
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/cargo)
-"sj" = (
-/obj/structure/table/reinforced,
-/obj/machinery/chem_dispenser/drinks/beer,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen/kitchen)
-"sk" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/computer/atmos_control/tank/toxin_tank{
-	dir = 1
-	},
-/turf/open/floor/plasteel/mono,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
-"sz" = (
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/effect/turf_decal/techfloor{
-	dir = 10
+"sJ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 5
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
-"sD" = (
-/obj/item/chair,
-/obj/item/chair{
-	pixel_x = 6;
-	pixel_y = 14
-	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"sG" = (
-/obj/structure/closet/firecloset/wall{
-	dir = 1;
-	pixel_y = -32
-	},
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
 "sK" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
-/turf/open/floor/engine,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/engine)
-"sO" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
+"sU" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
 	},
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
 "sY" = (
-/obj/effect/spawner/structure/window/reinforced/shutters,
+/obj/structure/grille,
 /obj/machinery/door/poddoor{
 	id = "windowlockdown"
 	},
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/firedoor/window,
 /turf/open/floor/plating,
 /area/ship/crew/office)
 "ta" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
 "tf" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
-/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/door/window/eastright,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{
-	dir = 4
-	},
-/obj/machinery/door/poddoor{
-	id = "windowlockdown";
+/obj/machinery/atmospherics/pipe/simple/green/visible{
 	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
+/turf/closed/wall/r_wall,
+/area/ship/engineering/atmospherics)
+"tk" = (
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
+	target_temperature = 73
 	},
-/obj/machinery/door/firedoor/border_only{
+/turf/open/floor/engine,
+/area/ship/engineering/engine)
+"tm" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
 	},
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
-"tm" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible{
+/obj/effect/turf_decal/corner/opaque/ntblue/diagonal,
+/obj/effect/turf_decal/corner/opaque/neutral/diagonal{
 	dir = 4
 	},
-/obj/effect/turf_decal/number/zero,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
 "tp" = (
 /obj/machinery/atmospherics/components/binary/circulator/cold{
 	dir = 1
@@ -2380,169 +2471,180 @@
 /turf/open/floor/engine,
 /area/ship/engineering/engine)
 "tr" = (
-/obj/machinery/computer/operating{
-	dir = 1
-	},
-/obj/effect/turf_decal/borderfloor{
-	dir = 4
-	},
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/machinery/door/window/westright,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/effect/turf_decal/corner/opaque/blue/mono,
+/turf/open/floor/plasteel/white,
 /area/ship/medical)
 "ts" = (
-/obj/machinery/newscaster/directional/north,
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1
+	},
+/obj/item/radio/intercom/directional/north,
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
 "tx" = (
 /turf/closed/wall/r_wall,
 /area/ship/cargo)
 "tz" = (
-/obj/effect/turf_decal/corner/opaque/yellow/half{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "2-4"
 	},
-/obj/effect/turf_decal/corner/opaque/yellow/border{
-	dir = 8
+/obj/effect/turf_decal/industrial/loading{
+	dir = 1
 	},
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -20;
-	pixel_y = 13
+/obj/structure/ore_box,
+/obj/structure/sign/warning/fire{
+	pixel_x = -23
 	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "tB" = (
-/obj/effect/turf_decal/corner/opaque/white/mono,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
+/turf/closed/wall,
+/area/ship/crew/office)
 "tF" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/obj/machinery/atmospherics/components/binary/pump/layer4{
+	dir = 1;
+	name = "Emergency Recycling Override"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/structure/catwalk/over,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
-"tH" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+"tI" = (
+/obj/structure/table,
+/obj/machinery/light/dim/directional/north,
+/obj/item/reagent_containers/food/drinks/mug/tea,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"tR" = (
+/obj/machinery/door/airlock/external,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"tX" = (
+/obj/machinery/door/airlock{
+	name = "Kitchen"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/siding/wood{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/obj/machinery/light/directional/south,
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/office)
-"tI" = (
-/obj/structure/table,
-/obj/item/toy/cards/deck{
-	pixel_y = 1
-	},
-/obj/item/reagent_containers/food/drinks/mug/tea{
-	pixel_x = 9;
-	pixel_y = 8
-	},
-/turf/open/floor/carpet/nanoweave/orange,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen/kitchen)
 "tZ" = (
-/obj/structure/table,
-/obj/item/book/manual/wiki/surgery,
-/obj/item/storage/box/gloves,
-/obj/item/storage/backpack/duffelbag/med/surgery,
-/obj/item/storage/belt/medical,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/transparent/blue/half{
-	dir = 8
-	},
-/obj/item/clothing/glasses/hud/health,
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/effect/turf_decal/borderfloorwhite/full,
+/turf/open/floor/plasteel/white,
 /area/ship/medical)
 "ub" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 10
+/obj/machinery/atmospherics/pipe/manifold/purple/visible{
+	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+/obj/structure/disposalpipe/segment{
+	dir = 2
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
 	dir = 1
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
+/obj/effect/turf_decal/techfloor/corner{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/atmospherics)
 "ug" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/space_heater,
-/turf/open/floor/plasteel/mono,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
 /area/ship/cargo)
+"uh" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/chair/comfy/black{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
 "ul" = (
 /turf/closed/wall/r_wall,
 /area/ship/engineering/engine)
 "um" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible{
+/obj/effect/turf_decal/corner/opaque/ntblue/diagonal,
+/obj/effect/turf_decal/corner/opaque/neutral/diagonal{
 	dir = 4
 	},
-/obj/effect/turf_decal/number/five,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
 "uq" = (
-/obj/structure/sink/kitchen{
-	dir = 4;
-	pixel_x = -12
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen/kitchen)
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
 "us" = (
-/obj/machinery/modular_computer/console/preset/command{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
 	},
-/obj/machinery/light/directional/east,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/wood,
 /area/ship/crew/crewthree)
-"uw" = (
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
+"ut" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/ship/crew/toilet)
+"uv" = (
+/obj/structure/fluff/hedge,
+/obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/siding/wood/corner{
 	dir = 4
 	},
-/obj/structure/chair,
-/obj/item/radio/intercom/directional/west,
+/turf/open/floor/wood,
+/area/ship/crew/office)
+"uw" = (
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/obj/structure/table/reinforced,
+/obj/item/kitchen/knife,
+/obj/item/cutting_board,
+/obj/effect/turf_decal/corner/opaque/green/mono,
 /turf/open/floor/plasteel,
-/area/ship/crew/canteen)
+/area/ship/crew/canteen/kitchen)
 "uD" = (
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
-	dir = 4
+/obj/machinery/airalarm/directional/east,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer{
-	pixel_x = 6;
-	pixel_y = 2
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/obj/structure/table/reinforced,
+/obj/item/kitchen/rollingpin,
+/obj/item/reagent_containers/food/condiment/peppermill{
+	pixel_x = -2;
+	pixel_y = 11
 	},
-/obj/item/reagent_containers/food/drinks/beer{
-	pixel_x = -7;
-	pixel_y = 6
+/obj/item/reagent_containers/food/condiment/saltshaker{
+	pixel_y = 6;
+	pixel_x = -8
 	},
 /turf/open/floor/plasteel,
-/area/ship/crew/canteen)
+/area/ship/crew/canteen/kitchen)
 "uG" = (
 /obj/machinery/power/shieldwallgen/atmos/roundstart{
 	dir = 4;
@@ -2562,969 +2664,1150 @@
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
+"uL" = (
+/obj/structure/table/wood,
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
 "uM" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
+	dir = 5
 	},
-/obj/machinery/light_switch{
-	pixel_y = 21;
-	pixel_x = 7
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/engine)
 "uQ" = (
-/obj/effect/turf_decal/corner/opaque/yellow/border{
+/obj/machinery/door/poddoor/shutters{
+	id = "hallwindows";
+	name = "Cargo Shutters";
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/yellow/half{
+/obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/machinery/light/small/directional/south,
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/cargo/office)
+"uS" = (
+/obj/structure/table/wood,
+/obj/machinery/light/small/directional/west,
+/obj/item/reagent_containers/food/snacks/grown/harebell,
+/turf/open/floor/carpet/blue,
+/area/ship/crew/dorm)
 "uT" = (
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 8;
-	name = "engine fuel pump"
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 6
-	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"uX" = (
+/obj/machinery/light/directional/west,
+/obj/structure/reagent_dispensers/watertank,
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"uY" = (
-/obj/effect/turf_decal/siding/wideplating/dark{
-	dir = 1
-	},
-/obj/machinery/light/directional/north,
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/crew/office)
-"va" = (
-/obj/effect/turf_decal/corner/opaque/yellow/half,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/atmospherics)
-"vc" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
+"uX" = (
+/obj/item/reagent_containers/food/snacks/chips{
+	pixel_x = 10;
+	pixel_y = 15
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/light/directional/south,
+/obj/structure/chair/plastic{
+	dir = 4
 	},
-/obj/machinery/light/directional/east,
-/turf/open/floor/carpet/nanoweave,
+/turf/open/floor/wood,
 /area/ship/hallway/central)
-"vo" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
-	dir = 1
+"uY" = (
+/obj/machinery/computer/communications{
+	dir = 8
 	},
-/obj/effect/turf_decal/industrial/warning{
+/obj/effect/turf_decal/corner/opaque/ntblue/half{
 	dir = 4
 	},
-/obj/machinery/door/poddoor/preopen{
-	dir = 4;
-	id = "coolingshutdown"
-	},
-/turf/open/floor/engine/airless,
-/area/ship/external)
-"vp" = (
-/obj/machinery/door/airlock/command{
-	name = "Bridge"
-	},
-/obj/effect/turf_decal/corner/opaque/black/full,
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 8
-	},
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"va" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/fulltile,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"vc" = (
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/ship/crew/cryo)
+"ve" = (
+/obj/machinery/door/airlock/medical/glass{
+	name = "Infirmary"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/bridge)
-"vq" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/medical)
+"vf" = (
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/office)
-"vB" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 10
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
-	dir = 5
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
 	},
-/turf/open/floor/engine,
-/area/ship/engineering/engine)
-"vD" = (
-/obj/machinery/power/shuttle/engine/electric{
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plating/airless,
-/area/ship/external)
-"vG" = (
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"vo" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/item/megaphone/command,
+/obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
-	pixel_x = -8;
-	pixel_y = 5
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"vp" = (
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
-	pixel_x = -8
+/turf/open/floor/carpet/royalblue,
+/area/ship/crew/crewtwo)
+"vB" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+	dir = 6
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"vH" = (
-/obj/machinery/ore_silo,
-/obj/structure/window/reinforced{
+/turf/open/floor/engine,
+/area/ship/engineering/engine)
+"vI" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/corner/opaque/neutral{
 	dir = 8
 	},
-/obj/item/multitool,
-/obj/effect/turf_decal/corner/opaque/black/three_quarters{
-	dir = 4
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
+/obj/effect/turf_decal/corner/opaque/ntblue,
+/obj/item/trash/plate,
+/obj/effect/turf_decal/corner/opaque/green/half{
+	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/crew/canteen/kitchen)
 "vO" = (
-/obj/effect/turf_decal/corner/opaque/blue/half,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering/atmospherics)
-"vP" = (
-/obj/structure/sign/warning/nosmoking{
-	pixel_y = 36
-	},
-/obj/structure/sink{
-	pixel_y = 22
-	},
-/obj/effect/turf_decal/corner/opaque/blue/mono,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/medical)
-"vR" = (
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
+/obj/effect/turf_decal/corner/opaque/ntblue/diagonal,
+/obj/effect/turf_decal/corner/opaque/neutral/diagonal{
 	dir = 4
 	},
-/obj/structure/chair{
-	dir = 4
+/obj/structure/sign/poster/official/random{
+	pixel_x = -30
 	},
+/obj/structure/table,
+/obj/item/trash/cheesie,
 /turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"vW" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer4{
+/area/ship/hallway/central)
+"vP" = (
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/borderfloorwhite{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/medical)
+"vR" = (
+/obj/structure/chair/office,
+/turf/open/floor/wood,
+/area/ship/crew/office)
+"vW" = (
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2{
+	dir = 1
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
 "vY" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 10
-	},
-/obj/structure/fireaxecabinet{
-	dir = 8;
-	pixel_x = 28
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/obj/structure/table,
+/obj/machinery/chem_dispenser/drinks,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen/kitchen)
+"vZ" = (
+/obj/structure/bed,
+/obj/item/bedsheet/captain,
+/obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1
 	},
+/turf/open/floor/carpet/royalblue,
+/area/ship/crew/crewtwo)
+"wb" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
-/obj/machinery/suit_storage_unit/industrial/atmos_firesuit,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering/atmospherics)
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/bridge)
 "wd" = (
+/obj/structure/table,
+/obj/item/stack/medical/gauze,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/medical)
+"we" = (
 /obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -25;
-	pixel_y = 25
+/obj/effect/decal/cleanable/oil/slippery,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"wg" = (
+/obj/machinery/door/airlock/external,
+/obj/docking_port/mobile{
+	dir = 2;
+	launch_status = 0;
+	port_direction = 8;
+	preferred_direction = 4
 	},
-/obj/machinery/newscaster/directional/south,
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/dorm)
-"we" = (
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
+/turf/open/floor/plating,
+/area/ship/hallway/central)
 "wp" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4;
-	name = "Helm"
+/obj/structure/table/wood/reinforced,
+/obj/item/hand_tele{
+	pixel_x = 4;
+	pixel_y = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
-	dir = 4
+/obj/item/coin/adamantine{
+	pixel_x = -12;
+	pixel_y = -3
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/bridge)
+/obj/item/stamp/captain{
+	pixel_y = 13;
+	pixel_x = -8
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/wood,
+/area/ship/crew/crewtwo)
 "wt" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
-/obj/machinery/door/firedoor/window,
-/obj/structure/window/plasma/reinforced/fulltile,
-/obj/structure/grille,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
 "ww" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "1-4"
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/structure/catwalk/over,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
 "wA" = (
-/obj/structure/chair/office{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/closet/crate/engineering,
+/obj/item/stack/sheet/metal/twenty,
+/obj/item/stack/sheet/glass/twenty,
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo/office)
 "wB" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+/obj/effect/turf_decal/industrial/warning{
+	dir = 5
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"wC" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/vending/cigarette,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"wG" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
 	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo/office)
-"wH" = (
-/obj/effect/turf_decal/siding/wideplating/dark{
+/turf/open/floor/plasteel,
+/area/ship/engineering/atmospherics)
+"wC" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{
 	dir = 1
 	},
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/crew/office)
-"wU" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/mineral/ore_redemption{
-	dir = 1;
-	input_dir = 2;
-	output_dir = 1
+/turf/open/floor/engine/plasma,
+/area/ship/engineering/atmospherics)
+"wG" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo/office)
+"wH" = (
+/turf/closed/wall/r_wall,
+/area/ship/crew/toilet)
+"wO" = (
+/obj/structure/table/wood,
+/obj/item/instrument/piano_synth,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
+"wT" = (
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/obj/structure/closet/secure_closet/freezer{
+	anchored = 1
+	},
+/obj/item/reagent_containers/food/snacks/meat/slab,
+/obj/item/reagent_containers/food/snacks/meat/slab,
+/obj/item/reagent_containers/food/snacks/meat/slab,
+/obj/item/storage/box/ingredients/vegetarian,
+/obj/item/storage/fancy/egg_box,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen/kitchen)
 "wX" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/sign/warning/deathsposal{
-	pixel_x = -28
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
 	},
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
+/obj/effect/turf_decal/corner/opaque/green/mono,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen/kitchen)
 "wZ" = (
-/obj/effect/spawner/structure/window/reinforced/shutters,
-/obj/machinery/door/poddoor/shutters{
-	id = "hallwindows";
-	name = "Cargo Shutters"
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
 	},
-/turf/open/floor/plating,
-/area/ship/cargo)
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
+	},
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"xb" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
 "xf" = (
 /turf/closed/wall,
 /area/ship/crew/canteen/kitchen)
 "xi" = (
-/obj/machinery/modular_computer/console/preset/command{
-	dir = 8
+/obj/structure/bed,
+/obj/item/bedsheet/head_of_personnel,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/carpet/blue,
+/area/ship/crew/crewthree)
+"xo" = (
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/corner/opaque/yellow,
-/obj/effect/turf_decal/corner/opaque/yellow{
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/bridge)
+/area/ship/hallway/central)
 "xs" = (
-/turf/closed/wall/r_wall,
-/area/ship/crew/cryo)
+/obj/structure/chair/sofa,
+/obj/machinery/light/directional/north,
+/turf/open/floor/carpet/red,
+/area/ship/hallway/central)
+"xu" = (
+/obj/structure/grille,
+/obj/machinery/door/poddoor{
+	id = "windowlockdown"
+	},
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/firedoor/window,
+/turf/open/floor/plating,
+/area/ship/crew/toilet)
 "xA" = (
-/obj/structure/chair/office{
-	dir = 1;
-	name = "Requests"
+/obj/machinery/computer/secure_data{
+	dir = 4
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/light/small/directional/west,
 /turf/open/floor/carpet/nanoweave/red,
 /area/ship/crew/crewthree)
 "xE" = (
-/turf/closed/wall/r_wall,
-/area/ship/crew/canteen)
+/obj/machinery/photocopier,
+/obj/machinery/light_switch{
+	pixel_x = 11;
+	pixel_y = 23
+	},
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/crew/office)
 "xK" = (
-/obj/item/radio/intercom/directional/west,
-/obj/effect/landmark/observer_start,
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"xO" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
-/obj/effect/turf_decal/techfloor{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
 	},
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering/atmospherics)
-"xW" = (
-/obj/machinery/power/apc/auto_name/directional/west,
+/turf/open/floor/wood,
+/area/ship/crew/cryo)
+"xO" = (
 /obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
-	dir = 4
+	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"xW" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/chair/comfy/black{
 	dir = 4
 	},
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
+/turf/open/floor/wood,
+/area/ship/crew/cryo)
 "yf" = (
-/obj/structure/sign/poster/official/high_class_martini{
-	pixel_y = 32
-	},
-/obj/machinery/vending/snack/random,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/obj/structure/table/reinforced,
+/obj/machinery/microwave{
+	pixel_x = -1;
+	pixel_y = 8
 	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -20;
-	pixel_y = 13
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen/kitchen)
+"yh" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
 "yj" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 6
+/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2{
+	dir = 8
 	},
-/obj/machinery/door/firedoor/window,
-/obj/structure/window/plasma/reinforced/fulltile,
-/obj/structure/grille,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
+"yo" = (
+/obj/machinery/atmospherics/components/unary/passive_vent{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/external)
 "ys" = (
 /turf/closed/wall,
 /area/ship/cargo/office)
-"yu" = (
-/obj/structure/chair/comfy/black,
-/obj/structure/sign/poster/official/random{
-	pixel_y = 32
-	},
-/turf/open/floor/carpet,
-/area/ship/crew/office)
-"yD" = (
-/obj/item/kirbyplants/random,
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/cryo)
+"yB" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/under/suit/dresssuit/skirt,
+/obj/item/clothing/under/color/grey,
+/obj/item/clothing/under/suit/charcoal,
+/obj/item/clothing/shoes/laceup,
+/obj/item/clothing/shoes/sneakers/black,
+/obj/item/clothing/shoes/workboots/mining,
+/obj/item/clothing/suit/hooded/hoodie/black,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
 "yF" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 9
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"yG" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
+	dir = 1
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"yU" = (
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"yG" = (
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/freezer{
-	dir = 4;
-	name = "Cold Room"
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen/kitchen)
-"zu" = (
-/obj/machinery/door/airlock{
-	desc = "Throne of kings.";
-	dir = 4;
-	name = "Bathroom"
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/atmospherics)
+"yM" = (
+/obj/structure/table/wood/reinforced,
+/obj/item/storage/fancy/cigarettes/cigars{
+	pixel_y = 12
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/item/lighter{
+	pixel_x = -6;
+	pixel_y = -3
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+/obj/item/coin/titanium{
+	pixel_x = 7;
+	pixel_y = -3
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/effect/turf_decal/siding/wood/corner,
+/turf/open/floor/wood,
+/area/ship/crew/crewthree)
+"yU" = (
+/obj/machinery/door/airlock{
+	name = "Crew Quarters"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
-	dir = 8
+	dir = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/dorm)
-"zy" = (
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
+"ze" = (
+/obj/structure/sink{
+	pixel_y = 22
 	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
+/obj/structure/mirror{
+	pixel_y = 32
 	},
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"zG" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
-	dir = 4
+/obj/structure/toilet{
+	dir = 8;
+	name = "The Throne";
+	desc = "Man, its good to be king."
 	},
-/obj/machinery/newscaster/security_unit/directional/west,
-/turf/open/floor/wood,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel/showroomfloor,
 /area/ship/crew/crewtwo)
-"zK" = (
+"zi" = (
+/obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable{
-	icon_state = "1-8"
+	icon_state = "2-4"
 	},
 /obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/techfloor{
-	dir = 4
-	},
-/obj/structure/closet/secure_closet/engineering_electrical{
-	anchored = 1
-	},
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"zM" = (
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"zR" = (
-/turf/open/floor/plasteel/stairs{
-	dir = 8
-	},
-/area/ship/cargo)
-"Aa" = (
-/obj/machinery/door/airlock/command{
-	name = "Bridge"
+	icon_state = "1-4"
 	},
-/obj/effect/turf_decal/corner/opaque/black/full,
 /obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+	icon_state = "0-4"
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/bridge)
-"Ak" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
 	},
-/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/door/window/eastleft,
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/machinery/door/poddoor{
+/obj/machinery/light_switch{
 	dir = 4;
-	id = "windowlockdown"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+	pixel_x = -24;
+	pixel_y = -14
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/steeldecal/steel_decals_central6{
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Ao" = (
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"zu" = (
+/obj/effect/turf_decal/industrial/loading{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"zy" = (
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 8;
+	name = "engine fuel pump"
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"zC" = (
+/obj/machinery/suit_storage_unit/cmo,
+/obj/effect/turf_decal/borderfloorwhite/full,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"zG" = (
+/obj/structure/bookcase/manuals/engineering,
+/turf/open/floor/wood,
+/area/ship/hallway/central)
+"zJ" = (
+/obj/structure/sink{
+	dir = 8;
+	pixel_x = 12
+	},
+/obj/structure/mirror{
+	pixel_x = 25
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
+"zK" = (
+/obj/machinery/light/directional/east,
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/cell/high/empty,
+/obj/item/stock_parts/cell/high/empty,
+/obj/item/stock_parts/cell/high/empty,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"zM" = (
 /obj/structure/chair{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ship/crew/office)
+"zO" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/extinguisher_cabinet/directional/north,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"zP" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 9
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/door/poddoor/preopen{
+	dir = 4;
+	id = "coolingshutdown"
+	},
+/turf/open/floor/engine/airless,
+/area/ship/external)
+"zS" = (
+/obj/structure/table/optable,
+/obj/effect/turf_decal/corner/opaque/blue/mono,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"Aa" = (
+/obj/structure/chair/comfy/brown{
+	dir = 4
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/wood,
+/area/ship/crew/crewthree)
+"Ao" = (
 /turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
+/area/ship/hallway/central)
 "As" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/bridge)
+/obj/structure/closet/cabinet,
+/obj/item/clothing/suit/toggle/lawyer/burgundy,
+/obj/item/clothing/suit/toggle/lawyer/charcoal,
+/obj/item/clothing/suit/toggle/lawyer/navy,
+/obj/item/clothing/under/rank/security/detective,
+/obj/item/clothing/under/rank/security/detective/skirt,
+/obj/item/clothing/under/suit/black,
+/obj/item/clothing/under/suit/black/skirt,
+/obj/item/clothing/under/suit/black_really,
+/obj/item/clothing/under/suit/black_really/skirt,
+/obj/item/clothing/glasses/sunglasses,
+/obj/item/clothing/neck/tie,
+/obj/item/clothing/glasses/regular,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/wood,
+/area/ship/crew/office)
 "At" = (
-/obj/effect/turf_decal/atmos/air,
-/obj/machinery/air_sensor/atmos/air_tank,
-/turf/open/floor/engine/air,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/fulltile,
+/turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "Au" = (
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo/office)
-"Az" = (
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/office)
+"Az" = (
+/obj/structure/railing/corner{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
 	},
 /turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/dorm)
+/area/ship/bridge)
 "AB" = (
-/obj/structure/rack,
-/obj/item/storage/bag/ore,
-/obj/item/storage/bag/ore,
-/obj/item/pickaxe/silver,
-/obj/item/pickaxe/mini,
-/obj/item/pickaxe/mini,
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 6
-	},
-/turf/open/floor/plasteel,
+/obj/effect/decal/cleanable/wrapping,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/office)
 "AE" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
 	},
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/medical)
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
 "AG" = (
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 8;
-	name = "engine fuel pump"
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/structure/sign/warning/fire{
-	pixel_y = -20
+/obj/machinery/atmospherics/components/trinary/mixer/flipped{
+	dir = 4;
+	name = "Chamber Mixer"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/button/door/incinerator_vent_atmos_aux{
-	pixel_x = -28;
-	pixel_y = 8
+/obj/item/paper/crumpled{
+	default_raw_text = "66% Oxy (Node 1) to 34% Plasma (Node 2) works great at 500 kPa."
 	},
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/engine,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/engine)
-"AJ" = (
-/obj/machinery/door/airlock/external,
-/obj/docking_port/mobile{
-	dir = 2;
-	launch_status = 0;
-	port_direction = 8;
-	preferred_direction = 4
+"AP" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
+/obj/machinery/computer/helm/viewscreen/directional/south,
+/obj/effect/turf_decal/number/right_eight,
+/obj/effect/turf_decal/number/left_nine,
 /turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"AM" = (
-/obj/effect/turf_decal/atmos/oxygen,
-/turf/open/floor/engine/o2,
-/area/ship/engineering/atmospherics)
+/area/ship/cargo/office)
 "AT" = (
 /turf/closed/wall,
 /area/ship/medical)
 "Bc" = (
-/obj/machinery/power/smes/engineering,
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
-	dir = 10
-	},
-/obj/structure/sign/warning/electricshock{
-	pixel_x = 32
+/obj/machinery/cryopod{
+	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/crew/cryo)
 "Bd" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
 "Bg" = (
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/structure/table,
-/obj/item/trash/can,
-/obj/item/trash/candle{
-	pixel_y = 12
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
+/area/ship/hallway/central)
 "Bh" = (
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
-	dir = 4
+/obj/structure/table,
+/obj/item/flashlight/lamp/green{
+	pixel_x = -6;
+	pixel_y = 13
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
+/obj/structure/sign/poster/official/nanotrasen_logo{
+	pixel_x = -30
 	},
+/obj/item/spacecash/bundle/c50,
+/turf/open/floor/wood,
+/area/ship/crew/office)
+"Bq" = (
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"Br" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
+	dir = 4
 	},
+/obj/effect/turf_decal/corner/opaque/white/mono,
 /turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"Br" = (
-/obj/structure/curtain/bounty,
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/ship/crew/canteen)
+/area/ship/crew/canteen/kitchen)
 "Bw" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/corner/opaque/ntblue/diagonal,
+/obj/effect/turf_decal/corner/opaque/neutral/diagonal{
+	dir = 4
 	},
-/obj/effect/turf_decal/ntspaceworks_small,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
+/obj/effect/decal/cleanable/food/tomato_smudge,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"BE" = (
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
 "BH" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/table/wood,
+/obj/machinery/light/small/directional/east,
+/obj/machinery/light_switch{
+	pixel_x = -5;
+	pixel_y = 24
+	},
+/obj/item/paicard,
+/turf/open/floor/carpet/blue,
+/area/ship/crew/dorm)
+"BI" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
+	dir = 9
+	},
+/obj/structure/sign/poster/official/random{
+	pixel_y = -32
 	},
+/obj/effect/turf_decal/ntspaceworks_small,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/office)
+"BJ" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/plasteel/stairs,
+/area/ship/bridge)
+"BK" = (
+/obj/structure/catwalk/over,
+/obj/effect/decal/cleanable/glass,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/robot_debris/gib,
+/turf/open/floor/plating,
+/area/ship/crew/toilet)
+"BS" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/cryo)
+"BW" = (
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
+"Ca" = (
+/obj/machinery/suit_storage_unit/mining/eva,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"Cl" = (
+/obj/machinery/door/airlock{
+	dir = 4;
+	name = "Bathroom"
 	},
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"BJ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
+	dir = 4
 	},
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"BW" = (
-/obj/effect/turf_decal/corner/opaque/white/mono,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"Ca" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/item/defibrillator/loaded,
-/obj/item/storage/box/bodybags{
-	pixel_x = 8;
-	pixel_y = 4
-	},
-/obj/item/storage/firstaid/fire{
-	pixel_x = -6
-	},
-/obj/item/reagent_containers/glass/bottle/formaldehyde{
-	pixel_x = 5;
-	pixel_y = 8
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/glass/bottle{
-	list_reagents = list(/datum/reagent/medicine/thializid=30);
-	name = "thializid bottle"
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
 	},
-/obj/structure/closet/crate/medical,
-/turf/open/floor/plasteel/mono,
-/area/ship/cargo)
-"Cl" = (
-/obj/structure/table,
-/obj/item/folder/blue{
-	pixel_x = 6;
-	pixel_y = -3
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/toilet)
+"Co" = (
+/obj/structure/spirit_board,
+/obj/structure/catwalk/over,
+/obj/item/toy/plush/moth/firewatch{
+	pixel_y = 14;
+	name = "soot-covered moth plushie"
 	},
-/obj/item/stamp/law{
-	pixel_x = 7
+/obj/structure/sign/poster/contraband/stechkin{
+	pixel_x = 32
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/plating/rust,
+/area/ship/crew/toilet)
+"Cr" = (
+/obj/structure/chair/office/light{
 	dir = 4
 	},
-/obj/item/folder/red{
-	pixel_x = -8
+/obj/effect/turf_decal/corner/opaque/blue/mono,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"Cs" = (
+/obj/structure/chair{
+	dir = 8
 	},
-/obj/item/stamp/centcom{
-	pixel_x = -7;
-	pixel_y = 4
+/obj/effect/turf_decal/techfloor{
+	dir = 4
 	},
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/crew/office)
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
 "Cu" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/obj/machinery/door/firedoor/window,
-/obj/structure/window/plasma/reinforced/fulltile,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 6
+	},
 /obj/structure/grille,
+/obj/structure/window/plasma/reinforced/fulltile,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
-"CA" = (
-/obj/effect/turf_decal/corner/opaque/yellow/border{
+"Cy" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/crew/office)
+"Cz" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 1
 	},
-/obj/effect/turf_decal/corner/opaque/yellow/half,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"CB" = (
-/obj/machinery/smartfridge/bloodbank/preloaded,
-/turf/closed/wall,
-/area/ship/medical)
-"CC" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
+	},
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"CA" = (
+/obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
-/obj/effect/turf_decal/techfloor{
-	dir = 10
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
 	},
+/obj/machinery/light/directional/south,
 /turf/open/floor/plasteel,
 /area/ship/engineering/atmospherics)
-"CE" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+"CB" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
-/obj/effect/turf_decal/techfloor{
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/medical)
+"CE" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/ship/engineering/atmospherics)
 "CH" = (
-/obj/machinery/medical_kiosk,
+/obj/structure/chair/sofa/right{
+	dir = 4
+	},
+/obj/machinery/airalarm/directional/west,
 /turf/open/floor/carpet/nanoweave/blue,
 /area/ship/medical)
 "CM" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/obj/effect/turf_decal/techfloor/corner{
 	dir = 4
 	},
-/turf/closed/wall/r_wall,
-/area/ship/engineering/engine)
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/cryo)
 "CR" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"CV" = (
-/obj/machinery/vending/cigarette,
-/obj/structure/sign/nanotrasen{
-	pixel_y = 32
+/obj/machinery/atmospherics/pipe/manifold/purple/visible{
+	dir = 4
 	},
-/obj/structure/sign/poster/official/random{
-	pixel_x = -32
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
+	dir = 1
 	},
-/turf/open/floor/wood,
-/area/ship/crew/office)
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"CV" = (
+/obj/effect/turf_decal/ntspaceworks_small/right,
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/office)
 "Da" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-8"
+/obj/effect/turf_decal/techfloor,
+/obj/machinery/computer/cryopod/directional/west,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
 	},
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/cryo)
+"Dc" = (
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
-"Dd" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible,
-/obj/machinery/door/firedoor/window,
-/obj/structure/window/plasma/reinforced/fulltile,
-/obj/structure/grille,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
-"Dp" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
 	},
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/crew/office)
-"Dv" = (
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
+/obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/structure/chair{
-	dir = 8
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"Dd" = (
+/obj/machinery/atmospherics/components/binary/pump/on{
+	name = "Nitrogen to Air";
+	dir = 8;
+	target_pressure = 1000
 	},
-/obj/machinery/newscaster/directional/east,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"DN" = (
-/obj/structure/window/reinforced/spawner/east,
-/obj/structure/chair/comfy/black{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"Dp" = (
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/turf/open/floor/carpet,
-/area/ship/crew/office)
-"DR" = (
-/obj/structure/sign/departments/medbay/alt{
-	pixel_y = -32
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/structure/closet/emcloset/wall{
+	dir = 1;
+	pixel_y = -28
 	},
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
-"DV" = (
-/obj/structure/filingcabinet{
-	pixel_x = 8
+"Dy" = (
+/obj/structure/closet/cardboard{
+	name = "pranking materials"
+	},
+/obj/item/storage/box/maid,
+/obj/item/toy/katana,
+/obj/item/bikehorn,
+/obj/item/grown/bananapeel,
+/obj/item/gun/ballistic/automatic/toy/pistol,
+/obj/item/restraints/legcuffs/beartrap,
+/obj/item/poster/random_contraband,
+/obj/item/poster/random_contraband,
+/obj/item/poster/random_contraband,
+/turf/open/floor/plating/rust,
+/area/ship/crew/toilet)
+"Dz" = (
+/obj/machinery/modular_computer/console/preset/command{
+	dir = 8
 	},
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/newscaster/security_unit/directional/west,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 24;
+	pixel_y = -5
+	},
+/turf/open/floor/carpet/nanoweave/red,
 /area/ship/crew/crewthree)
-"Ea" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+"DF" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
+	dir = 1
 	},
+/turf/open/floor/engine/plasma,
+/area/ship/engineering/atmospherics)
+"DL" = (
+/obj/effect/decal/cleanable/food/flour,
+/obj/effect/turf_decal/corner/opaque/green/mono,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen/kitchen)
+"DN" = (
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/airalarm/directional/south,
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
-"Eb" = (
-/turf/closed/wall,
-/area/ship/engineering)
-"Ek" = (
-/obj/effect/turf_decal/atmos/nitrogen,
-/turf/open/floor/engine/n2,
-/area/ship/engineering/atmospherics)
-"En" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
+"DV" = (
+/obj/structure/chair/sofa/corner,
+/obj/structure/sign/poster/official/random{
+	pixel_y = 32
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/computer/helm/viewscreen/directional/east,
+/turf/open/floor/carpet/red,
+/area/ship/hallway/central)
+"DZ" = (
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/decal/cleanable/food/flour,
+/obj/structure/sink/kitchen{
+	dir = 4;
+	pixel_x = -11
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen/kitchen)
+"Eb" = (
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+	dir = 10
 	},
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/wood,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/bridge)
+"Ek" = (
+/obj/machinery/advanced_airlock_controller{
+	pixel_x = 25
+	},
+/turf/open/floor/plating,
+/area/ship/hallway/central)
 "Eu" = (
 /obj/docking_port/stationary{
 	dwidth = 15;
@@ -3535,978 +3818,998 @@
 /turf/template_noop,
 /area/template_noop)
 "Ev" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+	pixel_x = 6
 	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
-	dir = 4
+/obj/item/pen{
+	pixel_x = 5;
+	pixel_y = 2
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 4
+/obj/item/reagent_containers/food/snacks/fortunecookie{
+	pixel_y = 7;
+	pixel_x = -7
 	},
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
+/obj/machinery/newscaster/directional/east,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/wood,
+/area/ship/crew/cryo)
 "Ew" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 4
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"Ex" = (
+/obj/structure/railing{
+	dir = 1
 	},
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
+/obj/item/kirbyplants/random,
+/obj/machinery/light/dim/directional/west,
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/bridge)
 "EE" = (
-/obj/machinery/power/smes/shuttle/precharged{
+/obj/machinery/atmospherics/components/unary/shuttle/heater{
 	dir = 4
 	},
 /obj/structure/window/reinforced/spawner/west,
-/obj/machinery/door/window/eastright,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
 /obj/machinery/door/poddoor{
 	dir = 4;
-	id = "windowlockdown"
+	id = "enginelockdown"
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/machinery/door/window/eastright{
+	name = "Engine Access"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"EF" = (
+/obj/machinery/modular_computer/console/preset/command{
 	dir = 8
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/corner/opaque/bar/half{
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"EG" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
+	},
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/wood,
+/area/ship/hallway/central)
 "EJ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
 /obj/effect/turf_decal/techfloor{
-	dir = 8
+	dir = 6
 	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"ES" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/atmospherics)
+"EP" = (
+/obj/machinery/atmospherics/pipe/simple/green/visible{
 	dir = 9
 	},
-/obj/effect/turf_decal/techfloor{
-	dir = 1
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"ES" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/light/broken/directional/east,
+/obj/effect/turf_decal/corner/opaque/ntblue/diagonal,
+/obj/effect/turf_decal/corner/opaque/neutral/diagonal{
+	dir = 4
 	},
 /turf/open/floor/plasteel,
-/area/ship/engineering/atmospherics)
+/area/ship/hallway/central)
 "Fc" = (
-/obj/machinery/atmospherics/pipe/layer_manifold{
-	dir = 4
+/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/techfloor{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"Fj" = (
+/obj/machinery/door/airlock/command{
+	name = "Bridge";
+	req_access_txt = "19"
 	},
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Ff" = (
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
 	},
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"Fj" = (
-/obj/structure/window/reinforced/spawner/east,
-/obj/item/kirbyplants/random,
+/obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/turf/open/floor/carpet,
-/area/ship/crew/office)
-"Fq" = (
-/obj/effect/turf_decal/corner/opaque/yellow/half{
-	dir = 4
+	dir = 1
 	},
-/obj/effect/turf_decal/corner/opaque/yellow/border{
-	dir = 8
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/bridge)
+"Fn" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
 	},
+/turf/open/floor/carpet/blue,
+/area/ship/crew/dorm)
+"Fq" = (
 /obj/machinery/airalarm/directional/west,
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/effect/decal/cleanable/generic,
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "Fu" = (
 /turf/closed/wall,
 /area/ship/cargo)
 "Fv" = (
-/obj/machinery/vending/coffee,
-/obj/structure/sign/poster/official/get_your_legs{
-	pixel_y = -32
+/obj/machinery/fax,
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"Fx" = (
+/obj/machinery/light/dim/directional/south,
+/obj/structure/chair{
+	dir = 4
 	},
+/obj/effect/decal/cleanable/food/egg_smudge,
 /turf/open/floor/plasteel/dark,
-/area/ship/crew/cryo)
+/area/ship/hallway/central)
 "FB" = (
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/turf/open/floor/carpet/nanoweave,
+/obj/structure/flora/bigplant,
+/turf/open/floor/wood,
 /area/ship/hallway/central)
 "FC" = (
-/obj/effect/turf_decal/corner/opaque/yellow/half{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/yellow/border{
-	dir = 8
-	},
-/obj/item/radio/intercom/directional/west,
+/obj/structure/rack,
+/obj/item/pickaxe,
+/obj/item/pickaxe,
+/obj/item/shovel,
+/obj/item/kinetic_crusher,
 /turf/open/floor/plasteel,
 /area/ship/cargo)
-"FN" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -22;
-	pixel_y = 9
-	},
+"FO" = (
 /obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/structure/extinguisher_cabinet/directional/west,
-/obj/machinery/firealarm/directional/west{
-	pixel_y = -12
+	icon_state = "4-8"
 	},
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/medical)
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
 "FW" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/portable_atmospherics/pump,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
 	},
-/turf/open/floor/plasteel/mono,
-/area/ship/cargo)
-"Gb" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/effect/turf_decal/techfloor{
+	dir = 6
 	},
 /turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/cryo)
-"Gc" = (
-/obj/machinery/door/window/westleft,
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/transparent/blue/half{
-	dir = 8
+/area/ship/bridge)
+"Gb" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/wood,
+/area/ship/hallway/central)
+"Gc" = (
+/obj/structure/bed,
+/obj/item/bedsheet/medical,
+/obj/machinery/iv_drip,
+/obj/effect/turf_decal/borderfloorwhite/full,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Gh" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 8;
+	name = "Activate Cooling"
+	},
+/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible,
-/obj/machinery/light/directional/south,
 /turf/open/floor/engine,
 /area/ship/engineering/engine)
 "Gi" = (
+/turf/open/floor/engine,
+/area/ship/engineering/engine)
+"Gm" = (
+/obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "0-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/crew/office)
+"Gp" = (
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 2
-	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Gm" = (
-/obj/structure/table/reinforced,
-/obj/machinery/chem_dispenser/drinks,
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen/kitchen)
-"Go" = (
-/obj/machinery/door/airlock{
-	dir = 4;
-	name = "Dormitory"
-	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/corner/opaque/black/full,
-/turf/open/floor/carpet/nanoweave,
-/area/ship/crew/dorm)
-"Gp" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/spawner/lootdrop/maintenance/five,
-/obj/structure/closet/crate/internals,
-/turf/open/floor/plasteel/mono,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "Gq" = (
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
-	dir = 4
-	},
+/obj/structure/table,
+/obj/item/folder/blue,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"Gs" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
-	},
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/medical)
-"Gx" = (
-/obj/machinery/atmospherics/components/trinary/mixer/airmix{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
-"GA" = (
-/obj/machinery/atmospherics/pipe/manifold/orange/visible{
 	dir = 4
 	},
-/obj/machinery/door/firedoor/window,
-/obj/structure/window/plasma/reinforced/fulltile,
-/obj/structure/grille,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
-"GF" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output,
-/turf/open/floor/engine/o2,
-/area/ship/engineering/atmospherics)
-"GL" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
+/obj/item/clipboard,
+/turf/open/floor/wood,
+/area/ship/crew/office)
+"Gs" = (
+/obj/machinery/door/window/westleft,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
-	dir = 4
+	dir = 9
 	},
-/obj/machinery/light/directional/south,
-/obj/item/radio/intercom/directional/west,
-/obj/structure/railing/corner{
-	dir = 4
+/obj/structure/sign/poster/official/cleanliness{
+	pixel_y = -33
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/bridge)
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"GL" = (
+/turf/open/floor/wood,
+/area/ship/crew/crewtwo)
 "GQ" = (
-/obj/effect/spawner/structure/window/reinforced/shutters,
-/obj/machinery/door/poddoor{
-	id = "windowlockdown"
-	},
-/turf/open/floor/plating,
-/area/ship/crew/canteen)
-"Hd" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
+/obj/structure/fluff/hedge,
+/turf/open/floor/wood,
+/area/ship/crew/office)
+"GW" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel/stairs{
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
+"Hb" = (
+/obj/machinery/vending/cola/random,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"Hd" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/corner/opaque/neutral{
 	dir = 8
 	},
-/area/ship/crew/cryo)
+/obj/effect/turf_decal/corner/opaque/ntblue,
+/obj/effect/turf_decal/corner/opaque/neutral/half{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen/kitchen)
 "Hm" = (
-/obj/machinery/atmospherics/components/binary/pump/layer4{
-	dir = 8;
-	name = "Emergency Recycling Override"
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
+	dir = 6
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
 "Hq" = (
-/obj/machinery/door/window/brigdoor/southright{
-	desc = "A strong door. A robust looking stainless steel plate with 'INTERNAL AFFAIRS' is written on it.";
-	dir = 4;
-	name = "Internal Affairs"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 9
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/office)
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
 "Hu" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/item/clothing/shoes/magboots,
-/obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/item/clothing/suit/space/hardsuit/engine,
-/obj/item/clothing/mask/breath,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"HA" = (
-/obj/effect/turf_decal/corner/opaque/black{
+/obj/machinery/atmospherics/pipe/manifold/purple/visible,
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
 	dir = 5
 	},
-/obj/machinery/light_switch{
-	pixel_x = 25;
-	pixel_y = 25
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"HA" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
 	},
-/turf/open/floor/plasteel,
-/area/ship/cargo/office)
-"HE" = (
-/obj/machinery/power/smes/engineering,
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/effect/turf_decal/techfloor{
+	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 4
 	},
-/obj/structure/sign/warning/electricshock{
-	pixel_x = 32
-	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/bridge)
+"HE" = (
+/obj/structure/catwalk/over,
+/obj/structure/closet/emcloset,
 /turf/open/floor/plating,
-/area/ship/engineering/engine)
+/area/ship/crew/toilet)
 "HL" = (
+/obj/machinery/igniter/incinerator_atmos,
 /obj/machinery/air_sensor/atmos/incinerator_tank{
 	id_tag = "nemo_incinerator_sensor"
 	},
-/obj/machinery/igniter/incinerator_atmos,
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
 /turf/open/floor/engine/airless,
 /area/ship/engineering/engine)
 "HO" = (
-/obj/structure/table/optable,
-/obj/effect/turf_decal/borderfloor{
-	dir = 4
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/table/glass,
+/obj/item/storage/backpack/duffelbag/med/surgery{
+	pixel_y = 11
+	},
+/obj/machinery/light_switch{
+	pixel_x = -5;
+	pixel_y = 24
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/white,
 /area/ship/medical)
 "HR" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/dark/visible{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/machinery/button/door/incinerator_vent_atmos_aux{
-	dir = 4;
-	pixel_x = -23;
-	pixel_y = 8
+/turf/open/floor/engine,
+/area/ship/engineering/atmospherics)
+"HW" = (
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
-/obj/effect/turf_decal/techfloor{
-	dir = 8
+/turf/open/floor/wood,
+/area/ship/hallway/central)
+"HZ" = (
+/obj/machinery/vending/coffee,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"Ir" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Ic" = (
-/obj/machinery/cryopod{
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"IA" = (
+/obj/machinery/power/terminal{
 	dir = 8
 	},
-/obj/structure/window/reinforced/tinted,
-/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "0-4"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/cryo)
-"Id" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"IB" = (
+/obj/structure/bookcase/random/fiction,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
+"IV" = (
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
 	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
 	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "1-4"
 	},
-/obj/effect/turf_decal/corner/opaque/black/full,
-/obj/machinery/door/airlock/public/glass{
-	name = "Canteen"
+/obj/effect/turf_decal/techfloor{
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"Ir" = (
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/atmospherics)
+"Jj" = (
+/obj/structure/closet/crate/bin,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"Jk" = (
+/obj/machinery/atmospherics/pipe/manifold/purple/visible{
 	dir = 4
 	},
-/obj/structure/chair{
-	dir = 8
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"Iy" = (
-/obj/machinery/power/apc/auto_name/directional/south,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"Jm" = (
 /obj/structure/cable{
-	icon_state = "0-8"
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
+/obj/machinery/airalarm/directional/west,
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
+	dir = 1
 	},
-/turf/open/floor/plasteel/freezer,
-/area/ship/crew/dorm)
-"IA" = (
-/obj/structure/tank_dispenser,
-/obj/machinery/light/directional/west,
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"IB" = (
-/obj/structure/chair{
-	dir = 4
+/area/ship/engineering/engine)
+"Jn" = (
+/obj/machinery/door/airlock/medical/glass{
+	name = "Infirmary"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
-/obj/effect/turf_decal/corner/transparent/grey/half{
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/medical)
+"JA" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/computer/cargo/express{
 	dir = 1
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/crew/office)
-"II" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
-	dir = 4
+/area/ship/cargo/office)
+"JE" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
 	},
-/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/door/window/eastleft,
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "windowlockdown"
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/cargo)
+"JJ" = (
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/wood,
+/area/ship/hallway/central)
+"JM" = (
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"IP" = (
-/obj/structure/railing{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/turf/open/floor/plasteel/stairs{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
 	},
-/area/ship/bridge)
-"IV" = (
-/turf/closed/wall,
-/area/ship/engineering/engine)
-"Ja" = (
-/obj/structure/sign/nanotrasen{
-	pixel_x = 32
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/obj/machinery/light/small/directional/east,
-/obj/machinery/vending/cola/random,
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
-"Jj" = (
-/obj/structure/chair{
-	dir = 8
+"JQ" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"JS" = (
+/obj/machinery/cryopod{
+	dir = 4
 	},
-/turf/open/floor/carpet/nanoweave/orange,
-/area/ship/hallway/central)
-"Jk" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
-	name = "Air to Distro";
-	target_pressure = 1000
+/obj/structure/sign/poster/official/nanotrasen_logo{
+	pixel_x = -30
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/crew/cryo)
+"JT" = (
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 6
 	},
-/obj/effect/turf_decal/industrial/warning{
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"JX" = (
+/obj/effect/turf_decal/radiation/white,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/engine)
+"JY" = (
+/obj/structure/closet/emcloset/anchored,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"Ka" = (
+/obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
-"Jm" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 5
-	},
-/turf/closed/wall,
-/area/ship/engineering/engine)
-"Jn" = (
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
-	dir = 4
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/wood,
+/area/ship/hallway/central)
+"Kb" = (
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"Kd" = (
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
+	dir = 10
 	},
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"Kf" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"JA" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo/office)
-"JE" = (
-/obj/effect/turf_decal/industrial/warning{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 1
 	},
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"JQ" = (
-/turf/open/floor/plasteel/mono,
-/area/ship/cargo)
-"JY" = (
-/obj/machinery/air_sensor/atmos/oxygen_tank,
-/turf/open/floor/engine/o2,
-/area/ship/engineering/atmospherics)
-"Ka" = (
-/obj/structure/filingcabinet/chestdrawer,
-/obj/structure/sign/poster/official/random{
-	pixel_x = 32
-	},
-/obj/effect/turf_decal/corner/transparent/grey/half{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
 	},
-/obj/effect/turf_decal/siding/wideplating/dark{
-	dir = 1
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
+"Kh" = (
+/obj/machinery/button/door{
+	dir = 1;
+	pixel_y = -24;
+	id = "privacyshutters"
 	},
-/turf/open/floor/plasteel/dark,
+/obj/item/kirbyplants/random,
+/turf/open/floor/carpet/nanoweave/blue,
 /area/ship/crew/office)
-"Kh" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+"Ki" = (
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/rag,
-/obj/machinery/door/poddoor/shutters{
-	dir = 4;
-	id = "sorrywejustclosed";
-	name = "Closing Shutters"
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 4
 	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = 8;
-	pixel_y = -25
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"Ki" = (
-/obj/machinery/vending/clothing,
-/obj/machinery/computer/cryopod/directional/west,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/cryo)
+/turf/open/floor/wood,
+/area/ship/hallway/central)
 "Kn" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 8
 	},
 /turf/open/floor/engine/airless,
 /area/ship/external)
-"Kp" = (
+"Kv" = (
 /obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 8
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
 	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"Kz" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
 	},
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"Kv" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/portable_atmospherics/canister/air,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/structure/disposalpipe/segment{
+	dir = 8
 	},
-/turf/open/floor/plasteel/mono,
-/area/ship/cargo)
-"Kz" = (
-/obj/machinery/atmospherics/components/binary/valve/digital{
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/effect/turf_decal/techfloor/corner{
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/atmospherics)
 "KH" = (
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
+/obj/structure/punching_bag,
+/obj/machinery/light_switch{
 	dir = 1;
-	name = "cryogenic freezer";
-	target_temperature = 73
+	pixel_x = 6;
+	pixel_y = -24
 	},
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/cryo)
-"KI" = (
-/obj/structure/dresser,
-/obj/item/radio/intercom/directional/north,
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
-"KL" = (
-/obj/machinery/door/airlock/external,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
-"KQ" = (
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 32
+"KI" = (
+/obj/machinery/door/airlock/maintenance_hatch{
+	dir = 4
 	},
-/obj/structure/sign/nanotrasen{
-	pixel_x = -32
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/structure/barricade/wooden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
-	dir = 1
+	dir = 8
 	},
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"KU" = (
-/obj/structure/closet/secure_closet/captains,
-/obj/item/stock_parts/cell/gun,
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/obj/machinery/power/apc/auto_name/directional/south,
-/turf/open/floor/wood,
-/area/ship/crew/crewtwo)
-"KY" = (
-/obj/machinery/advanced_airlock_controller{
-	dir = 4;
-	pixel_x = -25
+/turf/open/floor/plating,
+/area/ship/crew/toilet)
+"KL" = (
+/obj/effect/turf_decal/corner/opaque/green/mono,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen/kitchen)
+"KU" = (
+/obj/machinery/computer/arcade/orion_trail{
+	dir = 8;
+	pixel_x = 5
 	},
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 9
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = -15;
+	pixel_y = 10
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/wood,
 /area/ship/hallway/central)
+"La" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/effect/turf_decal/siding/wood,
+/obj/structure/table/wood,
+/obj/structure/bedsheetbin,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
 "Lm" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input,
 /turf/open/floor/engine/o2,
 /area/ship/engineering/atmospherics)
 "Lq" = (
-/obj/effect/spawner/structure/window/reinforced/shutters,
-/obj/machinery/door/poddoor{
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/door/poddoor/preopen{
 	dir = 4;
-	id = "bridgelockdown"
+	id = "coolingshutdown"
 	},
-/turf/open/floor/plating,
-/area/ship/bridge)
+/turf/open/floor/engine/airless,
+/area/ship/external)
 "Ls" = (
-/obj/effect/turf_decal/corner/opaque/yellow/border{
+/obj/machinery/door/airlock/mining/glass,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/obj/effect/turf_decal/corner/opaque/yellow/half,
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "Lv" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+/obj/machinery/power/smes/engineering,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/cable{
+	icon_state = "0-8"
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 8
-	},
-/obj/machinery/light/broken/directional/north,
-/turf/open/floor/engine,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Lz" = (
-/obj/machinery/atmospherics/pipe/manifold/orange/visible{
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"LA" = (
-/obj/structure/bookcase/random{
-	desc = "A great place for storing knowledge, if it weren't for the 'FOR DISPLAY ONLY' placard sitting on one of the shelves."
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/office)
-"LD" = (
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
 	dir = 1
 	},
-/obj/effect/decal/cleanable/vomit,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"LV" = (
-/obj/machinery/washing_machine,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/plasteel/freezer,
-/area/ship/crew/dorm)
-"LX" = (
-/obj/machinery/autolathe,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 9
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
-/obj/effect/turf_decal/industrial/warning{
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/atmospherics)
+"LA" = (
+/obj/structure/frame/computer{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
-/area/ship/cargo/office)
-"Mh" = (
-/obj/machinery/airalarm/directional/south,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"LD" = (
+/obj/structure/chair{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/wood,
+/area/ship/crew/office)
+"LX" = (
+/obj/structure/chair/office{
+	dir = 8
 	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
+/obj/machinery/button/door{
+	id = "hallwindows";
+	name = "Shutters Control";
+	pixel_y = 24
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/office)
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/office)
 "Mi" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"Mk" = (
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 10
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/table,
-/obj/structure/cable,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/plasteel,
-/area/ship/cargo/office)
-"Mn" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 4
 	},
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
-"Mq" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+"Mk" = (
+/obj/machinery/door/airlock{
+	dir = 4;
+	name = "Dormitory"
 	},
 /obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/sign/warning/enginesafety{
-	pixel_x = 32
+	icon_state = "4-8"
 	},
-/obj/machinery/light/small/directional/east,
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/effect/turf_decal/techfloor{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"Ms" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/machinery/portable_atmospherics/canister/toxins,
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
-"MA" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/door/window/eastright,
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "windowlockdown"
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/machinery/door/firedoor/border_only{
+/turf/open/floor/wood,
+/area/ship/crew/cryo)
+"Mn" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/under/color/grey,
+/obj/item/clothing/under/color/grey,
+/obj/item/clothing/under/color/grey,
+/obj/item/clothing/shoes/sneakers/black,
+/obj/item/clothing/shoes/sneakers/black,
+/obj/item/clothing/shoes/sneakers/black,
+/obj/item/storage/backpack,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/storage/backpack/satchel,
+/obj/item/radio,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/wood,
+/area/ship/crew/cryo)
+"Mq" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"Mr" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/bridge)
 "ME" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 1
 	},
 /turf/open/floor/engine/airless,
 /area/ship/external)
+"MG" = (
+/obj/effect/turf_decal/borderfloorwhite/full,
+/obj/structure/table,
+/obj/item/paper_bin{
+	pixel_x = 6;
+	pixel_y = 2
+	},
+/obj/item/pen{
+	pixel_y = 4;
+	pixel_x = 5
+	},
+/obj/item/folder/blue{
+	pixel_y = 11;
+	pixel_x = -8
+	},
+/obj/item/stamp/cmo{
+	pixel_x = -7
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "MH" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/spawner/lootdrop/maintenance/five,
-/obj/structure/closet/cardboard,
-/obj/effect/spawner/lootdrop/ration,
-/turf/open/floor/plasteel/mono,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central7{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "MI" = (
-/obj/structure/table/reinforced{
-	color = "#363636"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters{
-	id = "noiwillnotgiveyouaa";
-	name = "Closing Shutters"
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/northright,
+/obj/machinery/door/window/southright{
+	req_one_access_txt = "57"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/dark,
 /area/ship/crew/crewthree)
 "MJ" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 9
-	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"MP" = (
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
 	},
-/obj/machinery/atmospherics/components/binary/pump{
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
 	dir = 1
 	},
-/turf/open/floor/engine,
-/area/ship/engineering/engine)
-"MQ" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
-	name = "Oxygen to Air"
-	},
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 4
-	},
-/obj/effect/turf_decal/techfloor{
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/techfloor/corner,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/atmospherics)
+"MP" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+	dir = 10
+	},
+/turf/open/floor/engine,
+/area/ship/engineering/engine)
 "MS" = (
 /obj/machinery/atmospherics/components/binary/circulator,
 /turf/open/floor/engine,
 /area/ship/engineering/engine)
 "MT" = (
-/turf/open/floor/plasteel/stairs{
+/obj/structure/railing{
 	dir = 8
 	},
-/area/ship/crew/cryo)
-"MV" = (
-/obj/machinery/advanced_airlock_controller/mix_chamber{
-	pixel_y = 26
-	},
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
 	},
-/obj/machinery/button/ignition/incinerator/atmos{
+/obj/effect/turf_decal/techfloor,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/bridge)
+"MV" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/binary/pump{
 	dir = 4;
-	pixel_x = -26;
-	pixel_y = -3
+	name = "Mix Extract to TEG"
 	},
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/engine,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/engine)
-"Nh" = (
-/obj/machinery/airalarm/directional/west,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+"MZ" = (
+/obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
+/turf/open/floor/wood,
+/area/ship/crew/office)
+"Nh" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/wood,
+/area/ship/crew/cryo)
 "Ni" = (
-/obj/machinery/atmospherics/pipe/manifold/orange/visible,
-/obj/effect/turf_decal/techfloor{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 9
 	},
-/turf/open/floor/plasteel,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
 "Nm" = (
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 9
+/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 8
 	},
-/turf/open/floor/plasteel,
+/obj/structure/table,
+/obj/item/clipboard{
+	pixel_x = 6;
+	pixel_y = 6
+	},
+/obj/item/stamp{
+	pixel_x = 10
+	},
+/obj/item/stamp/denied{
+	pixel_x = 2
+	},
+/obj/item/flashlight/lamp{
+	pixel_x = -8;
+	pixel_y = 10
+	},
+/obj/item/folder{
+	pixel_x = -10
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/office)
 "Np" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output,
-/turf/open/floor/engine/air,
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 4
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/light_switch{
+	pixel_x = -14;
+	pixel_y = 24
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central6,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
+"Ny" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/machinery/newscaster/directional/south,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
 "NB" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 9
@@ -4514,433 +4817,389 @@
 /turf/open/floor/engine/airless,
 /area/ship/external)
 "NC" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/portable_atmospherics/scrubber,
-/turf/open/floor/plasteel/mono,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "NH" = (
 /obj/machinery/atmospherics/pipe/simple/dark/visible{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
+	dir = 1
 	},
-/turf/closed/wall,
-/area/ship/engineering/engine)
-"NI" = (
-/obj/structure/ore_box,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plasteel/mono,
-/area/ship/cargo)
-"NK" = (
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 8;
-	name = "engine fuel pump"
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
+	dir = 1
 	},
-/obj/effect/turf_decal/industrial/warning{
+/obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/atmospherics)
+"NK" = (
+/obj/machinery/light_switch{
+	pixel_x = -5;
+	pixel_y = 24
+	},
+/obj/effect/turf_decal/radiation/white,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/engine)
 "NL" = (
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/obj/structure/chair{
-	dir = 8
-	},
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"NT" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/effect/turf_decal/techfloor,
-/turf/open/floor/plasteel,
-/area/ship/engineering/atmospherics)
+/turf/open/floor/wood,
+/area/ship/crew/office)
 "Oi" = (
-/obj/machinery/cryopod{
-	dir = 8
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/cryo)
+/turf/open/floor/wood,
+/area/ship/hallway/central)
 "Om" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/closet/crate/engineering,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/turf/open/floor/plasteel/mono,
+/obj/machinery/suit_storage_unit/mining/eva,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "Oo" = (
-/obj/machinery/atmospherics/pipe/manifold/orange/visible,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Op" = (
-/obj/machinery/iv_drip,
-/obj/structure/bed,
-/obj/item/bedsheet/medical,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
 	dir = 1
 	},
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/medical)
-"OF" = (
-/obj/machinery/door/airlock/medical{
-	dir = 4;
-	name = "Infirmary"
+/obj/structure/disposalpipe/segment{
+	dir = 5
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
+	dir = 1
 	},
+/obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/atmospherics)
+"Op" = (
+/obj/effect/turf_decal/borderfloorwhite{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/carpet/nanoweave/blue,
 /area/ship/medical)
-"OG" = (
-/obj/effect/turf_decal/corner/opaque/red/mono,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"ON" = (
-/obj/effect/turf_decal/corner/opaque/red/mono,
+"OF" = (
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-8"
 	},
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"OT" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 6
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/medical)
+"OG" = (
+/obj/structure/filingcabinet/chestdrawer,
+/obj/item/storage/fancy/cigarettes/cigpack_robust{
+	pixel_y = 9;
+	pixel_x = -1
 	},
-/obj/effect/turf_decal/techfloor{
-	dir = 5
+/obj/item/lighter{
+	pixel_y = 7;
+	pixel_x = 4
 	},
-/turf/open/floor/plasteel,
-/area/ship/engineering/atmospherics)
-"Pf" = (
-/obj/structure/sign/warning/fire{
-	pixel_y = 32
+/obj/machinery/firealarm/directional/south,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/crew/office)
+"OH" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-8"
 	},
-/obj/machinery/air_sensor/atmos/toxin_tank,
-/turf/open/floor/engine/plasma,
-/area/ship/engineering/atmospherics)
-"Pk" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/machinery/space_heater,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/cargo/office)
+"OJ" = (
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
 	},
-/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/effect/turf_decal/corner/opaque/white/mono,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/medical)
-"Pl" = (
-/obj/item/kirbyplants/random,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"Pm" = (
-/obj/effect/turf_decal/corner/opaque/yellow/half,
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/structure/window/reinforced/spawner/west,
+/obj/machinery/door/poddoor{
+	dir = 4;
+	id = "enginelockdown"
+	},
+/obj/machinery/door/window/eastright{
+	name = "Engine Access"
+	},
+/turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
-"Pn" = (
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
+"OT" = (
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen/kitchen)
+"Pb" = (
+/obj/machinery/power/shuttle/engine/electric{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/external)
+"Pf" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input,
+/turf/open/floor/engine/n2,
+/area/ship/engineering/atmospherics)
+"Pk" = (
+/obj/effect/turf_decal/borderfloorwhite/full,
+/obj/machinery/sleeper,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"Pl" = (
 /obj/structure/chair/stool/bar{
-	dir = 4
+	dir = 1;
+	pixel_y = 10
 	},
-/obj/machinery/computer/security/telescreen/entertainment{
-	pixel_y = -32
+/obj/effect/turf_decal/corner/opaque/ntblue/diagonal,
+/obj/effect/turf_decal/corner/opaque/neutral/diagonal{
+	dir = 4
 	},
 /turf/open/floor/plasteel,
-/area/ship/crew/canteen)
+/area/ship/hallway/central)
 "Pq" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/cargo)
-"Pr" = (
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
-	dir = 4
-	},
-/obj/structure/table,
-/obj/item/trash/plate{
-	pixel_x = 2;
-	pixel_y = 9
-	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
-	pixel_x = -8;
-	pixel_y = 5
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
-	pixel_x = -8
+/obj/structure/cable{
+	icon_state = "1-4"
 	},
 /turf/open/floor/plasteel,
-/area/ship/crew/canteen)
+/area/ship/cargo)
 "Px" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 9
-	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
 /obj/machinery/atmospherics/pipe/simple/green/visible{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/binary/pump{
-	name = "Phoron to Mix"
-	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
-"Pz" = (
-/obj/structure/table,
-/obj/item/crowbar/large,
-/obj/item/flashlight/glowstick{
-	pixel_x = 5
-	},
-/obj/item/flashlight/glowstick,
-/obj/item/flashlight/glowstick{
-	pixel_x = -5
-	},
-/obj/structure/sign/poster/official/work_for_a_future{
-	pixel_y = 32
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/cryo)
 "PI" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/turf/open/floor/plasteel/mono,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
-"Qe" = (
-/obj/machinery/door/airlock/mining{
-	name = "Cargo Office"
+"PJ" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/corner/opaque/neutral{
+	dir = 8
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/corner/opaque/ntblue,
+/obj/effect/turf_decal/corner/opaque/neutral/half{
 	dir = 1
 	},
+/obj/item/reagent_containers/food/condiment/saltshaker{
+	pixel_y = 6;
+	pixel_x = -8
+	},
+/obj/item/reagent_containers/food/condiment/peppermill{
+	pixel_x = -2;
+	pixel_y = 11
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen/kitchen)
+"Qo" = (
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo/office)
-"Qi" = (
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/structure/curtain/bounty,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/wood,
-/area/ship/crew/dorm)
-"Ql" = (
-/obj/structure/sign/directions/command{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 9
 	},
-/turf/closed/wall,
-/area/ship/crew/cryo)
+/obj/structure/sign/poster/official/random{
+	pixel_y = -32
+	},
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
 "Qp" = (
 /turf/closed/wall/r_wall,
 /area/ship/bridge)
 "Qs" = (
-/obj/machinery/button/door{
-	id = "sorrywejustclosed";
-	name = "Canteen Shutters Control";
-	pixel_x = -5;
-	pixel_y = 24
-	},
-/obj/machinery/button/door{
-	id = "amogusdoors";
-	name = "Cargo Blast Door Control";
-	pixel_x = 6;
-	pixel_y = 24
-	},
-/obj/machinery/button/door{
-	id = "noiwillnotgiveyouaa";
-	name = "Requests Desk Shutters Control";
-	pixel_x = 17;
-	pixel_y = 24
-	},
-/obj/machinery/button/door{
-	id = "hallwindows";
-	name = "Cargo Bay Hallway Shutters Control";
-	pixel_y = 32
-	},
-/obj/machinery/button/door{
-	id = "bridgelockdown";
-	name = "Bridge Lockdown";
-	pixel_x = 11;
-	pixel_y = 32
-	},
-/obj/machinery/button/door{
-	id = "windowlockdown";
-	name = "Close Ship Window Blast Doors";
-	pixel_x = 5;
-	pixel_y = 40
-	},
-/obj/machinery/button/door{
-	id = "coolingshutdown";
-	name = "Shutdown Cooling";
-	pixel_x = 16;
-	pixel_y = 40
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/bridge)
-"QJ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/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,
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
 	},
+/turf/open/floor/wood,
+/area/ship/crew/crewthree)
+"QK" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/stairs{
-	dir = 8
-	},
-/area/ship/cargo)
-"QK" = (
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = -10;
-	pixel_y = -20
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
-/obj/effect/turf_decal/siding/wood{
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/office)
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
 "QM" = (
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+/obj/structure/closet/crate/freezer/blood,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"QQ" = (
+/obj/item/cigbutt,
+/obj/item/cigbutt{
+	pixel_x = -10;
+	pixel_y = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/turf/open/floor/wood,
+/area/ship/crew/office)
+"QU" = (
+/obj/effect/turf_decal/corner/opaque/ntblue/diagonal,
+/obj/effect/turf_decal/corner/opaque/neutral/diagonal{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/corner/opaque/white/mono,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/medical)
-"QU" = (
-/obj/effect/turf_decal/techfloor,
+/obj/machinery/newscaster/directional/west,
+/obj/structure/chair,
 /turf/open/floor/plasteel,
-/area/ship/engineering/atmospherics)
+/area/ship/hallway/central)
 "QY" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/computer/atmos_control/tank/nitrogen_tank{
-	dir = 1
+/obj/effect/turf_decal/corner/opaque/ntblue/diagonal,
+/obj/effect/turf_decal/corner/opaque/neutral/diagonal{
+	dir = 4
 	},
-/turf/open/floor/plasteel/mono,
-/area/ship/engineering/atmospherics)
+/obj/structure/closet/crate/bin,
+/obj/item/trash/plate,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
 "Ra" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{
+/obj/machinery/atmospherics/pipe/simple/green/visible{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/machinery/atmospherics/components/binary/pump{
+	name = "Oxygen to Mix"
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 6
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2{
+	dir = 4
 	},
-/obj/structure/catwalk/over,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "Re" = (
-/obj/effect/turf_decal/corner/opaque/red/mono,
-/obj/structure/table/reinforced,
-/obj/item/kitchen/knife{
-	pixel_x = 15
-	},
-/obj/item/reagent_containers/food/snacks/dough,
-/obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/food/condiment/enzyme{
-	pixel_x = -5;
-	pixel_y = 18
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-4"
 	},
-/obj/machinery/newscaster/directional/north,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
 "Ri" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/plasma{
+/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2{
 	dir = 8
 	},
-/obj/structure/catwalk/over,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "Rv" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/turf/open/floor/plasteel/mono,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "Rw" = (
-/obj/structure/chair/comfy/black,
-/turf/open/floor/carpet,
-/area/ship/crew/office)
-"Rx" = (
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"RB" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 1
 	},
-/obj/effect/turf_decal/techfloor,
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/bridge)
+"RB" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2{
+	dir = 8
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "RK" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input,
-/turf/open/floor/engine/air,
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/binary/pump/on{
+	name = "Oxygen to Air and Mix";
+	target_pressure = 1000
+	},
+/obj/effect/turf_decal/atmos/oxygen,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
 "RL" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 9
+/obj/structure/closet/secure_closet/freezer{
+	anchored = 1
 	},
-/obj/machinery/light/small/directional/west,
+/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/food/condiment/rice,
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/food/condiment/milk,
+/obj/item/reagent_containers/food/condiment/soymilk,
+/obj/effect/turf_decal/corner/opaque/green/mono,
 /turf/open/floor/plasteel,
-/area/ship/hallway/central)
+/area/ship/crew/canteen/kitchen)
 "RO" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/computer/atmos_control/tank/air_tank{
-	dir = 1
+/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{
+	dir = 8
 	},
-/turf/open/floor/plasteel/mono,
+/turf/open/floor/engine/air,
 /area/ship/engineering/atmospherics)
 "RQ" = (
 /obj/machinery/power/generator{
@@ -4952,718 +5211,675 @@
 /turf/open/floor/engine,
 /area/ship/engineering/engine)
 "RR" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/turf_decal/corner/opaque/white/mono,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/medical)
-"RV" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+/obj/effect/turf_decal/borderfloorwhite{
 	dir = 4
 	},
-/turf/open/floor/carpet/royalblue,
-/area/ship/crew/crewtwo)
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/medical)
 "Sc" = (
-/obj/machinery/computer/cargo/express{
-	dir = 8
-	},
-/obj/machinery/button/door{
-	id = "noiwillnotgiveyouaa";
-	name = "Requests Desk Shutters Control";
-	pixel_x = 25;
-	pixel_y = 24
+/obj/structure/chair/office{
+	dir = 1;
+	name = "Requests"
 	},
-/obj/item/radio/intercom/directional/east,
-/obj/item/spacecash/bundle/loadsamoney,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/carpet/nanoweave/red,
 /area/ship/crew/crewthree)
 "Ss" = (
-/obj/structure/table,
-/obj/item/flashlight/lamp{
-	pixel_x = -8;
-	pixel_y = 10
-	},
-/obj/item/areaeditor/shuttle,
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/crew/office)
-"Su" = (
-/obj/structure/cable/yellow{
-	icon_state = "0-2"
-	},
-/obj/machinery/power/terminal{
-	dir = 1
-	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
-	dir = 9
-	},
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
+/obj/machinery/vending/boozeomat,
+/obj/effect/turf_decal/corner/opaque/green/mono,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen/kitchen)
 "Sv" = (
-/obj/structure/chair{
-	dir = 4
-	},
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/crew/office)
-"Sz" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/shieldgen,
-/obj/machinery/shieldgen,
-/obj/machinery/shieldgen,
-/obj/machinery/shieldgen,
-/obj/structure/closet/crate{
-	name = "Anti-breach shield projectors crate"
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/cargo)
+/obj/machinery/vending/cola/shamblers,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
 "SA" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/light/directional/north,
-/obj/structure/railing/corner,
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -20;
-	pixel_y = 13
-	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/bridge)
-"SO" = (
-/obj/item/storage/lockbox/medal{
-	pixel_y = 5
-	},
-/obj/item/hand_tele,
-/obj/item/coin/adamantine{
-	pixel_x = -4;
-	pixel_y = 4
+/obj/machinery/door/airlock/command{
+	name = "Requests Office";
+	req_one_access_txt = "57";
+	dir = 4
 	},
-/obj/item/melee/chainofcommand,
-/obj/structure/table/wood/reinforced,
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/turf/open/floor/carpet/royalblue,
-/area/ship/crew/crewtwo)
-"SX" = (
-/obj/effect/turf_decal/corner/opaque/white/mono,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"SY" = (
-/obj/structure/table/reinforced,
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
-	pixel_x = -8;
-	pixel_y = 5
-	},
-/obj/item/reagent_containers/food/condiment/peppermill{
-	pixel_x = -8
-	},
-/obj/machinery/door/poddoor/shutters{
-	dir = 4;
-	id = "sorrywejustclosed";
-	name = "Closing Shutters"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"Ta" = (
-/obj/machinery/processor,
-/obj/structure/sign/poster/official/random{
-	pixel_y = 32
-	},
-/obj/machinery/button/door{
-	id = "sorrywejustclosed";
-	name = "Shutters Control";
-	pixel_x = -24;
-	pixel_y = 24
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen/kitchen)
-"Tc" = (
-/obj/machinery/door/airlock/engineering{
-	dir = 4;
-	name = "Engineering"
+/turf/open/floor/wood,
+/area/ship/crew/crewthree)
+"SE" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/effect/turf_decal/atmos/air{
+	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"SG" = (
+/obj/effect/decal/cleanable/food/egg_smudge,
+/obj/effect/turf_decal/corner/opaque/green/mono,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen/kitchen)
+"SK" = (
+/obj/machinery/suit_storage_unit/standard_unit,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"SO" = (
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/crewtwo)
+"SY" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/engineering)
-"Tf" = (
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/crew/office)
+"Ta" = (
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "2-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Tr" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/crew/office)
+"Tc" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/beer{
+	pixel_y = 10;
+	pixel_x = 9
+	},
+/obj/item/trash/popcorn,
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"Tf" = (
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 24;
+	pixel_y = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
+/obj/effect/turf_decal/techfloor/corner{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"Th" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/chair/sofa/left{
 	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "0-4"
 	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -24;
+	pixel_y = 14
+	},
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/medical)
+"Tm" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/office)
-"Tz" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/closed/wall/r_wall,
-/area/ship/crew/crewtwo)
-"TF" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible,
-/turf/closed/wall,
-/area/ship/engineering/atmospherics)
-"TG" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
+	},
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"Tz" = (
+/obj/machinery/vending/snack/random,
+/obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"TF" = (
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 6
 	},
-/obj/effect/turf_decal/techfloor{
-	dir = 8
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"TG" = (
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
 "TH" = (
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_x = -24;
+	id = "enginelockdown";
+	name = "Lockdown Engines"
 	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 5
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
 "TI" = (
-/obj/structure/rack,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/glasses/meson,
-/obj/item/clothing/glasses/meson,
-/obj/item/clothing/glasses/meson,
-/obj/item/t_scanner/adv_mining_scanner/lesser,
-/obj/item/kinetic_crusher,
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 6
+/obj/effect/decal/cleanable/ash,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"TJ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/structure/sign/poster/official/random{
-	pixel_x = 32
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
 	},
-/turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
+"TL" = (
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
 "TN" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 6
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 9
 	},
-/obj/machinery/door/firedoor/window,
-/obj/structure/window/plasma/reinforced/fulltile,
-/obj/structure/grille,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/atmos/nitrogen,
+/obj/structure/sign/warning/gasmask{
+	pixel_x = 31
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
 "TO" = (
-/turf/closed/wall,
-/area/ship/engineering/atmospherics)
-"TS" = (
-/obj/effect/turf_decal/industrial/warning/corner{
-	dir = 1
-	},
-/obj/machinery/atmospherics/components/binary/pump{
-	name = "Mix Exit Pump"
-	},
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+	dir = 8
 	},
-/obj/structure/catwalk/over,
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/fulltile,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
-"TU" = (
-/obj/machinery/door/airlock/engineering{
-	dir = 4;
-	name = "Engineering"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
+"TS" = (
+/obj/machinery/atmospherics/components/trinary/mixer/airmix,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"Ug" = (
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
+/obj/effect/turf_decal/techfloor/corner,
 /turf/open/floor/plasteel/dark,
-/area/ship/engineering)
+/area/ship/crew/cryo)
 "Uh" = (
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 10
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
 	},
-/obj/structure/closet/emcloset/anchored,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/plasteel,
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/office)
 "Uk" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/turf/closed/wall,
-/area/ship/engineering/engine)
-"Ut" = (
-/obj/effect/spawner/structure/window,
-/obj/structure/curtain/bounty,
-/turf/open/floor/plating,
-/area/ship/crew/canteen)
-"Uu" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
+	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/structure/disposalpipe/segment{
+	dir = 2
 	},
-/turf/open/floor/plasteel/mono,
-/area/ship/cargo)
-"Uv" = (
-/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"UA" = (
-/obj/effect/turf_decal/corner/opaque/yellow/border{
-	dir = 5
-	},
-/obj/effect/turf_decal/corner/opaque/yellow/bordercorner{
-	dir = 8
-	},
-/obj/machinery/button/door{
-	id = "hallwindows";
-	name = "Shutters Control";
-	pixel_y = 24
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"UC" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/atmospherics)
+"Uo" = (
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
+"Ut" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	name = "Privacy Shutters";
+	id = "privacyshutters"
 	},
+/obj/structure/window/fulltile,
+/obj/structure/grille,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/office)
+"Uu" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+	dir = 9
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-8"
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
 	},
-/turf/open/floor/plasteel/mono,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
+"Uv" = (
+/obj/structure/table,
+/turf/open/floor/wood,
+/area/ship/crew/office)
+"UA" = (
+/obj/structure/bed,
+/obj/structure/curtain/cloth/grey,
+/obj/item/bedsheet/random,
+/turf/open/floor/carpet/blue,
+/area/ship/crew/dorm)
 "UD" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2{
-	dir = 8
+/obj/structure/closet/firecloset,
+/obj/effect/turf_decal/corner/opaque/ntblue/diagonal,
+/obj/effect/turf_decal/corner/opaque/neutral/diagonal{
+	dir = 4
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
 "UI" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/light/directional/south,
-/turf/open/floor/carpet/nanoweave,
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
 "UJ" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
+/obj/machinery/power/smes/engineering,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/structure/sign/warning/enginesafety{
+	pixel_y = 32
 	},
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 8
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"UM" = (
+/obj/structure/closet/secure_closet{
+	icon_state = "cap";
+	name = "\proper captain's locker";
+	req_access_txt = "20"
 	},
 /obj/machinery/light_switch{
-	pixel_x = -12;
-	pixel_y = 23
-	},
-/turf/open/floor/engine,
-/area/ship/engineering/engine)
-"UL" = (
-/obj/structure/sign/directions/engineering{
+	dir = 8;
+	pixel_x = 24;
+	pixel_y = -5
+	},
+/obj/item/storage/backpack/satchel/cap,
+/obj/item/storage/backpack/captain,
+/obj/item/storage/belt/sabre,
+/obj/item/clothing/glasses/sunglasses,
+/obj/item/clothing/head/caphat,
+/obj/item/clothing/head/beret/captain,
+/obj/item/clothing/suit/armor/vest/capcarapace,
+/obj/item/clothing/under/rank/command/captain/skirt,
+/obj/item/clothing/under/rank/command/captain/suit,
+/obj/item/clothing/under/rank/command/captain/parade,
+/obj/item/clothing/shoes/laceup,
+/obj/item/door_remote/captain,
+/obj/item/clothing/suit/armor/vest/capcarapace/alt,
+/turf/open/floor/wood,
+/area/ship/crew/crewtwo)
+"UN" = (
+/turf/open/floor/wood,
+/area/ship/hallway/central)
+"UR" = (
+/obj/structure/railing{
 	dir = 8
 	},
-/obj/structure/sign/directions/supply{
-	pixel_y = -6
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/closed/wall/r_wall,
-/area/ship/engineering/engine)
-"UM" = (
-/obj/machinery/computer/helm{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/effect/turf_decal/corner/opaque/purple,
-/obj/effect/turf_decal/corner/opaque/purple{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
-	dir = 4
+/obj/effect/turf_decal/techfloor{
+	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"UN" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 6
 	},
 /turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/cryo)
+/area/ship/bridge)
 "Vd" = (
 /obj/machinery/door/airlock/engineering{
 	dir = 4;
 	name = "Engineering"
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/engineering)
+/area/ship/engineering/atmospherics)
 "Ve" = (
-/obj/structure/curtain/bounty,
-/obj/machinery/door/poddoor{
-	id = "windowlockdown"
-	},
-/obj/effect/spawner/structure/window/reinforced/shutters,
-/turf/open/floor/plating,
-/area/ship/crew/dorm)
+/obj/structure/railing,
+/obj/item/kirbyplants/random,
+/obj/machinery/light/dim/directional/west,
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/bridge)
 "Vj" = (
 /turf/closed/wall,
 /area/ship/hallway/central)
 "Vp" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 9
-	},
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/effect/turf_decal/techfloor{
-	dir = 4
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/food/drinks/beer,
+/obj/effect/turf_decal/corner/opaque/neutral{
+	dir = 8
 	},
-/obj/structure/extinguisher_cabinet/directional/south,
-/obj/machinery/light_switch{
-	dir = 8;
-	pixel_y = 11;
-	pixel_x = 20
+/obj/effect/turf_decal/corner/opaque/ntblue,
+/obj/effect/turf_decal/corner/opaque/green/half{
+	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/engineering/atmospherics)
-"Vz" = (
-/obj/effect/turf_decal/atmos/plasma,
-/turf/open/floor/engine/plasma,
-/area/ship/engineering/atmospherics)
-"VK" = (
-/obj/structure/cable/yellow,
-/obj/machinery/power/terminal,
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
-	dir = 4
+/area/ship/crew/canteen/kitchen)
+"Vq" = (
+/obj/structure/closet/secure_closet{
+	anchored = 1;
+	can_be_unanchored = 1;
+	icon_state = "sec";
+	name = "equipment locker";
+	req_access_txt = "1"
+	},
+/obj/item/melee/baton/loaded,
+/obj/item/restraints/handcuffs,
+/obj/item/restraints/handcuffs,
+/obj/item/stock_parts/cell/gun,
+/obj/item/stock_parts/cell/gun/mini,
+/obj/item/stock_parts/cell/gun/mini,
+/obj/item/ammo_box/magazine/co9mm,
+/obj/item/ammo_box/magazine/co9mm,
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1
 	},
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ship/crew/crewthree)
 "VP" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
+/obj/structure/chair{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/obj/structure/bedsheetbin,
-/obj/structure/table,
-/obj/item/radio/intercom/directional/north,
-/obj/machinery/light/small/directional/east,
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
 "VQ" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/corner/opaque/ntblue/diagonal,
+/obj/effect/turf_decal/corner/opaque/neutral/diagonal{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/green/visible{
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"Wa" = (
+/obj/effect/turf_decal/borderfloorwhite/full,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/binary/pump{
-	name = "Nitrogen to Mix"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
-"Wa" = (
-/obj/machinery/iv_drip,
-/obj/structure/bed,
-/obj/item/bedsheet/medical,
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/plasteel/mono/dark,
+/turf/open/floor/plasteel/white,
 /area/ship/medical)
-"Wb" = (
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/binary/pump,
-/turf/open/floor/engine,
-/area/ship/engineering/engine)
 "Wg" = (
-/obj/item/kirbyplants/random,
+/obj/structure/table,
+/obj/item/toy/cards/deck{
+	pixel_y = 7
+	},
+/turf/open/floor/carpet/red,
+/area/ship/hallway/central)
+"Wr" = (
+/obj/machinery/vending/clothing{
+	pixel_y = 10
+	},
 /obj/machinery/light_switch{
 	dir = 8;
-	pixel_y = 0;
-	pixel_x = 20
+	pixel_x = 24;
+	pixel_y = -5
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/wood,
 /area/ship/crew/cryo)
-"Wr" = (
+"Ws" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/light_switch{
-	dir = 8;
-	pixel_y = 0;
-	pixel_x = 20
+/turf/open/floor/engine,
+/area/ship/engineering/atmospherics)
+"Wy" = (
+/obj/structure/closet/emcloset/wall{
+	pixel_y = 28
 	},
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
-"Ws" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8
+"Wz" = (
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/techfloor{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Wv" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/layer2,
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/wood,
 /area/ship/hallway/central)
 "WC" = (
 /obj/machinery/light/directional/north,
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
-"WJ" = (
+"WE" = (
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
 	},
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 2
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 10
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering)
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
 "WO" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/item/storage/bag/trash,
-/obj/item/mop,
-/obj/item/pushbroom,
-/obj/structure/janitorialcart,
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/turf/open/floor/plasteel/mono,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/effect/decal/cleanable/oil,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "WP" = (
-/obj/effect/turf_decal/industrial/warning{
+/obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 4
-	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
-"WR" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
+"WR" = (
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/obj/machinery/vending/dinnerware,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen/kitchen)
 "WU" = (
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 8;
-	name = "engine fuel pump"
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
 	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 5
+/obj/machinery/light/directional/west,
+/obj/structure/reagent_dispensers/fueltank,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/atmospherics)
 "WX" = (
-/obj/structure/table/reinforced,
-/obj/machinery/microwave{
-	pixel_x = 2;
-	pixel_y = 8
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/corner/opaque/white/mono,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
 "WZ" = (
 /turf/closed/wall,
 /area/ship/crew/cryo)
 "Xe" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 10
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
+	dir = 1
 	},
-/obj/effect/turf_decal/techfloor/hole/right,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Xl" = (
-/obj/structure/curtain{
-	pixel_y = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/machinery/shower{
-	dir = 8;
-	pixel_y = 8
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
+	dir = 1
 	},
-/obj/item/soap/nanotrasen,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/plasteel/freezer,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"Xl" = (
+/obj/structure/bed,
+/obj/item/bedsheet/random,
+/obj/structure/curtain/cloth/grey,
+/turf/open/floor/carpet/blue,
 /area/ship/crew/dorm)
 "Xp" = (
 /turf/closed/wall/r_wall,
 /area/ship/cargo/office)
 "Xs" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 4
-	},
-/obj/effect/turf_decal/techfloor/hole,
-/obj/structure/extinguisher_cabinet/directional/east,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"Xt" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 9
-	},
-/obj/effect/turf_decal/number/two,
+/obj/structure/grille,
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/obj/structure/window/plasma/reinforced/fulltile,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
-"Xy" = (
-/obj/machinery/computer/secure_data{
+"Xt" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
-/obj/effect/turf_decal/corner/opaque/yellow,
-/obj/effect/turf_decal/corner/opaque/yellow{
+/obj/effect/turf_decal/corner/opaque/ntblue/diagonal,
+/obj/effect/turf_decal/corner/opaque/neutral/diagonal{
 	dir = 4
 	},
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"Xu" = (
+/obj/machinery/medical_kiosk,
+/obj/machinery/light/directional/south,
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ship/medical)
+"Xy" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/carpet/blue,
+/area/ship/crew/crewthree)
 "XA" = (
-/obj/structure/table,
-/obj/effect/turf_decal/corner/opaque/black/three_quarters,
-/obj/item/paper_bin{
-	pixel_x = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/item/pen,
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/ntspaceworks_small/left,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/office)
 "XJ" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
-	dir = 4
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/obj/machinery/door/window/brigdoor/southright{
+	name = "The Captain's Personal Lavatory";
+	opacity = 1;
+	dir = 8
 	},
-/turf/closed/wall/r_wall,
+/turf/open/floor/plasteel,
 /area/ship/crew/crewtwo)
 "XU" = (
 /turf/closed/wall/r_wall,
 /area/ship/crew/dorm)
+"XY" = (
+/obj/machinery/door/poddoor/preopen{
+	dir = 4;
+	id = "bridgelockdown"
+	},
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/firedoor/window,
+/turf/open/floor/plating,
+/area/ship/bridge)
 "Yb" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
+/obj/machinery/door/airlock/command{
+	name = "Bridge";
+	req_access_txt = "19"
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
 /turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/dorm)
+/area/ship/bridge)
 "Yj" = (
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 4
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/power/terminal{
+	dir = 1
 	},
-/turf/open/floor/engine,
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Ym" = (
 /obj/machinery/door/poddoor{
@@ -5675,250 +5891,181 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "Yn" = (
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
+	dir = 1
 	},
-/turf/closed/wall,
-/area/ship/engineering/engine)
-"Yp" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/plasteel/mono,
-/area/ship/cargo)
-"Ys" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/structure/disposalpipe/segment{
+	dir = 2
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+/obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/cryo)
-"Yv" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 4
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/atmospherics)
+"Yp" = (
+/obj/structure/closet/secure_closet/miningcloset{
+	anchored = 1
 	},
-/obj/effect/turf_decal/techfloor{
-	dir = 9
+/obj/item/storage/bag/ore,
+/obj/item/storage/bag/ore,
+/obj/item/clothing/suit/hooded/explorer,
+/obj/item/clothing/suit/hooded/explorer,
+/obj/item/clothing/glasses/meson,
+/obj/item/clothing/glasses/meson,
+/obj/item/mining_scanner,
+/obj/item/mining_scanner,
+/obj/machinery/light_switch{
+	pixel_x = 11;
+	pixel_y = 23
 	},
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/plasteel,
+/area/ship/cargo)
+"Yv" = (
+/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/plasma{
+	dir = 4
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "Yx" = (
-/obj/structure/table,
-/obj/item/storage/box/survival/radio{
-	pixel_x = -8;
-	pixel_y = 12
-	},
-/obj/item/storage/box/survival/radio{
-	pixel_x = 8;
-	pixel_y = 12
-	},
-/obj/item/storage/box/survival/radio{
-	pixel_y = 4
+/obj/structure/chair/sofa/right,
+/obj/machinery/light_switch{
+	pixel_x = 11;
+	pixel_y = 23
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/cryo)
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/carpet/red,
+/area/ship/hallway/central)
 "YC" = (
-/obj/item/bedsheet/dorms,
-/obj/structure/bed,
-/obj/structure/curtain/bounty,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/wood,
-/area/ship/crew/dorm)
-"YE" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/disposal/bin,
-/obj/item/paper{
-	default_raw_text = "The igniter in the chamber does not work very well. I suggest throwing lit welders down the disposal chute over there to ignite the chamber."
-	},
-/obj/item/weldingtool,
-/obj/structure/disposalpipe/trunk{
-	dir = 1
-	},
-/obj/structure/sign/warning/deathsposal{
-	desc = "A warning sign which reads 'DISPOSAL: LEADS TO INCINERATOR'.";
-	name = "\improper DISPOSAL: LEADS TO INCINERATOR sign";
-	pixel_x = 32
-	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
 	dir = 1
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"YL" = (
-/obj/effect/turf_decal/corner/opaque/purple,
-/obj/effect/turf_decal/corner/opaque/yellow{
-	dir = 4
-	},
-/obj/structure/displaycase/captain{
-	req_access = null;
-	req_access_txt = "20"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
 "YQ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/effect/turf_decal/siding/wood/corner{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/structure/chair{
+	dir = 4
 	},
-/obj/machinery/newscaster/directional/south,
-/turf/open/floor/carpet/nanoweave,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
 "YT" = (
-/obj/item/kirbyplants/random,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/carpet/nanoweave/blue,
-/area/ship/medical)
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/closet/crate/medical,
+/obj/item/defibrillator,
+/obj/item/pinpointer/crew/prox,
+/obj/item/storage/firstaid/fire,
+/obj/item/storage/box/bodybags,
+/obj/machinery/newscaster/directional/east,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/cargo/office)
 "Za" = (
-/obj/machinery/sleeper{
-	dir = 1
-	},
-/obj/structure/sign/poster/official/random{
-	pixel_y = -32
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
 	},
-/turf/open/floor/plasteel/mono/dark,
+/turf/open/floor/carpet/nanoweave/blue,
 /area/ship/medical)
 "Zd" = (
-/turf/closed/wall,
-/area/ship/crew/canteen)
-"Zf" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
-	dir = 4
-	},
-/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/door/window/eastleft,
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "windowlockdown"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/firedoor/border_only{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen/kitchen)
+"Zf" = (
+/obj/machinery/suit_storage_unit/engine,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/engine)
 "Zo" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
-	dir = 10
+/obj/machinery/computer/crew{
+	dir = 8
 	},
-/obj/effect/turf_decal/industrial/warning{
+/obj/effect/turf_decal/corner/opaque/bar/half{
 	dir = 4
 	},
-/obj/machinery/door/poddoor/preopen{
-	dir = 4;
-	id = "coolingshutdown"
-	},
-/turf/open/floor/engine/airless,
-/area/ship/external)
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
 "Zr" = (
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable,
-/obj/effect/turf_decal/techfloor{
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
+	dir = 10
+	},
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
+"Zu" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/closet/secure_closet/engineering_welding{
-	anchored = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
 	},
-/obj/item/reagent_containers/glass/bottle/welding_fuel,
-/obj/item/reagent_containers/glass/bottle/welding_fuel,
-/obj/item/reagent_containers/glass/bottle/welding_fuel,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"Zv" = (
-/obj/item/kirbyplants/random,
-/obj/item/radio/intercom/directional/north{
-	pixel_y = 25
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+	dir = 5
 	},
-/turf/open/floor/carpet,
-/area/ship/crew/office)
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
 "Zw" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/structure/railing{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/office)
+"ZD" = (
+/obj/machinery/power/terminal{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo/office)
-"ZC" = (
-/obj/machinery/pipedispenser,
-/obj/machinery/light/directional/west,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/sign/warning/electricshock{
+	pixel_y = 25
 	},
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "ZE" = (
-/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"
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
 	},
-/obj/machinery/light/directional/south,
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
 "ZI" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/mono,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "ZJ" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/structure/dresser,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/wood,
+/area/ship/crew/cryo)
+"ZR" = (
+/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "0-2"
 	},
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
-"ZO" = (
-/obj/machinery/atmospherics/pipe/simple/dark/visible{
-	dir = 4
-	},
-/turf/closed/wall/r_wall,
-/area/ship/engineering/engine)
-"ZR" = (
-/obj/machinery/vending/coffee,
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -20;
-	pixel_y = 13
-	},
-/turf/open/floor/wood,
-/area/ship/crew/office)
 
 (1,1,1) = {"
 fW
@@ -5928,20 +6075,20 @@ fW
 fW
 fW
 fW
-fW
-fW
-fW
-mF
-mF
+yo
+Pb
+Pb
+ul
+ul
 ul
 ul
 mX
 ul
 ul
-mF
-mF
-fW
-fW
+ul
+ul
+Pb
+Pb
 fW
 fW
 fW
@@ -5958,25 +6105,25 @@ fW
 fW
 fW
 fW
-fW
-vD
-gb
-kz
-kz
-II
-lE
+qF
+mF
+tf
+gh
+OJ
 ul
+lE
+dj
 nF
 HL
 bk
-ul
+dj
 Zf
-MA
-gh
+ul
 gh
-vD
-vD
-fW
+OJ
+kz
+mF
+mF
 fW
 fW
 fW
@@ -5988,29 +6135,29 @@ fW
 fW
 fW
 fW
-fW
-fW
 kz
-ed
-tf
 kz
-ZC
+bG
+EE
+tf
+ZD
+IA
 WU
-NK
+JX
 ul
-ZO
+lY
 lV
 lY
 ul
 NK
 uT
 IA
-gh
-Ak
+IA
+kz
+bG
 EE
-gh
-fW
-fW
+kz
+kz
 fW
 fW
 fW
@@ -6019,17 +6166,17 @@ fW
 (4,1,1) = {"
 fW
 fW
-fW
-kz
 kz
 kz
+JT
+gO
 gO
 dJ
 xO
 sz
-yG
-yG
-IV
+cQ
+aR
+kn
 MV
 sK
 AG
@@ -6040,21 +6187,21 @@ we
 sD
 TH
 zy
-gh
-gh
-gh
-fW
+zy
+gk
+kz
+kz
 fW
 fW
 fW
 "}
 (5,1,1) = {"
 fW
-fW
+kz
 kz
 kz
 Np
-wt
+Kd
 Jk
 nj
 Hm
@@ -6070,20 +6217,20 @@ ub
 Oo
 yF
 Xe
-CR
+yF
 CR
 Hu
 mL
-gh
-gh
-fW
+kz
+kz
+kz
 fW
 fW
 "}
 (6,1,1) = {"
 fW
 kz
-kz
+pT
 At
 RK
 wt
@@ -6097,40 +6244,40 @@ CE
 HR
 Ws
 bA
-Fc
-uX
+fc
+hc
 Kz
-sc
+Fc
 lW
-bz
+sJ
 bz
 dO
 qK
 bI
-gh
-gh
+DF
+kz
 fW
 fW
 "}
 (7,1,1) = {"
+fW
 kz
-kz
-gx
-gx
+Lm
+pZ
 yj
 TF
 gN
-pW
+Ni
 vW
 ne
 ra
 hZ
 ft
-pB
-pc
-WJ
+MS
+RQ
+tp
 Gi
-YE
+vB
 fw
 Tf
 ww
@@ -6140,40 +6287,40 @@ Zr
 Ew
 Xs
 wC
-gh
+kz
 fW
 fW
 "}
 (8,1,1) = {"
 kz
-Vz
-kr
+kz
+kz
 Cu
 Px
-jM
+Px
 TS
 lR
 dZ
-ff
+kz
 TO
-IV
+ul
 rx
 fT
 nu
 gB
 vB
-IV
-Eb
-Tc
+mc
+kz
+kz
 Vd
-Fu
-Fu
-Fu
+pM
 Fu
 Fu
 Fu
 tx
-fW
+tx
+tx
+tx
 fW
 "}
 (9,1,1) = {"
@@ -6185,98 +6332,98 @@ Ri
 Yv
 TG
 oE
-CC
+EP
 va
 RO
-IV
+ul
 Lv
 Yj
 fD
 MP
 Gh
-IV
-fg
+ik
+kz
 fz
 ai
+CA
 Fu
-qQ
 FC
 Fq
 qy
 tz
-tx
-tx
+pr
+uG
 fW
 "}
 (10,1,1) = {"
 kz
-gx
-gx
+rM
+At
 TN
 kB
-Ni
+fl
 fu
 bf
-NT
-fJ
+SE
+At
 sk
-IV
+ul
 UJ
-MS
-RQ
-tp
+rz
+Gi
+tk
 aL
-IV
-lr
+pB
+kz
 jZ
 wB
+sC
 Fu
-Ls
 Ca
-Sz
+hz
 sh
 Kv
-pr
-uG
+jv
+rb
 fW
 "}
 (11,1,1) = {"
 kz
-AM
-GF
-GA
-WP
-MQ
-Gx
-bf
-QU
-Pm
-ah
-IV
-oG
-Yj
-Ms
-Wb
-mA
+kz
+kz
+kz
+kz
+kz
+kz
+kz
+kz
+kz
+kz
 ul
-gh
-TU
+ul
+ul
+ul
+ul
+ul
+ul
+kz
+kz
 er
+og
 Fu
-CA
 Om
-NI
+JQ
 WO
-ug
-jv
-rb
+FO
+JE
+Ym
 fW
 "}
 (12,1,1) = {"
-kz
+hr
 JY
-Lm
-Dd
+SK
+hr
 UD
 dB
 rK
@@ -6284,20 +6431,20 @@ um
 QU
 vO
 QY
-ul
+WZ
+JS
 Bc
-Su
 Da
-VK
-HE
-ul
+Bc
+fU
+WZ
 rW
-pD
-gQ
+cS
+sU
+gc
 Fu
-dt
 Yp
-Rv
+TI
 PI
 Pq
 JE
@@ -6305,188 +6452,188 @@ Ym
 fW
 "}
 (13,1,1) = {"
-kz
+wg
+ky
 gx
-gx
-TN
+tR
 VQ
 ES
 Bw
 tm
 gi
-jD
-TO
-ul
-ul
-ul
-ul
-CM
+Ao
+Fx
+WZ
+ek
+Ug
+qp
 CM
-UL
+BS
+WZ
 tI
-pD
-gQ
-wZ
+xb
+hA
+gc
 Ls
-JQ
-JQ
+aQ
+Rv
 ZI
-JQ
-JE
+ug
+jv
 Ym
 Eu
 "}
 (14,1,1) = {"
-kz
+hr
 Ek
-rM
-GA
-WP
-jP
-pT
+hr
+hr
+hr
+hr
+hr
 Xt
-TO
-TO
-TO
-KQ
-pD
+GW
+Ao
+Tc
+WZ
+ZJ
 Nh
 xK
 xW
 Mn
-FB
-Jj
+WZ
+il
 pD
-gQ
-wZ
-Ls
+Cz
+pz
+is
 Gp
-JQ
+bZ
 Uu
 NC
-jv
-Ym
+fs
+jX
 fW
 "}
 (15,1,1) = {"
-kz
-jc
-as
-Dd
+lw
+lw
+lw
+DZ
 dp
-OT
+rF
 Vp
-TO
-TO
+Pl
+GW
 qY
 aF
-bE
-aF
+WZ
+WZ
 Wr
 vc
 Ev
-Kp
-oD
-fo
-fo
+WZ
+WZ
+ib
+cq
 Mi
 wZ
-Ls
+Fu
 MH
-JQ
-UC
-FW
-fs
-jX
+yh
+zu
+zu
+tx
+tx
 fW
 "}
 (16,1,1) = {"
-kz
-kz
-kz
-kz
+fW
+lw
+wT
+KL
 vY
-cY
-TO
-TO
-pD
-gQ
-pD
+KL
+Hd
+Pl
+GW
+UI
+fn
 FB
-MT
 WZ
 WZ
-aI
-Hd
-FB
-om
-pD
-gQ
-Fu
-UA
+Mk
+WZ
+Vj
+bY
+HW
+WP
+hA
+si
+ys
 pt
-zR
-QJ
+ys
 uQ
-tx
-tx
+uQ
+Xp
+fW
 fW
 "}
 (17,1,1) = {"
-hr
-KY
+fW
+lw
 RL
-TO
-TO
-TO
-TO
+OT
+Ss
+OT
+vI
 Pl
-pD
+gr
 gQ
-Ql
-WZ
-MT
+JJ
+cp
+Wz
 hb
 Ki
 lh
-Hd
-WZ
+EG
 cp
-Bd
-Ea
+ie
+Tm
+Hq
+gc
 ys
-vH
 LX
 Nm
-cQ
-pq
+hG
+hG
 Xp
 fW
 fW
 "}
 (18,1,1) = {"
-AJ
-Wv
+fW
+lw
 WR
-KL
-cC
+SG
+OT
 wX
-if
-if
+PJ
+Pl
 if
 UI
-WZ
-Pz
+sd
+re
 re
 Gb
 UN
 al
-Ys
-Fv
-WZ
-WC
+UN
+UN
+HW
+WP
 eu
-ys
+hC
 qR
 Au
 JA
@@ -6497,95 +6644,95 @@ fW
 fW
 "}
 (19,1,1) = {"
-xE
-xE
-Zd
+fW
+lw
+kL
 Zd
+DL
 Br
-Br
-Zd
-Ao
-pD
+xf
+kO
+if
 YQ
-WZ
+Vj
 Yx
 Wg
 Oi
 gP
-Ic
-yD
+UN
+UN
 KH
-WZ
+mf
 ts
-sO
-Qe
-qm
+hA
+pD
+ys
 nd
 Zw
 nv
-Mk
+gm
 Xp
 fW
 fW
 "}
 (20,1,1) = {"
 fW
-xE
+lw
 yf
 uw
 uD
 jr
-Br
+tX
 Bg
-gM
+xo
 pI
+Vj
 xs
-xs
-xs
-xs
-xs
+fa
+Oi
 cF
 cF
-xs
-xs
-Rx
-ta
-wU
-HA
-Au
+UN
+uX
+fx
+WC
+hA
+pD
+ys
+OH
 nB
 wA
-ba
+AP
 Xp
 fW
 fW
 "}
 (21,1,1) = {"
 fW
-xE
-ka
-bD
-nE
-Ir
-hw
+lw
+xf
+xf
+xf
+xf
+xf
 nX
-pD
-gQ
-ji
+Dc
+Cs
+Vj
 DV
 fI
-ji
+Ka
 qq
 fY
-zG
-KU
-qa
-gM
-eP
+zG
+KU
+Vj
+qr
+hA
+rc
 ys
-kM
 iI
-TI
+pq
 AB
 XA
 Xp
@@ -6594,192 +6741,192 @@ fW
 "}
 (22,1,1) = {"
 fW
-xE
-xE
+sY
+As
 mT
 Bh
 LD
-Id
-Jn
-fo
-ZJ
-MI
-lj
-gm
+Ut
+BE
+zO
+TL
 ji
-mD
-XJ
-RV
-qz
+ji
+ji
+ji
+ji
+qa
+qa
 qa
+hr
 pD
-DR
-AT
-AT
-AT
-AT
-AT
-ls
+hA
+om
+ys
+jf
+lU
+ic
+BI
 Xp
 fW
 fW
 "}
 (23,1,1) = {"
 fW
-fW
-GQ
+sY
+QQ
 vR
 Uv
-eT
-Br
-gR
+mM
+Ut
+pD
+ir
 pD
-gQ
 eC
 xA
 bO
 dl
-ht
+ji
 id
 qS
-rq
 qa
-rB
-sO
-rF
-FN
+Hb
+pD
+hA
+Jj
+ys
 js
 pf
 YT
-hJ
-fW
+CV
+Xp
 fW
 fW
 "}
 (24,1,1) = {"
 fW
-fW
+sY
 GQ
-Pr
+mM
 Gq
 zM
 Ut
-vG
-Bd
-aZ
+pD
+ir
+pD
 MI
 Sc
 us
+Vq
 ji
-En
-XJ
+ze
 SO
-qs
+qa
 Tz
-Ja
+Bd
 ta
-ga
-AE
-Gs
-oq
-dy
-hJ
-fW
+Vj
+ys
+ys
+ys
+ys
+ys
+Xp
 fW
 fW
 "}
 (25,1,1) = {"
 fW
-fW
-GQ
+sY
+uv
 NL
 oU
-Pn
-Zd
-Dv
+MZ
+Ut
 pD
+sA
 ZE
 ji
+Dz
+ps
+dG
 ji
-ji
-ji
-rN
-XJ
+qa
 XJ
 qa
-nq
-nq
+hr
+Bq
 hA
-nq
+ga
 bd
-dy
+Th
 CH
-em
+kE
+Xu
 ls
 fW
 fW
-fW
 "}
 (26,1,1) = {"
 fW
-fW
-xE
+nq
+nq
 xE
 SY
 Kh
-Zd
-Zd
-pD
-gQ
-sG
-Qp
+tB
+om
+ir
+cd
+ji
+ji
 SA
-IP
-pm
+ji
+ji
 bq
 GL
-Qp
-CV
+bW
+hr
 ZR
 QK
-nq
+Jn
 iY
 OF
 CB
+oq
 ls
 ls
 fW
 fW
-fW
 "}
 (27,1,1) = {"
 fW
 fW
-fW
-lw
+nq
+ed
 Ta
-tB
+Cy
 eL
 oT
 fo
-Ff
-BH
+Ny
+ji
 Aa
 kp
 oN
-As
+ji
 lk
 iP
 vp
-vq
-vq
-mi
-nq
-QM
+qa
+pD
+hA
+ve
+dy
 ix
 Za
-ls
-fW
+wd
+hJ
 fW
 fW
 fW
@@ -6787,188 +6934,348 @@ fW
 (28,1,1) = {"
 fW
 fW
-fW
-lw
+nq
+dW
 Gm
 OG
-SX
-xf
-Vj
+tB
+eg
+JM
 VP
-BJ
-Qp
+ji
+yM
 Qs
 rw
-pz
+ji
 wp
 ok
-Qp
-ps
-ip
-Tr
-nq
+ao
+qa
+Uo
+hA
+ga
 vP
 RR
 Op
+kM
+hJ
+fW
+fW
+fW
+"}
+(29,1,1) = {"
+fW
+fW
+nq
+tB
+tB
+tB
+tB
+tB
+vf
+Ir
+ji
+lf
+Xy
+xi
+ji
+UM
+hi
+vZ
+qa
+de
+eY
+AT
+Pk
+tZ
+Wa
+MG
+hJ
+fW
+fW
+fW
+"}
+(30,1,1) = {"
+fW
+fW
+XU
+IB
+eP
+Re
+BW
+jS
+bw
+Kb
+ji
+ji
+fi
+ji
+ji
+qa
+iB
+qa
+qa
+gM
+dM
+AT
+Gc
+tZ
+Wa
+zC
+hJ
+fW
+fW
+fW
+"}
+(31,1,1) = {"
+fW
+fW
+XU
+XU
+wO
+WX
+eB
+jS
+hT
+cJ
+Qp
+Ve
+Eb
+BJ
+zi
+iv
+AE
+Ex
+Qp
+pn
+hA
+AT
+HO
+tr
+Gs
+ls
+ls
+fW
+fW
+fW
+"}
+(32,1,1) = {"
+fW
+fW
+fW
+XU
+uL
+uh
+Kf
+yU
+WE
+YC
+Yb
+Az
+Mr
+MT
+Zu
+UR
+Rw
+aA
+Fj
+DN
+Qo
+AT
+zS
+Cr
+oD
 ls
 fW
 fW
 fW
 fW
 "}
-(29,1,1) = {"
+(33,1,1) = {"
 fW
 fW
 fW
-lw
-sj
-tB
-ca
+XU
+dq
 uq
+eQ
 jS
-jS
-Go
+Wy
+om
 Qp
-Xy
-xi
-YL
-UM
-hi
+ph
+sc
+FW
+du
+HA
+jM
+wb
 Qp
-Zv
-de
-tH
-nq
-Pk
-ix
-Wa
+Sv
+Dp
+AT
+LA
+dX
+QM
 ls
 fW
 fW
 fW
 fW
 "}
-(30,1,1) = {"
+(34,1,1) = {"
 fW
 fW
 fW
-lw
-lw
-Re
-BW
-ON
+XU
+XU
+mQ
+jK
 jS
-KI
-wd
+lA
+HZ
 Qp
-fi
-Lq
-Lq
-iB
-iB
+EF
+Zo
+Fv
+ng
+vo
+hP
+uY
 Qp
-yu
-ex
-dM
-nq
-Gc
-tZ
-ls
+kU
+Cl
+kU
+kU
+kU
+wH
 ls
 fW
 fW
 fW
 fW
 "}
-(31,1,1) = {"
+(35,1,1) = {"
 fW
 fW
 fW
 fW
-lw
-WX
-eB
-bW
+XU
+yB
+TJ
 jS
-Qi
-Az
-Ve
+jS
+jS
+XU
+XY
+XY
+XY
+ih
+ih
+XY
+XY
+wH
+qg
+fG
+mi
+ja
+kU
+wH
+fW
+fW
+fW
+fW
+fW
+"}
+(36,1,1) = {"
+fW
+fW
+fW
+fW
+XU
+bo
+gu
+Xl
+uS
+mI
+XU
 mg
 ME
 ME
 NB
-Kn
-sY
-Rw
-di
-Mh
-nq
-HO
-tr
-ls
+np
+ME
+qb
+wH
+mU
+zJ
+mw
+sn
+kU
+wH
 fW
 fW
 fW
 fW
 fW
 "}
-(32,1,1) = {"
+(37,1,1) = {"
 fW
 fW
 fW
 fW
-lw
-lw
-xf
-yU
-jS
-YC
-Yb
-ph
+XU
+XU
+hM
+rq
+Fn
+aZ
+XU
 np
 ME
 ME
+ME
+ME
 qb
 Kn
-sY
-Fj
-DN
-Hq
-nq
-ls
-ls
-ls
+wH
+kU
+kU
+KI
+kU
+wH
+wH
 fW
 fW
 fW
 fW
 fW
 "}
-(33,1,1) = {"
+(38,1,1) = {"
 fW
 fW
 fW
 fW
 fW
-lw
-eQ
-fS
-jS
-of
-ie
-ph
+XU
+La
+kW
+aZ
+aZ
+jq
 mg
 ME
 ME
+ME
+ME
 NB
 Kn
-nq
-uY
-Sv
-Dp
-IB
-LA
-nq
+xu
+bR
+mN
+bs
+HE
+wH
 fW
 fW
 fW
@@ -6976,31 +7283,31 @@ fW
 fW
 fW
 "}
-(34,1,1) = {"
+(39,1,1) = {"
 fW
 fW
 fW
 fW
 fW
-lw
-lw
-gu
-jS
-jS
-zu
 XU
-Zo
-vo
-vo
-vo
-hP
-sY
+XU
+Xl
+aZ
+aZ
+jq
+fg
+Lq
+Lq
+Lq
+Lq
+Lq
+zP
+xu
+aN
+ut
+eD
+wH
 wH
-Ss
-Cl
-kU
-nq
-nq
 fW
 fW
 fW
@@ -7008,30 +7315,30 @@ fW
 fW
 fW
 "}
-(35,1,1) = {"
+(40,1,1) = {"
 fW
 fW
 fW
 fW
 fW
 fW
-lw
-lw
-jS
-LV
-Iy
 XU
+XU
+BH
+UA
+jq
 im
 fW
 fW
 fW
+fW
+fW
 im
-sY
+xu
+BK
+Dy
+wH
 wH
-mM
-fG
-nq
-nq
 fW
 fW
 fW
@@ -7040,7 +7347,7 @@ fW
 fW
 fW
 "}
-(36,1,1) = {"
+(41,1,1) = {"
 fW
 fW
 fW
@@ -7048,21 +7355,21 @@ fW
 fW
 fW
 fW
-lw
 XU
-Xl
-rz
+XU
+XU
 XU
 im
 fW
 fW
 fW
+fW
+fW
 im
-sY
-Ka
-mU
-nq
-nq
+wH
+Co
+wH
+wH
 fW
 fW
 fW
@@ -7072,7 +7379,7 @@ fW
 fW
 fW
 "}
-(37,1,1) = {"
+(42,1,1) = {"
 fW
 fW
 fW
@@ -7084,16 +7391,48 @@ fW
 XU
 XU
 XU
+im
+fW
+fW
+fW
+fW
+fW
+im
+wH
+wH
+wH
+fW
+fW
+fW
+fW
+fW
+fW
+fW
+fW
+fW
+"}
+(43,1,1) = {"
+fW
+fW
+fW
+fW
+fW
+fW
+fW
+fW
+fW
+XU
 XU
 im
 fW
 fW
 fW
+fW
+fW
 im
-nq
-nq
-nq
-nq
+wH
+wH
+fW
 fW
 fW
 fW
diff --git a/code/__DEFINES/statpanel.dm b/code/__DEFINES/statpanel.dm
index 65b35e7654a2..8ce6ba624a1b 100644
--- a/code/__DEFINES/statpanel.dm
+++ b/code/__DEFINES/statpanel.dm
@@ -11,6 +11,4 @@ GLOBAL_LIST_INIT(client_verbs_required, list(
 	/client/verb/forum,
 	/client/verb/github,
 	/client/verb/joindiscord,
-	// Admin help
-	/client/verb/adminhelp,
 ))
diff --git a/code/datums/map_zones.dm b/code/datums/map_zones.dm
index b0f13fe19302..c50b93cb2dd7 100644
--- a/code/datums/map_zones.dm
+++ b/code/datums/map_zones.dm
@@ -412,7 +412,7 @@
 			unlink(dir)
 	parent_level.virtual_levels -= src
 	parent_level = null
-	SSidlenpcpool.idle_mobs_by_virtual_level["[id]"] = null
+	LAZYREMOVE(SSidlenpcpool.idle_mobs_by_virtual_level, "[id]")
 	SSmapping.virtual_z_translation -= "[id]"
 	parent_map_zone.remove_virtual_level(src)
 	if(up_linkage)
diff --git a/code/game/objects/effects/anomalies/anomalies_heartbeat.dm b/code/game/objects/effects/anomalies/anomalies_heartbeat.dm
index 33a2983fcff4..1b691d898436 100644
--- a/code/game/objects/effects/anomalies/anomalies_heartbeat.dm
+++ b/code/game/objects/effects/anomalies/anomalies_heartbeat.dm
@@ -24,6 +24,9 @@
 
 	COOLDOWN_START(src, pulse_secondary_cooldown, pulse_delay*4)
 	var/turf/spot = locate(rand(src.x-effectrange, src.x+effectrange), rand(src.y-effectrange, src.y+effectrange), src.z)
+	if(!spot)
+		return
+
 	playsound(spot, 'sound/health/slowbeat2.ogg', 100)
 	radiation_pulse(spot, 200, effectrange)
 	for(var/mob/living/carbon/nearby in range(effectrange, spot))
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 1cdcec95d05f..de5874c98d38 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -319,8 +319,8 @@
 	//Syndicate hardsuit
 /obj/item/clothing/head/helmet/space/hardsuit/syndi
 	name = "blood-red hardsuit helmet"
-	desc = "A dual-mode advanced helmet designed for work in special operations. It is in EVA mode. Property of Gorlex Marauders."
-	alt_desc = "A dual-mode advanced helmet designed for work in special operations. It is in combat mode. Property of Gorlex Marauders."
+	desc = "A dual-mode advanced hardsuit designed for special combat operations. It is in EVA mode. Produced by the Gorlex Marauders."
+	alt_desc = "A dual-mode advanced hardsuit designed for special combat operations. It is in combat mode. Produced by the Gorlex Marauders."
 	icon_state = "hardsuit1-syndi"
 	item_state = "syndie_helm"
 	hardsuit_type = "syndi"
@@ -407,12 +407,11 @@
 
 /obj/item/clothing/suit/space/hardsuit/syndi
 	name = "blood-red hardsuit"
-	desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in EVA mode. Property of Gorlex Marauders."
-	alt_desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in combat mode. Property of Gorlex Marauders."
+	desc = "A dual-mode advanced hardsuit designed for special combat operations. It is in EVA mode. Produced by the Gorlex Marauders."
+	alt_desc = "A dual-mode advanced hardsuit designed for special combat operations. It is in combat mode. Produced by the Gorlex Marauders."
 	icon_state = "hardsuit1-syndi"
 	item_state = "syndie_hardsuit"
 	hardsuit_type = "syndi"
-	w_class = WEIGHT_CLASS_NORMAL
 	armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90)
 	allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi
@@ -443,6 +442,7 @@
 	jetpack = null
 	armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
 	combat_slowdown = 0.5
+	jetpack = null
 
 //Elite Syndie suit
 /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite
@@ -502,6 +502,64 @@
 	hardsuit_type = "owl"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/owl
 
+//Cybersun Hardsuit
+/obj/item/clothing/suit/space/hardsuit/syndi/cybersun
+	name = "neutron-star combat hardsuit"
+	desc = "Designed with fighting Nanotrasen weapons in mind, the Cybersun combat hardsuit trades ballistic and blunt protection for top grade laser protection. It is in EVA mode. Produced by Cybersun Industries."
+	alt_desc = "Designed with fighting Nanotrasen weapons in mind, the Cybersun combat hardsuit trades ballistic and blunt protection for top grade laser protection. It is in combat mode. Produced by Cybersun Industries."
+	icon_state = "hardsuit1-cybersun"
+	hardsuit_type = "cybersun"
+	armor = list("melee" = 25, "bullet" = 25, "laser" = 50, "energy" = 50, "bomb" = 25, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 60)
+	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun
+	supports_variations = VOX_VARIATION
+
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun
+	name = "neutron-star combat hardsuit helmet"
+	desc = "Designed with fighting Nanotrasen weapons in mind, the Cybersun combat hardsuit trades ballistic and blunt protection for top grade laser protection. It is in EVA mode. Produced by Cybersun Industries."
+	alt_desc = "Designed with fighting Nanotrasen weapons in mind, the Cybersun combat hardsuit trades ballistic and blunt protection for top grade laser protection. It is in combat mode. Produced by Cybersun Industries."
+	icon_state = "hardsuit1-cybersun"
+	hardsuit_type = "cybersun"
+	armor = list("melee" = 25, "bullet" = 25, "laser" = 50, "energy" = 50, "bomb" = 25, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 60)
+
+//Cybersun Medical Techinician Hardsuit
+/obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed
+	name = "cybersun medical technician hardsuit"
+	desc = "A stripped down version of the neutron-star hardsuit for use by medical technicians. It is in EVA mode. Produced by Cybersun Industries."
+	alt_desc = "A stripped down version of the neutron-star hardsuit for use by medical technicians. It is in combat mode. Produced by Cybersun Industries."
+	icon_state = "hardsuit1-cyberparamed"
+	hardsuit_type = "cyberparamed"
+	armor = list("melee" = 25, "bullet" = 25, "laser" = 35, "energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 65, "fire" = 75, "acid" = 40)
+	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun/paramed
+	supports_variations = VOX_VARIATION
+	combat_slowdown = 0.4
+	jetpack = null
+
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun/paramed
+	name = "cybersun medical technician hardsuit helmet"
+	desc = "A stripped down version of the neutron-star hardsuit for use by medical technicians. It is in EVA mode. Produced by Cybersun Industries."
+	alt_desc = "A stripped down version of the neutron-star hardsuit for use by medical technicians. It is in combat mode. Produced by Cybersun Industries"
+	icon_state = "hardsuit1-cyberparamed"
+	hardsuit_type = "cyberparamed"
+	armor = list("melee" = 25, "bullet" = 25, "laser" = 35, "energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 65, "fire" = 75, "acid" = 40)
+
+//Pointman Hardsuit
+/obj/item/clothing/suit/space/hardsuit/syndi/inteq
+	name = "pointman hardsuit"
+	desc = "One of Inteq's strudiest and finest combat armors. It is in EVA mode. Retrofitted by the IRMG."
+	alt_desc = "One of Inteq's strudiest and finest combat armors. It is in combat mode. Retrofitted by the IRMG."
+	icon_state = "hardsuit1-pointman"
+	hardsuit_type = "pointman"
+	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/inteq
+	supports_variations = VOX_VARIATION
+
+
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/inteq
+	name = "pointman hardsuit helmet"
+	desc = "One of Inteq's strudiest and finest combat armors. It is in EVA mode. Retrofitted by the IRMG."
+	alt_desc = "One of Inteq's strudiest and finest combat armors. It is in combat mode. Retrofitted by the IRMG."
+	icon_state = "hardsuit1-pointman"
+	hardsuit_type = "pointman"
+	full_retraction = TRUE
 
 	//Wizard hardsuit
 /obj/item/clothing/head/helmet/space/hardsuit/wizard
diff --git a/code/modules/mob/living/simple_animal/bot/firebot.dm b/code/modules/mob/living/simple_animal/bot/firebot.dm
index 4bfa9dd98a6c..ba8eafba9010 100644
--- a/code/modules/mob/living/simple_animal/bot/firebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/firebot.dm
@@ -23,8 +23,8 @@
 	window_name = "Mobile Fire Extinguisher v1.0"
 	path_image_color = "#FFA500"
 
-	var/atom/target_fire
-	var/atom/old_target_fire
+	var/datum/weakref/target_fire_ref
+	var/datum/weakref/old_target_fire_ref
 
 	var/obj/item/extinguisher/internal_ext
 
@@ -106,15 +106,15 @@
 
 /mob/living/simple_animal/bot/firebot/bot_reset()
 	..()
-	target_fire = null
-	old_target_fire = null
+	target_fire_ref = null
+	old_target_fire_ref = null
 	ignore_list = list()
 	anchored = FALSE
 	update_appearance()
 
 /mob/living/simple_animal/bot/firebot/proc/soft_reset()
 	path = list()
-	target_fire = null
+	target_fire_ref = null
 	mode = BOT_IDLE
 	last_found = world.time
 	update_appearance()
@@ -149,7 +149,7 @@
 		audible_message("<span class='danger'>[src] buzzes oddly!</span>")
 		playsound(src, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
 		if(user)
-			old_target_fire = user
+			old_target_fire_ref = WEAKREF(user)
 		extinguish_fires = FALSE
 		extinguish_people = TRUE
 
@@ -184,7 +184,7 @@
 
 	else if(isturf(target))
 		var/turf/open/T = target
-		if(T.active_hotspot)
+		if(T.active_hotspot || T.turf_fire)
 			return TRUE
 
 	return FALSE
@@ -194,12 +194,12 @@
 		return
 
 	if(IsStun() || IsParalyzed())
-		old_target_fire = target_fire
-		target_fire = null
+		old_target_fire_ref = target_fire_ref
+		target_fire_ref = null
 		mode = BOT_IDLE
 		return
 
-	if(prob(1) && target_fire == null)
+	if(prob(1) && !target_fire_ref)
 		var/list/messagevoice = list("No fires detected." = 'sound/voice/firebot/nofires.ogg',
 		"Only you can prevent station fires." = 'sound/voice/firebot/onlyyou.ogg',
 		"Temperature nominal." = 'sound/voice/firebot/tempnominal.ogg',
@@ -210,24 +210,39 @@
 
 	// Couldn't reach the target, reset and try again ignoring the old one
 	if(frustration > 8)
-		old_target_fire = target_fire
+		old_target_fire_ref = target_fire_ref
 		soft_reset()
 
+	var/atom/target_fire = target_fire_ref?.resolve()
+
 	// We extinguished our target or it was deleted
 	if(QDELETED(target_fire) || !is_burning(target_fire) || isdead(target_fire))
 		target_fire = null
+		target_fire_ref = null
 		var/scan_range = (stationary_mode ? 1 : DEFAULT_SCAN_RANGE)
+		var/old_target_fire = old_target_fire_ref?.resolve()
 
 		if(extinguish_people)
 			target_fire = scan(/mob/living, old_target_fire, scan_range) // Scan for burning humans first
+			target_fire_ref = WEAKREF(target_fire)
 
-		if(target_fire == null && extinguish_fires)
+		if(!target_fire && extinguish_fires)
 			target_fire = scan(/turf/open, old_target_fire, scan_range) // Scan for burning turfs second
+			target_fire_ref = WEAKREF(target_fire)
 
-		old_target_fire = target_fire
+		old_target_fire_ref = target_fire_ref
+
+	if(!target_fire)
+		if(auto_patrol)
+			if(mode == BOT_IDLE || mode == BOT_START_PATROL)
+				start_patrol()
+
+			if(mode == BOT_PATROL)
+				bot_patrol()
+		return
 
 	// Target reached ENGAGE WATER CANNON
-	if(target_fire && (get_dist(src, target_fire) <= (emagged == 2 ? 1 : 2))) // Make the bot spray water from afar when not emagged
+	if(get_dist(src, target_fire) <= (emagged == 2 ? 1 : 2)) // Make the bot spray water from afar when not emagged
 		if((speech_cooldown + SPEECH_INTERVAL) < world.time)
 			if(ishuman(target_fire))
 				speak("Stop, drop and roll!")
@@ -243,39 +258,32 @@
 		soft_reset()
 
 	// Target ran away
-	else if(target_fire && path.len && (get_dist(target_fire,path[path.len]) > 2))
+	else if(length(path) && (get_dist(target_fire, path[length(path)]) > 2))
 		path = list()
 		mode = BOT_IDLE
 		last_found = world.time
 
-	else if(target_fire && stationary_mode)
+	else if(stationary_mode)
 		soft_reset()
 		return
 
-	if(target_fire && (get_dist(src, target_fire) > 2))
+	if(get_dist(src, target_fire) > 2)
 
 		path = get_path_to(src, get_turf(target_fire), /turf/proc/Distance_cardinal, 0, 30, 1, id=access_card)
 		mode = BOT_MOVING
-		if(!path.len)
+		if(!length(path))
 			soft_reset()
 
-	if(path.len > 0 && target_fire)
+	if(length(path))
 		if(!bot_move(path[path.len]))
-			old_target_fire = target_fire
+			old_target_fire_ref = target_fire_ref
 			soft_reset()
 		return
 
 	// We got a target but it's too far away from us
-	if(path.len > 8 && target_fire)
+	if(length(path) > 8)
 		frustration++
 
-	if(auto_patrol && !target_fire)
-		if(mode == BOT_IDLE || mode == BOT_START_PATROL)
-			start_patrol()
-
-		if(mode == BOT_PATROL)
-			bot_patrol()
-
 
 //Look for burning people or turfs around the bot
 /mob/living/simple_animal/bot/firebot/process_scan(atom/scan_target)
diff --git a/code/modules/ruins/spaceruin_code/forgottenship.dm b/code/modules/ruins/spaceruin_code/forgottenship.dm
index 4a3611dcbdcc..8e3ae585d73d 100644
--- a/code/modules/ruins/spaceruin_code/forgottenship.dm
+++ b/code/modules/ruins/spaceruin_code/forgottenship.dm
@@ -90,29 +90,6 @@ GLOBAL_VAR_INIT(fscpassword, generate_password())
 
 	//Cybersun hardsuit
 
-/obj/item/clothing/head/helmet/space/hardsuit/cybersun
-	name = "Cybersun hardsuit helmet"
-	desc = "Prototype hardsuit helmet with experimental armor plates, protecting from laser-based weapons very well, while giving limited protection against anything else."
-	icon_state = "cybersun"
-	item_state = "cybersun"
-	hardsuit_type = "cybersun"
-	armor = list("melee" = 30, "bullet" = 40, "laser" = 55, "energy" = 55, "bomb" = 30, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 60)
-	strip_delay = 600
-	actions_types = list()
-
-
-/obj/item/clothing/suit/space/hardsuit/cybersun
-	icon_state = "cybersun"
-	item_state = "cybersun"
-	hardsuit_type = "cybersun"
-	name = "Cybersun hardsuit"
-	desc = "Prototype hardsuit with experimental armor plates, protecting from laser-based weapons very well, while giving limited protection against anything else."
-	armor = list("melee" = 30, "bullet" = 40, "laser" = 55, "energy" = 55, "bomb" = 30, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 60)
-	slowdown = 0
-	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/cybersun
-	actions_types = list(/datum/action/item_action/toggle_helmet)
-	jetpack = /obj/item/tank/jetpack/suit
-
 //Special NT NPCs
 
 /mob/living/simple_animal/hostile/nanotrasen/ranged/assault
diff --git a/html/changelogs/AutoChangeLog-pr-2326.yml b/html/changelogs/AutoChangeLog-pr-2326.yml
deleted file mode 100644
index 2195efe659f8..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2326.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: spockye
-delete-after: true
-changes:
-  - bugfix: temp fixed the jukebox(with subtypes) so they appear in the mapmaker
diff --git a/html/changelogs/AutoChangeLog-pr-2335.yml b/html/changelogs/AutoChangeLog-pr-2335.yml
deleted file mode 100644
index 6bf9cfe27cca..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2335.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Skrem7
-delete-after: true
-changes:
-  - balance: Cybernetic organs can no longer require replacement due to EMPs (they
-      do not suffer permanent damage)
diff --git a/html/changelogs/AutoChangeLog-pr-2359.yml b/html/changelogs/AutoChangeLog-pr-2359.yml
deleted file mode 100644
index 0d3d5d529348..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2359.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-author: RKz, Jacquerel
-delete-after: true
-changes:
-  - rscadd: New foodtype, GORE. Split from GROSS, GORE foodtype will be replacing
-      it where the food in particular resembles a corpse or organ. GROSS should only
-      apply to inedible or rotting foods. (baseball burgers)
-  - balance: All butchered player species are considered to be gore, only preferred
-      by Lizards, Arachnids, Kepori, Slimepeople and Flies. If you like the taste
-      of your fellow(or rival) crew, prepare accordingly.
-  - balance: Moved food preferences around to make more sense with the current system.
-      Nothing drastic, but species liked foods should be much more immersive in general.
diff --git a/html/changelogs/AutoChangeLog-pr-2362.yml b/html/changelogs/AutoChangeLog-pr-2362.yml
deleted file mode 100644
index 26d6dcf2a65b..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2362.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Skrem7
-delete-after: true
-changes:
-  - rscadd: Adds the double eyepatch, a blindfold made by adding a normal eyepatch
-      to another
-  - tweak: Eyepatches can now swap sides with ALT+CLICK
diff --git a/html/changelogs/archive/2023-09.yml b/html/changelogs/archive/2023-09.yml
index d281e2a39f3f..a4bdf0b5e7b8 100644
--- a/html/changelogs/archive/2023-09.yml
+++ b/html/changelogs/archive/2023-09.yml
@@ -117,3 +117,39 @@
   - spellcheck: Assualt is gone.
   - code_imp: Repaths/renames most ballistic ammo pathing to maintain consistency
       or take advantage of inherits, when possible.
+2023-09-20:
+  RKz, Jacquerel:
+  - rscadd: New foodtype, GORE. Split from GROSS, GORE foodtype will be replacing
+      it where the food in particular resembles a corpse or organ. GROSS should only
+      apply to inedible or rotting foods. (baseball burgers)
+  - balance: All butchered player species are considered to be gore, only preferred
+      by Lizards, Arachnids, Kepori, Slimepeople and Flies. If you like the taste
+      of your fellow(or rival) crew, prepare accordingly.
+  - balance: Moved food preferences around to make more sense with the current system.
+      Nothing drastic, but species liked foods should be much more immersive in general.
+  Skrem7:
+  - rscadd: Adds the double eyepatch, a blindfold made by adding a normal eyepatch
+      to another
+  - tweak: Eyepatches can now swap sides with ALT+CLICK
+  - balance: Cybernetic organs can no longer require replacement due to EMPs (they
+      do not suffer permanent damage)
+  spockye:
+  - bugfix: temp fixed the jukebox(with subtypes) so they appear in the mapmaker
+2023-09-23:
+  Apogee-dev:
+  - tweak: Removed RnD from the Colossus and updated its looks
+2023-09-25:
+  retlaw34, Ebin-Halcyon, triplezeta:
+  - rscadd: IRMG Pointman hardsuit, admin only at the moment
+  - rscadd: Resprites and reworks the Cybersun hardsuit a little
+  - rscadd: Cybersun Medical technician hardsuit
+  - rscdel: Old cybersun hardsuit, It was unused anyways
+  - tweak: Extremely minor Blood red hardsuit sprite tweaks
+2023-09-26:
+  MarkSuckerberg:
+  - tweak: Firebots now extinguish turf fires.
+2023-09-27:
+  Zevotech:
+  - rscadd: Remaps the Skipper Heavy Cruiser
+  - rscadd: Adds an Atmos Tech, Cargo Tech and Cook job slot to the skipper
+  - rscdel: Removes two engineer slots from the skipper.
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index 9ba2f5b219db..53b4c5939f68 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/suits/spacesuits.dmi b/icons/mob/clothing/suits/spacesuits.dmi
index 08c7741eae97..6e97b33cd1b7 100644
Binary files a/icons/mob/clothing/suits/spacesuits.dmi and b/icons/mob/clothing/suits/spacesuits.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 83db437408eb..c705e16ccf63 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits/spacesuits.dmi b/icons/obj/clothing/suits/spacesuits.dmi
index 688709322f5f..7ab05863bf05 100644
Binary files a/icons/obj/clothing/suits/spacesuits.dmi and b/icons/obj/clothing/suits/spacesuits.dmi differ