diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm
index de573239009b..963ee50f7e04 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm
@@ -20,7 +20,9 @@
 	},
 /obj/effect/turf_decal/industrial/warning/fulltile,
 /turf/open/floor/plating/airless,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "ao" = (
 /obj/structure/cable{
 	icon_state = "5-9"
@@ -56,7 +58,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "aK" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -64,7 +66,6 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/turf_decal/trimline/transparent/white/filled/warning{
 	dir = 4
 	},
@@ -94,7 +95,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "bb" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 8
@@ -111,10 +112,12 @@
 	},
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "bk" = (
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "bo" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
@@ -122,7 +125,7 @@
 	},
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "bs" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -143,7 +146,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "bB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
@@ -159,14 +162,18 @@
 /area/ship/cargo/starboard)
 "bH" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "bK" = (
 /obj/item/tank/jetpack/carbondioxide,
 /obj/item/clothing/suit/space/hardsuit/mining,
 /obj/machinery/suit_storage_unit/inherit,
 /obj/machinery/atmospherics/pipe/layer_manifold,
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "bL" = (
 /obj/structure/table/reinforced,
 /obj/structure/sign/poster/retro/random{
@@ -194,7 +201,9 @@
 	pixel_x = -12
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "bU" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/spawner/lootdrop/ration,
@@ -210,7 +219,9 @@
 	dir = 2
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "bV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -271,7 +282,7 @@
 	pixel_y = -8
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
 "cG" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -363,20 +374,20 @@
 	req_access_txt = "20"
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
 "dp" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "dq" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
-	icon_state = "0-4"
+	icon_state = "4-6"
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
 	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
@@ -414,7 +425,7 @@
 /obj/effect/turf_decal/borderfloor,
 /obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "el" = (
 /obj/structure/railing,
 /turf/open/floor/plasteel/dark,
@@ -432,7 +443,9 @@
 	name = "Interior Hull Access"
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "eu" = (
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -452,9 +465,6 @@
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
@@ -465,10 +475,6 @@
 	dir = 9
 	},
 /obj/machinery/light/floor,
-/obj/machinery/computer/atmos_control/tank/toxin_tank{
-	dir = 4;
-	sensors = list("gecko_tox_sensor"="Plasma Tank")
-	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering/engine)
 "eA" = (
@@ -479,9 +485,13 @@
 	pixel_x = 2
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "eC" = (
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/atmos_control/tank/nitrogen_tank{
+	dir = 1;
+	sensors = list("gecko_n2_sensor"="Nitrogen Tank")
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "eD" = (
@@ -510,7 +520,9 @@
 /turf/open/floor/engine/hull,
 /area/ship/external)
 "eQ" = (
-/obj/item/radio/intercom/directional/south,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+	dir = 10
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "fb" = (
@@ -550,12 +562,12 @@
 /obj/structure/extinguisher_cabinet/directional/west,
 /obj/machinery/newscaster/directional/north,
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "fv" = (
 /obj/machinery/computer/crew,
 /obj/machinery/newscaster/directional/north,
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "fD" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -569,13 +581,16 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo/starboard)
 "fK" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
-	icon_state = "0-2"
+	icon_state = "5-6"
+	},
+/obj/structure/cable{
+	icon_state = "0-10"
+	},
+/obj/structure/cable{
+	icon_state = "5-9"
 	},
 /turf/open/floor/plasteel/stairs,
 /area/ship/maintenance/starboard)
@@ -588,7 +603,7 @@
 	},
 /obj/effect/turf_decal/borderfloor,
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "fS" = (
 /obj/effect/turf_decal/siding/yellow,
 /obj/effect/turf_decal/siding/yellow{
@@ -598,7 +613,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "fZ" = (
 /obj/effect/turf_decal/siding/yellow/corner,
 /obj/effect/turf_decal/siding/yellow/corner{
@@ -608,7 +623,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "ga" = (
 /obj/structure/bed,
 /obj/item/bedsheet/dorms,
@@ -623,10 +638,13 @@
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
 "gg" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
-	dir = 9
+/obj/structure/window/reinforced{
+	dir = 1
 	},
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{
+	dir = 1
+	},
+/turf/open/floor/engine/o2,
 /area/ship/engineering/engine)
 "gh" = (
 /obj/effect/spawner/lootdrop/salvage_50,
@@ -649,6 +667,10 @@
 /obj/structure/cable{
 	icon_state = "4-10"
 	},
+/obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "gE" = (
@@ -656,7 +678,7 @@
 /obj/structure/curtain/cloth,
 /obj/item/bedsheet/ce,
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "gF" = (
 /obj/effect/turf_decal/industrial/warning,
 /obj/effect/decal/cleanable/dirt,
@@ -676,7 +698,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "gQ" = (
 /obj/item/radio/intercom/directional/west,
 /obj/machinery/light_switch{
@@ -685,7 +709,7 @@
 	pixel_y = -25
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "gS" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 10
@@ -718,26 +742,25 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech/techmaint,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "hu" = (
 /turf/template_noop,
 /area/template_noop)
 "hL" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
-	icon_state = "2-8"
+	icon_state = "2-4"
 	},
-/obj/machinery/light/small/directional/north{
-	pixel_x = 11;
-	pixel_y = 28
+/obj/structure/cable{
+	icon_state = "6-8"
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
-	icon_state = "0-2"
+	icon_state = "4-10"
 	},
-/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
-	icon_state = "2-4"
+	icon_state = "0-10"
 	},
 /turf/open/floor/plating,
 /area/ship/medical/surgery)
@@ -773,7 +796,9 @@
 	},
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "in" = (
 /obj/machinery/light/small/directional/north,
 /obj/structure/cable{
@@ -827,10 +852,13 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
-	icon_state = "0-8"
+	icon_state = "8-10"
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "4-10"
+	},
+/obj/structure/cable{
+	icon_state = "0-6"
 	},
 /turf/open/floor/plating,
 /area/ship/crew/toilet)
@@ -883,7 +911,7 @@
 	},
 /obj/effect/turf_decal/borderfloor,
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "jx" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -915,23 +943,28 @@
 	},
 /obj/machinery/vending/boozeomat/all_access,
 /turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
-"jK" = (
-/obj/structure/window/reinforced{
-	dir = 8
+/area/ship/crew/dorm/captain)
+"jJ" = (
+/obj/machinery/air_sensor/atmos/oxygen_tank{
+	id_tag = "gecko_o2_sensor";
+	pixel_x = -1;
+	pixel_y = 4
 	},
 /obj/structure/window/reinforced{
-	icon_state = "rwindow";
 	dir = 4
 	},
-/obj/effect/turf_decal/atmos/plasma,
+/obj/structure/window/reinforced,
+/turf/open/floor/engine/o2,
+/area/ship/engineering/engine)
+"jK" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{
 	dir = 4
 	},
-/obj/machinery/air_sensor/atmos/toxin_tank{
-	id_tag = "gecko_tox_sensor";
-	pixel_x = 3;
-	pixel_y = 8
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8
 	},
 /turf/open/floor/engine/plasma,
 /area/ship/engineering/engine)
@@ -963,7 +996,10 @@
 /turf/closed/wall/mineral/titanium,
 /area/ship/maintenance/starboard)
 "ks" = (
-/obj/machinery/light/floor,
+/obj/machinery/atmospherics/components/unary/portables_connector/layer4,
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "kM" = (
@@ -975,10 +1011,12 @@
 /obj/machinery/rnd/production/protolathe/department/engineering,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "kZ" = (
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "lb" = (
 /obj/structure/bed,
 /obj/item/bedsheet/dorms,
@@ -1046,7 +1084,9 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "mM" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light_switch{
@@ -1064,12 +1104,9 @@
 /obj/effect/turf_decal/borderfloor,
 /obj/machinery/light/directional/south,
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "mS" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/tank/air{
-	dir = 4
-	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "mX" = (
@@ -1098,7 +1135,7 @@
 	},
 /obj/effect/turf_decal/industrial/warning/fulltile,
 /turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
 "nq" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 4
@@ -1118,7 +1155,9 @@
 	dir = 10
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "nH" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
@@ -1130,7 +1169,7 @@
 	dir = 9
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
 "oi" = (
 /obj/machinery/light/directional/west,
 /obj/effect/turf_decal/industrial/warning{
@@ -1150,9 +1189,6 @@
 /turf/closed/wall/mineral/titanium,
 /area/ship/engineering/engine)
 "ok" = (
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 4
-	},
 /obj/machinery/button/door{
 	id = "gecko_thrusters";
 	name = "Thruster Blast Door Control";
@@ -1178,7 +1214,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/borderfloor,
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "oy" = (
 /obj/effect/turf_decal/siding/white{
 	dir = 8
@@ -1190,17 +1226,21 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "oJ" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
 "oM" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "oR" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -1215,9 +1255,6 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
@@ -1235,7 +1272,9 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "pe" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/medical/surgery)
@@ -1259,7 +1298,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "pD" = (
 /obj/effect/turf_decal/industrial/fire{
 	dir = 8
@@ -1294,14 +1333,13 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "pQ" = (
-/obj/machinery/atmospherics/components/trinary/mixer/flipped,
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "pW" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/layer2,
-/obj/machinery/portable_atmospherics/canister/air{
-	anchored = 1
-	},
+/obj/machinery/atmospherics/pipe/layer_manifold,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "pX" = (
@@ -1311,34 +1349,35 @@
 /obj/machinery/light/small/directional/west,
 /obj/machinery/vending/cigarette/beach,
 /turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
 "qb" = (
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "qc" = (
 /obj/effect/turf_decal/industrial/warning/fulltile,
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "qn" = (
 /obj/structure/curtain/bounty,
 /obj/structure/bed,
 /obj/item/bedsheet/captain,
 /obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
 "qp" = (
-/obj/machinery/door/airlock/maintenance_hatch,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/effect/turf_decal/industrial/warning/fulltile,
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "2-5"
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "qu" = (
@@ -1357,17 +1396,17 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "qB" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/transparent/white/filled/warning,
 /obj/structure/cable{
-	icon_state = "2-4"
+	icon_state = "1-4"
 	},
 /obj/structure/cable{
-	icon_state = "2-8"
+	icon_state = "1-5"
 	},
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "8-9"
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/trimline/transparent/white/filled/warning,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "qL" = (
@@ -1378,7 +1417,9 @@
 /area/ship/medical/surgery)
 "qO" = (
 /turf/closed/wall/mineral/titanium,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "rd" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 8
@@ -1392,7 +1433,7 @@
 	},
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "re" = (
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
@@ -1431,8 +1472,11 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/structure/cable{
+	icon_state = "8-10"
+	},
 /turf/open/floor/plating,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
 "rF" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/turf_decal/siding/white{
@@ -1445,29 +1489,25 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "rU" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "sg" = (
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/medical/surgery)
 "ss" = (
-/obj/machinery/button/door{
-	dir = 1;
-	id = "gecko_thrusters";
-	name = "Thruster Blast Door Control";
-	pixel_x = -6;
-	pixel_y = -24;
-	sync_doors = 0
-	},
-/obj/machinery/atmospherics/components/unary/portables_connector{
-	dir = 8
+/obj/effect/turf_decal/atmos/oxygen,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 1
 	},
-/turf/open/floor/plating,
+/turf/open/floor/engine/o2,
 /area/ship/engineering/engine)
 "st" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
@@ -1495,11 +1535,11 @@
 /obj/item/clothing/suit/space/hardsuit/engine/elite,
 /obj/machinery/suit_storage_unit/inherit,
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "td" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
 "te" = (
 /obj/structure/window/reinforced/fulltile/shuttle,
 /obj/machinery/door/poddoor/shutters{
@@ -1551,7 +1591,7 @@
 	req_access_txt = "56"
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "ue" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
@@ -1566,7 +1606,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "ui" = (
 /obj/machinery/power/terminal{
 	dir = 8
@@ -1601,7 +1641,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "uP" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -1613,10 +1653,13 @@
 /area/ship/maintenance/starboard)
 "vi" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/floor,
 /obj/structure/cable{
 	icon_state = "2-10"
 	},
+/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{
+	dir = 8;
+	target_pressure = 101
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "vl" = (
@@ -1629,7 +1672,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "vo" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 8
@@ -1642,7 +1685,9 @@
 	},
 /obj/structure/tank_dispenser/oxygen,
 /turf/open/floor/plasteel/dark,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "vv" = (
 /obj/effect/turf_decal/industrial/fire{
 	dir = 8
@@ -1675,11 +1720,11 @@
 	},
 /obj/machinery/airalarm/directional/east,
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "vJ" = (
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "vL" = (
 /obj/effect/decal/cleanable/glass,
 /turf/open/floor/plasteel/patterned,
@@ -1707,10 +1752,10 @@
 /turf/open/floor/plating,
 /area/ship/medical/surgery)
 "ws" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/computer/atmos_control/tank/oxygen_tank{
+	dir = 1;
+	sensors = list("gecko_o2_sensor"="Oxygen Tank")
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "wv" = (
@@ -1722,7 +1767,7 @@
 	},
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "wy" = (
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -1737,19 +1782,19 @@
 /area/ship/maintenance/starboard)
 "wD" = (
 /obj/structure/window/reinforced{
-	dir = 8
+	dir = 4
 	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
+/obj/machinery/air_sensor/atmos/toxin_tank{
+	id_tag = "gecko_tox_sensor";
+	pixel_x = 3;
+	pixel_y = 8
 	},
-/obj/effect/turf_decal/atmos/oxygen,
-/obj/machinery/air_sensor/atmos/oxygen_tank{
-	id_tag = "gecko_o2_sensor";
-	pixel_x = 8;
-	pixel_y = 4
+/obj/effect/turf_decal/atmos/plasma,
+/obj/structure/window/reinforced{
+	dir = 8
 	},
-/turf/open/floor/engine/o2,
+/obj/structure/window/reinforced,
+/turf/open/floor/engine/plasma,
 /area/ship/engineering/engine)
 "wR" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -1768,11 +1813,10 @@
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "wW" = (
-/obj/machinery/atmospherics/components/binary/pump/layer2,
+/obj/machinery/door/airlock/maintenance_hatch,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "wY" = (
-/obj/machinery/light/floor,
 /obj/structure/railing,
 /turf/open/floor/plasteel/stairs/right{
 	dir = 8
@@ -1785,8 +1829,11 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/structure/cable{
+	icon_state = "2-10"
+	},
 /turf/open/floor/plating,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "xh" = (
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -1822,11 +1869,8 @@
 /turf/open/floor/plating,
 /area/ship/medical/surgery)
 "yc" = (
-/obj/machinery/atmospherics/pipe/simple/dark{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+	dir = 8
 	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
@@ -1845,13 +1889,29 @@
 /area/ship/crew)
 "yj" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "yp" = (
 /obj/machinery/atmospherics/pipe/simple/dark{
 	dir = 10
 	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
+"ys" = (
+/obj/structure/window/reinforced{
+	icon_state = "rwindow";
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{
+	dir = 1;
+	piping_layer = 4;
+	pixel_x = 5;
+	pixel_y = 0
+	},
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/turf/open/floor/engine/n2,
+/area/ship/engineering/engine)
 "yw" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
@@ -1918,10 +1978,6 @@
 /obj/effect/turf_decal/siding/yellow{
 	dir = 10
 	},
-/obj/machinery/computer/atmos_control/tank/oxygen_tank{
-	dir = 4;
-	sensors = list("gecko_o2_sensor"="Oxygen Tank")
-	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering/engine)
 "ze" = (
@@ -1937,8 +1993,9 @@
 /area/ship/medical/surgery)
 "zl" = (
 /obj/machinery/atmospherics/pipe/simple/purple/hidden{
-	dir = 4
+	dir = 9
 	},
+/obj/machinery/light/floor,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "zn" = (
@@ -1947,7 +2004,7 @@
 	},
 /obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "zv" = (
 /obj/effect/turf_decal/box/corners{
 	dir = 8
@@ -1958,7 +2015,7 @@
 "zE" = (
 /obj/item/pet_carrier,
 /turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
 "zM" = (
 /obj/effect/turf_decal/trimline/transparent/white/filled/warning{
 	dir = 4
@@ -1994,7 +2051,6 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
@@ -2017,7 +2073,7 @@
 	req_access_txt = "56"
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "AA" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -2053,8 +2109,11 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/medical/surgery)
 "AI" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 2
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 4
 	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
@@ -2120,7 +2179,9 @@
 	},
 /obj/machinery/firealarm/directional/north,
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "BB" = (
 /obj/machinery/atmospherics/pipe/simple{
 	dir = 8
@@ -2172,7 +2233,9 @@
 /obj/item/clothing/suit/space/hardsuit/engine,
 /obj/item/tank/jetpack/carbondioxide,
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "BV" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -2211,7 +2274,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
 "Cj" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -2234,7 +2297,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/open/floor/plasteel/tech/techmaint,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Ct" = (
 /obj/effect/turf_decal/siding/white{
 	dir = 4
@@ -2249,7 +2312,7 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Cv" = (
 /obj/effect/turf_decal/siding/white,
 /obj/effect/turf_decal/siding/white{
@@ -2309,7 +2372,7 @@
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "CU" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/maintenance/port)
@@ -2323,7 +2386,7 @@
 	},
 /obj/machinery/newscaster/directional/west,
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Dp" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 8
@@ -2341,11 +2404,11 @@
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Du" = (
 /obj/item/radio/intercom/wideband/directional/west,
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "DQ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -2385,7 +2448,9 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "Ek" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -2395,7 +2460,9 @@
 "En" = (
 /obj/structure/sign/warning,
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "Ew" = (
 /obj/effect/turf_decal/borderfloor,
 /obj/machinery/status_display/shuttle{
@@ -2417,7 +2484,7 @@
 	},
 /obj/effect/turf_decal/borderfloor,
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "EE" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -2437,7 +2504,7 @@
 	},
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "EK" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/patterned,
@@ -2494,7 +2561,7 @@
 	name = "Bob"
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
 "Gm" = (
 /obj/item/clothing/suit/armor/curator,
 /obj/item/clothing/suit/armor/curator,
@@ -2520,17 +2587,16 @@
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew)
 "Gt" = (
-/obj/structure/window/reinforced{
-	icon_state = "rwindow";
-	dir = 4
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{
+	dir = 1;
+	piping_layer = 4;
+	pixel_x = 5;
+	pixel_y = 0
 	},
 /obj/structure/window/reinforced{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{
-	dir = 4
-	},
-/turf/open/floor/engine/o2,
+/turf/open/floor/engine/n2,
 /area/ship/engineering/engine)
 "Gu" = (
 /obj/machinery/computer/rdconsole{
@@ -2551,18 +2617,17 @@
 /area/ship/medical/surgery)
 "GM" = (
 /obj/machinery/light/small/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
+	dir = 4
+	},
 /obj/structure/window/reinforced{
-	dir = 1
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 8
 	},
 /obj/structure/window/reinforced{
-	icon_state = "rwindow";
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
-	dir = 4
+	dir = 1
 	},
 /turf/open/floor/engine/plasma,
 /area/ship/engineering/engine)
@@ -2571,7 +2636,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
 "GQ" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
@@ -2607,7 +2672,7 @@
 	pixel_x = -5
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
 "GX" = (
 /obj/machinery/door/airlock/command{
 	dir = 4;
@@ -2643,7 +2708,9 @@
 "Ha" = (
 /obj/machinery/rnd/production/circuit_imprinter/department/engi,
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "Hc" = (
 /obj/machinery/door/airlock{
 	name = "Crew Quarters"
@@ -2661,7 +2728,12 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "Hg" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Hx" = (
@@ -2676,7 +2748,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "HT" = (
 /obj/machinery/light/small/directional/north,
 /obj/structure/cable{
@@ -2696,7 +2768,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Ig" = (
 /obj/machinery/light/small/directional/south,
 /obj/structure/cable{
@@ -2705,14 +2777,24 @@
 /obj/structure/cable{
 	icon_state = "1-5"
 	},
+/obj/machinery/computer/atmos_control/tank/toxin_tank{
+	sensors = list("gecko_tox_sensor"="Plasma Tank");
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Ij" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/fire{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
 	},
 /turf/open/floor/plating,
-/area/ship/engineering/engine)
+/area/ship/maintenance/port)
 "Im" = (
 /obj/machinery/button/door{
 	dir = 8;
@@ -2738,20 +2820,23 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Iu" = (
-/obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
 	icon_state = "rwindow";
 	dir = 4
 	},
+/obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{
-	dir = 4
+/obj/effect/turf_decal/atmos/nitrogen,
+/obj/machinery/air_sensor/atmos/nitrogen_tank{
+	id_tag = "gecko_n2_sensor";
+	pixel_x = 5;
+	pixel_y = 9
 	},
-/turf/open/floor/engine/o2,
+/turf/open/floor/engine/n2,
 /area/ship/engineering/engine)
 "Iv" = (
 /obj/effect/spawner/structure/window/plasma/reinforced,
@@ -2763,13 +2848,30 @@
 /area/ship/engineering/engine)
 "Iy" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Iz" = (
 /obj/machinery/atmospherics/components/unary/portables_connector{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4{
+	dir = 6
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
+"II" = (
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{
+	dir = 1
+	},
+/obj/structure/window/reinforced{
+	icon_state = "rwindow";
+	dir = 4
+	},
+/obj/structure/window/reinforced,
+/turf/open/floor/engine/o2,
+/area/ship/engineering/engine)
 "IK" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 8
@@ -2783,11 +2885,8 @@
 	},
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Jc" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/trimline/transparent/white/filled/warning{
 	dir = 1
@@ -2797,7 +2896,10 @@
 	pixel_y = -28
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "8-10"
+	},
+/obj/structure/cable{
+	icon_state = "4-10"
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
@@ -2811,7 +2913,9 @@
 	},
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "Jk" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/effect/decal/cleanable/dirt,
@@ -2843,19 +2947,14 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Jz" = (
 /obj/effect/turf_decal/borderfloor,
 /obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "JV" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
-	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Ki" = (
@@ -2882,7 +2981,7 @@
 	},
 /obj/effect/turf_decal/borderfloor,
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "KH" = (
 /obj/structure/cable{
 	icon_state = "0-10"
@@ -2910,7 +3009,9 @@
 	dir = 10
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "KU" = (
 /obj/structure/closet{
 	anchored = 1;
@@ -2956,6 +3057,15 @@
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo/starboard)
+"LA" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "LH" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3016,7 +3126,9 @@
 /obj/item/tank/internals/plasmaman/full,
 /obj/structure/closet/emcloset,
 /turf/open/floor/plasteel/dark,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "Ml" = (
 /obj/effect/turf_decal/industrial/fire{
 	dir = 8
@@ -3050,14 +3162,14 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/open/floor/plasteel/tech/techmaint,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Nq" = (
 /obj/machinery/firealarm/directional/north,
 /obj/effect/turf_decal/borderfloor{
 	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Nu" = (
 /obj/machinery/firealarm/directional/east,
 /obj/effect/turf_decal/borderfloor,
@@ -3067,7 +3179,7 @@
 	pixel_y = 11
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Nz" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -3107,7 +3219,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "Ow" = (
 /obj/effect/turf_decal/industrial/warning,
 /obj/effect/decal/cleanable/dirt,
@@ -3142,7 +3254,7 @@
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "Pg" = (
 /obj/machinery/mineral/ore_redemption{
 	input_dir = 2;
@@ -3209,7 +3321,7 @@
 /obj/structure/table/glass,
 /obj/item/lighter/clockwork,
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "PF" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/mineral/titanium/nodiagonal,
@@ -3218,7 +3330,7 @@
 /obj/structure/table/glass,
 /obj/item/storage/fancy/cigarettes/cigars/havana,
 /turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
 "PQ" = (
 /obj/structure/sign/warning/vacuum/external{
 	pixel_x = 32
@@ -3231,7 +3343,9 @@
 	},
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4,
 /turf/open/floor/plasteel/dark,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "PV" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -3288,7 +3402,7 @@
 	dir = 6
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "QA" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3313,12 +3427,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "QD" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/dark{
-	dir = 1
-	},
+/obj/machinery/atmospherics/components/trinary/mixer/flipped,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "QY" = (
@@ -3340,7 +3452,9 @@
 	req_access_txt = "10"
 	},
 /turf/open/floor/plasteel/tech/techmaint,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "Rc" = (
 /obj/machinery/light/directional/north,
 /obj/machinery/firealarm/directional/north{
@@ -3391,7 +3505,7 @@
 /obj/item/paper_bin,
 /obj/item/pen/fourcolor,
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "RN" = (
 /obj/effect/turf_decal/borderfloor{
 	dir = 1
@@ -3403,7 +3517,7 @@
 /area/ship/bridge)
 "RS" = (
 /turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
 "Sa" = (
 /obj/machinery/light/directional/east,
 /obj/effect/turf_decal/industrial/warning,
@@ -3419,7 +3533,7 @@
 	},
 /obj/effect/turf_decal/borderfloor,
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Sj" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
@@ -3428,7 +3542,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Sl" = (
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
@@ -3464,8 +3578,9 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable{
-	icon_state = "0-8"
+	icon_state = "8-9"
 	},
+/obj/structure/cable,
 /turf/open/floor/plating,
 /area/ship/bridge)
 "Sy" = (
@@ -3496,10 +3611,13 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "SQ" = (
-/obj/machinery/atmospherics/components/binary/pump/layer2{
-	dir = 8
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
 	},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/siding/yellow,
+/obj/structure/railing,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering/engine)
 "SV" = (
 /obj/structure/chair/comfy/shuttle{
@@ -3510,7 +3628,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Ta" = (
 /obj/effect/turf_decal/siding/yellow{
 	dir = 4
@@ -3519,15 +3637,11 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "Tb" = (
 /obj/effect/turf_decal/industrial/fire{
 	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/portables_connector/layer2{
-	dir = 4
-	},
-/obj/machinery/portable_atmospherics/canister,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Tc" = (
@@ -3541,12 +3655,12 @@
 /obj/machinery/power/terminal{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering/engine)
 "Tg" = (
@@ -3556,10 +3670,16 @@
 "Th" = (
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
-	icon_state = "0-8"
+	icon_state = "8-9"
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "4-9"
+	},
+/obj/structure/cable{
+	icon_state = "0-9"
+	},
+/obj/structure/cable{
+	icon_state = "6-8"
 	},
 /turf/open/floor/plating,
 /area/ship/crew)
@@ -3575,7 +3695,7 @@
 	},
 /obj/effect/turf_decal/industrial/warning,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Tq" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -3587,29 +3707,35 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "TA" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "TK" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "Ug" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/engineering/engine)
 "Uj" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/mineral/titanium,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "Ux" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/mineral/titanium,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
 "UB" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/turf_decal/siding/white{
@@ -3654,13 +3780,16 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/medical/surgery)
 "UV" = (
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /obj/effect/decal/cleanable/cobweb,
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
-	icon_state = "0-4"
+	icon_state = "4-6"
+	},
+/obj/structure/cable{
+	icon_state = "0-6"
+	},
+/obj/structure/cable{
+	icon_state = "5-6"
 	},
 /turf/open/floor/plating,
 /area/ship/cargo/starboard)
@@ -3683,7 +3812,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Vq" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/cargo/starboard)
@@ -3716,9 +3845,6 @@
 /area/ship/bridge)
 "VC" = (
 /obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light_switch{
@@ -3727,7 +3853,19 @@
 	pixel_y = -16
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "8-10"
+	},
+/obj/structure/cable{
+	icon_state = "0-10"
+	},
+/obj/structure/cable{
+	icon_state = "9-10"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "5-9"
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
@@ -3746,7 +3884,7 @@
 "VO" = (
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "VT" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{
 	dir = 4
@@ -3768,25 +3906,37 @@
 	},
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Wb" = (
 /obj/structure/chair/comfy/shuttle,
 /obj/machinery/computer/helm/viewscreen/directional/north{
 	pixel_y = 18
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "Wo" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
-	icon_state = "0-8"
+	icon_state = "6-8"
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "0-2"
+	},
+/obj/structure/cable{
+	icon_state = "4-10"
+	},
+/turf/open/floor/plating,
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
+"WB" = (
+/obj/machinery/atmospherics/components/unary/portables_connector,
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4{
+	dir = 4
 	},
 /turf/open/floor/plating,
-/area/ship/storage)
+/area/ship/engineering/engine)
 "WF" = (
 /obj/structure/closet/secure_closet{
 	anchored = 1;
@@ -3810,7 +3960,7 @@
 /obj/item/storage/photo_album/CE,
 /obj/item/circuitboard/machine/circuit_imprinter,
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
 "WJ" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/kirbyplants/random,
@@ -3821,7 +3971,7 @@
 	pixel_y = 11
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "WN" = (
 /obj/machinery/atmospherics/components/binary/circulator,
 /turf/open/floor/engine,
@@ -3835,7 +3985,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "WS" = (
 /obj/machinery/rnd/server,
 /obj/machinery/airalarm/directional/south,
@@ -3877,7 +4027,9 @@
 	dir = 5
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "Xs" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -3893,7 +4045,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
 "XA" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3930,6 +4082,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
+/obj/machinery/atmospherics/pipe/simple/purple/hidden{
+	dir = 6
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "XY" = (
@@ -3943,7 +4098,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "Yf" = (
 /obj/machinery/door/airlock/engineering{
 	dir = 4;
@@ -3983,19 +4138,25 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/medical/surgery)
 "YG" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/sign/warning/electricshock{
 	pixel_y = -32
 	},
 /obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable{
+	icon_state = "5-9"
+	},
+/obj/structure/cable{
+	icon_state = "1-6"
+	},
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/structure/cable{
+	icon_state = "8-9"
+	},
 /turf/open/floor/plating,
-/area/ship/hallway/fore)
+/area/ship/hallway/central)
 "YQ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
@@ -4004,7 +4165,9 @@
 	dir = 10
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "YR" = (
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
@@ -4013,7 +4176,9 @@
 /obj/item/tank/jetpack/carbondioxide,
 /obj/machinery/suit_storage_unit/inherit,
 /turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+	name = "Storage And Science Bay"
+	})
 "Ze" = (
 /obj/machinery/door/airlock/maintenance_hatch,
 /obj/structure/cable{
@@ -4062,12 +4227,16 @@
 /obj/machinery/power/terminal{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
 /obj/effect/turf_decal/industrial/fire{
 	dir = 8
 	},
+/obj/machinery/light/small/directional/north{
+	pixel_x = 11;
+	pixel_y = 28
+	},
+/obj/structure/cable{
+	icon_state = "0-6"
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "Zu" = (
@@ -4077,7 +4246,7 @@
 "Zv" = (
 /obj/effect/turf_decal/borderfloor,
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
 "ZB" = (
 /obj/effect/turf_decal/trimline/opaque/yellow/warning{
 	dir = 8
@@ -4088,6 +4257,7 @@
 /obj/structure/railing/corner{
 	dir = 8
 	},
+/obj/machinery/light/floor,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "ZM" = (
@@ -4252,7 +4422,7 @@ hu
 hu
 Ug
 ok
-SQ
+KM
 dZ
 KM
 KM
@@ -4262,7 +4432,7 @@ hb
 XS
 zl
 ks
-KQ
+ys
 ss
 Ug
 hu
@@ -4276,9 +4446,9 @@ wy
 xh
 Ki
 Ug
-Iz
-Ij
-yc
+KM
+KM
+yp
 UP
 UP
 hX
@@ -4288,7 +4458,7 @@ QD
 pQ
 Hg
 gg
-KM
+jJ
 Ug
 bV
 xh
@@ -4301,19 +4471,19 @@ Zn
 jn
 tB
 Ug
-pW
-wW
-AI
-KM
 KM
+wW
 KM
-Cj
 KM
 KM
 KM
+Cj
 KM
 KM
-eQ
+yc
+WB
+II
+Ug
 Ug
 wB
 Pk
@@ -4323,20 +4493,20 @@ wB
 (9,1,1) = {"
 tB
 Zo
-Zo
+Ij
 tB
 tB
 tB
 in
-JV
+LH
 zZ
-ws
+LH
 aK
 oT
 QA
 LH
-LH
-LH
+LA
+AI
 Ig
 wB
 wB
@@ -4360,7 +4530,7 @@ Lr
 ez
 zc
 KM
-KM
+eQ
 vi
 lZ
 Ze
@@ -4383,9 +4553,9 @@ Ba
 Xh
 XA
 Tf
-PV
-KM
-KM
+SQ
+JV
+pW
 gB
 eC
 wB
@@ -4412,7 +4582,7 @@ PV
 KM
 dX
 ah
-KM
+ws
 wB
 dk
 wB