diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index 8befbe1800..a199d21288 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -1235,6 +1235,10 @@
 	name = "CHAPEL"
 	icon_state = "chapel"
 
+/obj/structure/sign/department/janitor
+	name = "JANITOR"
+	icon_state = "janitor"
+
 /obj/structure/sign/department/bridge
 	name = "BRIDGE"
 	icon_state = "bridge"
diff --git a/code/modules/events/drone_pod_vr.dm b/code/modules/events/drone_pod_vr.dm
index 108f4c06d8..30e26d2a9e 100644
--- a/code/modules/events/drone_pod_vr.dm
+++ b/code/modules/events/drone_pod_vr.dm
@@ -22,7 +22,7 @@
 		qdel(target_spot)
 
 /datum/event/drone_pod_drop/announce()
-	command_announcement.Announce("An unidentified drone pod has been detected on a collision course towards the [location_name()]. Open and examine at your own risk.", "[location_name()] Sensor Network")
+	command_announcement.Announce("An unidentified drone pod has been detected on a collision course towards [location_name()]. Open and examine at your own risk.", "[location_name()] Sensor Network")
 
 /datum/event/drone_pod_drop/start()
 	if(!land_target)
diff --git a/icons/obj/decals_vr.dmi b/icons/obj/decals_vr.dmi
index babe5fe0d2..d6679c9a1b 100644
Binary files a/icons/obj/decals_vr.dmi and b/icons/obj/decals_vr.dmi differ
diff --git a/maps/yw/cryogaia-02-mining.dmm b/maps/yw/cryogaia-02-mining.dmm
index fb6b421c23..0240ba8540 100644
--- a/maps/yw/cryogaia-02-mining.dmm
+++ b/maps/yw/cryogaia-02-mining.dmm
@@ -5889,6 +5889,8 @@
 	frequency = 1441;
 	pixel_y = 22
 	},
