diff --git a/_maps/shuttles/shiptestHISPANIA/independent_mantarraya.dmm b/_maps/shuttles/shiptestHISPANIA/independent_mantarraya.dmm
index a7d606c986bf..7478be7996d8 100644
--- a/_maps/shuttles/shiptestHISPANIA/independent_mantarraya.dmm
+++ b/_maps/shuttles/shiptestHISPANIA/independent_mantarraya.dmm
@@ -26,72 +26,59 @@
 	pixel_x = 6;
 	pixel_y = 5
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "aw" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/poddoor{
 	id = "the_cage"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+/obj/effect/turf_decal/trimline/opaque/yellow/warning{
+	dir = 1
 	},
-/turf/open/floor/plating,
-/area/ship/crew/toilet)
+/turf/open/floor/plating/catwalk_floor,
+/area/ship/crew/toilet/nolight)
 "ax" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/button/door{
-	id = "the_cage2";
-	pixel_x = 24;
-	pixel_y = -24;
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/light_switch{
+/obj/machinery/computer/helm/viewscreen/directional/west,
+/obj/machinery/light/small/directional/west{
+	pixel_x = -44
+	},
+/obj/effect/turf_decal/trimline/opaque/yellow/warning{
 	dir = 1;
-	pixel_x = 22;
-	pixel_y = -34
+	pixel_y = 5
 	},
-/turf/open/floor/plasteel/tech/grid,
+/turf/open/floor/plasteel/tech,
 /area/ship/crew/crewtwo)
 "aE" = (
-/obj/effect/turf_decal/corner/opaque/black/border,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/turf/open/floor/plasteel/tech,
-/area/ship/crew)
+/obj/effect/spawner/lootdrop/maintenance/eight,
+/turf/open/floor/plating/ship/water,
+/area/ship/crew/toilet/nolight)
 "aG" = (
-/obj/structure/marker_beacon{
-	picked_color = "Yellow"
-	},
+/obj/effect/turf_decal/trimline/opaque/yellow/warning,
+/obj/effect/turf_decal/number/six,
 /turf/open/floor/engine/hull/reinforced,
 /area/ship/external/dark)
 "aP" = (
 /obj/effect/decal/cleanable/cobweb,
 /obj/machinery/light/small/directional/north,
+/obj/structure/mecha_wreckage/ripley,
 /turf/open/floor/plating/ship/water,
-/area/ship/crew/toilet)
+/area/ship/crew/toilet/nolight)
 "aS" = (
-/obj/effect/turf_decal/corner/opaque/black/border{
-	dir = 5
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "cageholo"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+/obj/machinery/door/poddoor{
+	id = "cagemain2"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
+/obj/structure/cable{
+	icon_state = "0-2"
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/crew)
+/turf/open/floor/plating,
+/area/ship/crew/crewtwo)
 "bi" = (
 /obj/structure/window/reinforced/spawner/east,
 /obj/machinery/power/shuttle/engine/electric{
@@ -101,14 +88,14 @@
 	icon_state = "0-4"
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "bu" = (
 /obj/machinery/vending/boozeomat/all_access,
 /turf/open/floor/plasteel/tech,
 /area/ship/crew)
 "bC" = (
 /turf/closed/wall/r_wall/rust,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "bG" = (
 /obj/structure/grille,
 /obj/structure/window/fulltile,
@@ -116,41 +103,62 @@
 	id = "cage_thrusters_starboard"
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "bQ" = (
-/obj/structure/disposaloutlet{
-	dir = 8;
-	pixel_x = 12
-	},
-/obj/structure/disposalpipe/trunk{
-	dir = 4;
-	pixel_x = 13
-	},
-/turf/open/floor/plating/ship/water,
-/area/ship/crew/toilet)
-"bX" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 8
 	},
-/obj/machinery/holopad/secure,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/airlock/public{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/crew/crewtwo)
-"co" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/structure/railing{
-	dir = 1
+/area/ship/crew)
+"bX" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/wall/blue{
+	dir = 8;
+	pixel_x = 32
+	},
+/obj/item/stack/sheet/mineral/plasma/five{
+	pixel_x = 1;
+	pixel_y = -5
 	},
-/obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
-	icon_state = "0-8"
+	icon_state = "1-2"
 	},
-/obj/machinery/light/small/directional/east{
-	pixel_x = 38
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/catwalk/over,
+/obj/item/crowbar/red,
+/obj/item/storage/fancy/cigarettes/derringer,
+/obj/item/lighter,
+/turf/open/floor/plating,
+/area/ship/engineering/nolight)
+"co" = (
+/obj/machinery/firealarm/directional/east,
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 8
 	},
-/turf/open/floor/plasteel/tech,
+/obj/effect/turf_decal/trimline/opaque/yellow/corner{
+	dir = 8;
+	pixel_y = 16
+	},
+/obj/structure/reagent_dispensers/watertank,
+/obj/item/reagent_containers/glass/bucket{
+	pixel_y = -7
+	},
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/crewtwo)
 "cF" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -172,27 +180,31 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/crew/crewtwo)
+/area/ship/crew)
 "cK" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor{
-	id = "the_cage"
+/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/structure/closet/crate/trashcart,
+/turf/open/floor/plating/ship/water,
+/area/ship/crew/toilet/nolight)
+"cW" = (
+/obj/machinery/disposal/deliveryChute{
+	dir = 4;
+	pixel_x = -13;
+	pixel_y = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
+/obj/structure/disposalpipe/trunk{
+	dir = 8;
+	pixel_x = -13
 	},
-/turf/open/floor/plating,
-/area/ship/crew/toilet)
-"cW" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
+/obj/machinery/door/window/northleft{
+	dir = 4;
+	name = "Cage Access";
+	color = "#B47B31"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/effect/turf_decal/corner/opaque/black/border{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
+/obj/effect/turf_decal/industrial/warning/fulltile,
 /turf/open/floor/plasteel/tech,
 /area/ship/crew)
 "dm" = (
@@ -209,11 +221,8 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "dw" = (
-/obj/machinery/light_switch{
-	pixel_y = -23
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
 	},
@@ -223,7 +232,7 @@
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
-/area/ship/crew/toilet)
+/area/ship/crew/toilet/nolight)
 "dS" = (
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
@@ -233,6 +242,22 @@
 	dir = 1
 	},
 /area/ship/crew)
+"ec" = (
+/obj/structure/bed/double/maint,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/item/switchblade{
+	pixel_x = -6
+	},
+/obj/item/reagent_containers/food/drinks/beer/light{
+	pixel_x = 7;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/food/drinks/beer/light{
+	pixel_x = 2;
+	pixel_y = -1
+	},
+/turf/open/floor/plating,
+/area/ship/crew)
 "el" = (
 /obj/structure/table/reinforced,
 /obj/item/radio/intercom/wideband/table{
@@ -264,79 +289,76 @@
 	pixel_x = -22;
 	pixel_y = 35
 	},
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/crew/toilet)
+/area/ship/crew/toilet/nolight)
 "ex" = (
-/obj/effect/turf_decal/techfloor/corner{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/wrapping,
+/obj/effect/turf_decal/corner/opaque/black/border,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
+	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
-	},
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
+	dir = 5
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/structure/railing/wood{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "1-4"
 	},
-/obj/item/storage/backpack/messenger,
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "fc" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/borderfloorblack/full,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "fl" = (
 /turf/closed/wall/rust,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "fr" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-4"
 	},
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/effect/turf_decal/trimline/opaque/yellow/warning{
+	dir = 1;
+	pixel_y = 5
 	},
-/turf/open/floor/plasteel/tech/grid,
+/turf/open/floor/plasteel/tech,
 /area/ship/crew/crewtwo)
 "fG" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/machinery/computer/helm/viewscreen/directional/west,
-/obj/machinery/light/small/directional/west{
-	pixel_x = -44
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/crew/crewtwo)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -22;
+	pixel_y = -34
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/toilet/nolight)
 "fV" = (
 /obj/structure/closet/crate/engineering{
 	anchored = 1
 	},
 /obj/item/storage/toolbox/mechanical,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/storage/toolbox/mechanical,
 /obj/item/decal_painter,
 /obj/item/storage/belt,
 /obj/item/storage/belt,
 /obj/item/pipe_dispenser,
 /obj/item/storage/toolbox/electrical,
-/obj/item/storage/toolbox/electrical,
 /obj/effect/turf_decal/industrial/outline/orange,
 /obj/item/stack/cable_coil/random/five,
 /obj/item/stack/cable_coil/random/five,
 /obj/item/stack/cable_coil/random/five,
-/turf/open/floor/pod/dark,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "gv" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -357,7 +379,7 @@
 	pixel_x = -32
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "gG" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 4
@@ -365,39 +387,44 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "hz" = (
-/obj/machinery/telecomms/relay,
 /obj/machinery/light/directional/east,
-/turf/open/floor/plasteel/telecomms_floor,
+/obj/machinery/rnd/server,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
 /area/ship/crew)
-"ii" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
+"hD" = (
+/obj/docking_port/stationary{
+	dwidth = 15;
+	width = 30;
+	height = 15;
+	dir = 2
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
 	},
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
+"ii" = (
+/obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "0-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/machinery/light/small/directional/east{
+	pixel_x = 38
 	},
-/obj/machinery/button/door{
-	id = "the_cage";
-	pixel_x = 24;
-	pixel_y = 24
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
 	},
-/obj/machinery/light_switch{
+/obj/effect/turf_decal/trimline/opaque/yellow/warning{
 	dir = 1;
-	pixel_x = 22;
-	pixel_y = 35
+	pixel_y = 5
 	},
-/turf/open/floor/plasteel/tech/grid,
+/turf/open/floor/plasteel/tech,
 /area/ship/crew/crewtwo)
 "ip" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 1
-	},
 /obj/structure/bed/double/maint{
 	dir = 1
 	},
@@ -408,14 +435,20 @@
 	pixel_x = 7;
 	pixel_y = 24
 	},
-/turf/open/floor/plasteel/tech,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
 /area/ship/crew)
 "iN" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/warning{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
 	},
