diff --git a/_maps/shuttles/shiptest/independent_box.dmm b/_maps/shuttles/shiptest/independent_box.dmm
index f46c36b3cec9..d80bb829bfbb 100644
--- a/_maps/shuttles/shiptest/independent_box.dmm
+++ b/_maps/shuttles/shiptest/independent_box.dmm
@@ -148,6 +148,7 @@
 	dir = 5
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/medical/morgue)
 "aI" = (
@@ -257,10 +258,12 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/obj/effect/turf_decal/ntspaceworks_small,
 /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plating,
 /area/ship/engineering)
 "bk" = (
@@ -320,11 +323,15 @@
 /obj/effect/turf_decal/industrial/shutoff{
 	dir = 1
 	},
+/obj/effect/decal/cleanable/wrapping,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "bo" = (
 /obj/structure/catwalk/over,
-/turf/open/floor/plating/airless,
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+	dir = 8
+	},
+/turf/open/floor/plating,
 /area/ship/external)
 "bq" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
@@ -353,12 +360,28 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "bw" = (
-/obj/structure/sign/poster/official/random,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/medical)
+/obj/machinery/button/door{
+	dir = 8;
+	id = "boxbathroom";
+	name = "Privacy Button";
+	normaldoorcontrol = 1;
+	pixel_x = 26;
+	pixel_y = 7;
+	specialfunctions = 4
+	},
+/obj/machinery/shower{
+	dir = 1;
+	layer = 3
+	},
+/obj/structure/curtain,
+/obj/item/soap,
+/obj/machinery/door/window/northleft,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/crew/toilet)
 "by" = (
 /obj/machinery/door/airlock/external,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/atmospherics/pipe/layer_manifold/visible,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "bz" = (
@@ -549,6 +572,7 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/layer_manifold/visible,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "cd" = (
@@ -596,21 +620,35 @@
 /turf/open/floor/carpet/nanoweave/blue,
 /area/ship/bridge)
 "cr" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/machinery/atmospherics/components/unary/portables_connector/layer2,
 /obj/structure/cable{
-	icon_state = "6-9"
+	icon_state = "6-8"
 	},
-/obj/effect/decal/cleanable/wrapping,
-/obj/effect/turf_decal/ntspaceworks_small/right,
+/obj/machinery/portable_atmospherics/canister/air,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "cu" = (
-/obj/machinery/atmospherics/pipe/layer_manifold/visible,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/engineering)
-"cw" = (
-/obj/structure/sign/poster/random,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/medical)
+/obj/effect/turf_decal/spline/fancy/opaque/blue,
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = -12
+	},
+/obj/structure/mirror{
+	pixel_x = -24
+	},
+/obj/structure/toilet{
+	pixel_y = 13
+	},
+/obj/machinery/light_switch{
+	pixel_x = 11;
+	pixel_y = 22
+	},
+/obj/machinery/light/small/directional/north{
+	pixel_x = -10
+	},
+/turf/open/floor/plasteel/freezer,
+/area/ship/crew/toilet)
 "cB" = (
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/medical)
@@ -653,9 +691,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "cE" = (
-/obj/machinery/door/airlock{
-	name = "Restroom"
-	},
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
@@ -667,27 +702,25 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock{
+	pixel_x = "chemistry"
+	},
 /turf/open/floor/plasteel/dark,
-/area/ship/crew)
+/area/ship/crew/toilet)
 "cF" = (
-/obj/structure/sign/departments/restroom,
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/crew)
+/area/ship/crew/toilet)
 "cG" = (
+/obj/effect/spawner/lootdrop/maintenance/three,
 /obj/structure/closet/emcloset/anchored,
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 4
 	},
-/obj/effect/spawner/lootdrop/maintenance/three,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 6
-	},
 /obj/machinery/button/door{
 	id = "box_engine1";
 	name = "Egnine shutter";
 	pixel_y = 28
 	},
-/obj/machinery/light/small/broken/directional/south,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "cJ" = (
@@ -717,21 +750,14 @@
 	},
 /obj/structure/table/chem,
 /obj/machinery/light/broken/directional/south,
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
 /obj/effect/turf_decal/siding/white{
 	dir = 1
 	},
-/obj/machinery/reagentgrinder{
-	pixel_y = 8;
-	pixel_x = 16
-	},
 /obj/item/reagent_containers/glass/filter{
 	pixel_x = -8
 	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/crew)
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/toilet)
 "cO" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 1
@@ -741,22 +767,37 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/freezer,
-/area/ship/crew)
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/item/cigbutt/roach,
+/obj/effect/turf_decal/spline/fancy/opaque/bottlegreen/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/bottlegreen/corner{
+	dir = 1
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "cP" = (
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = 12
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/machinery/light_switch{
+	pixel_x = 19;
+	pixel_y = 12;
+	dir = 8
 	},
-/obj/structure/mirror{
-	pixel_x = 28
+/obj/structure/cable{
+	icon_state = "0-8"
 	},
-/turf/open/floor/plasteel/freezer,
-/area/ship/crew)
+/obj/effect/turf_decal/spline/fancy/opaque/bottlegreen{
+	dir = 5
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "cQ" = (
 /obj/machinery/smartfridge/chemistry/preloaded,
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/crew)
+/area/ship/crew/toilet)
 "cT" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
@@ -767,10 +808,6 @@
 /turf/open/floor/wood,
 /area/ship/crew)
 "cU" = (
-/obj/machinery/light_switch{
-	pixel_x = -25;
-	pixel_y = 25
-	},
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 4
 	},
@@ -803,10 +840,10 @@
 	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "1-4"
 	},
