From bc22761e08031d2648ff074cf48ae6268092ce94 Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Sat, 27 Jan 2024 01:02:10 +0000
Subject: [PATCH] Update syndicate_gorlex_komodo.dmm

---
 .../syndicate/syndicate_gorlex_komodo.dmm     | 641 +++++++++++-------
 1 file changed, 382 insertions(+), 259 deletions(-)

diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
index 3da232da75dc..319e89d81133 100644
--- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
+++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -6,14 +6,17 @@
 /obj/effect/decal/cleanable/oil{
 	icon_state = "streak4"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/structure/cable,
+/obj/machinery/power/terminal,
+/obj/machinery/atmospherics/pipe/simple/supply/visible/layer2{
 	dir = 9
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
 	dir = 9
 	},
-/obj/structure/cable,
-/obj/machinery/power/terminal,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 6
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "am" = (
@@ -58,14 +61,6 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "av" = (
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = -5;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = 2;
-	pixel_y = 3
-	},
 /obj/structure/closet/crate{
 	name = "food crate"
 	},
@@ -77,6 +72,22 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
+/obj/effect/spawner/lootdrop/ration{
+	pixel_x = -6
+	},
+/obj/effect/spawner/lootdrop/ration{
+	pixel_x = -6
+	},
+/obj/effect/spawner/lootdrop/ration{
+	pixel_x = -6
+	},
+/obj/effect/spawner/lootdrop/ration{
+	pixel_x = -6
+	},
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/aft)
 "ax" = (
@@ -166,10 +177,13 @@
 	dir = 9
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/firealarm/directional/west,
+/obj/machinery/firealarm/directional/west{
+	pixel_y = 4
+	},
 /obj/machinery/light_switch{
-	pixel_x = -13;
-	pixel_y = 22
+	dir = 4;
+	pixel_x = -21;
+	pixel_y = -10
 	},
 /turf/open/floor/holofloor/wood,
 /area/ship/crew/dorm)
@@ -218,7 +232,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/dim/directional/west,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/extinguisher_cabinet/directional/north,
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "bS" = (
@@ -285,12 +298,18 @@
 /obj/machinery/door/airlock/hatch{
 	name = "Cargo Bay"
 	},
-/obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 2
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/cargo)
 "cV" = (
@@ -308,7 +327,6 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/firealarm/directional/north,
-/obj/item/radio/intercom/directional/west,
 /obj/item/t_scanner{
 	pixel_x = -7;
 	pixel_y = 3
@@ -351,6 +369,7 @@
 	pixel_x = 6
 	},
 /obj/item/hemostat,
+/obj/machinery/light/directional/south,
 /turf/open/floor/pod/dark,
 /area/ship/medical)
 "dv" = (
@@ -390,7 +409,6 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "dz" = (
-/obj/machinery/door/firedoor,
 /obj/structure/barricade/wooden,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -400,6 +418,10 @@
 /obj/machinery/door/airlock/hatch{
 	name = "Starboard Maintenance"
 	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/maintenance/starboard)
 "dF" = (
@@ -434,11 +456,17 @@
 	id = "syndiewarship_armorybay";
 	name = "Weapon Hold"
 	},
-/obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/security/armory)
 "dR" = (
@@ -454,10 +482,6 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "ea" = (
@@ -541,7 +565,6 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
-/obj/machinery/firealarm/directional/south,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -551,15 +574,8 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "eW" = (
-/obj/structure/closet/crate,
 /obj/effect/decal/cleanable/cobweb,
-/obj/item/blackbox,
-/obj/item/storage/toolbox/infiltrator,
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = -10;
-	pixel_y = -19
-	},
+/obj/machinery/blackbox_recorder,
 /turf/open/floor/engine,
 /area/ship/bridge)
 "eX" = (
@@ -603,6 +619,10 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
+/obj/machinery/light_switch{
+	pixel_x = 3;
+	pixel_y = 22
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/engineering)
 "fk" = (
@@ -679,6 +699,12 @@
 /obj/effect/spawner/lootdrop/costume,
 /obj/item/storage/box/emptysandbags,
 /obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/button/door{
+	dir = 1;
+	id = "syndie_mechbay";
+	name = "mechbay door";
+	pixel_y = -24
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "gp" = (
@@ -744,6 +770,11 @@
 	pixel_x = -7;
 	pixel_y = 3
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 21;
+	pixel_y = 6
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/crew/canteen)
 "gy" = (
@@ -763,10 +794,9 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 10
 	},
-/obj/machinery/mineral/ore_redemption{
-	dir = 1;
-	output_dir = 1
-	},
+/obj/structure/closet/crate,
+/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/turf_decal/box,
 /turf/open/floor/pod,
 /area/ship/cargo)
 "gJ" = (
@@ -837,20 +867,19 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
 "hj" = (
-/obj/machinery/turretid{
-	pixel_x = -2;
-	pixel_y = 8
-	},
 /obj/structure/table/reinforced,
 /obj/item/gps{
 	pixel_x = -6;
-	pixel_y = 2
+	pixel_y = 4
 	},
 /obj/machinery/button/door{
 	id = "warshipbridge";
 	name = "Bridge lockdown";
-	pixel_x = 7;
-	pixel_y = -2
+	pixel_y = -1
+	},
+/obj/item/reagent_containers/food/drinks/mug{
+	pixel_y = 6;
+	pixel_x = 7
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
@@ -942,6 +971,9 @@
 /obj/structure/railing{
 	dir = 8
 	},
+/obj/machinery/firealarm/directional/west{
+	pixel_y = 8
+	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/hallway/central)
 "iO" = (
@@ -1003,6 +1035,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 6
 	},
+/obj/machinery/firealarm/directional/north{
+	pixel_x = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "jp" = (
@@ -1152,6 +1187,7 @@
 /obj/effect/turf_decal/trimline/transparent/bar/filled/line{
 	dir = 10
 	},
+/obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/crew/canteen)
 "kD" = (
@@ -1186,12 +1222,18 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "la" = (
-/obj/machinery/light/directional/north,
 /obj/structure/tank_dispenser/oxygen,
 /obj/effect/decal/cleanable/blood/old,
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
 	},
+/obj/machinery/light/small/directional/north{
+	pixel_x = -4
+	},
+/obj/machinery/light_switch{
+	pixel_x = 5;
+	pixel_y = 22
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "lj" = (
@@ -1228,24 +1270,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
-"lm" = (
-/obj/machinery/door/airlock/hatch{
-	name = "Engineering"
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/firedoor,
-/turf/open/floor/mineral/plastitanium/red,
-/area/ship/engineering)
 "lu" = (
 /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/poddoor/shutters{
@@ -1287,18 +1311,15 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
 /obj/machinery/button/door{
 	dir = 1;
 	id = "warship_engines";
 	name = "Engine shutters";
 	pixel_y = -24
 	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 8
+	},
 /turf/open/floor/plasteel/stairs{
 	dir = 8
 	},
@@ -1368,14 +1389,14 @@
 	pixel_x = -3;
 	pixel_y = 6
 	},
-/obj/item/stack/sheet/glass/fifty{
-	pixel_x = 6
-	},
-/obj/item/stack/sheet/metal/fifty,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/item/stack/sheet/glass/twenty{
+	pixel_x = 6
+	},
+/obj/item/stack/sheet/metal/ten,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "mN" = (
@@ -1443,11 +1464,6 @@
 /obj/machinery/microwave{
 	pixel_y = 5
 	},
-/obj/item/storage/box/donkpockets/donkpocketteriyaki{
-	pixel_x = 4;
-	pixel_y = 5
-	},
-/obj/item/storage/box/donkpockets/donkpocketteriyaki,
 /obj/effect/turf_decal/trimline/transparent/bar/filled/line{
 	dir = 5
 	},
@@ -1512,7 +1528,6 @@
 /obj/effect/decal/cleanable/robot_debris/limb,
 /obj/machinery/light/dim/directional/east,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/structure/extinguisher_cabinet/directional/north,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "on" = (
@@ -1539,7 +1554,6 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/maintenance/starboard)
 "pf" = (
-/obj/machinery/power/port_gen/pacman/super,
 /obj/structure/railing{
 	dir = 4
 	},
@@ -1548,13 +1562,13 @@
 	},
 /obj/effect/turf_decal/industrial/warning,
 /obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/light/dim/directional/north,
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 4
 	},
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
+/obj/machinery/power/port_gen/pacman,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "po" = (
@@ -1597,9 +1611,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -1614,21 +1625,22 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "pN" = (
-/obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/hatch{
 	name = "Aft Hallway"
 	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/hallway/aft)
 "pS" = (
@@ -1663,7 +1675,14 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/firedoor,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/dorm)
 "qu" = (
@@ -1722,7 +1741,6 @@
 /obj/item/pickaxe,
 /obj/item/mining_scanner,
 /obj/item/mining_scanner,
-/obj/machinery/light/directional/east,
 /obj/structure/closet/wall{
 	dir = 8;
 	icon_door = "orange_wall";
@@ -1759,22 +1777,30 @@
 /obj/machinery/syndicatebomb/self_destruct{
 	anchored = 1
 	},
-/obj/machinery/light/directional/south,
+/obj/machinery/door/window/brigdoor/northright{
+	req_access_txt = "19"
+	},
+/obj/machinery/light/dim/directional/south{
+	bulb_colour = "#FF3232";
+	bulb_power = 0.4;
+	brightness = 6
+	},
 /turf/open/floor/circuit/red,
 /area/ship/bridge)
 "rf" = (
 /obj/structure/railing/corner,
 /obj/effect/turf_decal/steeldecal/steel_decals1,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 4
-	},
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/manifold/orange/visible{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning/corner,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "rh" = (
@@ -1794,6 +1820,7 @@
 	pixel_x = 6;
 	pixel_y = -3
 	},
+/obj/item/radio/intercom/directional/south,
 /turf/open/floor/pod/dark,
 /area/ship/security/armory)
 "ro" = (
@@ -1846,17 +1873,25 @@
 /turf/open/floor/pod/dark,
 /area/ship/crew/dorm)
 "rK" = (
-/obj/machinery/button/door{
-	dir = 1;
-	id = "syndie_mechbay";
-	name = "mechbay door";
-	pixel_y = -24
-	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/techfloor,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/light/floor,
+/obj/machinery/button/shieldwallgen{
+	dir = 1;
+	id = "komodo_cargo";
+	pixel_y = -24;
+	pixel_x = -6
+	},
+/obj/machinery/button/door{
+	dir = 1;
+	id = "syndie_warship_cargo";
+	name = "cargohold shutters";
+	pixel_y = -26;
+	pixel_x = 4
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "rN" = (
@@ -1878,7 +1913,8 @@
 "sb" = (
 /obj/structure/closet/toolcloset,
 /obj/structure/railing{
-	dir = 1
+	dir = 1;
+	layer = 2.8
 	},
 /obj/effect/decal/cleanable/oil{
 	icon_state = "streak5"
@@ -2015,7 +2051,8 @@
 /area/ship/engineering)
 "tv" = (
 /obj/structure/railing{
-	dir = 8
+	dir = 8;
+	layer = 2.8
 	},
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/mask/gas/syndicate,
@@ -2025,13 +2062,27 @@
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
 	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -7;
+	pixel_y = -24
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "tw" = (
-/obj/machinery/door/airlock/vault{
-	req_access_txt = "53"
+/obj/machinery/door/airlock/hatch{
+	name = "Vault";
+	req_access_txt = "19";
+	security_level = 6
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
 	},
-/obj/machinery/door/firedoor,
 /turf/open/floor/engine,
 /area/ship/bridge)
 "tx" = (
@@ -2080,9 +2131,6 @@
 	pixel_y = 14
 	},
 /obj/effect/turf_decal/industrial/radiation,
-/obj/structure/railing{
-	dir = 9
-	},
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
@@ -2177,41 +2225,23 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ship/crew/canteen)
 "uR" = (
-/obj/structure/rack,
-/obj/item/grenade/chem_grenade/smart_metal_foam{
-	pixel_x = 2;
-	pixel_y = 8
-	},
-/obj/item/grenade/chem_grenade/smart_metal_foam{
-	pixel_x = -2;
-	pixel_y = 6
-	},
-/obj/item/storage/belt/utility{
-	pixel_y = -3
-	},
-/obj/item/storage/belt/utility{
-	pixel_x = 3;
-	pixel_y = 5
-	},
-/obj/item/clothing/shoes/magboots/syndie{
-	pixel_x = -6;
-	pixel_y = -5
-	},
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 8
 	},
-/obj/item/clothing/head/beret/eng/hazard{
-	pixel_x = -5;
-	pixel_y = 4
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/robot_debris/old,
+/obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "uW" = (
 /obj/machinery/vending/medical,
+/obj/machinery/light/directional/east,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/medical)
 "vg" = (
@@ -2316,30 +2346,28 @@
 	name = "fuel locker";
 	pixel_y = 28
 	},
-/obj/item/stack/sheet/mineral/uranium/five,
-/obj/item/stack/sheet/mineral/uranium/five{
-	pixel_x = 2
-	},
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/item/stack/sheet/mineral/plasma/five,
+/obj/item/stack/sheet/mineral/plasma/five,
+/obj/item/stack/sheet/mineral/plasma/five,
+/obj/item/stack/sheet/mineral/plasma/five,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "vQ" = (
-/obj/machinery/light/directional/east,
 /obj/effect/turf_decal/box,
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/machinery/button/door{
-	dir = 8;
 	id = "syndiewarship_armorybay";
 	name = "Weapon Hold";
-	pixel_x = 28
+	pixel_y = 25;
+	pixel_x = -7
 	},
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
 /obj/machinery/suit_storage_unit/inherit,
 /obj/machinery/light_switch{
-	pixel_x = -13;
-	pixel_y = 22
+	pixel_x = 2;
+	pixel_y = 24
 	},
 /obj/item/clothing/suit/space/hardsuit/syndi/hl,
 /obj/item/clothing/mask/gas/syndicate,
@@ -2385,10 +2413,6 @@
 	dir = 6
 	},
 /obj/machinery/light/small/directional/east,
-/obj/item/toy/plush/beeplushie{
-	pixel_x = 3;
-	pixel_y = 8
-	},
 /turf/open/floor/holofloor/wood,
 /area/ship/bridge)
 "wP" = (
@@ -2405,6 +2429,9 @@
 /obj/machinery/power/terminal{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
 /turf/open/floor/plasteel/stairs{
 	dir = 8
 	},
@@ -2435,15 +2462,17 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 23;
+	pixel_y = 4
+	},
 /turf/open/floor/plasteel/stairs,
 /area/ship/bridge)
 "xC" = (
 /obj/machinery/power/smes{
 	charge = 5e+006
 	},
-/obj/structure/railing{
-	dir = 1
-	},
 /obj/effect/turf_decal/industrial/radiation,
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -2529,14 +2558,19 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
+/obj/machinery/atmospherics/pipe/manifold/orange/visible{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/binary/pump/layer2,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "yY" = (
@@ -2690,11 +2724,18 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/highsecurity{
+/obj/machinery/door/airlock/grunge{
 	name = "Bridge";
 	req_access_txt = "19"
 	},
-/obj/machinery/door/firedoor,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Au" = (
@@ -2753,9 +2794,6 @@
 	},
 /obj/item/clothing/mask/gas/sechailer/swat,
 /obj/item/clothing/head/HoS/beret/syndicate,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/structure/closet/secure_closet/wall{
 	dir = 1;
 	icon_state = "sec_wall";
@@ -2793,7 +2831,7 @@
 	dir = 1
 	},
 /turf/open/floor/engine/hull,
-/area/ship/external)
+/area/ship/external/dark)
 "Bj" = (
 /obj/effect/turf_decal/industrial/warning/corner{
 	dir = 8
@@ -3026,11 +3064,6 @@
 	dir = 4
 	},
 /obj/item/radio/intercom/directional/west,
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -23;
-	pixel_y = 13
-	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Do" = (
@@ -3047,7 +3080,16 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/firedoor,
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/dorm)
 "DO" = (
@@ -3069,6 +3111,11 @@
 /area/ship/hallway/central)
 "DQ" = (
 /obj/structure/railing/corner,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 5;
+	pixel_y = -24
+	},
 /turf/open/floor/plasteel/stairs{
 	dir = 8
 	},
@@ -3121,7 +3168,6 @@
 /turf/open/floor/plasteel/freezer,
 /area/ship/hallway/aft)
 "Eh" = (
-/obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/hatch{
 	dir = 4;
 	name = "Canteen"
@@ -3135,6 +3181,15 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/crew/canteen)
 "Ek" = (
@@ -3383,7 +3438,6 @@
 /obj/structure/railing{
 	dir = 9
 	},
-/obj/machinery/firealarm/directional/north,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/hallway/central)
 "Hc" = (
@@ -3413,6 +3467,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/light/floor,
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "Hp" = (
@@ -3433,17 +3488,15 @@
 /obj/structure/railing/corner{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/structure/cable,
+/obj/machinery/power/terminal,
+/obj/machinery/atmospherics/pipe/simple/supply/visible/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 8
 	},
-/obj/structure/cable,
-/obj/machinery/power/terminal,
+/obj/effect/turf_decal/industrial/warning,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Hy" = (
@@ -3480,9 +3533,6 @@
 	},
 /obj/item/kirbyplants/random,
 /obj/effect/decal/cleanable/wrapping,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/machinery/camera/autoname{
 	dir = 1
 	},
@@ -3714,7 +3764,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Jo" = (
-/obj/machinery/power/port_gen/pacman/super,
 /obj/effect/decal/cleanable/cobweb,
 /obj/effect/decal/cleanable/plasma,
 /obj/effect/turf_decal/industrial/warning,
@@ -3725,17 +3774,27 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
+/obj/machinery/light/dim/directional/north,
+/obj/machinery/power/port_gen/pacman,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Js" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 10
-	},
 /obj/item/radio/intercom/directional/east,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/obj/machinery/computer/monitor,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/generic,
+/obj/item/stack/cable_coil/orange{
+	pixel_x = 6;
+	pixel_y = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 10
+	},
+/obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Jw" = (
@@ -3802,13 +3861,13 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
-/obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
 /obj/machinery/suit_storage_unit/inherit,
 /obj/item/clothing/suit/space/hardsuit/syndi/hl,
 /obj/item/clothing/mask/gas/syndicate,
+/obj/machinery/power/apc/auto_name/directional/south,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security/armory)
 "JH" = (
@@ -3861,6 +3920,11 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 23;
+	pixel_y = 4
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/aft)
 "Ko" = (
@@ -3887,7 +3951,9 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "KL" = (
-/obj/machinery/vending/custom,
+/obj/machinery/vending/custom{
+	layer = 3.1
+	},
 /obj/structure/railing{
 	dir = 1
 	},
@@ -3930,7 +3996,18 @@
 	req_access_txt = "20";
 	dir = 4
 	},
-/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Lx" = (
@@ -3998,7 +4075,6 @@
 /obj/machinery/chem_dispenser/drinks/beer/fullupgrade,
 /obj/structure/table/reinforced,
 /obj/machinery/light/directional/north,
-/obj/machinery/firealarm/directional/north,
 /obj/machinery/vending/boozeomat/syndicate_access{
 	pixel_x = 32
 	},
@@ -4116,9 +4192,6 @@
 	dir = 10
 	},
 /obj/structure/rack,
-/obj/item/inducer/syndicate{
-	pixel_y = -7
-	},
 /obj/item/storage/toolbox/syndicate{
 	name = "syndicate toolbox";
 	pixel_x = -3;
@@ -4324,7 +4397,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light_switch{
-	pixel_x = -13;
+	pixel_x = -7;
 	pixel_y = 22
 	},
 /turf/open/floor/mineral/plastitanium,
@@ -4354,24 +4427,20 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 9
 	},
-/mob/living/simple_animal/hostile/carp/megacarp{
-	faction = list("neutral");
-	name = "Tom";
-	resize = 0.8
-	},
-/obj/effect/decal/cleanable/blood/old,
-/obj/structure/bed/dogbed,
 /obj/structure/railing{
 	dir = 9;
 	layer = 2.9
 	},
+/obj/structure/table/reinforced,
+/obj/machinery/turretid{
+	pixel_x = -2
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "PE" = (
 /obj/machinery/suit_storage_unit/inherit,
 /obj/effect/turf_decal/box,
 /obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/extinguisher_cabinet/directional/north,
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
@@ -4380,6 +4449,7 @@
 	},
 /obj/item/clothing/suit/space/hardsuit/syndi/hl,
 /obj/item/clothing/mask/gas/syndicate,
+/obj/machinery/light/directional/east,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security/armory)
 "PK" = (
@@ -4391,7 +4461,6 @@
 "Qv" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
@@ -4401,6 +4470,10 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/machinery/atmospherics/components/binary/volume_pump{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/shutoff,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Qy" = (
@@ -4474,6 +4547,7 @@
 	pixel_x = -5;
 	pixel_y = 12
 	},
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/crew/canteen)
 "RB" = (
@@ -4514,7 +4588,6 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "RT" = (
-/obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/hatch{
 	name = "Port Maintenance"
 	},
@@ -4526,6 +4599,10 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/maintenance/port)
 "Sd" = (
@@ -4580,14 +4657,26 @@
 	id = "syndiewarship_armorybay";
 	name = "Weapon Hold"
 	},
-/obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/security/armory)
 "Sq" = (
 /obj/machinery/door/airlock/hatch{
 	dir = 4
 	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/aft)
 "Sr" = (
@@ -4603,7 +4692,8 @@
 /area/ship/bridge)
 "SC" = (
 /obj/machinery/computer/cargo/express{
-	dir = 4
+	dir = 4;
+	layer = 3
 	},
 /obj/effect/turf_decal/techfloor{
 	dir = 8
@@ -4619,24 +4709,29 @@
 /obj/machinery/door/airlock/hatch{
 	dir = 4
 	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
 /turf/open/floor/plasteel/showroomfloor,
 /area/ship/hallway/aft)
 "SN" = (
 /obj/effect/turf_decal/steeldecal/steel_decals9,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/caution,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
-	dir = 8
-	},
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 5
+	},
+/obj/effect/turf_decal/industrial/caution{
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "SU" = (
@@ -4727,8 +4822,6 @@
 /turf/open/floor/plasteel/stairs,
 /area/ship/cargo)
 "TN" = (
-/obj/structure/frame/machine,
-/obj/structure/grille/broken,
 /obj/structure/railing{
 	dir = 4
 	},
@@ -4739,6 +4832,30 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/structure/rack,
+/obj/item/grenade/chem_grenade/smart_metal_foam{
+	pixel_x = 2;
+	pixel_y = 8
+	},
+/obj/item/grenade/chem_grenade/smart_metal_foam{
+	pixel_x = -2;
+	pixel_y = 6
+	},
+/obj/item/storage/belt/utility{
+	pixel_x = 3;
+	pixel_y = 5
+	},
+/obj/item/storage/belt/utility{
+	pixel_y = -3
+	},
+/obj/item/clothing/shoes/magboots/syndie{
+	pixel_x = -6;
+	pixel_y = -5
+	},
+/obj/item/clothing/head/beret/eng/hazard{
+	pixel_x = -5;
+	pixel_y = 4
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "TR" = (
@@ -4746,19 +4863,21 @@
 /area/ship/medical)
 "TY" = (
 /obj/effect/turf_decal/steeldecal/steel_decals6,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 4
-	},
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
 	},
 /obj/machinery/power/terminal{
 	dir = 1
 	},
+/obj/machinery/atmospherics/components/binary/pump/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Uo" = (
-/obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/hatch{
 	dir = 4;
 	name = "Infirmary"
@@ -4772,6 +4891,15 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/medical)
 "Uw" = (
@@ -4782,9 +4910,6 @@
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -4795,6 +4920,9 @@
 	icon_state = "1-8"
 	},
 /obj/structure/catwalk/over,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Ux" = (
@@ -4824,7 +4952,6 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "UK" = (
-/obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/hatch{
 	name = "Engineering"
 	},
@@ -4833,6 +4960,14 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/engineering)
 "UO" = (
@@ -4856,7 +4991,6 @@
 /area/ship/medical)
 "Vj" = (
 /obj/structure/table/optable,
-/obj/machinery/light/directional/south,
 /obj/machinery/defibrillator_mount/loaded{
 	pixel_y = -26
 	},
@@ -4866,7 +5000,6 @@
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/cargo)
 "Vq" = (
-/obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 1
 	},
@@ -4874,10 +5007,20 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/hatch{
+/obj/machinery/door/airlock/grunge{
 	name = "Bridge";
 	req_access_txt = "19"
 	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/door/firedoor/border_only{
+	dir = 2
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Vu" = (
@@ -4897,11 +5040,8 @@
 	name = "tactical swivel chair"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/firealarm/directional/south,
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = -8;
-	pixel_y = -24
+/obj/machinery/firealarm/directional/south{
+	pixel_x = 4
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -4961,12 +5101,6 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/hallway/central)
 "Wq" = (
-/obj/machinery/button/door{
-	dir = 4;
-	id = "syndie_warship_cargo";
-	name = "cargohold shutters";
-	pixel_x = -25
-	},
 /obj/structure/table/reinforced,
 /obj/item/storage/fancy/cigarettes/cigpack_robustgold{
 	pixel_x = -6;
@@ -4976,18 +5110,8 @@
 	pixel_x = -5;
 	pixel_y = 3
 	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -24;
-	pixel_y = 10
-	},
 /obj/item/trash/boritos,
-/obj/machinery/button/shieldwallgen{
-	dir = 4;
-	id = "komodo_cargo";
-	pixel_x = -24;
-	pixel_y = -10
-	},
+/obj/machinery/computer/helm/viewscreen/directional/west,
 /turf/open/floor/pod,
 /area/ship/cargo)
 "Ws" = (
@@ -5124,9 +5248,6 @@
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -5162,7 +5283,6 @@
 /area/ship/crew/dorm)
 "XC" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/directional/east,
 /obj/machinery/airalarm/directional/east,
 /obj/structure/table/reinforced,
 /obj/item/clipboard,
@@ -5241,7 +5361,6 @@
 "Yv" = (
 /obj/machinery/chem_dispenser/drinks/fullupgrade,
 /obj/structure/table/reinforced,
-/obj/structure/extinguisher_cabinet/directional/north,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/crew/canteen)
 "Yw" = (
@@ -5352,9 +5471,6 @@
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
@@ -5380,13 +5496,20 @@
 "ZS" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/firealarm/directional/east,
+/obj/machinery/firealarm/directional/east{
+	pixel_y = -4
+	},
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 23;
+	pixel_y = 10
+	},
 /turf/open/floor/pod,
 /area/ship/cargo)
 
@@ -5819,7 +5942,7 @@ WZ
 ew
 qu
 JC
-lm
+UK
 vg
 ty
 UK