-/obj/structure/closet/crate/trashcart,
-/turf/open/floor/pod/dark,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/crewtwo)
 "jv" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -426,46 +459,43 @@
 /obj/structure/catwalk/over,
 /obj/item/storage/overmap_ship/electric/directional/east,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "jO" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/wall/blue{
-	dir = 8;
-	pixel_x = 32
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
 	},
-/obj/item/stack/sheet/mineral/plasma/five{
-	pixel_x = 1;
-	pixel_y = -5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/catwalk/over,
-/obj/item/stack/sheet/mineral/plasma/five{
-	pixel_x = -5;
-	pixel_y = 3
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew)
 "kn" = (
-/obj/structure/chair/pew/right,
-/obj/machinery/computer/security/telescreen/entertainment{
-	pixel_y = 2;
-	pixel_x = 32
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 24;
+	pixel_y = 18
 	},
-/turf/open/floor/plasteel/tech,
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/light/small/directional/east{
+	pixel_x = 38
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew/crewtwo)
 "kA" = (
 /obj/structure/catwalk/over,
-/obj/item/gun/energy/dueling{
-	pixel_x = -6;
-	pixel_y = 7
-	},
-/obj/item/gun/energy/dueling{
-	pixel_x = -7;
-	pixel_y = 11
-	},
 /obj/structure/closet/secure_closet/wall{
 	dir = 4;
 	icon_door = "sec_wall";
@@ -474,9 +504,6 @@
 	pixel_x = -32;
 	req_access_txt = "151"
 	},
-/obj/item/gun/ballistic/automatic/pistol/commissar{
-	pixel_x = -2
-	},
 /obj/item/ammo_box/magazine/co9mm/ap,
 /obj/item/ammo_box/magazine/co9mm/ap{
 	pixel_x = 9
@@ -484,55 +511,61 @@
 /obj/item/ammo_box/magazine/co9mm/ap{
 	pixel_x = 4
 	},
-/obj/item/reagent_containers/syringe/contraband{
-	pixel_x = 2;
-	pixel_y = 4
+/obj/item/gun/ballistic/automatic/pistol/commander,
+/obj/item/kitchen/knife/hunting,
+/obj/item/grenade/frag,
+/obj/item/reagent_containers/syringe/contraband/krokodil,
+/obj/item/reagent_containers/syringe/contraband/bath_salts{
+	pixel_x = 4
 	},
-/obj/item/reagent_containers/syringe/contraband{
-	pixel_x = 5;
-	pixel_y = 4
+/obj/item/reagent_containers/syringe/contraband/fentanyl,
+/obj/item/reagent_containers/syringe/contraband/crank{
+	pixel_x = 3
 	},
+/obj/item/ammo_box/c9mm/rubbershot,
+/obj/item/ammo_box/magazine/co9mm/rubbershot,
 /turf/open/floor/plating,
 /area/ship/crew)
 "lh" = (
 /obj/machinery/computer/rdconsole{
 	dir = 8
 	},
-/turf/open/floor/pod/dark,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "lI" = (
-/obj/effect/turf_decal/techfloor/corner,
-/obj/effect/decal/cleanable/oil,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+/obj/effect/turf_decal/corner/opaque/black/border{
+	dir = 6
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
-	},
-/obj/structure/closet/emcloset/wall{
-	pixel_y = -28;
-	dir = 1
+	dir = 10
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
 	},
-/obj/structure/railing/wood{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
-/obj/item/storage/backpack/messenger,
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "lU" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	layer = 1
+/obj/structure/disposaloutlet{
+	dir = 8;
+	pixel_x = 12;
+	density = 0
 	},
+/obj/structure/disposalpipe/trunk{
+	dir = 4;
+	pixel_x = 13
+	},
+/obj/structure/closet/crate,
+/obj/effect/spawner/lootdrop/maintenance/seven,
 /turf/open/floor/plating/ship/water,
-/area/ship/crew/toilet)
+/area/ship/crew/toilet/nolight)
 "ms" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/machinery/light/small/directional/north,
+/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/mapping_helpers/airlock,
 /turf/open/floor/plating/ship/water,
-/area/ship/crew/toilet)
+/area/ship/crew/toilet/nolight)
 "mu" = (
 /obj/machinery/shower{
 	pixel_y = -1;
@@ -542,24 +575,27 @@
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/crew)
-"mO" = (
+"mF" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/trimline/opaque/yellow/warning,
+/obj/effect/turf_decal/number/eight,
 /turf/open/floor/engine/hull/reinforced,
 /area/ship/external/dark)
-"mV" = (
-/obj/structure/fans/tiny,
-/obj/machinery/door/airlock/external/glass,
-/obj/effect/decal/cleanable/oil/slippery,
-/obj/docking_port/mobile{
-	preferred_direction = 4;
-	port_direction = 8;
-	dir = 2
+"mO" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/corner,
+/obj/structure/marker_beacon{
+	picked_color = "Yellow"
 	},
-/turf/open/floor/plating,
-/area/ship/crew)
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
+"mV" = (
+/obj/item/storage/bag/trash,
+/obj/structure/closet/crate/trashcart/laundry,
+/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/lootdrop/maintenance/eight,
+/turf/open/floor/plating/catwalk_floor,
+/area/ship/crew/toilet/nolight)
 "mZ" = (
-/obj/effect/turf_decal/techfloor,
 /obj/machinery/cryopod{
 	dir = 1
 	},
@@ -570,7 +606,8 @@
 	pixel_y = -24;
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
 /area/ship/crew)
 "nv" = (
 /obj/structure/grille,
@@ -582,27 +619,19 @@
 /turf/open/floor/plating,
 /area/ship/crew)
 "oD" = (
-/obj/item/clothing/mask/breath,
-/obj/item/tank/internals/oxygen,
-/obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/structure/railing{
 	dir = 4;
 	layer = 4.1
 	},
-/obj/effect/turf_decal/borderfloorblack/full,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/head/helmet/space/syndicate/black{
-	armor = list("melee"=5,"bullet"=10,"laser"=10,"energy"=10,"bomb"=30,"bio"=30,"rad"=30,"fire"=30,"acid"=85);
-	name = "degrading black space helmet";
-	w_class = 4
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 1
 	},
-/obj/item/clothing/suit/space/syndicate/black{
-	armor = list("melee"=5,"bullet"=10,"laser"=10,"energy"=10,"bomb"=30,"bio"=30,"rad"=30,"fire"=30,"acid"=85);
-	name = "degrading black space suit";
-	w_class = 4
+/obj/effect/turf_decal/box/corners,
+/obj/effect/turf_decal/box/corners{
+	dir = 8
 	},
-/obj/machinery/suit_storage_unit/inherit/industrial,
-/turf/open/floor/plating,
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "oE" = (
 /obj/machinery/power/apc/auto_name/directional/west,
@@ -612,17 +641,17 @@
 /obj/machinery/airalarm/directional/north,
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
-/area/ship/crew/toilet)
+/area/ship/crew/toilet/nolight)
 "oP" = (
 /obj/machinery/light/directional/west,
 /obj/effect/turf_decal/corner/opaque/black/border{
 	dir = 4
 	},
-/obj/structure/window/reinforced/survival_pod,
 /obj/machinery/vending/cigarette,
 /obj/machinery/firealarm/directional/west{
 	pixel_x = -43
 	},
+/obj/structure/railing/wood,
 /turf/open/floor/plasteel/tech,
 /area/ship/crew)
 "pg" = (
@@ -631,7 +660,7 @@
 /obj/machinery/door/airlock/external,
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "pm" = (
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/effect/landmark/observer_start,
@@ -639,22 +668,19 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2,
+/obj/machinery/holopad/emergency/bar,
 /turf/open/floor/plating,
 /area/ship/crew)
 "pB" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/power/port_gen/pacman{
+	anchored = 1
 	},
-/turf/open/floor/plasteel/tech,
+/obj/structure/cable,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/item/stack/sheet/mineral/plasma/five,
+/obj/item/stack/sheet/mineral/plasma/five,
+/turf/open/floor/plating,
 /area/ship/crew)
 "pJ" = (
 /obj/machinery/light/directional/north,
@@ -665,7 +691,7 @@
 /obj/machinery/computer/security/telescreen/entertainment{
 	pixel_y = 35
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "re" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -684,7 +710,7 @@
 /obj/item/flashlight,
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "rp" = (
 /turf/closed/wall/r_wall/rust,
 /area/ship/crew)
@@ -693,34 +719,11 @@
 	pixel_x = -5;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = 2;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = -2
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 5
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 1;
-	pixel_y = -3
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 8;
-	pixel_y = -3
-	},
 /obj/structure/closet/crate{
 	name = "food crate"
 	},
 /obj/item/storage/cans/sixbeer,
 /obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
 /obj/item/storage/cans/sixbeer,
 /obj/item/storage/cans/sixbeer,
 /obj/machinery/power/apc/auto_name/directional/west,
@@ -728,14 +731,29 @@
 	icon_state = "0-4"
 	},
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "sp" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 5
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
 	},
-/obj/structure/bed/double/maint,
-/turf/open/floor/plasteel/tech,
-/area/ship/crew)
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/button/door{
+	id = "the_cage";
+	pixel_x = 24;
+	pixel_y = 24
+	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 22;
+	pixel_y = 32
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/crewtwo)
 "ta" = (
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -746,22 +764,33 @@
 /obj/structure/railing/wood{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "tu" = (
-/obj/effect/turf_decal/corner/opaque/black/border{
-	dir = 1
-	},
+/obj/effect/turf_decal/techfloor/corner,
+/obj/effect/decal/cleanable/oil,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
+	dir = 9
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
+	dir = 9
+	},
+/obj/structure/closet/emcloset/wall{
+	pixel_y = -28;
+	dir = 1
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech,
+/obj/structure/railing/wood{
+	dir = 4
+	},
+/obj/item/storage/backpack/messenger,
+/obj/item/tank/internals/oxygen,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "tF" = (
 /obj/machinery/door/airlock/engineering{
@@ -785,31 +814,35 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/crewtwo)
 "tS" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/plating/catwalk_floor,
-/area/ship/crew/toilet)
+/obj/effect/spawner/lootdrop/maintenance/seven,
+/obj/machinery/button/door{
+	id = "the_cage";
+	pixel_x = 24;
+	pixel_y = -24;
+	dir = 1;
+	req_access_txt = "151"
+	},
+/turf/open/floor/plating/ship/water,
+/area/ship/crew/toilet/nolight)
 "ue" = (
 /obj/machinery/atmospherics/pipe/layer_manifold/visible,
 /turf/closed/wall/rust,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "uZ" = (
-/obj/structure/railing{
-	dir = 4;
-	layer = 4.1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
 	},
-/obj/effect/turf_decal/borderfloorblack{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
 	},
-/obj/effect/turf_decal/box/corners,
-/obj/effect/turf_decal/box/corners{
-	dir = 8
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "vs" = (
 /obj/machinery/autolathe/hacked,
-/turf/open/floor/pod/dark,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "vy" = (
 /obj/machinery/power/terminal{
@@ -818,7 +851,7 @@
 /obj/structure/cable,
 /obj/structure/catwalk/over,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "vE" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/chair/stool/bar,
@@ -830,7 +863,8 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
-/turf/open/floor/plating/airless,
+/obj/effect/turf_decal/trimline/opaque/yellow/warning,
+/turf/open/floor/engine/hull/reinforced,
 /area/ship/external/dark)
 "wC" = (
 /obj/structure/catwalk/over/plated_catwalk/dark,
@@ -846,7 +880,7 @@
 /obj/machinery/computer/security/telescreen/entertainment{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "wX" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -870,55 +904,56 @@
 /turf/closed/wall/rust,
 /area/ship/crew)
 "xF" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/warning{
-	dir = 1
+/obj/effect/turf_decal/techfloor/corner{
+	dir = 4
 	},
-/obj/item/pushbroom{
-	pixel_x = -5;
-	pixel_y = 1
+/obj/effect/decal/cleanable/wrapping,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
 	},
-/obj/item/mop,
-/obj/structure/mopbucket,
-/obj/machinery/button/door{
-	id = "cagemaindump";
-	name = "Shutters Control";
-	pixel_x = 7;
-	pixel_y = -24;
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
 	},
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/pod/dark,
-/area/ship/crew/crewtwo)
-"xV" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/structure/closet/emcloset/wall{
+	pixel_y = 28
+	},
+/obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/structure/railing/wood{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech,
+/obj/item/storage/backpack/messenger,
+/obj/item/tank/internals/oxygen,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
-"yk" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/disposal/deliveryChute{
-	dir = 4;
-	pixel_x = -13;
-	pixel_y = 1
+"xV" = (
+/obj/effect/spawner/lootdrop/maintenance/seven,
+/obj/structure/closet/crate/trashcart,
+/obj/machinery/button/door{
+	id = "the_cage2";
+	pixel_x = 24;
+	pixel_y = 24;
+	req_access_txt = "151"
 	},
-/obj/structure/disposalpipe/trunk{
+/turf/open/floor/plating/ship/water,
+/area/ship/crew/toilet/nolight)
+"yk" = (
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
 	dir = 8;
-	pixel_x = -13
+	id = "cageholo"
 	},
-/obj/machinery/door/window/northleft{
-	dir = 4;
-	name = "Cage Access";
-	pixel_x = -6
+/obj/machinery/door/poddoor{
+	id = "cagemain2"
 	},
-/obj/effect/turf_decal/corner/opaque/black/border{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "0-2"
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/crew)
+/turf/open/floor/plating,
+/area/ship/crew/crewtwo)
 "ym" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 1
@@ -927,11 +962,22 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "yr" = (
 /turf/template_noop,
 /area/template_noop)
+"yu" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/door/poddoor{
+	id = "the_cagem";
+	dir = 4
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/turf/open/floor/plating,
+/area/ship/crew)
 "yK" = (
 /obj/machinery/door/airlock/engineering{
 	dir = 4
@@ -949,13 +995,13 @@
 /area/ship/crew/crewtwo)
 "yN" = (
 /turf/closed/wall/r_wall/rust,
-/area/ship/crew/toilet)
+/area/ship/crew/toilet/nolight)
 "yP" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	layer = 1
+/obj/machinery/door/poddoor{
+	id = "cagemain2"
 	},
-/turf/open/floor/plating/ship/water,
-/area/ship/crew/toilet)
+/turf/open/floor/plating,
+/area/ship/crew/crewtwo)
 "yQ" = (
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -968,7 +1014,7 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "zf" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
@@ -981,14 +1027,20 @@
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "zZ" = (
-/obj/structure/grille,
-/obj/structure/window/fulltile,
-/obj/machinery/door/poddoor/preopen{
-	id = "cagemain2"
+/obj/item/radio/intercom/directional/west,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/button/shieldwallgen{
+	id = "cageholo";
+	name = "Holofield Controls";
+	pixel_x = -24;
+	pixel_y = 24
 	},
-/turf/open/floor/plating,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/crewtwo)
 "Af" = (
 /obj/structure/catwalk/over,
@@ -1007,37 +1059,53 @@
 	dir = 6
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "AS" = (
 /obj/machinery/door/airlock/external,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "BP" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/yellow/warning,
-/obj/effect/turf_decal/number/two,
-/turf/open/floor/engine/hull/reinforced,
-/area/ship/external/dark)
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/plasteel/stairs,
+/area/ship/crew)
+"BR" = (
+/obj/item/storage/bag/trash,
+/obj/effect/spawner/lootdrop/maintenance/four,
+/turf/open/floor/plating/ship/water,
+/area/ship/crew/toilet/nolight)
 "Ca" = (
 /obj/machinery/power/terminal{
 	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Cc" = (
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/plating/ship/water,
-/area/ship/crew/toilet)
-"Cl" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
+	icon_state = "0-2"
+	},
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
+/area/ship/engineering/nolight)
+"Cc" = (
+/obj/machinery/light/small/directional/south,
+/obj/structure/closet/crate/wooden,
+/obj/effect/spawner/lootdrop/maintenance/five,
+/turf/open/floor/plating/ship/water,
+/area/ship/crew/toilet/nolight)
+"Cl" = (
+/obj/effect/turf_decal/corner/opaque/black/border{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
 	},
-/obj/structure/sign/poster/official/moth/delam,
-/turf/closed/wall/rust,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "Cw" = (
 /obj/effect/turf_decal/techfloor{
@@ -1046,22 +1114,25 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "CG" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/obj/effect/turf_decal/trimline/opaque/yellow/warning{
 	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/plasteel/tech,
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/crewtwo)
 "CL" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/warning,
-/obj/effect/turf_decal/number/seven,
-/turf/open/floor/engine/hull/reinforced,
-/area/ship/external/dark)
+/obj/structure/fans/tiny,
+/obj/effect/decal/cleanable/oil/slippery,
+/obj/machinery/door/airlock/external,
+/obj/docking_port/mobile{
+	dir = 2;
+	launch_status = 0
+	},
+/turf/open/floor/plating,
+/area/ship/crew)
 "DX" = (
 /obj/item/reagent_containers/glass/bottle/formaldehyde,
 /obj/item/reagent_containers/glass/bottle/iron,
@@ -1076,6 +1147,7 @@
 	pixel_x = -30
 	},
 /obj/structure/catwalk/over,
+/obj/item/storage/firstaid/regular,
 /turf/open/floor/plating,
 /area/ship/crew)
 "EM" = (
@@ -1085,42 +1157,90 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew)
+"EN" = (
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
+"EO" = (
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/light/small/directional/north,
+/obj/effect/spawner/lootdrop/maintenance/three,
+/turf/open/floor/plating/ship/water,
+/area/ship/crew/toilet/nolight)
 "EX" = (
-/obj/structure/chair/pew/left,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/plasteel/tech,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/computer/helm/viewscreen/directional/west,
+/obj/machinery/light/small/directional/west{
+	pixel_x = -44
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew/crewtwo)
 "Fe" = (
 /obj/machinery/atmospherics/pipe/layer_manifold/visible,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
+"Gb" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/warning,
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
 "Gl" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/structure/closet/crate/trashcart,
 /turf/open/floor/plating/catwalk_floor,
-/area/ship/crew/toilet)
+/area/ship/crew/toilet/nolight)
 "Gx" = (
 /turf/closed/wall/rust,
 /area/ship/crew/crewtwo)
 "GQ" = (
-/obj/machinery/disposal/deliveryChute{
-	dir = 1;
-	pixel_y = -4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/structure/disposalpipe/trunk,
-/obj/machinery/door/window/northleft{
-	name = "Dumpster Access"
+/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2{
+	dir = 8
 	},
-/turf/open/floor/pod/dark,
-/area/ship/crew/crewtwo)
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/crew)
 "GZ" = (
+/obj/item/trash/can,
+/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/item/storage/bag/trash,
 /turf/open/floor/plating/ship/water,
-/area/ship/crew/toilet)
+/area/ship/crew/toilet/nolight)
 "IR" = (
 /turf/closed/wall,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
+"JQ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -23;
+	pixel_y = -21
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew)
 "JT" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/table/reinforced,
@@ -1144,9 +1264,11 @@
 /turf/open/floor/pod/dark,
 /area/ship/crew)
 "Kd" = (
-/obj/structure/table/wood,
-/obj/item/radio/intercom/wideband/table,
-/turf/open/floor/plasteel/tech,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew/crewtwo)
 "Km" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -1157,7 +1279,7 @@
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2,
 /obj/structure/catwalk/over,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "Kn" = (
 /obj/structure/catwalk/over,
 /obj/effect/turf_decal/industrial/hatch/yellow,
@@ -1166,53 +1288,86 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "KE" = (
-/obj/machinery/computer/arcade/battle{
-	dir = 4;
-	pixel_x = -5
-	},
 /obj/machinery/light/directional/west,
 /obj/effect/turf_decal/corner/opaque/black/border{
 	dir = 4
 	},
-/obj/structure/window/reinforced/survival_pod{
+/obj/machinery/airalarm/directional/west,
+/obj/machinery/button/door{
+	id = "the_cagem";
+	pixel_x = -34;
+	dir = 4
+	},
+/obj/structure/railing/wood{
 	dir = 1
 	},
-/obj/machinery/airalarm/directional/west,
+/obj/structure/table/reinforced,
+/obj/machinery/microwave{
+	pixel_y = 3
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew)
 "KW" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating/airless,
+/obj/effect/turf_decal/trimline/opaque/yellow/warning{
+	dir = 4
+	},
+/turf/open/floor/engine/hull/reinforced,
 /area/ship/external/dark)
 "Lh" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/on,
-/turf/open/floor/plating/airless,
+/obj/effect/turf_decal/trimline/opaque/yellow/warning{
+	dir = 4
+	},
+/turf/open/floor/engine/hull/reinforced,
 /area/ship/external/dark)
 "LS" = (
+/obj/item/stack/sheet/mineral/wood/fifty,
+/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/item/trash/boritos,
 /turf/open/floor/plating/catwalk_floor,
-/area/ship/crew/toilet)
+/area/ship/crew/toilet/nolight)
+"Mb" = (
+/obj/item/clothing/mask/breath,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/railing{
+	dir = 4;
+	layer = 4.1
+	},
+/obj/effect/turf_decal/borderfloorblack/full,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/clothing/head/helmet/space/syndicate/black{
+	armor = list("melee"=5,"bullet"=10,"laser"=10,"energy"=10,"bomb"=30,"bio"=30,"rad"=30,"fire"=30,"acid"=85);
+	name = "degrading black space helmet";
+	w_class = 4
+	},
+/obj/item/clothing/suit/space/syndicate/black{
+	armor = list("melee"=5,"bullet"=10,"laser"=10,"energy"=10,"bomb"=30,"bio"=30,"rad"=30,"fire"=30,"acid"=85);
+	name = "degrading black space suit";
+	w_class = 4
+	},
+/obj/machinery/suit_storage_unit/inherit/industrial,
+/obj/machinery/light/directional/west,
+/turf/open/floor/plating,
+/area/ship/crew)
 "MW" = (
 /turf/open/floor/plasteel/stairs,
 /area/ship/crew)
 "Nd" = (
-/obj/structure/chair/pew,
-/obj/machinery/button/door{
-	id = "cagemain2";
-	name = "Shutters Control";
-	pixel_y = 35
-	},
-/turf/open/floor/plasteel/tech,
+/obj/effect/turf_decal/industrial/stand_clear,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/crewtwo)
 "Nk" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/door/poddoor{
-	id = "the_cage"
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -23;
+	pixel_y = -9
 	},
-/turf/open/floor/plating,
-/area/ship/crew/toilet)
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew)
 "NM" = (
 /obj/structure/closet/crate{
 	anchored = 1
@@ -1223,7 +1378,8 @@
 /obj/item/pickaxe/drill,
 /obj/item/storage/toolbox/emergency,
 /obj/effect/turf_decal/industrial/outline/orange,
-/turf/open/floor/pod/dark,
+/obj/item/multitool,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "NR" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1253,17 +1409,28 @@
 /turf/open/floor/carpet/royalblack,
 /area/ship/crew)
 "NW" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/machinery/light_switch{
-	dir = 1;
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/button/door{
+	id = "the_cage2";
 	pixel_x = 24;
-	pixel_y = 18
+	pixel_y = -24;
+	dir = 1
 	},
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/light/small/directional/east{
-	pixel_x = 38
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 22;
+	pixel_y = -32
 	},
-/turf/open/floor/plasteel/tech,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/crewtwo)
 "NY" = (
 /obj/structure/chair/stool/bar,
@@ -1274,12 +1441,12 @@
 /turf/open/floor/plating,
 /area/ship/crew)
 "Op" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/poddoor{
 	id = "the_cage2"
 	},
-/turf/open/floor/plating,
-/area/ship/crew/toilet)
+/obj/effect/turf_decal/trimline/opaque/yellow/warning,
+/turf/open/floor/plating/catwalk_floor,
+/area/ship/crew/toilet/nolight)
 "Ow" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 5
@@ -1295,7 +1462,7 @@
 	pixel_x = -8;
 	pixel_y = 35
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "OK" = (
 /obj/machinery/firealarm/directional/east{
@@ -1311,7 +1478,7 @@
 	},
 /obj/structure/catwalk/over,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "OS" = (
 /obj/structure/grille,
 /obj/structure/window/fulltile,
@@ -1333,9 +1500,13 @@
 /turf/open/floor/carpet/royalblack,
 /area/ship/crew)
 "PO" = (
-/mob/living/simple_animal/mouse/white,
+/obj/machinery/light/small/directional/south,
+/obj/structure/closet/crate/bin{
+	anchored = 0
+	},
+/obj/effect/spawner/lootdrop/maintenance/six,
 /turf/open/floor/plating/ship/water,
-/area/ship/crew/toilet)
+/area/ship/crew/toilet/nolight)
 "Qn" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/cable{
@@ -1352,16 +1523,20 @@
 	pixel_y = 5
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "QC" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
+/obj/structure/railing{
+	dir = 9;
+	layer = 4.1
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
+/obj/effect/turf_decal/techfloor{
+	dir = 6
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/crew)
+/obj/structure/marker_beacon{
+	picked_color = "Yellow"
+	},
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
 "QG" = (
 /obj/item/storage/cans/sixbeer,
 /obj/structure/table/wood/poker,
@@ -1375,9 +1550,18 @@
 /turf/open/floor/carpet/royalblack,
 /area/ship/crew)
 "Si" = (
-/mob/living/simple_animal/mouse/brown,
-/turf/open/floor/plating/ship/water,
-/area/ship/crew/toilet)
+/obj/structure/railing{
+	dir = 5;
+	layer = 4.1
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 10
+	},
+/obj/structure/marker_beacon{
+	picked_color = "Yellow"
+	},
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
 "SI" = (
 /obj/effect/turf_decal/techfloor,
 /obj/effect/turf_decal/techfloor/corner{
@@ -1386,7 +1570,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "SQ" = (
 /obj/effect/turf_decal/techfloor/hole,
@@ -1395,39 +1579,61 @@
 	dir = 1
 	},
 /obj/machinery/computer/helm/viewscreen/directional/west,
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "ST" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/warning,
-/obj/effect/turf_decal/number/zero,
+/obj/effect/turf_decal/trimline/opaque/yellow/warning{
+	dir = 1
+	},
 /turf/open/floor/engine/hull/reinforced,
 /area/ship/external/dark)
 "Tl" = (
-/obj/effect/turf_decal/corner/opaque/black/border{
-	dir = 6
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "To" = (
 /obj/machinery/door/airlock/highsecurity{
 	req_access_txt = "151"
 	},
 /turf/open/floor/plating/catwalk_floor,
-/area/ship/crew/toilet)
-"Tr" = (
-/obj/machinery/holopad/emergency/bar,
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 8
+/area/ship/crew/toilet/nolight)
+"Tp" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/button/door{
+	desc = "A remote control switch.";
+	id = "cagemain2";
+	name = "Cargo Bay Doors";
+	pixel_x = 24;
+	pixel_y = 24
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2{
-	dir = 8
+/obj/machinery/button/door{
+	desc = "A remote control switch.";
+	id = "cagemain2";
+	name = "Cargo Bay Doors";
+	pixel_x = 24;
+	pixel_y = 24
+	},
+/obj/machinery/firealarm/directional/east,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/crewtwo)
+"Tr" = (
+/obj/effect/turf_decal/borderfloorblack/full,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew)
@@ -1440,15 +1646,10 @@
 /turf/open/floor/plating,
 /area/ship/crew)
 "Vn" = (
+/obj/structure/disposalpipe/segment,
 /obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/power/port_gen/pacman{
-	anchored = 1
-	},
-/obj/item/stack/sheet/mineral/plasma/five,
-/obj/structure/cable,
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/plating,
-/area/ship/crew)
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
 "VJ" = (
 /obj/machinery/computer/helm{
 	dir = 8
@@ -1475,7 +1676,7 @@
 /obj/item/storage/cans/sixbeer,
 /obj/item/storage/cans/sixbeer,
 /obj/item/storage/box/lights/mixed,
-/turf/open/floor/pod/dark,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "Wk" = (
 /obj/effect/turf_decal/techfloor/hole/right{
@@ -1489,53 +1690,10 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "WD" = (
-/mob/living/simple_animal/mouse/gray,
-/turf/open/floor/plating/ship/water,
-/area/ship/crew/toilet)
-"WE" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/airlock/public{
-	dir = 4
-	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew/crewtwo)
-"WW" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = -22;
-	pixel_y = -34
-	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew/toilet)
-"Xq" = (
 /obj/structure/rack,
-/obj/item/crowbar,
-/obj/item/crowbar{
-	pixel_x = -4
-	},
-/obj/item/switchblade{
-	pixel_x = -6
-	},
 /obj/item/radio/off{
 	pixel_x = 9
 	},
@@ -1548,8 +1706,40 @@
 /obj/item/radio/off{
 	pixel_x = 13
 	},
+/obj/item/crowbar,
+/obj/item/crowbar{
+	pixel_x = -4
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew)
+"WE" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/crewtwo)
+"WW" = (
+/obj/effect/spawner/lootdrop/maintenance/five,
+/turf/open/floor/plating/ship/water,
+/area/ship/crew/toilet/nolight)
+"Xq" = (
+/obj/structure/grille,
+/obj/structure/window/fulltile,
+/obj/machinery/door/poddoor/preopen{
+	id = "cagemaindump";
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/crew/crewtwo)
 "XH" = (
 /obj/structure/catwalk/over,
 /turf/open/floor/plating,
@@ -1577,7 +1767,7 @@
 	id = "cage_thrusters_starboard"
 	},
 /turf/open/floor/pod/dark,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "Zd" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/power/smes/shuttle/precharged{
@@ -1594,7 +1784,7 @@
 	name = "Engine Access"
 	},
 /turf/open/floor/pod/dark,
-/area/ship/engineering)
+/area/ship/engineering/nolight)
 "Ze" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 6
@@ -1610,14 +1800,20 @@
 	pixel_x = -8;
 	pixel_y = -27
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "Zn" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/warning{
-	dir = 1
+/obj/machinery/disposal/deliveryChute{
+	dir = 1;
+	pixel_y = -4
 	},
-/obj/machinery/light/directional/south,
-/turf/open/floor/pod/dark,
+/obj/structure/disposalpipe/trunk,
+/obj/machinery/door/window/northleft{
+	name = "Dumpster Access";
+	color = "#B47B31"
+	},
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/crewtwo)
 "Zv" = (
 /obj/structure/chair/stool/bar,
@@ -1629,35 +1825,49 @@
 	dir = 1
 	},
 /obj/structure/railing/wood,
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "ZK" = (
-/obj/effect/turf_decal/borderfloorblack/full,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plasteel/tech,
+/obj/effect/turf_decal/corner/opaque/black/border{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "ZN" = (
 /obj/machinery/stasis{
 	dir = 1
 	},
-/turf/open/floor/pod/dark,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "ZU" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
+/obj/item/pushbroom{
+	pixel_x = -5;
+	pixel_y = 1
 	},
-/obj/machinery/computer/helm/viewscreen/directional/west,
-/obj/structure/toilet{
-	dir = 4;
-	pixel_y = 6;
-	pixel_x = 1;
-	desc = "The great head of the Pillbottle."
+/obj/item/mop,
+/obj/structure/mopbucket,
+/obj/machinery/button/door{
+	id = "cagemaindump";
+	name = "Shutters Control";
+	pixel_x = 7;
+	pixel_y = -24;
+	dir = 1
 	},
-/obj/machinery/light/small/directional/west{
-	pixel_x = -44
+/obj/machinery/airalarm/directional/west,
+/obj/effect/turf_decal/industrial/warning/corner,
+/obj/effect/turf_decal/trimline/opaque/yellow/corner{
+	pixel_y = 16
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/crewtwo)
 
 (1,1,1) = {"
@@ -1677,6 +1887,8 @@ yr
 yr
 yr
 yr
+yr
+yr
 "}
 (2,1,1) = {"
 yr
@@ -1684,6 +1896,7 @@ yr
 yr
 yr
 yr
+yr
 fl
 bi
 fl
@@ -1695,12 +1908,14 @@ yr
 yr
 yr
 yr
+yr
 "}
 (3,1,1) = {"
 yr
 yr
 yr
 yr
+yr
 fl
 fl
 Zd
@@ -1712,12 +1927,14 @@ IR
 IR
 IR
 IR
+ST
 yr
 "}
 (4,1,1) = {"
 yr
 yr
 yr
+yr
 fl
 fl
 Kn
@@ -1730,16 +1947,18 @@ pg
 Km
 Fe
 AS
+hD
 yr
 "}
 (5,1,1) = {"
 yr
 yr
 yr
+yr
 fl
 oE
 OK
-jO
+bX
 yQ
 jv
 Qn
@@ -1748,10 +1967,12 @@ IR
 IR
 IR
 IR
+ST
 yr
 "}
 (6,1,1) = {"
 yr
+mO
 Lh
 KW
 ue
@@ -1767,16 +1988,18 @@ yr
 yr
 yr
 yr
+yr
 "}
 (7,1,1) = {"
 yr
+Gb
 Gx
 Gx
 Gx
 yK
 yN
 aP
-Si
+WW
 Cc
 yN
 tF
@@ -1785,71 +2008,79 @@ Gx
 Gx
 yr
 yr
+yr
 "}
 (8,1,1) = {"
 yr
+Gb
+aS
 zZ
 EX
 fG
-WW
 Op
 GZ
 Gl
-yP
-Nk
+BR
+aw
 ev
+ax
 ZU
-xF
-Gx
 Gx
-yr
+Xq
+Xq
+Si
 "}
 (9,1,1) = {"
 yr
-Gx
+aG
+yP
 Nd
 Kd
-bX
+iN
 Op
-WD
+aE
 LS
-GZ
 cK
+aw
+WE
 fr
 CG
 Zn
-GQ
 OS
+Vn
 wu
 "}
 (10,1,1) = {"
 yr
-zZ
+mF
+yk
+Tp
 kn
 NW
-ax
 Op
-GZ
+xV
+mV
 tS
-lU
 aw
+sp
 ii
 co
-iN
-Gx
 Gx
-yr
+Xq
+Xq
+QC
 "}
 (11,1,1) = {"
 yr
 Gx
 Gx
 Gx
-WE
+Gx
+bQ
 yN
+EO
 ms
 PO
-Cc
 yN
 cF
 Gx
@@ -1857,85 +2088,95 @@ Gx
 Gx
 yr
 yr
+yr
 "}
 (12,1,1) = {"
-mO
+yr
 VO
+Mb
 oD
+Nk
 uZ
-xV
 yN
 yN
-bQ
+lU
 yN
 yN
+JQ
 pB
-Vn
 VO
 yr
 yr
 yr
+yr
 "}
 (13,1,1) = {"
+yr
 CL
-mV
-MW
 MW
-QC
+BP
+EN
+Tl
 SQ
 rp
-Cl
+yu
 rp
 Wk
-cW
+jO
 hz
 VO
 yr
 yr
 yr
+yr
 "}
 (14,1,1) = {"
-BP
+yr
 xs
+nv
 xs
 xs
+xF
 ex
-aE
 oP
-yk
+cW
 KE
+Cl
 tu
-lI
 xs
 xs
 yr
 yr
 yr
+yr
 "}
 (15,1,1) = {"
-ST
-aG
+yr
+yr
+yr
 xs
 xs
 ip
-Tl
-ZK
+lI
+Tr
+GQ
 Tr
 ZK
-aS
 mZ
 xs
 xs
 yr
 yr
 yr
+yr
 "}
 (16,1,1) = {"
 yr
 yr
 yr
+yr
 VO
-sp
+ec
 fc
 NY
 ar
@@ -1947,13 +2188,15 @@ yr
 yr
 yr
 yr
+yr
 "}
 (17,1,1) = {"
 yr
 yr
 yr
+yr
 VO
-Xq
+WD
 ym
 wC
 pm
@@ -1965,8 +2208,10 @@ yr
 yr
 yr
 yr
+yr
 "}
 (18,1,1) = {"
+yr
 xs
 xs
 nv
@@ -1983,9 +2228,11 @@ nv
 xs
 xs
 yr
+yr
 "}
 (19,1,1) = {"
-xs
+yr
+VO
 Wh
 XH
 kA
@@ -1999,10 +2246,12 @@ Ya
 DX
 XH
 ZN
-xs
+VO
+yr
 yr
 "}
 (20,1,1) = {"
+yr
 xs
 xs
 lh
@@ -2019,9 +2268,11 @@ vs
 xs
 xs
 yr
+yr
 "}
 (21,1,1) = {"
 yr
+yr
 xs
 nv
 nv
@@ -2037,6 +2288,7 @@ nv
 xs
 yr
 yr
+yr
 "}
 (22,1,1) = {"
 yr
@@ -2044,6 +2296,7 @@ yr
 yr
 yr
 yr
+yr
 TL
 TL
 TL
@@ -2055,6 +2308,7 @@ yr
 yr
 yr
 yr
+yr
 "}
 (23,1,1) = {"
 yr
@@ -2073,4 +2327,6 @@ yr
 yr
 yr
 yr
+yr
+yr
 "}
diff --git a/code/hispania/game/area/ship_areas.dm b/code/hispania/game/area/ship_areas.dm
new file mode 100644
index 000000000000..4c6f1c456cad
--- /dev/null
+++ b/code/hispania/game/area/ship_areas.dm
@@ -0,0 +1,5 @@
+/area/ship/crew/toilet/nolight
+	lightswitch = 0
+
+/area/ship/engineering/nolight
+	lightswitch = 0
diff --git a/shiptest.dme b/shiptest.dme
index 4dd02ee4ab59..1598fa4b92f2 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -1454,6 +1454,7 @@
 #include "code\game\turfs\open\floor\plating\whitesands.dm"
 #include "code\game\turfs\open\space\space.dm"
 #include "code\game\turfs\open\space\transit.dm"
+#include "code\hispania\game\area\ship_areas.dm"
 #include "code\hispania\modules\jobs\job_types\mantarraya.dm"
 #include "code\modules\admin\admin.dm"
 #include "code\modules\admin\admin_investigate.dm"