-/turf/open/floor/plasteel/freezer,
-/area/ship/crew)
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "da" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
@@ -815,8 +852,15 @@
 	dir = 4
 	},
 /obj/item/cigbutt,
-/turf/open/floor/plasteel/freezer,
-/area/ship/crew)
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/bottlegreen/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/bottlegreen/corner,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "dc" = (
 /obj/effect/turf_decal/corner/opaque/blue{
 	dir = 8
@@ -831,6 +875,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/crew)
 "de" = (
@@ -844,6 +891,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/wood,
 /area/ship/crew)
 "df" = (
@@ -856,6 +906,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/wood,
 /area/ship/crew)
 "dg" = (
@@ -866,6 +919,9 @@
 /obj/structure/chair/stool{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
 /turf/open/floor/wood,
 /area/ship/crew)
 "dh" = (
@@ -895,6 +951,7 @@
 /obj/item/clothing/neck/stethoscope,
 /obj/structure/window/reinforced/spawner/north,
 /obj/effect/turf_decal/spline/fancy/opaque/black/corner,
+/obj/machinery/light/small/directional/west,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "do" = (
@@ -927,6 +984,7 @@
 /area/ship/medical)
 "ds" = (
 /obj/machinery/suit_storage_unit/cmo,
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "dt" = (
@@ -978,7 +1036,6 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "ei" = (
-/obj/machinery/light/small/directional/east,
 /obj/machinery/cryopod,
 /obj/effect/turf_decal/box/white,
 /obj/machinery/computer/cryopod/retro/directional/north,
@@ -995,19 +1052,6 @@
 /obj/machinery/firealarm/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
-"eP" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 4
-	},
-/obj/structure/catwalk/over,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/ship/engineering)
 "eR" = (
 /obj/machinery/door/window/westright,
 /obj/effect/turf_decal/trimline/opaque/blue/warning{
@@ -1137,7 +1181,6 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/directional/west,
 /obj/structure/closet/firecloset/wall{
 	dir = 4;
 	pixel_x = -32
@@ -1198,12 +1241,21 @@
 /turf/open/floor/plating,
 /area/ship/medical)
 "hS" = (
-/obj/item/cigbutt/roach,
-/obj/effect/turf_decal/spline/fancy/opaque/lightgrey{
+/obj/item/clothing/head/beret/chem,
+/obj/item/clothing/suit/longcoat/chemist,
+/obj/item/reagent_containers/dropper,
+/obj/item/storage/box/pillbottles,
+/obj/structure/closet/wall/white/chem{
+	pixel_y = 32
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/bottlegreen{
+	dir = 1
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/bottlegreen/corner{
 	dir = 8
 	},
-/turf/open/floor/plasteel/freezer,
-/area/ship/crew)
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "iv" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -1230,20 +1282,6 @@
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
-"iQ" = (
-/obj/machinery/power/terminal{
-	dir = 1
-	},
-/obj/structure/cable/yellow{
-	icon_state = "0-8"
-	},
-/obj/structure/catwalk/over,
-/obj/structure/sign/warning/electricshock{
-	pixel_x = 32
-	},
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/plating,
-/area/ship/engineering)
 "iU" = (
 /obj/structure/closet/secure_closet/medical2,
 /turf/open/floor/plasteel/dark,
@@ -1261,16 +1299,16 @@
 /obj/structure/sign/poster/official/cleanliness{
 	pixel_x = 32
 	},
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
 /obj/effect/turf_decal/siding/white{
 	dir = 1
 	},
-/obj/structure/table/chem,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/crew)
+/obj/structure/frame/machine,
+/obj/item/stack/cable_coil/cyan{
+	amount = 5
+	},
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/toilet)
 "jk" = (
 /obj/machinery/firealarm/directional/south,
 /obj/machinery/stasis{
@@ -1382,7 +1420,7 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/obj/item/radio/intercom/directional/west,
+/obj/machinery/light/directional/west,
 /turf/open/floor/plasteel/tech,
 /area/ship/medical)
 "mx" = (
@@ -1432,8 +1470,15 @@
 	pixel_x = -5;
 	pixel_y = 3
 	},
-/obj/machinery/light/small/directional/north,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/light_switch{
+	pixel_x = 11;
+	pixel_y = 21
+	},
 /turf/open/floor/wood,
 /area/ship/crew)
 "nQ" = (
@@ -1474,19 +1519,15 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "qD" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
+/obj/structure/catwalk/over,
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "5-9"
 	},
-/obj/structure/catwalk/over,
-/obj/effect/turf_decal/number/two,
-/obj/effect/turf_decal/trimline/opaque/yellow/filled/corner{
-	dir = 1
+/obj/structure/sign/warning/electricshock{
+	pixel_x = 32
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
@@ -1502,14 +1543,10 @@
 /obj/structure/railing{
 	dir = 4
 	},
+/obj/machinery/light/small/directional/south,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "ro" = (
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = -25;
-	pixel_y = -25
-	},
 /obj/effect/turf_decal/corner/opaque/lightgrey/diagonal,
 /obj/effect/turf_decal/trimline/opaque/white/filled/line{
 	dir = 8
@@ -1540,18 +1577,9 @@
 /turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "ss" = (
-/obj/structure/toilet{
-	dir = 4
-	},
-/obj/machinery/door/window/survival_pod{
-	dir = 4
-	},
-/obj/structure/curtain,
-/obj/structure/window/reinforced/tinted/frosted{
-	dir = 1
-	},
-/turf/open/floor/mineral/titanium/airless,
-/area/ship/crew)
+/obj/machinery/door/window/northleft,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew/toilet)
 "su" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -1569,17 +1597,18 @@
 /obj/effect/turf_decal/siding/wood,
 /obj/structure/bookcase/manuals/medical,
 /obj/effect/turf_decal/siding/wood,
+/obj/machinery/light/small/directional/south,
 /turf/open/floor/wood,
 /area/ship/crew)
 "tn" = (
 /obj/machinery/vending/wardrobe/medi_wardrobe,
-/obj/machinery/firealarm/directional/north,
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 1
 	},
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 8
 	},
+/obj/machinery/light/small/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "tw" = (
@@ -1593,15 +1622,14 @@
 /area/ship/engineering)
 "tz" = (
 /obj/structure/catwalk/over,
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+	dir = 1
+	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+	dir = 9
 	},
 /obj/structure/cable/yellow{
-	icon_state = "2-4"
-	},
-/obj/effect/turf_decal/number/nine,
-/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
-	dir = 1
+	icon_state = "2-5"
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
@@ -1631,19 +1659,14 @@
 "uj" = (
 /obj/machinery/light/small/built/directional/west,
 /obj/machinery/power/apc/auto_name/directional/north,
-/obj/machinery/light_switch{
-	pixel_x = -25;
-	pixel_y = 25
-	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -20;
-	pixel_y = 10
+	pixel_x = -13;
+	pixel_y = 21
 	},
 /turf/open/floor/carpet/nanoweave/blue,
 /area/ship/bridge)
@@ -1767,7 +1790,6 @@
 /turf/open/floor/plating,
 /area/ship/crew)
 "vs" = (
-/obj/machinery/airalarm/directional/south,
 /obj/effect/turf_decal/industrial/warning/fulltile,
 /obj/machinery/light/small/built/directional/south,
 /obj/structure/sign/warning/biohazard{
@@ -1794,6 +1816,7 @@
 /area/ship/bridge)
 "vE" = (
 /obj/structure/dresser,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/plasteel,
 /area/ship/crew)
 "vX" = (
@@ -1825,7 +1848,7 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/item/wrench,
 /obj/structure/cable/yellow,
-/obj/machinery/light/small/directional/south,
+/obj/machinery/airalarm/directional/south,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "wd" = (
@@ -1858,7 +1881,6 @@
 	icon_state = "2-4"
 	},
 /obj/structure/catwalk/over,
-/obj/effect/turf_decal/ntspaceworks_small/left,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "wj" = (
@@ -1989,19 +2011,12 @@
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
 /obj/machinery/button/door{
 	dir = 1;
 	id = "box_engine3";
 	name = "Egnine shutter";
 	pixel_y = -28
 	},
-/obj/machinery/light/small/directional/north,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "yN" = (
@@ -2026,6 +2041,9 @@
 /obj/structure/closet/crate/freezer/surplus_limbs,
 /obj/item/reagent_containers/glass/beaker/synthflesh,
 /obj/effect/turf_decal/corner/opaque/lightgrey/diagonal,
+/obj/structure/sign/poster/official/random{
+	pixel_y = -32
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "zy" = (
@@ -2054,6 +2072,15 @@
 /obj/machinery/sleeper{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -21;
+	pixel_y = -10
+	},
+/obj/item/radio/intercom/directional/west{
+	pixel_x = -41;
+	pixel_y = -3
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/medical)
 "AH" = (
@@ -2194,20 +2221,13 @@
 /obj/item/mop,
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable,
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = 11;
-	pixel_y = -16
-	},
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Dm" = (
 /obj/structure/catwalk/over,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 8
-	},
+/obj/item/cigbutt/roach,
 /obj/item/reagent_containers/food/snacks/burrito,
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
 /area/ship/external)
 "Dr" = (
 /obj/machinery/door/airlock{
@@ -2229,10 +2249,10 @@
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 4
 	},
-/obj/structure/catwalk/over,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
 	},
+/obj/machinery/light/small/broken/directional/north,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "ED" = (
@@ -2295,6 +2315,11 @@
 /obj/effect/turf_decal/trimline/opaque/yellow/filled/corner{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 10;
+	pixel_y = -19
+	},
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Gb" = (
@@ -2304,9 +2329,6 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-6"
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -2356,16 +2378,24 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "HM" = (
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/structure/railing{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/unary/portables_connector/layer2,
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/structure/railing{
+/obj/machinery/power/terminal{
 	dir = 4
 	},
+/obj/structure/cable/yellow{
+	icon_state = "0-10"
+	},
+/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/structure/rack,
+/obj/item/areaeditor/shuttle,
+/obj/item/flashlight{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = 4
+	},
+/obj/item/bot_assembly/hygienebot,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Ic" = (
@@ -2388,15 +2418,12 @@
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/medical)
 "In" = (
-/obj/machinery/airalarm/directional/north,
-/obj/effect/turf_decal/industrial/outline/yellow,
 /obj/machinery/power/smes/engineering{
 	charge = 1e+006
 	},
 /obj/structure/cable{
 	icon_state = "0-10"
 	},
-/obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Ja" = (
@@ -2416,11 +2443,13 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
+"Jy" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/crew/toilet)
 "JI" = (
 /obj/structure/chair/office/light{
 	dir = 1
 	},
-/obj/machinery/light/small/directional/south,
 /obj/effect/turf_decal/corner/opaque/blue{
 	dir = 8
 	},
@@ -2471,8 +2500,8 @@
 "Lf" = (
 /obj/structure/table,
 /obj/machinery/microwave,
-/obj/machinery/airalarm/directional/north,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/light/small/directional/north,
 /turf/open/floor/wood,
 /area/ship/crew)
 "Ln" = (
@@ -2509,20 +2538,15 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
-/obj/structure/closet/wall/white/chem{
-	dir = 4;
-	pixel_y = -32;
+/obj/structure/sign/departments/restroom{
 	pixel_x = -32
 	},
-/obj/item/storage/box/pillbottles,
-/obj/item/clothing/suit/longcoat/chemist,
-/obj/item/reagent_containers/dropper,
-/obj/item/clothing/head/beret/chem,
-/obj/effect/turf_decal/spline/fancy/opaque/lightgrey{
-	dir = 8
+/obj/effect/turf_decal/siding/white{
+	dir = 5
 	},
-/turf/open/floor/plasteel/freezer,
-/area/ship/crew)
+/obj/structure/table/chem,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/toilet)
 "Mi" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/medical/morgue)
@@ -2551,16 +2575,19 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/medical)
 "NT" = (
-/obj/machinery/airalarm/directional/south,
-/obj/effect/turf_decal/siding/white{
-	dir = 1
+/obj/effect/turf_decal/siding/white/corner{
+	dir = 4
 	},
-/obj/structure/frame/machine,
-/obj/item/stack/cable_coil/cyan{
-	amount = 5
+/obj/structure/table/chem,
+/obj/machinery/reagentgrinder{
+	pixel_y = 14
 	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/crew)
+/obj/structure/sign/poster/official/moth/meth{
+	pixel_y = -32
+	},
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/toilet)
 "OF" = (
 /obj/machinery/fax,
 /obj/structure/table/reinforced,
@@ -2568,10 +2595,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "OS" = (
-/obj/machinery/door/airlock{
-	dir = 4;
-	name = "Restroom"
-	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
@@ -2584,19 +2607,31 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/airlock{
+	pixel_x = "chemistry";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
-/area/ship/crew)
+/area/ship/crew/toilet)
 "Ps" = (
 /obj/structure/catwalk/over,
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	dir = 8
 	},
 /obj/item/chair/plastic,
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
 /area/ship/external)
 "Qh" = (
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 12;
+	pixel_y = -17
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "QD" = (
@@ -2678,6 +2713,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
 	},
+/obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/wood,
 /area/ship/crew)
 "Tr" = (
@@ -2697,18 +2733,16 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/medical/morgue)
 "UA" = (
-/obj/structure/rack,
-/obj/item/storage/toolbox/mechanical{
-	pixel_y = 4
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
 	},
-/obj/item/flashlight{
-	pixel_x = 3;
-	pixel_y = 3
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
 	},
-/obj/item/areaeditor/shuttle,
-/obj/effect/spawner/lootdrop/maintenance/three,
-/obj/item/bot_assembly/hygienebot,
-/obj/effect/turf_decal/number/four,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/light/small/directional/south,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "UN" = (
@@ -2808,17 +2842,19 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "XD" = (
-/obj/machinery/firealarm/directional/west,
-/obj/structure/curtain,
-/obj/machinery/shower{
-	pixel_y = 15
+/obj/machinery/door/airlock{
+	dir = 4;
+	name = "Restroom";
+	id_tag = "boxbathroom"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
 	},
-/obj/machinery/door/window/survival_pod{
+/obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
-/obj/item/soap,
-/turf/open/floor/mineral/titanium/airless,
-/area/ship/crew)
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/toilet)
 "XN" = (
 /obj/structure/extinguisher_cabinet/directional/north,
 /obj/effect/turf_decal/siding/thinplating/dark{
@@ -2851,6 +2887,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/crew)
 "Ye" = (
@@ -2882,6 +2921,9 @@
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 6
 	},
+/obj/structure/sign/poster/random{
+	pixel_y = -32
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/medical)
 "Yj" = (
@@ -2978,9 +3020,9 @@ aa
 aa
 at
 cG
-cu
+at
 Dm
-cu
+at
 yI
 at
 aa
@@ -2997,11 +3039,11 @@ aa
 aa
 aa
 at
-AH
+DP
 by
 Ps
 cc
-yA
+UA
 at
 aa
 aa
@@ -3017,11 +3059,11 @@ aa
 aa
 aa
 at
-Gi
+AH
 at
 bo
 at
-lM
+yA
 at
 aa
 aa
@@ -3037,11 +3079,11 @@ aa
 aa
 aS
 at
-DP
+Gi
 at
 aa
 at
-eP
+lM
 at
 aS
 aa
@@ -3162,10 +3204,10 @@ bq
 aa
 at
 In
-iQ
-UA
-at
-aS
+cF
+cF
+cF
+Jy
 aa
 aa
 "}
@@ -3182,10 +3224,10 @@ bq
 hQ
 al
 al
-at
-at
-at
-at
+cF
+cu
+bw
+cF
 aa
 aa
 "}
@@ -3202,11 +3244,11 @@ QM
 bM
 VQ
 Ic
-tD
+cF
 XD
 ss
-tD
-nQ
+cF
+Jy
 aa
 "}
 (15,1,1) = {"
@@ -3226,7 +3268,7 @@ cF
 hS
 LV
 NT
-tD
+cF
 aa
 "}
 (16,1,1) = {"
@@ -3246,7 +3288,7 @@ cE
 cO
 cZ
 cK
-tD
+cF
 aa
 "}
 (17,1,1) = {"
@@ -3266,7 +3308,7 @@ cQ
 cP
 da
 ja
-tD
+cF
 aa
 "}
 (18,1,1) = {"
@@ -3282,11 +3324,11 @@ dr
 Bh
 tT
 jk
-tD
-tD
+cF
+cF
 OS
-tD
-tD
+cF
+cF
 cY
 "}
 (19,1,1) = {"
@@ -3417,11 +3459,11 @@ aq
 bc
 jI
 zl
-bw
+al
 gB
 fJ
 Yg
-cw
+al
 vE
 cV
 di
diff --git a/_maps/shuttles/shiptest/independent_litieguai.dmm b/_maps/shuttles/shiptest/independent_litieguai.dmm
index 16fb276dc808..9e64a8e4407a 100644
--- a/_maps/shuttles/shiptest/independent_litieguai.dmm
+++ b/_maps/shuttles/shiptest/independent_litieguai.dmm
@@ -54,9 +54,6 @@
 /area/ship/storage)
 "bC" = (
 /obj/item/radio/intercom/directional/south,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
-	},
 /obj/effect/turf_decal/industrial/outline/red,
 /obj/machinery/autolathe,
 /turf/open/floor/plasteel/tech,
@@ -83,7 +80,7 @@
 "cn" = (
 /obj/effect/turf_decal/trimline/opaque/red/filled/warning,
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "cs" = (
 /obj/machinery/defibrillator_mount/loaded{
 	pixel_y = -32
@@ -91,7 +88,7 @@
 /obj/effect/turf_decal/industrial/loading{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/tech,
 /area/ship/medical)
 "cI" = (
 /obj/effect/turf_decal/trimline/opaque/red/filled/line{
@@ -202,7 +199,7 @@
 /area/ship/crew)
 "eS" = (
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "fa" = (
 /obj/structure/table,
 /obj/effect/spawner/lootdrop/ration,
@@ -229,7 +226,7 @@
 /obj/machinery/stasis,
 /obj/effect/turf_decal/industrial/outline/red,
 /obj/machinery/light/directional/west,
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/medical)
 "go" = (
 /obj/effect/turf_decal/corner/opaque/red/full,
@@ -246,10 +243,10 @@
 	icon_state = "2-8"
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "gL" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "gO" = (
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -268,7 +265,7 @@
 	name = "Lobby"
 	},
 /turf/open/floor/engine,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "hq" = (
 /turf/open/floor/plasteel/stairs/right{
 	dir = 8
@@ -278,10 +275,10 @@
 /obj/effect/turf_decal/arrows/red{
 	dir = 8
 	},
-/obj/effect/turf_decal/siding/thinplating/dark{
+/obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/patterned/grid,
 /area/ship/storage)
 "hF" = (
 /obj/structure/table/reinforced,
@@ -297,7 +294,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/medical)
 "hT" = (
 /obj/machinery/power/apc/auto_name/directional/south,
@@ -308,7 +305,7 @@
 	},
 /obj/machinery/light_switch{
 	dir = 1;
-	pixel_x = -12;
+	pixel_x = -13;
 	pixel_y = -16
 	},
 /turf/open/floor/vault,
@@ -324,7 +321,7 @@
 	},
 /obj/effect/turf_decal/corner/opaque/white/mono,
 /turf/open/floor/plasteel/white,
-/area/ship/medical)
+/area/ship/cargo)
 "iA" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/crew)
@@ -333,6 +330,9 @@
 	dir = 4
 	},
 /obj/machinery/airalarm/directional/south,
+/obj/structure/sign/poster/official/cleanliness{
+	pixel_x = -32
+	},
 /turf/open/floor/plasteel/freezer,
 /area/ship/crew/toilet)
 "iP" = (
@@ -391,8 +391,8 @@
 /obj/item/radio/intercom/directional/east,
 /obj/machinery/power/terminal,
 /obj/structure/cable/yellow,
-/obj/structure/reagent_dispensers/fueltank,
 /obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "kO" = (
@@ -439,7 +439,7 @@
 	pixel_y = -1
 	},
 /obj/item/reagent_containers/medigel/sterilizine,
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/medical)
 "kR" = (
 /obj/machinery/computer/crew,
@@ -457,6 +457,11 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
+/obj/machinery/light_switch{
+	pixel_x = 19;
+	pixel_y = 13;
+	dir = 8
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "lj" = (
@@ -467,7 +472,7 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/tech,
 /area/ship/medical)
 "lF" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -492,7 +497,7 @@
 	icon_state = "1-4"
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "lY" = (
 /obj/machinery/door/airlock/medical{
 	dir = 4;
@@ -637,7 +642,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "oH" = (
 /obj/effect/turf_decal/trimline/opaque/red/filled/warning{
 	dir = 1
@@ -651,7 +656,7 @@
 	icon_state = "1-4"
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "oQ" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/window/southleft,
@@ -689,7 +694,7 @@
 	pixel_y = -4
 	},
 /turf/open/floor/plating,
-/area/ship/medical)
+/area/ship/cargo)
 "oS" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
@@ -711,7 +716,7 @@
 /obj/machinery/light_switch{
 	dir = 1;
 	pixel_x = -12;
-	pixel_y = -16
+	pixel_y = -13
 	},
 /turf/open/floor/plasteel/freezer,
 /area/ship/crew/toilet)
@@ -769,7 +774,7 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "ru" = (
 /obj/effect/turf_decal/trimline/opaque/red/filled/warning{
 	dir = 8
@@ -795,7 +800,7 @@
 	},
 /obj/machinery/light_switch{
 	dir = 1;
-	pixel_x = -12;
+	pixel_x = -13;
 	pixel_y = -16
 	},
 /turf/open/floor/carpet/nanoweave,
@@ -890,7 +895,7 @@
 /obj/item/kirbyplants/random,
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "tO" = (
 /obj/structure/closet/secure_closet{
 	icon_state = "med_secure";
@@ -899,7 +904,6 @@
 /obj/machinery/airalarm/directional/south,
 /obj/item/clothing/glasses/hud/health,
 /obj/item/clothing/glasses/hud/health,
-/obj/structure/extinguisher_cabinet/directional/north,
 /obj/item/clothing/glasses/hud/health,
 /obj/item/healthanalyzer,
 /obj/item/healthanalyzer,
@@ -907,15 +911,13 @@
 /obj/item/storage/backpack/satchel/med,
 /obj/item/storage/backpack/satchel/med,
 /obj/item/storage/backpack/satchel/med,
-/obj/item/clothing/under/rank/medical,
-/obj/item/clothing/under/rank/medical,
-/obj/item/clothing/under/rank/medical,
-/obj/item/clothing/under/rank/medical,
-/obj/item/clothing/under/rank/medical,
-/obj/item/clothing/under/rank/medical,
 /obj/item/clothing/shoes/sneakers/blue,
 /obj/item/clothing/shoes/sneakers/blue,
 /obj/item/clothing/shoes/sneakers/blue,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/item/clothing/under/rank/medical/paramedic/emt,
+/obj/item/clothing/under/rank/medical/paramedic/emt,
+/obj/item/clothing/under/rank/medical/paramedic/emt,
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew)
 "tT" = (
@@ -923,11 +925,8 @@
 /obj/structure/chair{
 	dir = 8
 	},
-/obj/structure/sign/poster/official/soft_cap_pop_art{
-	pixel_x = 32
-	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "tW" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/effect/turf_decal/corner/opaque/white/mono,
@@ -951,7 +950,7 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/tech,
 /area/ship/medical)
 "uq" = (
 /obj/structure/table/reinforced,
@@ -965,15 +964,14 @@
 /obj/item/folder/white,
 /obj/item/pen,
 /turf/open/floor/plating,
-/area/ship/medical)
+/area/ship/cargo)
 "ur" = (
 /obj/effect/turf_decal/trimline/opaque/red/filled/line{
 	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "uE" = (
-/obj/machinery/light/directional/south,
 /obj/structure/window/reinforced/tinted/frosted{
 	dir = 8
 	},
@@ -982,6 +980,7 @@
 	},
 /obj/machinery/rnd/production/techfab/department/medical,
 /obj/effect/turf_decal/industrial/hatch/red,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "uN" = (
@@ -995,14 +994,16 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "uW" = (
 /obj/structure/chair{
 	dir = 8
 	},
-/obj/structure/extinguisher_cabinet/directional/north,
+/obj/structure/sign/poster/official/soft_cap_pop_art{
+	pixel_x = 32
+	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "ve" = (
 /obj/structure/table/reinforced,
 /obj/structure/window/reinforced{
@@ -1016,7 +1017,7 @@
 /obj/machinery/door/firedoor/border_only,
 /obj/effect/turf_decal/industrial/hatch/red,
 /turf/open/floor/plating,
-/area/ship/medical)
+/area/ship/cargo)
 "vj" = (
 /obj/effect/turf_decal/trimline/opaque/red/filled/warning{
 	dir = 1
@@ -1027,11 +1028,11 @@
 	},
 /obj/machinery/light_switch{
 	dir = 8;
-	pixel_x = 20;
-	pixel_y = 14
+	pixel_x = 19;
+	pixel_y = 13
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "vn" = (
 /obj/effect/turf_decal/trimline/opaque/red/filled/line{
 	dir = 8
@@ -1077,8 +1078,8 @@
 /obj/item/storage/toolbox/electrical,
 /obj/machinery/light_switch{
 	dir = 8;
-	pixel_x = 20;
-	pixel_y = 14
+	pixel_x = 19;
+	pixel_y = 13
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
@@ -1112,7 +1113,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "yi" = (
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable{
@@ -1124,7 +1125,7 @@
 /obj/machinery/light_switch{
 	dir = 4;
 	pixel_x = -20;
-	pixel_y = 10
+	pixel_y = 13
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
@@ -1147,7 +1148,7 @@
 /obj/structure/bodycontainer/morgue{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/tech,
 /area/ship/medical)
 "zE" = (
 /obj/structure/cable{
@@ -1187,38 +1188,26 @@
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
-"Aj" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/line{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/firealarm/directional/west,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/fore)
 "AG" = (
-/obj/effect/turf_decal/siding/thinplating/dark,
 /obj/structure/railing{
 	dir = 6
 	},
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/turf/open/floor/plasteel/patterned/grid,
 /area/ship/storage)
 "AJ" = (
 /turf/closed/wall/mineral/titanium,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "Bl" = (
 /obj/effect/turf_decal/corner/opaque/red/full,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "BH" = (
 /obj/machinery/power/shieldwallgen/atmos/roundstart{
 	dir = 1;
@@ -1277,7 +1266,7 @@
 	name = "Lobby"
 	},
 /turf/open/floor/engine,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "Cr" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -1289,9 +1278,10 @@
 	},
 /obj/machinery/light_switch{
 	dir = 4;
-	pixel_x = -20;
+	pixel_x = -21;
 	pixel_y = 10
 	},
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/fore)
 "CX" = (
@@ -1356,7 +1346,6 @@
 /obj/item/storage/box/gloves,
 /obj/item/storage/box/masks,
 /obj/item/storage/box/bodybags,
-/obj/machinery/firealarm/directional/east,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "DU" = (
@@ -1367,7 +1356,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/medical)
 "Ev" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
@@ -1396,7 +1385,6 @@
 /obj/item/lighter{
 	pixel_x = -8
 	},
-/obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Go" = (
@@ -1412,7 +1400,7 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/tech,
 /area/ship/medical)
 "Gs" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
@@ -1482,7 +1470,7 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/tech,
 /area/ship/medical)
 "HP" = (
 /turf/open/floor/carpet/nanoweave/beige,
@@ -1505,13 +1493,14 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "Ja" = (
 /obj/structure/chair{
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "Je" = (
 /obj/machinery/power/terminal,
 /obj/structure/cable/yellow,
@@ -1554,6 +1543,11 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/firealarm/directional/west,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -21;
+	pixel_y = -10
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew)
 "Ko" = (
@@ -1600,7 +1594,6 @@
 /obj/item/clothing/glasses/science,
 /obj/item/reagent_containers/glass/beaker/large,
 /obj/item/reagent_containers/glass/beaker/large,
-/obj/machinery/airalarm/directional/east,
 /obj/structure/closet/wall/white/chem{
 	dir = 1;
 	name = "Chemistry Locker";
@@ -1608,12 +1601,13 @@
 	},
 /obj/item/storage/backpack/satchel/chem,
 /obj/item/clothing/head/beret/chem,
+/obj/machinery/light/directional/east,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "KW" = (
 /obj/structure/sign/departments/medbay/alt,
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "Lh" = (
 /obj/machinery/atmospherics/components/binary/pump/on/layer2,
 /obj/structure/closet/firecloset/wall{
@@ -1640,11 +1634,11 @@
 /obj/effect/turf_decal/arrows/red{
 	dir = 8
 	},
-/obj/effect/turf_decal/siding/thinplating/dark/corner,
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/effect/turf_decal/spline/fancy/opaque/black/corner,
+/turf/open/floor/plasteel/patterned/grid,
 /area/ship/storage)
 "Lt" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -1665,13 +1659,13 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
-	},
 /obj/effect/turf_decal/siding/white,
 /obj/effect/turf_decal/siding/white{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/vault,
 /area/ship/storage)
 "Ml" = (
@@ -1705,15 +1699,8 @@
 /area/ship/maintenance/starboard)
 "MK" = (
 /obj/effect/turf_decal/industrial/outline/red,
-/obj/structure/rack,
-/obj/item/pickaxe/emergency{
-	desc = "For extracting yourself from rough landings, and getting to the even rougher ones";
-	name = "Medical Retrieval Tool"
-	},
-/obj/item/pickaxe/emergency{
-	desc = "For extracting yourself from rough landings, and getting to the even rougher ones";
-	name = "Medical Retrieval Tool"
-	},
+/obj/structure/railing/corner,
+/obj/machinery/vending/medical,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/storage)
 "MN" = (
@@ -1811,7 +1798,7 @@
 /obj/machinery/airalarm/directional/south,
 /obj/effect/turf_decal/industrial/hatch/red,
 /obj/structure/closet/crate/freezer/surplus_limbs/organs,
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/tech,
 /area/ship/medical)
 "OB" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -1834,7 +1821,7 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/tech,
 /area/ship/medical)
 "Pp" = (
 /obj/effect/turf_decal/corner/opaque/white/mono,
@@ -1907,8 +1894,11 @@
 "Qp" = (
 /obj/machinery/vending/snack/random,
 /obj/effect/turf_decal/trimline/opaque/red/filled/line,
+/obj/structure/sign/poster/official/cleanliness{
+	pixel_x = -32
+	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "Qq" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/medical)
@@ -1963,11 +1953,6 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -20;
-	pixel_y = 10
-	},
 /turf/open/floor/plasteel,
 /area/ship/crew)
 "QY" = (
@@ -2001,7 +1986,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "Rs" = (
 /obj/effect/turf_decal/trimline/opaque/red/filled/warning{
 	dir = 8
@@ -2028,7 +2013,7 @@
 	density = 0;
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/medical)
 "RW" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -2068,10 +2053,10 @@
 /obj/effect/turf_decal/arrows/red{
 	dir = 8
 	},
-/obj/effect/turf_decal/siding/thinplating/dark{
+/obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/patterned/grid,
 /area/ship/storage)
 "Sy" = (
 /obj/machinery/stasis,
@@ -2080,7 +2065,7 @@
 	density = 0;
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/medical)
 "SH" = (
 /obj/machinery/light/directional/east,
@@ -2147,6 +2132,9 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/closet/secure_closet/medical2,
+/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/glass/bottle/morphine,
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "TI" = (
@@ -2171,7 +2159,7 @@
 	name = "Lobby"
 	},
 /turf/open/floor/engine,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "TR" = (
 /obj/structure/chair,
 /obj/effect/landmark/start/assistant,
@@ -2301,7 +2289,7 @@
 	},
 /obj/effect/turf_decal/corner/opaque/white/mono,
 /turf/open/floor/plasteel/white,
-/area/ship/medical)
+/area/ship/cargo)
 "Vs" = (
 /obj/item/radio/intercom/wideband/directional/south,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -2327,7 +2315,7 @@
 	},
 /obj/item/reagent_containers/syringe,
 /obj/item/radio/intercom/directional/north,
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/medical)
 "VM" = (
 /obj/machinery/power/smes/shuttle/precharged{
@@ -2353,9 +2341,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/structure/sign/poster/official/cleanliness{
-	pixel_y = -32
-	},
 /turf/open/floor/plasteel/freezer,
 /area/ship/crew/toilet)
 "Wc" = (
@@ -2453,7 +2438,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "Xs" = (
 /obj/machinery/light/small/directional/south{
 	pixel_x = 17
@@ -2537,18 +2522,15 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/tech,
 /area/ship/medical)
 "YI" = (
 /obj/machinery/light/directional/west,
 /obj/structure/chair{
 	dir = 4
 	},
-/obj/structure/sign/poster/official/cleanliness{
-	pixel_x = -32
-	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 "YK" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -2566,11 +2548,6 @@
 	dir = 1
 	},
 /obj/structure/extinguisher_cabinet/directional/west,
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -20;
-	pixel_y = 10
-	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "YM" = (
@@ -2592,14 +2569,14 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/tech,
 /area/ship/medical)
 "ZO" = (
 /obj/machinery/vending/cola/random,
 /obj/effect/turf_decal/trimline/opaque/red/filled/line,
 /obj/machinery/firealarm/directional/east,
 /turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/cargo)
 
 (1,1,1) = {"
 UG
@@ -2802,7 +2779,7 @@ OA
 YM
 YM
 JA
-YM
+gL
 gL
 Rh
 gL
@@ -2880,7 +2857,7 @@ Wc
 Ll
 Pr
 BK
-Aj
+Ll
 sM
 Cr
 vn
@@ -2982,7 +2959,7 @@ ck
 YM
 YM
 JA
-YM
+gL
 gL
 Xj
 gL