+/obj/machinery/recharger,
+/obj/structure/table/steel,
 /turf/simulated/floor/tiled,
 /area/outpost/mining_main/airlock)
 "oC" = (
@@ -19429,8 +19431,9 @@
 "Vg" = (
 /obj/item/weapon/pickaxe,
 /obj/structure/table/steel,
-/obj/item/device/binoculars,
 /obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/item/weapon/storage/belt/utility,
+/obj/item/weapon/storage/belt/utility,
 /turf/simulated/floor/tiled,
 /area/outpost/mining_main/storage)
 "Vh" = (
diff --git a/maps/yw/cryogaia-04-maintenance.dmm b/maps/yw/cryogaia-04-maintenance.dmm
index 85a2975875..91db31304b 100644
--- a/maps/yw/cryogaia-04-maintenance.dmm
+++ b/maps/yw/cryogaia-04-maintenance.dmm
@@ -832,10 +832,6 @@
 "aFj" = (
 /turf/simulated/shuttle/wall/voidcraft/hard_corner/blue,
 /area/borealis2/elevator/medbasement)
-"aFw" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/yellow,
-/turf/simulated/floor/tiled,
-/area/engineering/atmos)
 "aGn" = (
 /obj/structure/closet/crate/mimic/cointoss,
 /turf/simulated/floor/plating,
@@ -2030,12 +2026,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/engineering/hallway_lower)
-"btg" = (
-/obj/machinery/atmospherics/pipe/simple/visible/yellow{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/engineering/atmos)
 "btj" = (
 /turf/simulated/floor,
 /area/maintenance/lowfloor3)
@@ -2635,13 +2625,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
-"bRH" = (
-/obj/machinery/atmospherics/pipe/simple/visible/red,
-/obj/machinery/atmospherics/pipe/simple/visible/yellow{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/engineering/atmos)
 "bRV" = (
 /obj/structure/table/steel,
 /turf/simulated/floor,
@@ -12872,9 +12855,6 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/visible/yellow{
-	dir = 4
-	},
 /turf/simulated/floor/tiled,
 /area/engineering/atmos)
 "iln" = (
@@ -26388,9 +26368,6 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/visible/red{
-	dir = 4
-	},
 /turf/simulated/floor/tiled,
 /area/engineering/atmos)
 "qaJ" = (
@@ -29261,13 +29238,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/broken,
 /area/maintenance/maintroom6)
-"rUR" = (
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/manifold/hidden/red{
-	dir = 1
-	},
-/turf/simulated/wall/r_wall,
-/area/engineering/atmos)
 "rVr" = (
 /obj/machinery/door/airlock/maintenance/engi{
 	name = "Telecomms Substation"
@@ -34501,12 +34471,6 @@
 /obj/item/device/assembly/igniter,
 /turf/simulated/floor/reinforced,
 /area/rnd/lab)
-"uUU" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/red{
-	dir = 1
-	},
-/turf/simulated/floor/tiled,
-/area/engineering/atmos)
 "uVi" = (
 /turf/simulated/floor/bluegrid,
 /area/ai_upload)
@@ -36567,10 +36531,6 @@
 /obj/machinery/atmospherics/pipe/simple/visible/red,
 /turf/simulated/wall/r_wall,
 /area/engineering/atmos)
-"wkS" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/red,
-/turf/simulated/floor/tiled,
-/area/engineering/atmos)
 "wkV" = (
 /obj/machinery/portable_atmospherics/canister/empty/phoron,
 /obj/machinery/camera/network/engineering{
@@ -38332,12 +38292,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/recreation_area_restroom)
-"xrq" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/red{
-	dir = 5
-	},
-/turf/simulated/wall/r_wall,
-/area/engineering/atmos)
 "xrt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
@@ -39108,9 +39062,6 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/visible/yellow{
-	dir = 4
-	},
 /turf/simulated/floor/tiled,
 /area/engineering/atmos)
 "xOA" = (
@@ -39419,9 +39370,6 @@
 /area/maintenance/maintroom6)
 "xYc" = (
 /obj/machinery/portable_atmospherics/canister/nitrogen,
-/obj/machinery/atmospherics/pipe/simple/visible/red{
-	dir = 4
-	},
 /turf/simulated/floor/tiled,
 /area/engineering/atmos)
 "xYx" = (
@@ -39652,13 +39600,6 @@
 "yfc" = (
 /turf/simulated/floor/tiled,
 /area/security/perma)
-"yfh" = (
-/obj/machinery/atmospherics/binary/pump{
-	dir = 1;
-	name = "Port to Waste"
-	},
-/turf/simulated/floor/tiled,
-/area/engineering/atmos)
 "yfi" = (
 /obj/structure/window/reinforced{
 	dir = 8;
@@ -39839,10 +39780,6 @@
 /obj/machinery/status_display,
 /turf/simulated/wall,
 /area/medical/pyschwarde)
-"ykR" = (
-/obj/machinery/atmospherics/valve/digital,
-/turf/simulated/floor/tiled,
-/area/engineering/atmos)
 "ylc" = (
 /obj/structure/trash_pile,
 /turf/simulated/floor/plating,
@@ -48775,7 +48712,7 @@ oMq
 egf
 tvU
 lOy
-aFw
+gxC
 tUr
 ulv
 dtT
@@ -48937,7 +48874,7 @@ oMq
 qZY
 gxC
 tUr
-btg
+tUr
 tUr
 tUr
 fVE
@@ -49099,7 +49036,7 @@ jHf
 jcY
 mmf
 vLO
-bRH
+tAW
 wvV
 tAW
 xWQ
@@ -49261,7 +49198,7 @@ veA
 vuu
 fVE
 tUr
-vJS
+tUr
 szG
 tAW
 tAW
@@ -49421,11 +49358,11 @@ bZj
 voP
 tUr
 iDK
-uUU
-yfh
-bRH
-tAW
-jtz
+fVE
+tUr
+tUr
+tUr
+tUr
 tUr
 wgv
 khA
@@ -49585,9 +49522,9 @@ vAc
 gfh
 aKM
 tUr
-uQm
-ykR
-wkS
+tUr
+tUr
+tUr
 tUr
 tUr
 gQC
@@ -50073,8 +50010,8 @@ pkP
 cZU
 cZU
 caj
-rUR
-xrq
+cZU
+cZU
 cZU
 lzU
 lzU
diff --git a/maps/yw/cryogaia-05-main.dmm b/maps/yw/cryogaia-05-main.dmm
index edeb29e4a7..314da4e538 100644
--- a/maps/yw/cryogaia-05-main.dmm
+++ b/maps/yw/cryogaia-05-main.dmm
@@ -1050,11 +1050,13 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+/obj/structure/closet/secure_closet/engineering_electrical,
+/obj/structure/window/reinforced{
+	dir = 8;
+	health = 1e+006
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+/obj/effect/floor_decal/corner/yellow{
+	dir = 5
 	},
 /turf/simulated/floor/tiled{
 	icon_state = "monotile"
@@ -1262,7 +1264,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/medical/medbay)
 "ayR" = (
-/obj/structure/frame,
 /obj/effect/floor_decal/corner/yellow{
 	dir = 9
 	},
@@ -1270,6 +1271,9 @@
 	c_tag = "Engineering Workshop West";
 	dir = 4
 	},
+/obj/machinery/computer/station_alert{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/engineering/workshop)
 "ayV" = (
@@ -1314,13 +1318,9 @@
 /turf/simulated/floor/tiled,
 /area/civilian/atrium/central)
 "azS" = (
-/obj/structure/closet/toolcloset,
-/obj/item/weapon/pickaxe,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/steel_grid,
-/area/engineering/workshop)
+/obj/structure/sign/department/janitor,
+/turf/simulated/wall,
+/area/janitor)
 "aAi" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/polarized{
@@ -3255,15 +3255,20 @@
 /area/crew_quarters/bar)
 "bmN" = (
 /obj/structure/cable/green{
-	d1 = 1;
 	d2 = 4;
-	icon_state = "1-4"
+	icon_state = "0-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+/obj/structure/reagent_dispensers/watertank,
+/obj/effect/floor_decal/corner/yellow{
+	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+/obj/effect/floor_decal/corner/yellow{
+	dir = 9
+	},
+/obj/machinery/power/apc{
+	dir = 1;
+	name = "north bump";
+	pixel_y = 24
 	},
 /turf/simulated/floor/tiled{
 	icon_state = "monotile"
@@ -4784,15 +4789,14 @@
 /turf/simulated/floor/tiled,
 /area/security/hallway)
 "bSS" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled{
-	icon_state = "monotile"
+/obj/machinery/light/small{
+	dir = 1
 	},
-/area/engineering/workshop)
+/turf/simulated/floor/tiled,
+/area/civilian/atrium/central)
 "bST" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -4882,19 +4886,9 @@
 /turf/simulated/wall/r_wall,
 /area/crew_quarters/heads/hos)
 "bUN" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/deployable/barrier,
-/obj/structure/window/reinforced{
-	dir = 8;
-	health = 1e+006
-	},
-/obj/machinery/power/apc{
-	name = "south bump";
-	pixel_y = -32
-	},
-/obj/structure/cable/green,
-/turf/simulated/floor/tiled/red,
-/area/security/security_equiptment_storage)
+/obj/machinery/light,
+/turf/simulated/floor/tiled/white,
+/area/medical/medbay_emt_bay)
 "bVr" = (
 /obj/structure/grille,
 /obj/machinery/door/firedoor/glass,
@@ -5943,7 +5937,7 @@
 /turf/simulated/floor/tiled/red,
 /area/security/outpost)
 "cov" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/decal/cleanable/liquid_fuel,
 /turf/simulated/floor/tiled{
 	icon_state = "monotile"
 	},
@@ -7667,12 +7661,15 @@
 /turf/simulated/floor/tiled/steel,
 /area/security/airlock)
 "cVo" = (
-/obj/machinery/computer/station_alert{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/yellow{
 	dir = 9
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/engineering/workshop)
 "cVr" = (
@@ -7892,16 +7889,17 @@
 /turf/simulated/floor/plating/snow/plating/cryogaia,
 /area/borealis2/outdoors/grounds)
 "cZP" = (
-/obj/machinery/alarm{
-	dir = 1;
-	pixel_y = -25
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
-/obj/machinery/camera/network/security{
-	c_tag = "Equipment Storage";
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/security_equiptment_storage)
+/area/security/armoury)
 "cZS" = (
 /obj/machinery/camera/network/medbay{
 	c_tag = "Medical Reception South";
@@ -8157,10 +8155,6 @@
 /area/storage/primary)
 "deM" = (
 /obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineeringatmos{
-	name = "Engineering";
-	req_one_access = list(10,52)
-	},
 /obj/structure/cable/green{
 	d1 = 4;
 	d2 = 8;
@@ -8178,6 +8172,9 @@
 /obj/effect/floor_decal/corner/yellow{
 	dir = 5
 	},
+/obj/machinery/door/airlock/glass_engineering{
+	name = "Engineering"
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/engineering_monitoring)
 "deN" = (
@@ -8481,11 +8478,13 @@
 /turf/simulated/floor/plating,
 /area/maintenance/medbay)
 "djU" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
 	},
-/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/structure/frame,
 /turf/simulated/floor/tiled{
 	icon_state = "monotile"
 	},
@@ -8822,6 +8821,11 @@
 /turf/simulated/floor/plating,
 /area/medical/ward)
 "drl" = (
+/obj/effect/floor_decal/corner/yellow{
+	dir = 5
+	},
+/obj/structure/closet/toolcloset,
+/obj/item/weapon/pickaxe,
 /turf/simulated/floor/tiled/steel_grid,
 /area/engineering/workshop)
 "drs" = (
@@ -9299,7 +9303,9 @@
 /turf/simulated/floor/tiled/red,
 /area/security/armoury)
 "dEc" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
 /turf/simulated/floor/tiled{
 	icon_state = "monotile"
 	},
@@ -9354,10 +9360,27 @@
 /turf/simulated/floor/plating,
 /area/storage/tech)
 "dFS" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
+/obj/structure/table/rack,
+/obj/item/clothing/mask/gas{
+	pixel_x = 3;
+	pixel_y = 3
 	},
-/turf/simulated/floor/tiled/dark,
+/obj/item/clothing/mask/gas{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/gas{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled/red,
 /area/security/security_equiptment_storage)
 "dGd" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
@@ -9576,10 +9599,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/lawoffice)
 "dJF" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/flasher/portable,
-/obj/machinery/light/small,
-/turf/simulated/floor/tiled/red,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
 /area/security/armoury)
 "dJS" = (
 /turf/simulated/floor/plating,
@@ -9756,9 +9779,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/security/hallway)
 "dOd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
+/obj/structure/bed/chair/sofa/right,
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/workshop)
 "dOD" = (
@@ -9914,6 +9935,9 @@
 	dir = 1
 	},
 /obj/machinery/camera/autoname,
+/obj/machinery/light/small{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/starboard)
 "dQw" = (
@@ -10295,6 +10319,9 @@
 /obj/effect/floor_decal/industrial/warning/dust{
 	dir = 1
 	},
+/obj/machinery/light/small{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/security/airlock)
 "dXV" = (
@@ -10612,7 +10639,9 @@
 /area/security/checkpoint)
 "ecd" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/steel_grid,
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
+	},
 /area/engineering/workshop)
 "ecz" = (
 /obj/structure/table/standard,
@@ -13146,7 +13175,10 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/tiled{
 	icon_state = "monotile"
 	},
@@ -15000,16 +15032,9 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
 "fOK" = (
-/obj/structure/closet/secure_closet/engineering_electrical,
-/obj/item/clothing/gloves/yellow,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/yellow{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/steel_grid,
-/area/engineering/workshop)
+/obj/structure/sign/department/armory,
+/turf/simulated/wall/r_wall,
+/area/security/armoury)
 "fOU" = (
 /obj/structure/cable/green{
 	d1 = 4;
@@ -15857,12 +15882,18 @@
 /turf/simulated/wall/r_wall,
 /area/bridge_hallway)
 "gdz" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/effect/decal/cleanable/liquid_fuel,
-/turf/simulated/floor/tiled{
-	icon_state = "monotile"
+/obj/machinery/door/window/brigdoor/southleft{
+	dir = 4;
+	name = "Ion Handguns"
 	},
-/area/engineering/workshop)
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/item/weapon/gun/energy/ionrifle/pistol,
+/obj/structure/table/rack,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled/red,
+/area/security/security_equiptment_storage)
 "gdA" = (
 /obj/effect/floor_decal/snow/floor/edges{
 	dir = 8
@@ -15974,18 +16005,17 @@
 /turf/simulated/floor/plating,
 /area/security/checkpoint)
 "gfk" = (
-/obj/structure/grille,
 /obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/full,
-/obj/machinery/door/blast/shutters{
-	density = 0;
-	dir = 4;
-	icon_state = "shutter0";
-	id = "engidenshutters";
-	name = "Privacy Shutters";
-	opacity = 0
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
-/turf/simulated/floor,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/door/airlock/engineering{
+	name = "Engineering Den"
+	},
+/turf/simulated/floor/tiled,
 /area/engineering/workshop)
 "gfp" = (
 /obj/structure/table/reinforced,
@@ -16023,9 +16053,19 @@
 /turf/simulated/floor/tiled,
 /area/engineering/engineering_monitoring)
 "gfX" = (
-/obj/structure/sign/department/armory,
-/turf/simulated/wall/r_wall,
-/area/security/armoury)
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/deployable/barrier,
+/obj/structure/window/reinforced{
+	dir = 8;
+	health = 1e+006
+	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/red,
+/area/security/security_equiptment_storage)
 "ggd" = (
 /obj/machinery/door/airlock/glass_medical{
 	name = "Patient Ward";
@@ -16209,11 +16249,11 @@
 	dir = 8;
 	health = 1e+006
 	},
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+/obj/machinery/power/apc{
+	name = "south bump";
+	pixel_y = -32
 	},
+/obj/structure/cable/green,
 /turf/simulated/floor/tiled/red,
 /area/security/security_equiptment_storage)
 "gka" = (
@@ -16396,11 +16436,10 @@
 /turf/simulated/floor/plating/snow/plating/cryogaia,
 /area/borealis2/outdoors/grounds)
 "gnQ" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/dark,
-/area/security/armoury)
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/deployable/barrier,
+/turf/simulated/floor/tiled/red,
+/area/security/security_equiptment_storage)
 "gnX" = (
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -16972,19 +17011,11 @@
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/chief)
 "gyu" = (
-/obj/structure/table/rack,
-/obj/item/weapon/storage/box/seccarts{
-	pixel_x = 3;
-	pixel_y = 2
-	},
-/obj/item/weapon/storage/box/handcuffs,
-/obj/item/weapon/storage/box/flashbangs{
-	pixel_x = -2;
-	pixel_y = -2
-	},
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/flasher/portable,
+/obj/machinery/light/small,
 /turf/simulated/floor/tiled/red,
-/area/security/security_equiptment_storage)
+/area/security/armoury)
 "gyy" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/structure/cable/green{
@@ -17294,27 +17325,15 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/foyer)
 "gES" = (
-/obj/structure/table/rack,
-/obj/item/clothing/mask/gas{
-	pixel_x = 3;
-	pixel_y = 3
+/obj/machinery/alarm{
+	dir = 1;
+	pixel_y = -25
 	},
-/obj/item/clothing/mask/gas{
-	pixel_x = 3;
-	pixel_y = 3
+/obj/machinery/camera/network/security{
+	c_tag = "Equipment Storage";
+	dir = 1
 	},
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/mask/gas{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/item/clothing/mask/gas{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/red,
+/turf/simulated/floor/tiled/dark,
 /area/security/security_equiptment_storage)
 "gEX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -17523,9 +17542,7 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/borealis2/outdoors/grounds/tower/northeast)
 "gLb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
+/obj/structure/bed/chair/sofa,
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/workshop)
 "gLd" = (
@@ -18003,7 +18020,12 @@
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/entry/docking_lounge)
 "gUR" = (
+/obj/effect/floor_decal/corner/yellow{
+	dir = 5
+	},
 /obj/effect/decal/cleanable/blood/oil,
+/obj/structure/closet/toolcloset,
+/obj/item/weapon/pickaxe,
 /turf/simulated/floor/tiled/steel_grid,
 /area/engineering/workshop)
 "gUX" = (
@@ -18865,12 +18887,19 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
 "hmj" = (
-/obj/structure/frame,
-/obj/effect/floor_decal/corner/yellow{
-	dir = 5
+/obj/structure/table/rack,
+/obj/item/weapon/storage/box/seccarts{
+	pixel_x = 3;
+	pixel_y = 2
 	},
-/turf/simulated/floor/tiled/steel_grid,
-/area/engineering/workshop)
+/obj/item/weapon/storage/box/handcuffs,
+/obj/item/weapon/storage/box/flashbangs{
+	pixel_x = -2;
+	pixel_y = -2
+	},
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled/red,
+/area/security/security_equiptment_storage)
 "hmr" = (
 /obj/machinery/atmospherics/pipe/simple/visible/black{
 	dir = 6
@@ -21132,20 +21161,15 @@
 /turf/simulated/floor/wood,
 /area/bridge/meeting_room)
 "ijI" = (
-/obj/structure/closet/secure_closet/engineering_welding,
-/obj/structure/window/reinforced{
-	dir = 4;
-	health = 1e+006
+/obj/structure/grille,
+/obj/structure/cable/green{
+	icon_state = "0-8"
 	},
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/machinery/light{
-	dir = 1
+/obj/structure/cable/green{
+	icon_state = "0-4"
 	},
-/obj/effect/floor_decal/corner/yellow{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/steel_grid,
-/area/engineering/workshop)
+/turf/simulated/floor/plating,
+/area/security/security_equiptment_storage)
 "iki" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 1
@@ -21211,13 +21235,16 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
 "ikX" = (
-/obj/structure/bed/chair/sofa/corner{
-	dir = 8
-	},
 /obj/item/device/radio/intercom{
 	name = "Common Channel";
 	pixel_y = -21
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
 /turf/simulated/floor/carpet,
 /area/engineering/workshop)
 "ilc" = (
@@ -21621,7 +21648,9 @@
 /obj/item/weapon/paper/psmartfridge{
 	pixel_y = 9
 	},
-/turf/simulated/floor/tiled/steel_grid,
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
+	},
 /area/engineering/workshop)
 "itN" = (
 /turf/simulated/wall,
@@ -22384,10 +22413,11 @@
 /turf/simulated/wall/r_wall,
 /area/engineering/engine_monitoring)
 "iKh" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/deployable/barrier,
-/turf/simulated/floor/tiled/red,
+/obj/structure/grille,
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/plating,
 /area/security/security_equiptment_storage)
 "iKn" = (
 /obj/effect/floor_decal/industrial/warning/dust{
@@ -24543,7 +24573,9 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay)
 "jDJ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark,
 /area/security/security_equiptment_storage)
 "jEo" = (
@@ -25355,12 +25387,7 @@
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/showers)
 "jWb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
+/obj/structure/bed/chair/sofa/corner,
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/workshop)
 "jWH" = (
@@ -25759,7 +25786,7 @@
 "kdh" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
+/obj/structure/frame,
 /turf/simulated/floor/tiled{
 	icon_state = "monotile"
 	},
@@ -25789,12 +25816,6 @@
 	name = "Common Channel";
 	pixel_y = -21
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/engineering/workshop)
 "kdq" = (
@@ -25837,12 +25858,6 @@
 /obj/effect/floor_decal/corner/yellow{
 	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/engineering/workshop)
 "keN" = (
@@ -26484,7 +26499,9 @@
 	description_info = "Materials stored in here will not last in-between rounds";
 	name = "\improper temporary Smart Sheet Storage"
 	},
-/turf/simulated/floor/tiled/steel_grid,
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
+	},
 /area/engineering/workshop)
 "krb" = (
 /obj/structure/table/standard,
@@ -26593,9 +26610,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
@@ -27593,6 +27607,7 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
+/obj/structure/flora/pottedplant/smallcactus,
 /turf/simulated/floor/tiled,
 /area/quartermaster/office)
 "kNS" = (
@@ -27716,7 +27731,16 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "kPY" = (
-/obj/structure/closet/wardrobe/engineering_yellow,
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/closet/secure_closet/engineering_electrical,
+/obj/item/clothing/gloves/yellow,
 /obj/effect/floor_decal/corner/yellow{
 	dir = 5
 	},
@@ -30712,12 +30736,16 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/workshop)
 "mbc" = (
-/obj/structure/grille,
-/obj/structure/cable/green{
-	icon_state = "0-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
-/turf/simulated/floor/plating,
-/area/security/armoury)
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
+	},
+/area/engineering/workshop)
 "mbi" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/red,
@@ -31078,9 +31106,6 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/phoronics)
 "miu" = (
-/obj/structure/bed/chair/sofa{
-	dir = 1
-	},
 /obj/machinery/alarm{
 	dir = 1;
 	pixel_y = -25
@@ -31094,6 +31119,9 @@
 	req_access = newlist();
 	req_one_access = list(10)
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/carpet,
 /area/engineering/workshop)
 "miP" = (
@@ -31561,16 +31589,25 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/research)
 "mrM" = (
-/obj/machinery/door/window/brigdoor/southleft{
-	dir = 4;
-	name = "Ion Handguns"
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/item/weapon/gun/energy/ionrifle/pistol,
 /obj/structure/table/rack,
 /obj/effect/floor_decal/industrial/outline/yellow,
+/obj/item/clothing/suit/storage/vest/heavy/officer,
+/obj/item/clothing/suit/storage/vest/heavy/officer,
+/obj/item/clothing/suit/storage/vest/heavy/officer,
+/obj/item/clothing/suit/storage/vest/heavy/officer,
+/obj/item/clothing/suit/storage/vest/heavy/officer,
+/obj/item/clothing/suit/storage/vest/heavy/officer,
+/obj/machinery/door/window/brigdoor/southright{
+	dir = 4;
+	name = "Heavy Armor Vests"
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	pixel_y = 4
+	},
 /turf/simulated/floor/tiled/red,
 /area/security/security_equiptment_storage)
 "mrP" = (
@@ -32639,15 +32676,15 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/structure/closet/secure_closet/engineering_welding,
+/obj/structure/window/reinforced{
+	dir = 8;
+	health = 1e+006
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+/obj/effect/floor_decal/corner/yellow{
+	dir = 5
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/steel_grid,
 /area/engineering/workshop)
 "mIY" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -34195,6 +34232,12 @@
 /area/maintenance/medbay_aft)
 "nkD" = (
 /obj/effect/decal/cleanable/blood/oil,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
 /turf/simulated/floor/tiled{
 	icon_state = "monotile"
 	},
@@ -35031,15 +35074,20 @@
 /turf/simulated/floor/plating,
 /area/maintenance/bridge)
 "nBk" = (
-/obj/structure/closet/secure_closet/engineering_electrical,
-/obj/structure/window/reinforced{
-	dir = 8;
-	health = 1e+006
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
-/obj/effect/floor_decal/corner/yellow{
-	dir = 5
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
 	},
-/turf/simulated/floor/tiled/steel_grid,
 /area/engineering/workshop)
 "nBm" = (
 /obj/structure/table/standard,
@@ -35090,6 +35138,9 @@
 /obj/machinery/holoposter{
 	pixel_y = 32
 	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/starboard)
 "nCs" = (
@@ -36614,19 +36665,12 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay_primary_storage)
 "ohR" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/structure/cable/green{
-	icon_state = "0-2"
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
 	},
-/obj/machinery/power/apc{
-	dir = 1;
-	name = "north bump";
-	pixel_y = 24
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
 	},
-/obj/effect/floor_decal/corner/yellow{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/steel_grid,
 /area/engineering/workshop)
 "oid" = (
 /obj/structure/bed/chair/office/dark{
@@ -37801,10 +37845,6 @@
 /area/security/evidence_storage)
 "oGB" = (
 /obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineeringatmos{
-	name = "Engineering";
-	req_one_access = list(10)
-	},
 /obj/structure/cable/green{
 	d1 = 4;
 	d2 = 8;
@@ -37819,6 +37859,9 @@
 /obj/effect/floor_decal/corner/yellow{
 	dir = 5
 	},
+/obj/machinery/door/airlock/glass_engineering{
+	name = "Engineering"
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/hallway)
 "oGJ" = (
@@ -38031,6 +38074,9 @@
 /area/borealis2/outdoors/grounds/power)
 "oMy" = (
 /obj/machinery/mech_recharger,
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark,
 /area/security/security_equiptment_storage)
 "oMB" = (
@@ -38507,7 +38553,7 @@
 /turf/simulated/floor/tiled,
 /area/assembly/robotics)
 "oVq" = (
-/obj/structure/disposalpipe/segment,
+/obj/structure/table/reinforced,
 /turf/simulated/floor/tiled{
 	icon_state = "monotile"
 	},
@@ -41909,16 +41955,11 @@
 /turf/simulated/floor/plating,
 /area/engineering/engineering_monitoring)
 "qmn" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
-/turf/simulated/floor/tiled{
-	icon_state = "monotile"
+/obj/structure/closet/wardrobe/engineering_yellow,
+/obj/effect/floor_decal/corner/yellow{
+	dir = 5
 	},
+/turf/simulated/floor/tiled/steel_grid,
 /area/engineering/workshop)
 "qmp" = (
 /obj/effect/floor_decal/corner/green/diagonal{
@@ -42222,8 +42263,13 @@
 	charge = 100;
 	maxcharge = 15000
 	},
-/obj/structure/disposalpipe/segment,
 /obj/item/weapon/rms,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/engineering/workshop)
 "qrN" = (
@@ -43511,10 +43557,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/chapel/monastery)
 "qRP" = (
-/obj/effect/floor_decal/corner/yellow{
-	dir = 6
+/obj/structure/flora/pottedplant{
+	icon_state = "plant-21"
+	},
+/obj/effect/floor_decal/corner/yellow/full{
+	dir = 1
 	},
-/obj/vehicle/train/trolley,
 /turf/simulated/floor/tiled/steel_grid,
 /area/engineering/workshop)
 "qRZ" = (
@@ -43556,10 +43604,6 @@
 /area/security/airlock)
 "qSt" = (
 /obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineeringatmos{
-	name = "Engineering";
-	req_one_access = list(10,52)
-	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
@@ -43568,6 +43612,9 @@
 /obj/effect/floor_decal/corner/yellow{
 	dir = 10
 	},
+/obj/machinery/door/airlock/glass_engineering{
+	name = "Engineering"
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/engineering_monitoring)
 "qSw" = (
@@ -43661,12 +43708,13 @@
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/exit)
 "qVi" = (
-/obj/structure/closet/toolcloset,
-/obj/item/weapon/pickaxe,
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
 	},
-/turf/simulated/floor/tiled/steel_grid,
 /area/engineering/workshop)
 "qVk" = (
 /obj/machinery/firealarm{
@@ -43825,6 +43873,7 @@
 /turf/simulated/floor/outdoors/snow/snow/cryogaia,
 /area/borealis2/outdoors/exterior)
 "qYH" = (
+/obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/deployable/barrier,
 /turf/simulated/floor/tiled/red,
@@ -44099,16 +44148,17 @@
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
 "rer" = (
-/obj/structure/closet/secure_closet/engineering_welding,
-/obj/structure/window/reinforced{
-	dir = 8;
-	health = 1e+006
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/effect/floor_decal/corner/yellow{
-	dir = 5
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
 	},
-/turf/simulated/floor/tiled/steel_grid,
 /area/engineering/workshop)
 "reC" = (
 /obj/structure/flora/pottedplant/crystal,
@@ -44387,7 +44437,7 @@
 /area/crew_quarters/bar)
 "rkV" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
+	dir = 10
 	},
 /turf/simulated/floor/carpet,
 /area/engineering/workshop)
@@ -46258,7 +46308,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/steel_grid,
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
+	},
 /area/engineering/workshop)
 "rXo" = (
 /obj/effect/floor_decal/corner/red,
@@ -46845,6 +46897,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/light/small,
 /turf/simulated/floor/plating,
 /area/security/airlock)
 "sks" = (
@@ -47440,14 +47493,10 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
 "svu" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 4
-	},
 /obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/corner/yellow,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled{
 	icon_state = "monotile"
 	},
@@ -48287,12 +48336,6 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/yellow{
 	dir = 8
 	},
@@ -48643,15 +48686,6 @@
 	},
 /turf/simulated/floor,
 /area/engineering/engine_room)
-"sVB" = (
-/obj/structure/flora/pottedplant{
-	icon_state = "plant-21"
-	},
-/obj/effect/floor_decal/corner/yellow/full{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/steel_grid,
-/area/engineering/workshop)
 "sVL" = (
 /obj/machinery/status_display,
 /turf/simulated/wall,
@@ -48970,28 +49004,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/kitchen)
-"ten" = (
-/obj/structure/table/rack,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/clothing/suit/storage/vest/heavy/officer,
-/obj/item/clothing/suit/storage/vest/heavy/officer,
-/obj/item/clothing/suit/storage/vest/heavy/officer,
-/obj/item/clothing/suit/storage/vest/heavy/officer,
-/obj/item/clothing/suit/storage/vest/heavy/officer,
-/obj/item/clothing/suit/storage/vest/heavy/officer,
-/obj/machinery/door/window/brigdoor/southright{
-	dir = 4;
-	name = "Heavy Armor Vests"
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 1;
-	pixel_y = 4
-	},
-/turf/simulated/floor/tiled/red,
-/area/security/security_equiptment_storage)
 "tep" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -49940,8 +49952,8 @@
 /turf/simulated/floor/tiled/steel,
 /area/security/briefing_room)
 "txB" = (
-/obj/structure/bed/chair/sofa/left{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
 	},
 /turf/simulated/floor/carpet,
 /area/engineering/workshop)
@@ -52556,6 +52568,7 @@
 /obj/effect/floor_decal/corner/red{
 	dir = 10
 	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/steel,
 /area/security/hallway)
 "uHe" = (
@@ -54531,19 +54544,6 @@
 	},
 /turf/simulated/wall/titanium,
 /area/borealis2/outdoors/grounds/tower/southwest)
-"vyT" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/door/airlock/engineering{
-	name = "Engineering Den"
-	},
-/turf/simulated/floor/tiled,
-/area/engineering/workshop)
 "vzb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -54880,9 +54880,6 @@
 /obj/effect/floor_decal/corner/yellow{
 	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/engineering/workshop)
 "vEX" = (
@@ -55615,21 +55612,23 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
 "vVv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/structure/cable/green{
 	d1 = 2;
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/turf/simulated/floor/tiled{
-	icon_state = "monotile"
+/obj/structure/closet/secure_closet/engineering_welding,
+/obj/structure/window/reinforced{
+	dir = 4;
+	health = 1e+006
 	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/yellow{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/steel_grid,
 /area/engineering/workshop)
 "vVx" = (
 /obj/machinery/computer/power_monitor{
@@ -55995,16 +55994,15 @@
 /area/bridge/blueshield)
 "wcB" = (
 /obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineeringatmos{
-	name = "Engineering";
-	req_one_access = list(10)
-	},
 /obj/effect/floor_decal/corner/yellow{
 	dir = 10
 	},
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/glass_engineering{
+	name = "Engineering"
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/hallway)
 "wcF" = (
@@ -58470,12 +58468,10 @@
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/locker/locker_toilet)
 "wZd" = (
-/obj/structure/bed/chair/sofa/right{
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/structure/bed/chair/sofa/left{
 	dir = 8
 	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
-	},
 /turf/simulated/floor/carpet,
 /area/engineering/workshop)
 "wZx" = (
@@ -60429,9 +60425,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/lawoffice)
 "xOB" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
 /obj/effect/floor_decal/corner_oldtile/purple{
 	dir = 8
 	},
@@ -68596,7 +68589,7 @@ jWH
 kEN
 gsF
 bmi
-mbc
+cDU
 vgT
 jWb
 wZd
@@ -68754,13 +68747,13 @@ iEW
 qQz
 qQz
 qQz
-qQz
+cZP
 ksV
 tiO
 bmi
-bmi
+cDU
 vgT
-vyT
+kUx
 kUx
 gfk
 kUx
@@ -68916,12 +68909,12 @@ pLp
 nvS
 bmi
 gqv
-jWH
-gnQ
+dJF
 mGp
 mGp
 bmi
-ohR
+cDU
+vgT
 bmN
 xcH
 cVo
@@ -69079,14 +69072,14 @@ mMr
 bmi
 jyF
 oUp
-jWH
 mGp
-dJF
+gyu
 bmi
-nBk
+cDU
+vgT
 auL
 lmI
-lmI
+mbc
 dEc
 cov
 vEQ
@@ -69241,16 +69234,16 @@ mMr
 bmi
 bmi
 xMu
-xMu
-gfX
-bmi
-bmi
 fOK
-auL
+bmi
+bmi
+cDU
+vgT
+kPY
 sCK
 nkD
+ohR
 lmI
-gdz
 kdm
 kUx
 jqL
@@ -69403,16 +69396,16 @@ tox
 oBP
 bTf
 aGk
-tGV
+gdz
 mrM
-ten
 uoM
-rer
+ijI
+vgT
 mIG
-oVq
+lmI
 qrC
 oVq
-oVq
+qVi
 keG
 yjZ
 jvG
@@ -69566,15 +69559,15 @@ tGV
 tGV
 tGV
 tGV
-tGV
-cZP
+gES
 uoM
 ijI
+vgT
 vVv
 loz
-loz
+nBk
 kML
-loz
+rer
 sMJ
 oky
 gAL
@@ -69728,12 +69721,12 @@ tGV
 nWr
 tGV
 tGV
-tGV
-gyu
+hmj
 uoM
-kPY
+ijI
+vgT
 qmn
-bSS
+lmI
 djU
 kdh
 feB
@@ -69891,12 +69884,12 @@ msn
 pje
 jDJ
 dFS
-gES
 uoM
-hmj
+ijI
+vgT
 gUR
-qVi
-azS
+lmI
+lmI
 kqY
 itn
 vky
@@ -70051,14 +70044,14 @@ wPF
 uTQ
 evG
 sXB
-sXB
+gfX
 gjM
-bUN
 uoM
-hmj
+ijI
+vgT
 drl
 ecd
-drl
+lmI
 ecd
 rXl
 wMF
@@ -70213,11 +70206,11 @@ mMr
 bVG
 vfP
 tGV
-tGV
+gnQ
 qYH
-iKh
 uoM
-sVB
+iKh
+vgT
 qRP
 ngl
 blA
@@ -72770,7 +72763,7 @@ rgu
 thQ
 mUF
 boY
-oLX
+bUN
 pYh
 tsI
 tsI
@@ -75030,7 +75023,7 @@ cqv
 cyR
 hEM
 mHb
-hEM
+azS
 hEM
 pls
 tjc
@@ -75360,7 +75353,7 @@ raN
 pWS
 rZJ
 wBj
-qPj
+bSS
 fVu
 ddl
 rZJ
@@ -80946,7 +80939,7 @@ uDf
 uDf
 uDf
 uDf
-uDf
+fep
 lta
 uDf
 uDf
@@ -81749,7 +81742,7 @@ uDf
 uDf
 uDf
 uDf
-fep
+uDf
 uDf
 uDf
 uDf