diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm
index f252c6371a1..2d2dfeb051c 100644
--- a/code/game/objects/items/weapons/surgery_tools.dm
+++ b/code/game/objects/items/weapons/surgery_tools.dm
@@ -318,4 +318,22 @@
 		/obj/item/device/mass_spectrometer,
 		/obj/item/reagent_containers/glass/beaker/vial,
 		/obj/item/reagent_containers/syringe
+	)
+
+/obj/item/storage/box/fancy/tray/robotics
+	starts_with = list(
+		/obj/item/surgery/circular_saw = 1,
+		/obj/item/surgery/hemostat = 1,
+		/obj/item/surgery/retractor = 1,
+		/obj/item/surgery/scalpel = 1,
+		/obj/item/surgery/surgicaldrill = 1
+	)
+
+	can_hold = list(
+		/obj/item/surgery/circular_saw,
+		/obj/item/surgery/circular_saw,
+		/obj/item/surgery/hemostat,
+		/obj/item/surgery/retractor,
+		/obj/item/surgery/scalpel,
+		/obj/item/surgery/surgicaldrill
 	)
\ No newline at end of file
diff --git a/maps/sccv_horizon/code/sccv_horizon_areas.dm b/maps/sccv_horizon/code/sccv_horizon_areas.dm
index aea6539ceb0..18acbc3938f 100644
--- a/maps/sccv_horizon/code/sccv_horizon_areas.dm
+++ b/maps/sccv_horizon/code/sccv_horizon_areas.dm
@@ -154,6 +154,9 @@
 	name = "Operations Equipment Storage"
 	icon_state = "dark160"
 
+/area/operations/lower/machinist
+	name = "Machinist Workshop"
+
 //Wings
 
 /area/maintenance/substation/wing_starboard
diff --git a/maps/sccv_horizon/placeholder-1_deck_1.dmm b/maps/sccv_horizon/placeholder-1_deck_1.dmm
index 59427f5f6c0..1fa80f864ee 100644
--- a/maps/sccv_horizon/placeholder-1_deck_1.dmm
+++ b/maps/sccv_horizon/placeholder-1_deck_1.dmm
@@ -186,27 +186,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/research_port)
-"alW" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/structure/railing/mapped{
-	dir = 1
-	},
-/obj/machinery/light/small/emergency{
-	dir = 4
-	},
-/obj/effect/floor_decal/spline/plain{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/engineering)
 "amw" = (
 /obj/structure/shuttle_part{
 	icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi';
@@ -311,14 +290,8 @@
 	dir = 4
 	},
 /obj/machinery/light,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced,
-/obj/structure/table/reinforced/steel,
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/carpet/rubber,
-/area/operations/storage)
+/turf/simulated/floor/tiled/dark,
+/area/operations/lower/machinist)
 "aqr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -874,7 +847,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/effect/floor_decal/corner/white/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "aPY" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -897,7 +870,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled/white,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "aSL" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -1530,13 +1503,6 @@
 /obj/machinery/light/small,
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
-"bsP" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/dark,
-/area/operations/storage)
 "btw" = (
 /obj/machinery/atmospherics/pipe/simple/visible/black{
 	dir = 5
@@ -2099,7 +2065,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "bSo" = (
 /obj/effect/floor_decal/corner_wide/purple{
 	dir = 4
@@ -2135,24 +2101,25 @@
 /turf/simulated/floor/tiled,
 /area/hangar/intrepid)
 "bVc" = (
-/obj/machinery/light{
-	dir = 8
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
 	},
-/obj/effect/floor_decal/corner/black{
-	dir = 9
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/tiled,
-/area/hallway/primary/aft)
+/area/maintenance/engineering)
 "bVh" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
 	},
 /turf/simulated/floor/tiled/dark,
 /area/turret_protected/ai_upload_foyer)
-"bVO" = (
-/obj/structure/closet/crate,
-/turf/simulated/floor/tiled/dark,
-/area/operations/storage)
 "bVV" = (
 /obj/item/material/shard,
 /turf/simulated/floor/plating,
@@ -3311,9 +3278,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos/air)
-"daY" = (
-/turf/simulated/wall,
-/area/operations/upper)
 "dcs" = (
 /obj/structure/sign/securearea{
 	desc = "A warning sign which reads 'RADIOACTIVE AREA'";
@@ -3522,9 +3486,9 @@
 /turf/simulated/floor/tiled,
 /area/storage/eva)
 "dmq" = (
-/obj/structure/bed/stool/padded/red,
+/obj/machinery/mecha_part_fabricator,
 /turf/simulated/floor/tiled/dark,
-/area/operations/storage)
+/area/operations/lower/machinist)
 "dns" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -3685,7 +3649,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled/white,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "dtN" = (
 /obj/machinery/light/spot/weak{
 	dir = 8
@@ -3706,16 +3670,12 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
 "dvT" = (
-/obj/structure/table/reinforced/steel,
-/obj/machinery/door/window/brigdoor/westleft{
-	name = "Workshop";
-	req_access = list(29)
-	},
 /obj/machinery/door/firedoor,
-/obj/item/paper_bin,
-/obj/item/pen/black,
-/turf/simulated/floor/tiled/dark,
-/area/operations/lower)
+/obj/effect/map_effect/wingrille_spawn/reinforced/polarized{
+	id = "1deckworkshop"
+	},
+/turf/simulated/floor/plating,
+/area/operations/lower/machinist)
 "dwY" = (
 /obj/effect/floor_decal/corner_wide/purple{
 	dir = 5
@@ -4133,12 +4093,10 @@
 	dir = 1
 	},
 /obj/effect/floor_decal/corner/white/diagonal,
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
-	dir = 8
-	},
+/obj/structure/table/steel,
+/obj/item/device/floor_painter,
 /turf/simulated/floor/tiled/white,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "dVs" = (
 /obj/structure/cable/green{
 	icon_state = "0-2"
@@ -4274,7 +4232,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled/white,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "eaO" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
@@ -4338,21 +4296,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/maintenance/wing/port/deck1)
-"ecj" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
-/obj/machinery/alarm{
-	pixel_y = 28
-	},
-/turf/simulated/floor/tiled/dark,
-/area/operations/storage)
 "edm" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -5761,17 +5704,15 @@
 /turf/simulated/floor/plating,
 /area/maintenance/cargo)
 "fga" = (
-/obj/structure/table/reinforced/steel,
-/obj/machinery/camera/network/supply{
-	c_tag = "Cargo -  Workshop";
-	dir = 4
+/obj/machinery/optable{
+	desc = "Used for advanced medical procedures, such as removing brains for cyborgification. Also used to repair unlawed synthetics.";
+	name = "Repairs Operation Table"
 	},
-/obj/item/stack/material/glass/full,
-/obj/item/stack/material/glass/full,
-/obj/item/stack/material/steel/full,
-/obj/item/stack/material/steel/full,
-/turf/simulated/floor/tiled/dark,
-/area/operations/lower)
+/obj/effect/floor_decal/industrial/warning{
+	dir = 1
+	},
+/turf/simulated/floor/reinforced,
+/area/operations/lower/machinist)
 "fgF" = (
 /obj/effect/floor_decal/corner/black{
 	dir = 5
@@ -5998,15 +5939,15 @@
 /turf/simulated/floor/tiled,
 /area/hangar/cargo)
 "fqU" = (
-/obj/machinery/alarm{
-	dir = 4;
-	pixel_x = -28
-	},
 /obj/effect/floor_decal/corner/white{
 	dir = 9
 	},
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
+/obj/machinery/disposal/small/east,
 /turf/simulated/floor/tiled/white,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "frg" = (
 /obj/structure/table/steel,
 /obj/machinery/light{
@@ -6974,7 +6915,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "ghn" = (
 /obj/structure/cable/green{
 	icon_state = "2-8"
@@ -7337,16 +7278,10 @@
 /turf/simulated/wall/shuttle/scc/cardinal,
 /area/shuttle/mining)
 "gxS" = (
-/obj/structure/cable/green{
-	icon_state = "0-2"
-	},
-/obj/machinery/power/apc/low{
-	dir = 1;
-	name = "north bump";
-	pixel_y = 24
-	},
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/reagent_dispensers/fueltank,
 /turf/simulated/floor/tiled/dark,
-/area/operations/lower)
+/area/operations/lower/machinist)
 "gya" = (
 /obj/machinery/meter,
 /obj/machinery/atmospherics/pipe/manifold4w/visible/black,
@@ -7399,9 +7334,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/research_port)
-"gyJ" = (
-/turf/simulated/wall,
-/area/operations/storage)
 "gyL" = (
 /obj/machinery/atmospherics/pipe/simple/visible/blue,
 /turf/simulated/floor/reinforced/airmix,
@@ -7414,14 +7346,14 @@
 	dir = 8
 	},
 /obj/structure/table/reinforced/steel,
-/obj/item/storage/toolbox/mechanical,
 /obj/effect/floor_decal/corner/white/diagonal,
+/obj/item/storage/bag/circuits/basic,
 /obj/structure/disposalpipe/segment{
-	dir = 1;
+	dir = 8;
 	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/tiled/white,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "gzQ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -7619,8 +7551,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
-/area/operations/storage)
+/area/operations/lower/machinist)
 "gIc" = (
 /obj/structure/table/standard,
 /obj/item/hoist_kit{
@@ -8029,12 +7962,12 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/mining{
 	name = "Workshop";
 	req_access = list(29)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/operations/lower)
+/area/operations/lower/machinist)
 "heH" = (
 /turf/simulated/floor/reinforced/oxygen,
 /area/engineering/atmos/air)
@@ -8415,6 +8348,14 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos)
+"hvO" = (
+/obj/machinery/vending/robotics,
+/obj/structure/sign/nosmoking_1{
+	pixel_y = 28
+	},
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "hwk" = (
 /obj/machinery/atmospherics/binary/pump{
 	dir = 8;
@@ -8548,6 +8489,15 @@
 /obj/machinery/atmospherics/pipe/simple/visible/supply,
 /turf/simulated/floor/plating,
 /area/engineering/atmos/air)
+"hDI" = (
+/obj/effect/floor_decal/corner/black{
+	dir = 9
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/primary/aft)
 "hEh" = (
 /obj/machinery/conveyor{
 	id = "mining_1";
@@ -8721,7 +8671,7 @@
 	layer = 2.9
 	},
 /turf/simulated/floor/plating,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "hNC" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -8779,14 +8729,18 @@
 /turf/simulated/floor/plating,
 /area/engineering/atmos)
 "hPD" = (
-/obj/structure/railing/mapped{
-	dir = 1
-	},
 /obj/effect/floor_decal/corner/white/full{
 	dir = 1
 	},
+/obj/machinery/door/window/brigdoor/northright{
+	name = "Workshop";
+	req_access = list(29)
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "hQr" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -8972,11 +8926,16 @@
 /turf/simulated/floor/plating,
 /area/maintenance/research_port)
 "hYh" = (
-/obj/structure/table/rack,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/storage/toolbox/mechanical,
+/obj/structure/table/steel,
+/obj/machinery/light{
+	dir = 1;
+	icon_state = "tube1"
+	},
+/obj/item/nitrilebox,
+/obj/item/storage/box/masks,
+/obj/item/reagent_containers/spray/cleaner,
 /turf/simulated/floor/tiled/dark,
-/area/operations/lower)
+/area/operations/lower/machinist)
 "hYy" = (
 /turf/simulated/floor/tiled,
 /area/hangar/intrepid)
@@ -9175,7 +9134,7 @@
 	},
 /obj/effect/floor_decal/corner/white/full,
 /turf/simulated/floor/tiled/white,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "ifU" = (
 /obj/structure/grille,
 /obj/structure/window/shuttle/scc,
@@ -9492,7 +9451,7 @@
 	req_access = list(29)
 	},
 /turf/simulated/floor/tiled/white,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "iAs" = (
 /obj/structure/railing/mapped{
 	dir = 1
@@ -9549,7 +9508,7 @@
 /area/shuttle/escape_pod/pod4)
 "iDw" = (
 /turf/simulated/wall,
-/area/operations/lower)
+/area/operations/lower/machinist)
 "iDM" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -9665,22 +9624,6 @@
 	icon_state = "vault"
 	},
 /area/maintenance/wing/port/deck1)
-"iJc" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/dark,
-/area/operations/storage)
 "iJi" = (
 /obj/effect/floor_decal/corner_wide/purple/diagonal,
 /obj/structure/cable/green{
@@ -10176,12 +10119,26 @@
 /turf/simulated/floor/tiled/dark,
 /area/hangar/intrepid)
 "jiU" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
+/obj/structure/table/rack,
+/obj/item/storage/toolbox/mechanical{
+	desc = "A blue toolbox containing mechanic-related tools."
 	},
+/obj/item/storage/toolbox/mechanical{
+	desc = "A blue toolbox containing mechanic-related tools."
+	},
+/obj/item/storage/toolbox/electrical,
+/obj/item/device/multitool,
+/obj/item/device/multitool,
+/obj/item/clothing/glasses/welding,
+/obj/item/clothing/glasses/welding,
+/obj/item/clothing/head/welding,
+/obj/item/clothing/head/welding,
+/obj/item/storage/belt/utility,
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil,
 /obj/machinery/firealarm/north,
 /turf/simulated/floor/tiled/dark,
-/area/operations/storage)
+/area/operations/lower/machinist)
 "jjZ" = (
 /obj/machinery/firealarm/east,
 /obj/effect/floor_decal/corner/black/full{
@@ -10254,26 +10211,6 @@
 /obj/machinery/light/small,
 /turf/simulated/floor/tiled/white,
 /area/shuttle/intrepid)
-"joU" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/corner/white/diagonal,
-/obj/effect/floor_decal/corner/black,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/operations/lower)
 "joW" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/random/junk,
@@ -10678,7 +10615,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "jEt" = (
 /obj/structure/shuttle_part{
 	icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi';
@@ -10769,11 +10706,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenoarch_atrium)
-"jHe" = (
-/obj/structure/table/reinforced/steel,
-/obj/machinery/cell_charger,
-/turf/simulated/floor/tiled/dark,
-/area/operations/storage)
 "jHu" = (
 /obj/structure/tank_wall{
 	icon_state = "m-8"
@@ -11020,10 +10952,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos)
 "jWE" = (
-/obj/effect/floor_decal/corner/white/diagonal,
-/obj/effect/floor_decal/corner/black,
-/turf/simulated/floor/tiled,
-/area/operations/storage)
+/obj/effect/floor_decal/industrial/loading/yellow{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/operations/lower/machinist)
 "jWI" = (
 /obj/machinery/newscaster{
 	pixel_x = 30
@@ -11540,8 +11473,13 @@
 	pixel_x = 28
 	},
 /obj/effect/floor_decal/corner/white/diagonal,
+/obj/structure/table/steel,
+/obj/item/device/flashlight/lamp{
+	pixel_x = 2;
+	pixel_y = 2
+	},
 /turf/simulated/floor/tiled/dark,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "kzC" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/black,
 /obj/effect/floor_decal/industrial/warning{
@@ -11743,13 +11681,26 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos/air)
+"kHz" = (
+/obj/machinery/conveyor{
+	dir = 1;
+	id = "Robocompo"
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/operations/lower/machinist)
 "kHS" = (
 /obj/effect/floor_decal/industrial/loading/yellow{
 	dir = 8
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "kHT" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -12172,19 +12123,6 @@
 	},
 /turf/simulated/floor/carpet/rubber,
 /area/shuttle/intrepid)
-"laW" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/turf/simulated/floor/tiled/dark,
-/area/operations/storage)
 "lbr" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -12616,25 +12554,11 @@
 /turf/simulated/floor/plating,
 /area/engineering/storage/lower)
 "lzt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+/obj/effect/floor_decal/industrial/warning{
+	dir = 10
 	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
-	dir = 4
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/operations/storage)
+/turf/simulated/floor/reinforced,
+/area/operations/lower/machinist)
 "lAU" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -13286,12 +13210,24 @@
 /obj/machinery/gibber,
 /turf/simulated/floor/tiled,
 /area/crew_quarters/kitchen/freezer)
+"mdZ" = (
+/obj/machinery/conveyor{
+	dir = 10;
+	id = "Robocompo"
+	},
+/obj/structure/plasticflaps/mining,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 9
+	},
+/obj/effect/floor_decal/industrial/warning/corner,
+/turf/simulated/floor/tiled/dark,
+/area/operations/lower/machinist)
 "mey" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "mfk" = (
 /obj/machinery/door/blast/regular/open{
 	id = "hangarlockdown";
@@ -13491,9 +13427,6 @@
 /obj/structure/cable/green{
 	icon_state = "2-4"
 	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
@@ -14030,8 +13963,12 @@
 /obj/structure/reagent_dispensers/acid{
 	pixel_x = -32
 	},
+/obj/machinery/alarm{
+	dir = 1;
+	pixel_y = -28
+	},
 /turf/simulated/floor/carpet/rubber,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "mPy" = (
 /obj/machinery/atmospherics/binary/pump{
 	name = "Mix to Connectors"
@@ -14332,9 +14269,6 @@
 /turf/simulated/floor/plating,
 /area/maintenance/engineering)
 "mZe" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/firealarm/east,
@@ -14703,7 +14637,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/operations/lower)
+/area/operations/lower/machinist)
 "nrq" = (
 /obj/machinery/atmospherics/pipe/simple/visible/purple{
 	dir = 4
@@ -15460,6 +15394,14 @@
 /obj/structure/trash_pile,
 /turf/simulated/floor/plating,
 /area/maintenance/engineering)
+"ocs" = (
+/obj/machinery/conveyor{
+	dir = 1;
+	id = "Robocompo"
+	},
+/obj/effect/floor_decal/industrial/warning/cee,
+/turf/simulated/floor/tiled/dark,
+/area/operations/lower/machinist)
 "oct" = (
 /obj/vehicle/train/cargo/trolley,
 /obj/effect/floor_decal/spline/plain,
@@ -15693,13 +15635,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/drone_fabrication)
-"osQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/floor_decal/corner/white/diagonal,
-/obj/effect/floor_decal/corner/black,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled,
-/area/operations/lower)
 "otX" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -15830,7 +15765,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "ozx" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
@@ -16049,14 +15984,24 @@
 /turf/simulated/wall,
 /area/outpost/mining_main/eva)
 "oPL" = (
-/obj/structure/bed/stool/chair/office/dark{
-	dir = 4
+/obj/structure/table/steel,
+/obj/item/device/flash/synthetic{
+	pixel_x = -7;
+	pixel_y = 1
 	},
-/obj/effect/landmark/start{
-	name = "Machinist"
+/obj/item/device/flash/synthetic{
+	pixel_y = 1
+	},
+/obj/item/device/flash/synthetic{
+	pixel_x = 7;
+	pixel_y = 1
+	},
+/obj/item/device/flash/synthetic{
+	pixel_x = 14;
+	pixel_y = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/operations/lower)
+/area/operations/lower/machinist)
 "oQa" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/dark,
@@ -16186,10 +16131,15 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "oZj" = (
-/obj/structure/table/reinforced/steel,
-/obj/machinery/light,
+/obj/machinery/r_n_d/circuit_imprinter{
+	dir = 1;
+	product_offset = 1
+	},
+/obj/structure/reagent_dispensers/acid{
+	pixel_y = -32
+	},
 /turf/simulated/floor/tiled/dark,
-/area/operations/storage)
+/area/operations/lower/machinist)
 "oZJ" = (
 /obj/effect/floor_decal/corner_wide/purple{
 	dir = 9
@@ -16462,15 +16412,7 @@
 "plZ" = (
 /obj/effect/floor_decal/corner/white/diagonal,
 /turf/simulated/floor/tiled/dark,
-/area/operations/upper)
-"pne" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/corner/white/diagonal,
-/obj/effect/floor_decal/corner/black,
-/turf/simulated/floor/tiled,
-/area/operations/lower)
+/area/operations/lower/machinist)
 "pnf" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/structure/cable{
@@ -16837,7 +16779,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled/white,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "pEF" = (
 /obj/structure/closet/secure_closet/xenoarchaeologist{
 	req_access = null;
@@ -16904,10 +16846,16 @@
 /turf/simulated/floor/tiled,
 /area/hangar/cargo)
 "pHI" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/machinery/firealarm/north,
+/obj/structure/table/steel,
+/obj/item/device/robotanalyzer{
+	pixel_y = 8
+	},
+/obj/item/device/robotanalyzer,
+/obj/machinery/camera/network/supply{
+	c_tag = "Cargo -  Machinist Workshop Entrance"
+	},
 /turf/simulated/floor/tiled/dark,
-/area/operations/lower)
+/area/operations/lower/machinist)
 "pIf" = (
 /obj/structure/table/reinforced/steel,
 /obj/item/paper_bin{
@@ -17213,7 +17161,7 @@
 	},
 /obj/effect/floor_decal/corner/white/diagonal,
 /turf/simulated/floor/tiled/dark,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "pYa" = (
 /turf/simulated/wall,
 /area/hangar/intrepid/interstitial)
@@ -17238,7 +17186,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/operations/lower)
+/area/operations/lower/machinist)
 "pYW" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -17375,17 +17323,14 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "qcC" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
 	},
 /turf/simulated/floor/tiled/dark,
-/area/operations/storage)
+/area/operations/lower/machinist)
 "qdm" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -17578,10 +17523,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/hangar/intrepid)
 "qks" = (
-/obj/structure/table/reinforced/steel,
-/obj/item/device/multitool,
-/turf/simulated/floor/tiled/dark,
-/area/operations/lower)
+/obj/effect/floor_decal/industrial/warning{
+	dir = 5
+	},
+/turf/simulated/floor/reinforced,
+/area/operations/lower/machinist)
 "qlv" = (
 /turf/simulated/floor/reinforced,
 /area/engineering/gravity_gen)
@@ -17631,10 +17577,9 @@
 /turf/simulated/floor/reinforced/airless,
 /area/engineering/atmos/propulsion)
 "qns" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/rods,
+/obj/effect/map_effect/wingrille_spawn/reinforced,
 /turf/simulated/floor/plating,
-/area/maintenance/cargo)
+/area/operations/lower/machinist)
 "qnt" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
@@ -18206,15 +18151,12 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/floor_decal/corner/white/diagonal,
-/obj/effect/floor_decal/corner/black,
 /obj/structure/disposalpipe/segment{
 	dir = 4;
 	icon_state = "pipe-c"
 	},
-/turf/simulated/floor/tiled,
-/area/operations/lower)
+/turf/simulated/floor/tiled/dark,
+/area/operations/lower/machinist)
 "qOf" = (
 /obj/effect/floor_decal/corner/brown/full{
 	dir = 8
@@ -18527,7 +18469,7 @@
 	pixel_y = 28
 	},
 /turf/simulated/floor/tiled/dark,
-/area/operations/lower)
+/area/operations/lower/machinist)
 "qZZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -18640,15 +18582,22 @@
 /turf/simulated/floor/tiled/dark,
 /area/hangar/control)
 "ref" = (
-/obj/machinery/light{
-	dir = 4
+/obj/structure/table/steel,
+/obj/item/cell/high{
+	pixel_y = 10
+	},
+/obj/item/cell/high{
+	pixel_y = 5
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
-/obj/structure/table/reinforced/steel,
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/cell_charger,
 /turf/simulated/floor/tiled/dark,
-/area/operations/lower)
+/area/operations/lower/machinist)
 "reE" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -18739,11 +18688,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/outpost/mining_main/eva)
-"rjv" = (
-/obj/effect/map_effect/wingrille_spawn/reinforced,
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
-/area/operations/upper)
 "rjz" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -19346,10 +19290,6 @@
 /area/outpost/mining_main/refinery)
 "rPA" = (
 /obj/effect/floor_decal/corner/white/diagonal,
-/obj/machinery/camera/network/supply{
-	c_tag = "Cargo -  Workshop Lobby";
-	dir = 4
-	},
 /turf/simulated/floor/tiled/white,
 /area/hangar/intrepid)
 "rPJ" = (
@@ -19449,20 +19389,9 @@
 /turf/simulated/floor/plating,
 /area/engineering/atmos/air)
 "rTF" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/effect/floor_decal/corner/white/diagonal,
-/obj/effect/floor_decal/corner/black,
-/obj/structure/disposalpipe/junction{
-	dir = 1;
-	icon_state = "pipe-j2"
-	},
-/turf/simulated/floor/tiled,
-/area/operations/lower)
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/dark,
+/area/operations/lower/machinist)
 "rVm" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -19675,19 +19604,11 @@
 	},
 /area/medical/morgue/lower)
 "sfr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+/obj/effect/floor_decal/industrial/warning{
+	dir = 6
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/effect/floor_decal/corner/white/diagonal,
-/obj/effect/floor_decal/corner/black,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/operations/lower)
+/turf/simulated/floor/reinforced,
+/area/operations/lower/machinist)
 "sfF" = (
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos/propulsion/starboard)
@@ -19749,6 +19670,22 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/hangar)
+"shB" = (
+/obj/machinery/conveyor{
+	dir = 1;
+	id = "Robocompo"
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/operations/lower/machinist)
 "siF" = (
 /obj/machinery/atmospherics/pipe/simple/visible/red,
 /obj/structure/tank_wall/hydrogen{
@@ -20249,9 +20186,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenoarch_atrium)
 "sJJ" = (
-/obj/structure/railing/mapped{
-	dir = 1
-	},
 /obj/machinery/light{
 	dir = 8
 	},
@@ -20259,8 +20193,17 @@
 /obj/effect/floor_decal/corner/white/full{
 	dir = 8
 	},
+/obj/machinery/door/window/brigdoor/westleft{
+	dir = 1;
+	name = "Workshop";
+	req_access = list(29)
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "conpipe-c"
+	},
 /turf/simulated/floor/tiled/white,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "sJN" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -20397,19 +20340,17 @@
 /turf/space/dynamic,
 /area/template_noop)
 "sPT" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+	dir = 5
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+	dir = 5
 	},
-/obj/effect/floor_decal/corner/white/diagonal,
-/obj/effect/floor_decal/corner/black,
-/turf/simulated/floor/tiled,
-/area/operations/storage)
+/turf/simulated/floor/tiled/dark,
+/area/operations/lower/machinist)
 "sQc" = (
 /obj/machinery/computer/ship/helm{
 	dir = 1
@@ -20579,6 +20520,7 @@
 	dir = 1
 	},
 /obj/effect/floor_decal/corner/white/diagonal,
+/obj/structure/closet/wardrobe/robotics_black,
 /turf/simulated/floor/tiled/white,
 /area/hangar/intrepid)
 "sZp" = (
@@ -20604,7 +20546,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
-/area/operations/lower)
+/area/operations/lower/machinist)
 "tbd" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -20784,6 +20726,10 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/corner/white/diagonal,
+/obj/machinery/camera/network/supply{
+	c_tag = "Cargo -  Workshop Lobby";
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/hangar/intrepid)
 "thU" = (
@@ -20828,28 +20774,45 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
-"tkG" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/white/diagonal,
-/obj/effect/floor_decal/corner/black,
-/turf/simulated/floor/tiled,
-/area/operations/lower)
 "tkS" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/black,
 /obj/machinery/meter,
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos/propulsion)
 "tlx" = (
+/obj/structure/table/rack,
+/obj/item/stack/material/plasteel{
+	amount = 20;
+	pixel_y = 4;
+	randpixel = 0
+	},
+/obj/item/stack/material/glass{
+	amount = 50;
+	pixel_x = -1;
+	pixel_y = 2;
+	randpixel = 0
+	},
+/obj/item/stack/material/steel{
+	amount = 50;
+	pixel_x = 1;
+	pixel_y = -2;
+	randpixel = 0
+	},
+/obj/item/stack/material/steel{
+	amount = 50;
+	pixel_x = 1;
+	pixel_y = -2;
+	randpixel = 0
+	},
+/obj/item/stack/material/steel{
+	amount = 50;
+	pixel_x = 1;
+	pixel_y = -2;
+	randpixel = 0
+	},
+/obj/item/reagent_containers/glass/beaker/sulphuric,
 /turf/simulated/floor/tiled/dark,
-/area/operations/storage)
+/area/operations/lower/machinist)
 "tlU" = (
 /obj/effect/floor_decal/corner_wide/purple{
 	dir = 6
@@ -20912,13 +20875,16 @@
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mining)
 "tqT" = (
-/obj/structure/closet/wardrobe/machinist,
-/obj/machinery/camera/network/supply{
-	c_tag = "Cargo -  Workshop Storage";
-	dir = 4
+/obj/machinery/conveyor{
+	dir = 4;
+	id = "Robocompo"
+	},
+/obj/effect/floor_decal/industrial/warning,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/operations/storage)
+/area/operations/lower/machinist)
 "tri" = (
 /obj/machinery/atmospherics/unary/outlet_injector{
 	frequency = 1441;
@@ -21177,9 +21143,6 @@
 /turf/simulated/floor/plating,
 /area/hangar/auxiliary)
 "tGK" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -21189,7 +21152,7 @@
 	req_access = list(29)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/operations/storage)
+/area/operations/lower/machinist)
 "tGU" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -21361,11 +21324,19 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
 "tMp" = (
-/obj/structure/table/rack,
-/obj/item/reagent_containers/glass/beaker,
-/obj/item/reagent_containers/glass/beaker,
-/turf/simulated/floor/tiled/dark,
-/area/operations/lower)
+/obj/structure/table/steel,
+/obj/machinery/button/switch/windowtint{
+	id = "1deckworkshop";
+	pixel_y = 25
+	},
+/obj/item/storage/box/fancy/tray/robotics{
+	pixel_x = -15
+	},
+/obj/item/device/mmi,
+/obj/item/device/mmi,
+/obj/item/device/mmi,
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "tNo" = (
 /obj/structure/closet/hydrant{
 	pixel_x = 28;
@@ -21875,8 +21846,14 @@
 	c_tag = "Cargo -  Workshop Desk";
 	dir = 1
 	},
+/obj/machinery/requests_console{
+	department = "Operations";
+	departmentType = 2;
+	name = "Machinist Workshop";
+	pixel_y = -30
+	},
 /turf/simulated/floor/carpet/rubber,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "ukS" = (
 /turf/simulated/wall,
 /area/hangar/cargo)
@@ -22031,7 +22008,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "uqE" = (
 /obj/structure/bed/stool/chair/office/dark,
 /obj/effect/floor_decal/corner/white/diagonal,
@@ -22039,7 +22016,7 @@
 	name = "Machinist"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "urr" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 8
@@ -22659,7 +22636,13 @@
 /obj/effect/map_effect/wingrille_spawn/reinforced,
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
-/area/operations/storage)
+/area/operations/lower/machinist)
+"uXR" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 9
+	},
+/turf/simulated/floor/reinforced,
+/area/operations/lower/machinist)
 "uYi" = (
 /obj/structure/railing/mapped,
 /obj/structure/bed/stool/chair/padded/black{
@@ -22954,13 +22937,8 @@
 /turf/simulated/floor/plating,
 /area/maintenance/cargo)
 "vjM" = (
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
-/obj/effect/floor_decal/corner/white/diagonal,
-/obj/effect/floor_decal/corner/black,
-/turf/simulated/floor/tiled,
-/area/operations/lower)
+/turf/simulated/floor/tiled/dark,
+/area/operations/lower/machinist)
 "vjT" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -22977,7 +22955,7 @@
 	req_access = list(29)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "vjW" = (
 /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
 	dir = 4
@@ -23146,27 +23124,22 @@
 /turf/simulated/floor/plating,
 /area/maintenance/engineering)
 "vrg" = (
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/machinery/conveyor_switch/oneway{
+	desc = "A conveyor control switch. It appears to only go in one direction. Controls the components conveyor belt.";
+	id = "Robocompo";
+	pixel_x = -10
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/obj/structure/closet/wardrobe/machinist,
 /turf/simulated/floor/tiled/dark,
-/area/operations/storage)
+/area/operations/lower/machinist)
 "vrm" = (
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/ramp/bottom{
 	dir = 8
@@ -23191,18 +23164,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/intrepid)
 "vsW" = (
-/obj/structure/window/reinforced{
-	dir = 8
+/obj/structure/table/steel,
+/obj/item/device/mmi/digital/posibrain{
+	pixel_y = -8
 	},
-/obj/structure/window/reinforced{
-	dir = 1
+/obj/item/device/mmi/digital/posibrain{
+	pixel_y = 8
 	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/item/modular_computer/console/preset/supply,
 /turf/simulated/floor/tiled/dark,
-/area/operations/lower)
+/area/operations/lower/machinist)
 "vsY" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -23657,7 +23627,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "vTJ" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -23949,13 +23919,10 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 6
 	},
-/obj/machinery/computer/rdconsole/core{
-	req_access = list(29)
-	},
 /obj/effect/floor_decal/industrial/hatch,
 /obj/machinery/r_n_d/protolathe,
 /turf/simulated/floor/carpet/rubber,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "wjM" = (
 /obj/structure/bed/stool/chair/office/bridge{
 	dir = 1
@@ -24147,8 +24114,14 @@
 /obj/item/stack/packageWrap,
 /obj/item/stack/wrapping_paper,
 /obj/item/device/hand_labeler,
+/obj/machinery/ringer{
+	department = "Robotics";
+	id = "robo_ringer";
+	pixel_x = -25;
+	req_access = list(29)
+	},
 /turf/simulated/floor/tiled/dark,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "wpM" = (
 /obj/machinery/atmospherics/omni/mixer{
 	active_power_usage = 7500;
@@ -24193,13 +24166,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_mining{
-	name = "Workshop";
-	req_access = list(29)
-	},
 /turf/simulated/floor/tiled/dark,
-/area/operations/storage)
+/area/operations/lower/machinist)
 "wqR" = (
 /turf/simulated/wall/shuttle/scc/cardinal,
 /area/shuttle/escape_pod/pod4)
@@ -24544,20 +24512,9 @@
 /turf/simulated/floor/tiled,
 /area/hangar/intrepid)
 "wMO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/bed/stool/chair/office/dark,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/effect/floor_decal/corner/white/diagonal,
-/obj/effect/floor_decal/corner/black,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/operations/lower)
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/reinforced,
+/area/operations/lower/machinist)
 "wNn" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	req_one_access = list(48,67)
@@ -24705,23 +24662,23 @@
 /area/hangar/intrepid)
 "wVB" = (
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+	dir = 9
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+	dir = 9
 	},
 /obj/structure/railing/mapped{
 	dir = 1
 	},
+/obj/machinery/light/small/emergency{
+	dir = 4
+	},
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
 	},
-/obj/item/material/shard{
-	icon_state = "small"
-	},
 /turf/simulated/floor/plating,
 /area/maintenance/engineering)
 "wVE" = (
@@ -25656,19 +25613,27 @@
 /turf/simulated/floor/tiled/ramp/bottom,
 /area/hangar/intrepid)
 "xFB" = (
-/obj/structure/cable/green{
-	icon_state = "0-2"
+/obj/structure/table/steel,
+/obj/item/storage/firstaid/regular{
+	empty = 1;
+	name = "First-Aid (empty)"
 	},
-/obj/machinery/power/apc/low{
-	dir = 1;
-	name = "north bump";
-	pixel_y = 24
+/obj/item/storage/firstaid/regular{
+	empty = 1;
+	name = "First-Aid (empty)"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
+/obj/item/device/healthanalyzer,
+/obj/item/device/healthanalyzer,
+/obj/item/reagent_containers/glass/bucket{
+	pixel_y = 2
 	},
+/obj/item/reagent_containers/glass/bucket{
+	pixel_y = 2
+	},
+/obj/item/device/assembly/prox_sensor,
+/obj/item/device/assembly/prox_sensor,
 /turf/simulated/floor/tiled/dark,
-/area/operations/storage)
+/area/operations/lower/machinist)
 "xGe" = (
 /obj/machinery/door/airlock/engineering,
 /obj/structure/cable/green{
@@ -25751,9 +25716,6 @@
 /turf/simulated/floor/airless,
 /area/engineering/atmos)
 "xJE" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/railing/mapped{
@@ -25762,7 +25724,7 @@
 /turf/simulated/floor/tiled/ramp/bottom{
 	dir = 1
 	},
-/area/operations/storage)
+/area/operations/lower/machinist)
 "xKE" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -26214,8 +26176,13 @@
 	},
 /obj/item/paper_bin,
 /obj/item/pen/black,
+/obj/machinery/ringer_button{
+	id = "robo_ringer";
+	pixel_x = 5;
+	pixel_y = 5
+	},
 /turf/simulated/floor/tiled/white,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "yaP" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -26256,7 +26223,7 @@
 "ycX" = (
 /obj/effect/floor_decal/corner/white/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/operations/upper)
+/area/operations/lower/machinist)
 "ydm" = (
 /obj/structure/shuttle/engine/propulsion/burst/left{
 	dir = 4
@@ -26372,11 +26339,17 @@
 /turf/simulated/floor/tiled/dark,
 /area/hangar/cargo)
 "yif" = (
-/obj/machinery/light{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
 	},
 /turf/simulated/floor/tiled/dark,
-/area/operations/storage)
+/area/operations/lower/machinist)
 "yiT" = (
 /obj/machinery/mineral/stacking_unit_console{
 	pixel_y = -3
@@ -43454,7 +43427,7 @@ abh
 abh
 qBv
 ebK
-gtS
+bVc
 wVB
 nnw
 wqj
@@ -43657,12 +43630,12 @@ arr
 arr
 arr
 vrm
-alW
-nnw
+iDw
+iDw
 qns
-wqj
-jak
-pzg
+qns
+iDw
+iDw
 rgo
 pzg
 pzg
@@ -43857,14 +43830,14 @@ adj
 ohB
 leB
 cdT
-gyJ
+iDw
 gGE
-gyJ
-gyJ
-gyJ
-gyJ
-gyJ
-gyJ
+iDw
+mdZ
+kHz
+shB
+ocs
+iDw
 aJa
 nPK
 uGn
@@ -44059,14 +44032,14 @@ non
 non
 dOa
 bMg
-gyJ
-ecj
+iDw
+wqs
 vrg
 tqT
-bVO
+dmq
 dmq
 oZj
-gyJ
+iDw
 lou
 shp
 quA
@@ -44261,14 +44234,14 @@ bHx
 fVm
 lNE
 rpK
-gyJ
+iDw
 yif
 sPT
 jWE
-jWE
-jWE
-jHe
-gyJ
+vjM
+vjM
+vjM
+iDw
 pzg
 pzg
 nTR
@@ -44463,12 +44436,12 @@ aMG
 cEl
 lNE
 cxG
-gyJ
+iDw
 jiU
-sPT
-jWE
-jWE
-jWE
+wqs
+vjM
+vjM
+vjM
 tlx
 uWW
 sYZ
@@ -44665,11 +44638,11 @@ wbg
 cEl
 lNE
 aDm
-gyJ
+iDw
 xFB
-iJc
-bsP
-laW
+wqs
+vjM
+vjM
 qcC
 xJE
 tGK
@@ -44867,19 +44840,19 @@ arr
 arr
 tes
 arr
-gyJ
-gyJ
+iDw
+hvO
 wqs
-gyJ
+uXR
 lzt
 aqn
-daY
-daY
-daY
+iDw
+iDw
+iDw
 izN
-daY
-daY
-daY
+iDw
+iDw
+iDw
 edm
 hts
 uCH
@@ -45071,7 +45044,7 @@ sLn
 qIT
 iDw
 hYh
-tkG
+wqs
 fga
 wMO
 pYD
@@ -45081,7 +45054,7 @@ pEE
 ifK
 vSS
 mPm
-daY
+iDw
 qtm
 jDq
 uCH
@@ -45273,7 +45246,7 @@ mnr
 tKE
 iDw
 tMp
-tkG
+wqs
 qks
 sfr
 pYD
@@ -45283,7 +45256,7 @@ ycX
 dsT
 mey
 ukF
-daY
+iDw
 lwm
 tbd
 wqf
@@ -45476,7 +45449,7 @@ xqe
 iDw
 pHI
 qNU
-osQ
+rTF
 rTF
 taF
 gzI
@@ -45485,8 +45458,8 @@ aPV
 eaw
 jEf
 wjr
-daY
-daY
+iDw
+iDw
 eKo
 fWx
 wuD
@@ -45677,8 +45650,8 @@ xvG
 uhE
 iDw
 gxS
-joU
-pne
+nqA
+vjM
 vjM
 pYD
 dUK
@@ -45883,7 +45856,7 @@ nqA
 vsW
 oPL
 ref
-daY
+iDw
 hMV
 bRX
 oys
@@ -46082,17 +46055,17 @@ fyb
 iDw
 iDw
 her
-iDw
+dvT
 dvT
 iDw
-daY
+iDw
 ggZ
-daY
+iDw
 vjT
-daY
-rjv
-rjv
-daY
+iDw
+uWW
+uWW
+iDw
 gFI
 gkE
 mNH
@@ -46282,9 +46255,9 @@ bBD
 fvq
 ygx
 pLU
-ygx
+hDI
 uUZ
-bVc
+ygx
 qnt
 kBe
 pYa
diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm
index 5a12c862a56..b130133d96e 100644
--- a/maps/sccv_horizon/placeholder-2_deck_2.dmm
+++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm
@@ -406,24 +406,15 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_room/tesla)
 "alr" = (
-/obj/structure/table/steel,
-/obj/item/device/flash/synthetic{
-	pixel_x = -7;
-	pixel_y = 1
+/obj/structure/table/reinforced{
+	table_mat = "steel";
+	table_reinf = "mhydrogen"
 	},
-/obj/item/device/flash/synthetic{
-	pixel_y = 1
+/obj/machinery/light{
+	dir = 1
 	},
-/obj/item/device/flash/synthetic{
-	pixel_x = 7;
-	pixel_y = 1
-	},
-/obj/item/device/flash/synthetic{
-	pixel_x = 14;
-	pixel_y = 1
-	},
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/strongroom)
 "amf" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 6
@@ -977,8 +968,14 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
 "aAp" = (
-/turf/simulated/floor/carpet/rubber,
-/area/assembly/robotics/workshop)
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/obj/machinery/light/small/emergency{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/wing/port)
 "aAx" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
@@ -986,13 +983,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
 "aBa" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 1
+/obj/structure/railing/mapped{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/ramp/bottom{
-	dir = 1
-	},
-/area/assembly/robotics/workshop)
+/obj/structure/trash_pile,
+/turf/simulated/floor/plating,
+/area/maintenance/wing/port)
 "aBq" = (
 /obj/structure/sink{
 	dir = 4;
@@ -1903,30 +1899,8 @@
 /turf/simulated/floor/reinforced,
 /area/hallway/primary/central_two)
 "baq" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
-	},
-/obj/structure/table/rack,
-/obj/item/stack/material/steel{
-	amount = 50;
-	pixel_x = 1;
-	pixel_y = -2;
-	randpixel = 0
-	},
-/obj/item/stack/material/steel{
-	amount = 50;
-	pixel_x = 1;
-	pixel_y = -2;
-	randpixel = 0
-	},
-/obj/item/stack/material/steel{
-	amount = 50;
-	pixel_x = 1;
-	pixel_y = -2;
-	randpixel = 0
-	},
 /turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/area/teleporter)
 "baJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/light{
@@ -2088,7 +2062,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/assembly/robotics/workshop)
+/area/assembly/chargebay)
 "bhR" = (
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -2522,12 +2496,6 @@
 /obj/structure/flora/ausbushes/lavendergrass,
 /turf/simulated/floor/grass/alt,
 /area/hallway/primary/central_two)
-"bvi" = (
-/obj/effect/floor_decal/industrial/loading/yellow{
-	dir = 1
-	},
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
 "bvV" = (
 /obj/structure/plasticflaps/airtight,
 /obj/machinery/door/window/westleft{
@@ -2596,6 +2564,9 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = 30
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/hallway)
 "byx" = (
@@ -2957,12 +2928,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_monitoring/tesla)
-"bMJ" = (
-/obj/structure/table/steel,
-/obj/item/cell/high,
-/obj/item/cell/high,
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
 "bNd" = (
 /obj/machinery/power/apc/high{
 	pixel_y = -24
@@ -3566,11 +3531,14 @@
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos/storage)
 "cdv" = (
-/obj/effect/floor_decal/industrial/warning{
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
-/turf/simulated/floor/reinforced,
-/area/assembly/robotics)
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/strongroom)
 "cei" = (
 /obj/structure/window/phoronreinforced{
 	dir = 4
@@ -3701,32 +3669,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
 "cjX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/airlock/research{
-	name = "Research storage";
-	req_access = list(7)
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/blast/regular{
-	closed_layer = 3.5;
-	density = 0;
-	icon_state = "pdoor0";
-	id = "RDStorage";
-	name = "Storage lockdown";
-	opacity = 0
-	},
-/obj/machinery/button/remote/blast_door{
-	id = "RDStorage";
-	name = "Storage lockdown";
-	pixel_x = 27;
-	pixel_y = 5;
-	req_access = list(30)
-	},
-/turf/simulated/floor/carpet/rubber,
+/turf/simulated/wall,
 /area/rnd/strongroom)
 "ckc" = (
 /obj/structure/railing/mapped,
@@ -3971,11 +3914,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/medical/psych)
-"ctM" = (
-/obj/effect/map_effect/wingrille_spawn/reinforced,
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
 "cua" = (
 /obj/structure/table/standard,
 /obj/item/storage/firstaid/o2{
@@ -4037,6 +3975,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/assembly/chargebay)
 "cxu" = (
@@ -4134,10 +4075,9 @@
 /turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "cAx" = (
-/obj/machinery/light{
-	dir = 8
+/obj/machinery/door/window/brigdoor{
+	req_access = list(7)
 	},
-/obj/structure/closet/radiation,
 /turf/simulated/floor/carpet/rubber,
 /area/rnd/strongroom)
 "cBq" = (
@@ -4197,13 +4137,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos/storage)
-"cCC" = (
-/obj/structure/closet/wardrobe/robotics_black,
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
 "cCM" = (
 /obj/effect/floor_decal/corner/green/diagonal,
 /obj/structure/disposalpipe/segment,
@@ -5055,10 +4988,12 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/effect/landmark/start{
 	name = "Scientist"
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/conference)
 "dht" = (
@@ -5170,10 +5105,10 @@
 /turf/simulated/floor/tiled,
 /area/security/prison)
 "dkr" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
+/obj/machinery/door/window/brigdoor/northright{
+	dir = 2;
+	req_access = list(7)
 	},
-/obj/structure/closet/crate,
 /turf/simulated/floor/carpet/rubber,
 /area/rnd/strongroom)
 "dkz" = (
@@ -5269,14 +5204,15 @@
 /turf/simulated/floor/plating,
 /area/maintenance/hangar/port)
 "dnJ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
 /obj/structure/cable/green{
-	icon_state = "1-4"
+	icon_state = "1-8"
 	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/strongroom)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled,
+/area/teleporter)
 "dnP" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -5664,6 +5600,9 @@
 /obj/effect/floor_decal/corner/mauve{
 	dir = 5
 	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/hallway)
 "dDo" = (
@@ -5710,6 +5649,9 @@
 /obj/effect/floor_decal/corner/mauve{
 	dir = 5
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/hallway)
 "dEz" = (
@@ -5747,29 +5689,15 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/port/far)
 "dGp" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/obj/structure/table/rack,
-/obj/item/stack/material/glass{
-	amount = 50;
-	pixel_x = -1;
-	pixel_y = 2;
-	randpixel = 0
-	},
-/obj/item/stack/material/glass{
-	amount = 50;
-	pixel_x = -1;
-	pixel_y = 2;
-	randpixel = 0
-	},
-/obj/item/stack/material/plasteel{
-	amount = 20;
-	pixel_y = 4;
-	randpixel = 0
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
+/obj/item/device/radio/beacon,
 /turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/area/teleporter)
 "dGz" = (
 /obj/structure/shuttle_part/scc_space_ship{
 	icon_state = "d2-2"
@@ -6540,6 +6468,9 @@
 	target_temperature = 278
 	},
 /obj/machinery/door/firedoor,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/hallway)
 "ekM" = (
@@ -7079,6 +7010,9 @@
 	name = "Mech Bay";
 	req_access = list(29)
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/carpet/rubber,
 /area/assembly/chargebay)
 "eBj" = (
@@ -7553,9 +7487,10 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/research)
 "eUp" = (
-/obj/structure/closet/secure_closet/sciguncabinet,
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/strongroom)
+/obj/random/junk,
+/obj/machinery/light/small/emergency,
+/turf/simulated/floor/plating,
+/area/maintenance/wing/port)
 "eUT" = (
 /obj/structure/bed/stool/chair/padded/black{
 	dir = 4
@@ -8010,12 +7945,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical)
-"ffh" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 9
-	},
-/turf/simulated/floor/reinforced,
-/area/assembly/robotics)
 "ffP" = (
 /obj/structure/cable/green{
 	icon_state = "2-8"
@@ -8158,13 +8087,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_research{
-	name = "Robotics";
-	req_access = list(29)
-	},
 /obj/structure/disposalpipe/segment,
-/turf/simulated/floor/carpet/rubber,
-/area/assembly/robotics)
+/obj/machinery/door/airlock/command{
+	name = "Teleport Access";
+	req_access = list(17)
+	},
+/turf/simulated/floor/tiled,
+/area/teleporter)
 "fkZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -8293,9 +8222,6 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/grey{
 	dir = 8
 	},
@@ -8305,6 +8231,15 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/conference)
 "fqg" = (
@@ -8678,23 +8613,18 @@
 /turf/simulated/floor/wood,
 /area/hydroponics/garden)
 "fEO" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/area/teleporter)
 "fEQ" = (
 /obj/structure/railing/mapped,
 /obj/structure/window/reinforced,
 /turf/simulated/open,
 /area/hallway/primary/central_two)
 "fEY" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
-	},
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/carpet/rubber,
 /area/rnd/strongroom)
 "fFx" = (
@@ -9556,9 +9486,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/armory)
 "gec" = (
-/obj/machinery/r_n_d/circuit_imprinter,
-/turf/simulated/floor/carpet/rubber,
-/area/assembly/robotics/workshop)
+/obj/effect/floor_decal/industrial/warning,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/teleporter)
 "gei" = (
 /obj/structure/table/standard,
 /obj/item/storage/box/freezer/organcooler,
@@ -9687,17 +9620,6 @@
 /mob/living/simple_animal/carp/fluff/ginny,
 /turf/simulated/floor/reinforced,
 /area/crew_quarters/heads/chief)
-"ghL" = (
-/obj/machinery/alarm{
-	pixel_y = 28;
-	target_temperature = 278
-	},
-/obj/machinery/disposal/small/south,
-/obj/structure/disposalpipe/trunk{
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
 "ghX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -9883,13 +9805,12 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/port)
 "goc" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
+/obj/machinery/light_switch{
+	pixel_x = 10;
+	pixel_y = 26
 	},
-/obj/machinery/mineral/rigpress,
-/obj/machinery/firealarm/north,
 /turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/area/teleporter)
 "gof" = (
 /obj/structure/reagent_dispensers/water_cooler,
 /obj/structure/sign/nosmoking_2{
@@ -9914,15 +9835,17 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_two)
 "goQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+/obj/effect/floor_decal/industrial/warning,
+/obj/item/device/radio/intercom{
+	dir = 8;
+	name = "Station Intercom (General)";
+	pixel_x = 24
 	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
 	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/strongroom)
+/turf/simulated/floor/tiled,
+/area/teleporter)
 "gps" = (
 /obj/structure/lattice,
 /obj/machinery/light{
@@ -10092,14 +10015,16 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/armory)
 "guh" = (
-/obj/structure/plasticflaps/mining,
-/obj/machinery/conveyor{
-	dir = 1;
-	id = "robotics";
-	layer = 2.9
+/obj/structure/table/rack{
+	dir = 1
 	},
-/turf/simulated/floor/tiled,
-/area/assembly/robotics/workshop)
+/obj/item/clothing/suit/fire,
+/obj/item/tank/oxygen,
+/obj/item/clothing/mask/gas,
+/obj/item/extinguisher,
+/obj/item/clothing/head/hardhat/red,
+/turf/simulated/floor/plating,
+/area/maintenance/wing/port)
 "guj" = (
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
 	dir = 5
@@ -10351,12 +10276,9 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/wing_port)
 "gBT" = (
-/obj/item/storage/bag/circuits/basic,
-/obj/item/device/integrated_electronics/wirer,
-/obj/item/device/integrated_electronics/debugger,
-/obj/structure/table/steel,
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/obj/structure/window/reinforced,
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/strongroom)
 "gCj" = (
 /obj/structure/closet/secure_closet/engineering_electrical,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -10612,12 +10534,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
-"gIs" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 10
-	},
-/turf/simulated/floor/reinforced,
-/area/assembly/robotics)
 "gII" = (
 /obj/structure/table/standard,
 /obj/item/storage/slide_projector,
@@ -10655,15 +10571,10 @@
 /turf/simulated/floor/plating,
 /area/maintenance/hangar/port)
 "gKG" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/table/reinforced{
-	table_mat = "steel";
-	table_reinf = "mhydrogen"
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/strongroom)
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/plating,
+/area/maintenance/wing/port)
 "gKT" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -11220,21 +11131,9 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/lobby)
 "heH" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/grey/diagonal,
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/white{
-	dir = 8
-	},
-/obj/structure/bed/stool/chair/office/dark{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
-/area/assembly/robotics)
+/obj/machinery/suit_storage_unit/standard_unit,
+/turf/simulated/floor/tiled,
+/area/teleporter)
 "hfh" = (
 /obj/effect/map_effect/wingrille_spawn/reinforced,
 /turf/simulated/floor/plating,
@@ -11329,7 +11228,13 @@
 /turf/simulated/floor/tiled,
 /area/engineering/storage_hard)
 "hiq" = (
-/obj/machinery/light{
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /turf/simulated/floor/carpet/rubber,
@@ -11738,14 +11643,6 @@
 	},
 /turf/simulated/floor/carpet,
 /area/medical/psych)
-"htx" = (
-/obj/structure/table/steel,
-/obj/item/reagent_containers/spray/cleaner,
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
 "huw" = (
 /turf/simulated/floor/tiled/dark,
 /area/rnd/conference)
@@ -12713,6 +12610,9 @@
 /obj/machinery/light/small,
 /turf/simulated/floor/plating,
 /area/storage/tech)
+"ibU" = (
+/turf/simulated/wall/r_wall,
+/area/security/brig/processing)
 "ica" = (
 /obj/structure/bookcase/libraryspawn/fiction,
 /turf/simulated/floor/wood,
@@ -12890,17 +12790,12 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_two)
 "iic" = (
-/obj/structure/table/steel,
-/obj/item/device/mmi/digital/posibrain{
-	pixel_x = -5;
-	pixel_y = 3
+/obj/structure/table/reinforced{
+	table_mat = "steel";
+	table_reinf = "mhydrogen"
 	},
-/obj/item/device/mmi/digital/posibrain{
-	pixel_x = 11;
-	pixel_y = 3
-	},
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/strongroom)
 "iid" = (
 /obj/effect/floor_decal/spline/plain,
 /turf/simulated/floor/carpet/rubber,
@@ -13916,9 +13811,8 @@
 /turf/simulated/floor/tiled,
 /area/security/prison)
 "iRb" = (
-/obj/machinery/mecha_part_fabricator,
-/turf/simulated/floor/carpet/rubber,
-/area/assembly/robotics/workshop)
+/turf/simulated/floor/plating,
+/area/maintenance/wing/port)
 "iRj" = (
 /obj/structure/closet/chefcloset{
 	desc = "It's a storage unit for foodservice equipment."
@@ -14935,14 +14829,10 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
-	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/area/teleporter)
 "jvV" = (
 /turf/simulated/wall,
 /area/engineering/storage_eva)
@@ -14983,20 +14873,9 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/pharmacy)
 "jwc" = (
-/obj/structure/closet/secure_closet/scientist,
-/obj/item/clothing/mask/gas/half,
-/obj/item/clothing/mask/gas/half,
-/obj/item/clothing/gloves/latex/nitrile/tajara,
-/obj/item/clothing/gloves/latex/nitrile/tajara,
-/obj/item/clothing/gloves/latex/nitrile/unathi,
-/obj/item/clothing/gloves/latex/nitrile/unathi,
-/obj/item/nitrilebox,
-/obj/machinery/camera/network/research{
-	c_tag = "Research - Research Storage";
-	dir = 4
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/strongroom)
+/obj/structure/trash_pile,
+/turf/simulated/floor/plating,
+/area/maintenance/wing/port)
 "jwY" = (
 /obj/effect/floor_decal/corner/mauve/full{
 	dir = 1
@@ -15008,13 +14887,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/rnd/hallway)
 "jxs" = (
-/obj/machinery/conveyor{
-	dir = 1;
-	id = "robotics";
-	layer = 2.9
+/obj/machinery/light/small/emergency{
+	dir = 4
 	},
-/turf/simulated/floor/carpet/rubber,
-/area/assembly/robotics/workshop)
+/obj/machinery/space_heater,
+/turf/simulated/floor/plating,
+/area/maintenance/wing/port)
 "jxz" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -15137,16 +15015,14 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/main_storage)
 "jCk" = (
-/obj/machinery/door/window/southright,
-/obj/effect/floor_decal/corner/grey/diagonal,
-/obj/effect/floor_decal/corner/white{
-	dir = 4
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/corner/white{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
 	},
-/turf/simulated/floor/tiled/white,
-/area/assembly/robotics)
+/turf/simulated/floor/tiled,
+/area/teleporter)
 "jCt" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/lino/grey,
@@ -16794,11 +16670,30 @@
 /turf/simulated/floor/tiled/dark,
 /area/hallway/primary/central_two)
 "kJQ" = (
-/obj/structure/bed/stool/chair/office/dark{
-	dir = 8
+/obj/machinery/door/airlock/research{
+	name = "Research storage";
+	req_access = list(7)
+	},
+/obj/machinery/door/firedoor,
+/obj/machinery/door/blast/regular{
+	closed_layer = 3.5;
+	density = 0;
+	icon_state = "pdoor0";
+	id = "RDStorage";
+	name = "Storage lockdown";
+	opacity = 0
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/assembly/robotics/workshop)
+/area/rnd/strongroom)
 "kKk" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -17207,10 +17102,10 @@
 	},
 /area/maintenance/wing/port/far)
 "kZv" = (
-/obj/structure/table/steel,
-/obj/item/reagent_containers/glass/beaker/sulphuric,
-/turf/simulated/floor/carpet/rubber,
-/area/assembly/robotics/workshop)
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/light/small/emergency,
+/turf/simulated/floor/plating,
+/area/maintenance/wing/port)
 "kZD" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/structure/bed/stool/chair/office/light{
@@ -17805,13 +17700,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_room/tesla)
-"lup" = (
-/obj/effect/floor_decal/industrial/warning/corner{
-	dir = 1
-	},
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
 "luT" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -17899,6 +17787,9 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/spline/plain/corner,
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -32
+	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/conference)
 "lAi" = (
@@ -18770,15 +18661,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/storage/tech)
-"lXC" = (
-/obj/structure/cable/green{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
 "lXO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -19207,10 +19089,6 @@
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/bar)
-"miZ" = (
-/obj/machinery/door/window/southleft,
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
 "mjb" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -20237,6 +20115,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/tiled,
 /area/assembly/chargebay)
 "mRr" = (
@@ -20277,20 +20158,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/conference)
-"mSR" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/door/airlock/multi_tile/glass{
-	dir = 1;
-	name = "Robotics Lab";
-	req_access = list(29)
-	},
-/obj/machinery/door/firedoor/multi_tile{
-	dir = 1
-	},
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
 "mTY" = (
 /obj/machinery/computer/robotics{
 	dir = 4
@@ -20605,6 +20472,12 @@
 	dir = 6
 	},
 /obj/machinery/hologram/holopad,
+/obj/machinery/requests_console{
+	department = "Research and Development";
+	departmentType = 2;
+	name = "Research Meeting Room";
+	pixel_x = 30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/conference)
 "ncN" = (
@@ -20629,16 +20502,15 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
 "ndO" = (
-/obj/structure/closet/secure_closet/scientist,
-/obj/item/clothing/mask/gas/half,
-/obj/item/clothing/mask/gas/half,
-/obj/item/clothing/gloves/latex/nitrile/tajara,
-/obj/item/clothing/gloves/latex/nitrile/tajara,
-/obj/item/clothing/gloves/latex/nitrile/unathi,
-/obj/item/clothing/gloves/latex/nitrile/unathi,
-/obj/item/nitrilebox,
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/strongroom)
+/obj/structure/table/rack,
+/obj/item/tank/oxygen,
+/obj/item/clothing/mask/gas,
+/obj/machinery/camera/network/command{
+	c_tag = "Third Deck - Teleporter";
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/teleporter)
 "nen" = (
 /obj/machinery/button/remote/blast_door{
 	desc = "It controls the Mech Bay's shutters.";
@@ -20676,7 +20548,7 @@
 /obj/effect/floor_decal/industrial/warning,
 /obj/machinery/door/window/northright,
 /turf/simulated/floor/tiled/dark,
-/area/assembly/robotics/workshop)
+/area/assembly/chargebay)
 "nfz" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -21804,13 +21676,14 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "nOJ" = (
-/obj/structure/table/steel,
-/obj/item/stack/material/glass/full,
-/obj/structure/reagent_dispensers/acid{
-	pixel_x = -32
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/assembly/robotics/workshop)
+/area/rnd/strongroom)
 "nOS" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -22636,6 +22509,9 @@
 /obj/effect/landmark/start{
 	name = "Research Director"
 	},
+/obj/machinery/newscaster{
+	pixel_x = 30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/conference)
 "ouo" = (
@@ -23552,9 +23428,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/quartermaster/qm)
-"oVB" = (
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
 "oWm" = (
 /obj/effect/floor_decal/spline/fancy{
 	dir = 8
@@ -24143,29 +24016,6 @@
 /obj/effect/map_effect/wingrille_spawn/reinforced,
 /turf/simulated/floor/plating,
 /area/rnd/xenobiology)
-"pnD" = (
-/obj/structure/table/standard,
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/white{
-	dir = 8
-	},
-/obj/machinery/ringer_button{
-	id = "robo_ringer";
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/obj/machinery/door/window/northleft,
-/obj/machinery/door/window{
-	base_state = "right";
-	icon_state = "right";
-	name = "Robotics Desk";
-	req_access = list(29)
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
 "pnF" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -24449,15 +24299,12 @@
 /turf/simulated/floor/tiled,
 /area/engineering/engine_airlock)
 "pyV" = (
-/obj/effect/floor_decal/corner/grey/diagonal,
-/obj/effect/floor_decal/corner/white{
+/obj/machinery/shieldwallgen,
+/obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/effect/floor_decal/corner/white{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
-/area/assembly/robotics)
+/turf/simulated/floor/tiled,
+/area/teleporter)
 "pzc" = (
 /obj/effect/floor_decal/corner_wide/yellow{
 	dir = 5
@@ -24748,6 +24595,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/assembly/chargebay)
 "pIE" = (
@@ -25424,19 +25274,14 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_monitoring/tesla)
 "qdw" = (
-/obj/structure/window/reinforced{
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/door/window/southleft,
-/obj/effect/floor_decal/corner/grey/diagonal,
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/white{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
-/area/assembly/robotics)
+/turf/simulated/floor/tiled,
+/area/teleporter)
 "qdY" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -25907,6 +25752,9 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/assembly/chargebay)
 "quV" = (
@@ -26224,9 +26072,26 @@
 /turf/simulated/floor/plating,
 /area/engineering/lobby)
 "qFg" = (
-/obj/machinery/light,
-/turf/simulated/floor/carpet/rubber,
-/area/assembly/robotics/workshop)
+/obj/effect/floor_decal/corner/mauve/diagonal,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/effect/floor_decal/corner/grey{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/white{
+	dir = 4
+	},
+/obj/effect/floor_decal/spline/plain{
+	dir = 1
+	},
+/obj/item/device/radio/intercom{
+	dir = 1;
+	name = "Station Intercom (General)";
+	pixel_y = -20
+	},
+/turf/simulated/floor/tiled/white,
+/area/rnd/conference)
 "qFs" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -26407,7 +26272,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/hallway/primary/central_two)
 "qMd" = (
-/turf/simulated/wall,
+/turf/simulated/wall/r_wall,
 /area/assembly/robotics/workshop)
 "qMJ" = (
 /obj/structure/shuttle_part/scc_space_ship{
@@ -26569,12 +26434,22 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/lobby)
 "qRY" = (
-/obj/machinery/door/window{
-	dir = 8;
-	req_access = list(7)
+/obj/effect/floor_decal/corner/mauve/diagonal,
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/strongroom)
+/obj/effect/floor_decal/corner/grey{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/white{
+	dir = 4
+	},
+/obj/effect/floor_decal/spline/plain{
+	dir = 1
+	},
+/obj/machinery/light,
+/turf/simulated/floor/tiled/white,
+/area/rnd/conference)
 "qSa" = (
 /obj/machinery/disposal/small/north,
 /obj/structure/disposalpipe/trunk{
@@ -26773,13 +26648,14 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_monitoring/tesla)
 "qXH" = (
+/obj/machinery/firealarm/east,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/area/teleporter)
 "qXJ" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -26841,7 +26717,7 @@
 /area/hydroponics)
 "qZi" = (
 /obj/structure/cable/green{
-	icon_state = "2-4"
+	icon_state = "2-8"
 	},
 /turf/simulated/floor/tiled,
 /area/assembly/chargebay)
@@ -26885,14 +26761,10 @@
 /turf/simulated/floor/tiled,
 /area/security/brig)
 "raA" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/obj/machinery/teleport/pad,
+/obj/machinery/light,
+/turf/simulated/floor/plating,
+/area/teleporter)
 "rbe" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -26926,12 +26798,9 @@
 /turf/simulated/floor/plating,
 /area/crew_quarters/heads/hor)
 "rbL" = (
-/obj/structure/table/reinforced{
-	table_mat = "steel";
-	table_reinf = "mhydrogen"
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/strongroom)
+/obj/random/junk,
+/turf/simulated/floor/plating,
+/area/maintenance/wing/port)
 "rbO" = (
 /obj/item/aicard,
 /obj/item/aiModule/reset,
@@ -27081,26 +26950,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/turret_protected/ai_upload_foyer)
 "rfO" = (
-/obj/structure/table/rack{
-	dir = 8;
-	layer = 2.9
-	},
-/obj/item/stack/material/steel{
-	amount = 50
-	},
-/obj/item/stack/material/glass{
-	amount = 50
-	},
-/obj/machinery/power/apc/low{
-	dir = 1;
-	name = "north bump";
-	pixel_y = 24
-	},
-/obj/structure/cable/green{
-	icon_state = "0-2"
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/strongroom)
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/reagent_dispensers/watertank,
+/turf/simulated/floor/plating,
+/area/maintenance/wing/port)
 "rfQ" = (
 /obj/machinery/door/airlock/glass,
 /obj/machinery/door/firedoor,
@@ -27155,8 +27008,9 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
 "rgR" = (
-/turf/simulated/wall/r_wall,
-/area/maintenance/substation/research)
+/obj/structure/closet/radiation,
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/strongroom)
 "rhz" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -27226,21 +27080,6 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/dark,
 /area/medical/pharmacy)
-"rjc" = (
-/obj/structure/table/steel,
-/obj/item/device/flashlight/lamp{
-	pixel_x = 2;
-	pixel_y = 2
-	},
-/obj/effect/floor_decal/corner/grey/diagonal,
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/white{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
-/area/assembly/robotics)
 "rjK" = (
 /obj/effect/floor_decal/spline/fancy/wood/corner,
 /turf/simulated/floor/wood,
@@ -27410,11 +27249,12 @@
 /turf/simulated/floor/tiled,
 /area/storage/primary)
 "rom" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
+/obj/structure/closet/secure_closet/sciguncabinet,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
 	},
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/strongroom)
 "rou" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 10
@@ -28427,9 +28267,6 @@
 /obj/item/paper_bin,
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
-"rRA" = (
-/turf/simulated/wall,
-/area/assembly/robotics)
 "rSv" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -28569,9 +28406,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/hallway/primary/central_two)
 "rUZ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/conference)
@@ -28701,13 +28540,6 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
 /area/quartermaster/lobby)
-"rZp" = (
-/obj/structure/window/reinforced,
-/obj/machinery/conveyor_switch/oneway{
-	id = "robotics"
-	},
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
 "rZU" = (
 /obj/effect/floor_decal/corner/mauve/full,
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -29033,12 +28865,13 @@
 /turf/simulated/floor/plating,
 /area/storage/tech)
 "smn" = (
-/obj/structure/railing/mapped{
-	dir = 8
+/obj/machinery/power/apc/low{
+	name = "south bump";
+	pixel_y = -24
 	},
-/obj/structure/railing/mapped,
-/turf/simulated/floor/plating,
-/area/maintenance/wing/port)
+/obj/structure/cable/green,
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/strongroom)
 "smr" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -29600,11 +29433,8 @@
 /turf/simulated/floor/reinforced,
 /area/turret_protected/ai_upload_foyer)
 "sHY" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 5
-	},
-/turf/simulated/floor/reinforced,
-/area/assembly/robotics)
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/strongroom)
 "sIe" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/light/small/emergency,
@@ -30439,10 +30269,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/cafeteria)
-"thJ" = (
-/obj/machinery/door/window/southright,
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
 "thL" = (
 /obj/machinery/atmospherics/portables_connector,
 /obj/machinery/portable_atmospherics/canister/nitrogen,
@@ -30523,12 +30349,13 @@
 /turf/simulated/floor/lino/grey,
 /area/crew_quarters/cafeteria)
 "tjP" = (
-/obj/machinery/optable,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
+/obj/structure/closet/crate,
+/obj/machinery/alarm{
+	dir = 4;
+	pixel_x = -28
 	},
-/turf/simulated/floor/reinforced,
-/area/assembly/robotics)
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/strongroom)
 "tjS" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/structure/table/stone/marble,
@@ -30813,17 +30640,17 @@
 /turf/simulated/floor/grass/alt,
 /area/rnd/xenobiology/xenoflora)
 "tvX" = (
-/obj/structure/table/steel,
-/obj/item/device/robotanalyzer,
-/obj/item/device/robotanalyzer{
-	pixel_y = 8
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/obj/machinery/camera/network/research{
-	c_tag = "Research - Robotics Lab";
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/strongroom)
 "twC" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2;
@@ -31412,13 +31239,12 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/hor)
 "tNT" = (
-/obj/structure/window/reinforced,
-/obj/machinery/light{
-	dir = 8
+/obj/machinery/door/airlock/maintenance{
+	req_access = list(17)
 	},
-/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/teleporter)
 "tNU" = (
 /obj/structure/railing/mapped{
 	dir = 1
@@ -31578,21 +31404,13 @@
 	},
 /area/medical/surgery)
 "tTb" = (
-/obj/structure/table/steel,
-/obj/structure/window/reinforced{
-	dir = 4
+/obj/item/hand_tele,
+/obj/structure/table/standard,
+/obj/machinery/alarm{
+	pixel_y = 28
 	},
-/obj/effect/floor_decal/corner/grey/diagonal,
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/white{
-	dir = 8
-	},
-/obj/item/paper_bin,
-/obj/item/pen,
-/turf/simulated/floor/tiled/white,
-/area/assembly/robotics)
+/turf/simulated/floor/tiled,
+/area/teleporter)
 "tTM" = (
 /obj/structure/cable/green,
 /obj/machinery/power/apc{
@@ -31735,18 +31553,15 @@
 /turf/simulated/wall,
 /area/security/security_office)
 "tYa" = (
-/obj/effect/floor_decal/corner/grey/diagonal,
-/obj/effect/floor_decal/corner/white{
+/obj/machinery/shieldwallgen,
+/obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/effect/floor_decal/corner/white{
-	dir = 8
-	},
-/obj/structure/bed/stool/chair/office/dark{
+/obj/machinery/light{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/white,
-/area/assembly/robotics)
+/turf/simulated/floor/tiled,
+/area/teleporter)
 "tYj" = (
 /turf/simulated/wall/r_wall,
 /area/engineering/engine_monitoring)
@@ -32282,7 +32097,6 @@
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
-/obj/machinery/light,
 /obj/effect/floor_decal/corner/grey{
 	dir = 8
 	},
@@ -32428,19 +32242,18 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
 "urh" = (
-/obj/structure/table/steel,
-/obj/machinery/ringer{
-	department = "Robotics";
-	id = "robo_ringer";
-	pixel_x = 28;
-	req_access = list(29)
+/obj/structure/table/rack{
+	dir = 8;
+	layer = 2.9
 	},
-/obj/item/surgery/scalpel,
-/obj/item/surgery/hemostat,
-/obj/item/surgery/retractor,
-/obj/item/surgery/circular_saw,
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/obj/item/stack/material/steel{
+	amount = 50
+	},
+/obj/item/stack/material/glass{
+	amount = 50
+	},
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/strongroom)
 "urs" = (
 /obj/machinery/power/emitter,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -32722,20 +32535,10 @@
 /turf/simulated/floor/reinforced,
 /area/storage/tech)
 "uzL" = (
-/obj/structure/cable/green{
-	icon_state = "1-4"
-	},
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/obj/structure/table/standard,
+/obj/item/modular_computer/laptop/preset/command/teleporter,
+/turf/simulated/floor/plating,
+/area/teleporter)
 "uzU" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -32800,6 +32603,16 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
 	},
+/obj/machinery/button/remote/blast_door{
+	id = "RDStorage";
+	name = "Storage lockdown";
+	pixel_x = -27;
+	pixel_y = -5;
+	req_access = list(30)
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/conference)
 "uDs" = (
@@ -32926,20 +32739,16 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
 "uGP" = (
-/obj/structure/table/steel,
-/obj/item/storage/toolbox/mechanical,
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/obj/structure/closet/hydrant{
+	pixel_x = -32
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/wing/port)
 "uGW" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
 /obj/effect/floor_decal/corner/grey{
 	dir = 8
 	},
@@ -32949,6 +32758,7 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
 	},
+/obj/machinery/firealarm/south,
 /turf/simulated/floor/tiled/white,
 /area/rnd/conference)
 "uHh" = (
@@ -33373,14 +33183,8 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/prison)
 "uTr" = (
-/obj/machinery/power/apc{
-	is_critical = 1;
-	name = "south bump";
-	pixel_y = -24
-	},
-/obj/structure/cable/green,
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/turf/simulated/wall/r_wall,
+/area/teleporter)
 "uTw" = (
 /turf/simulated/wall,
 /area/turret_protected/ai_upload)
@@ -34239,11 +34043,8 @@
 /turf/simulated/floor/plating,
 /area/hallway/engineering/tesla)
 "vyd" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access = list(29)
-	},
-/turf/simulated/floor/plating,
-/area/assembly/robotics)
+/turf/simulated/wall/r_wall,
+/area/assembly/chargebay)
 "vye" = (
 /obj/structure/table/standard,
 /obj/effect/floor_decal/spline/plain{
@@ -34438,14 +34239,10 @@
 /turf/simulated/floor/tiled/white,
 /area/quartermaster/break_room)
 "vEg" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/strongroom)
+/obj/structure/reagent_dispensers/fueltank,
+/obj/structure/lattice/catwalk/indoor/grate,
+/turf/simulated/floor/plating,
+/area/maintenance/wing/port)
 "vEh" = (
 /obj/machinery/power/terminal{
 	dir = 1
@@ -34595,6 +34392,9 @@
 /obj/effect/floor_decal/corner/mauve{
 	dir = 10
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/hallway)
 "vJw" = (
@@ -34660,9 +34460,16 @@
 /turf/simulated/floor/plating,
 /area/hallway/medical)
 "vLu" = (
-/obj/machinery/vending/robotics,
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/obj/structure/closet/secure_closet/scientist,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/gloves/latex/nitrile/tajara,
+/obj/item/clothing/gloves/latex/nitrile/tajara,
+/obj/item/clothing/gloves/latex/nitrile/unathi,
+/obj/item/clothing/gloves/latex/nitrile/unathi,
+/obj/item/nitrilebox,
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/strongroom)
 "vMD" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -34716,6 +34523,9 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/kitchen)
+"vNG" = (
+/turf/simulated/wall/r_wall,
+/area/security/brig/processing_secondary)
 "vNK" = (
 /obj/structure/railing/mapped,
 /obj/structure/railing/mapped{
@@ -34823,11 +34633,13 @@
 /turf/simulated/floor/tiled,
 /area/engineering/engine_airlock)
 "vPg" = (
-/obj/structure/table/steel,
-/obj/item/nitrilebox,
-/obj/item/storage/box/masks,
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/obj/machinery/door/airlock/maintenance{
+	name = "Firefighting equipment";
+	req_access = list(12)
+	},
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/maintenance/wing/port)
 "vPj" = (
 /turf/simulated/wall/r_wall,
 /area/security/armory)
@@ -34936,8 +34748,7 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/or1)
 "vRt" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/closet,
 /turf/simulated/floor/plating,
 /area/maintenance/wing/port)
 "vRT" = (
@@ -35086,6 +34897,10 @@
 /obj/effect/floor_decal/spline/plain/corner{
 	dir = 4
 	},
+/obj/machinery/alarm{
+	dir = 1;
+	pixel_y = -28
+	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/conference)
 "vWt" = (
@@ -36758,6 +36573,9 @@
 /obj/effect/floor_decal/corner/mauve{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/hallway)
 "wNk" = (
@@ -36793,12 +36611,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/hydroponics)
 "wOV" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/area/teleporter)
 "wPj" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -37521,14 +37336,10 @@
 /turf/simulated/floor/tiled,
 /area/assembly/chargebay)
 "xmF" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/obj/machinery/teleport/station,
+/obj/effect/floor_decal/industrial/warning/full,
+/turf/simulated/floor/plating,
+/area/teleporter)
 "xnf" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -37705,13 +37516,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/bar)
 "xsU" = (
-/obj/structure/table/steel,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/obj/structure/closet/crate,
+/turf/simulated/floor/plating,
+/area/maintenance/wing/port)
 "xsX" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 9
@@ -37866,9 +37673,13 @@
 /turf/simulated/wall,
 /area/rnd/hallway)
 "xzd" = (
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/reinforced,
-/area/assembly/robotics)
+/obj/structure/closet/secure_closet/sciguncabinet,
+/obj/machinery/camera/network/research{
+	c_tag = "Research - Research Storage";
+	dir = 4
+	},
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/strongroom)
 "xzx" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
@@ -38054,9 +37865,9 @@
 	},
 /area/maintenance/wing/starboard/far)
 "xGz" = (
-/obj/structure/bed/stool/chair/office/dark,
-/turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/obj/machinery/light,
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/strongroom)
 "xGM" = (
 /obj/effect/floor_decal/corner/green/diagonal,
 /obj/structure/curtain/medical,
@@ -38324,11 +38135,9 @@
 /turf/simulated/floor/plating,
 /area/maintenance/research_port)
 "xNJ" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
+/obj/effect/floor_decal/industrial/warning/corner,
 /turf/simulated/floor/tiled,
-/area/assembly/robotics)
+/area/teleporter)
 "xNO" = (
 /obj/effect/map_effect/wingrille_spawn/reinforced,
 /turf/simulated/floor/plating,
@@ -38385,32 +38194,9 @@
 /turf/simulated/floor/lino/grey,
 /area/crew_quarters/bar)
 "xQg" = (
-/obj/structure/table/steel,
-/obj/item/storage/firstaid/regular{
-	empty = 1;
-	name = "First-Aid (empty)"
-	},
-/obj/item/storage/firstaid/regular{
-	empty = 1;
-	name = "First-Aid (empty)"
-	},
-/obj/item/device/healthanalyzer,
-/obj/item/device/healthanalyzer,
-/obj/item/reagent_containers/glass/bucket{
-	pixel_y = -14
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/grey/diagonal,
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/white{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
-/area/assembly/robotics)
+/obj/machinery/shieldwallgen,
+/turf/simulated/floor/tiled,
+/area/teleporter)
 "xQj" = (
 /turf/simulated/open,
 /area/hallway/primary/central_two)
@@ -38495,9 +38281,11 @@
 /turf/simulated/floor/tiled,
 /area/security/armory)
 "xSO" = (
-/obj/machinery/computer/rdconsole/robotics,
-/turf/simulated/floor/carpet/rubber,
-/area/assembly/robotics/workshop)
+/obj/machinery/door/airlock/maintenance_hatch{
+	req_one_access = list(12,47)
+	},
+/turf/simulated/floor/plating,
+/area/assembly/chargebay)
 "xSU" = (
 /obj/structure/cable/green{
 	icon_state = "2-8"
@@ -39181,6 +38969,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
 /area/assembly/chargebay)
 "ykA" = (
@@ -39188,23 +38979,16 @@
 /turf/simulated/floor/tiled/dark,
 /area/turbolift/scc_ship/morgue_lift)
 "ylk" = (
-/obj/structure/table/steel,
-/obj/item/device/assembly/prox_sensor{
-	pixel_x = -7
+/obj/machinery/power/apc/low{
+	dir = 8;
+	name = "west bump";
+	pixel_x = -24
 	},
-/obj/item/device/assembly/prox_sensor{
-	pixel_x = 3
+/obj/structure/cable/green{
+	icon_state = "0-4"
 	},
-/obj/structure/window/reinforced,
-/obj/effect/floor_decal/corner/grey/diagonal,
-/obj/effect/floor_decal/corner/white{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/white{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
-/area/assembly/robotics)
+/turf/simulated/floor/tiled,
+/area/teleporter)
 "ylu" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden,
 /obj/machinery/meter,
@@ -63377,9 +63161,9 @@ quT
 mQW
 nGI
 mzL
-qMd
-qMd
-qMd
+qav
+qav
+qav
 tXR
 msO
 ukV
@@ -63975,18 +63759,18 @@ eUj
 cNU
 dDS
 rnA
-rRA
-ctM
-ctM
-rRA
-oVB
-mSR
-rRA
+uTr
+uTr
+uTr
+uTr
+uTr
+uTr
+uTr
 qMd
-qMd
-qMd
-qMd
-czU
+vyd
+vyd
+xSO
+ibU
 dLe
 dQR
 bkn
@@ -64177,18 +63961,18 @@ oAR
 cNU
 ekI
 fVA
-ctM
-rjc
+uTr
+xQg
 xQg
 ylk
 xNJ
 fEO
 tNT
-qMd
-xSO
-nOJ
+kaT
+kaT
+kaT
 kZv
-czU
+ibU
 hrC
 erH
 oZB
@@ -64379,18 +64163,18 @@ bmq
 bmq
 wMv
 rnA
-pnD
+uTr
 tYa
 pyV
 jCk
-xNJ
-fEO
-miZ
+gec
+ndO
+uTr
 aBa
 aAp
-kJQ
-aAp
-czU
+jOv
+kaT
+ibU
 ljm
 aVf
 jno
@@ -64581,18 +64365,18 @@ jko
 jIL
 umH
 rnA
-rRA
+uTr
 tTb
 heH
 qdw
 wOV
 xmF
-thJ
-aBa
-aAp
-aAp
-qFg
-sEk
+uTr
+wsW
+wsW
+wsW
+kaT
+vNG
 sEk
 sEk
 sEk
@@ -64783,18 +64567,18 @@ cer
 xxy
 qhA
 hYo
-rRA
+uTr
 goc
 baq
 dGp
-lup
+wOV
 raA
-rZp
-qMd
+uTr
+uGP
 iRb
-iRb
-gec
-sEk
+vPg
+kaT
+vNG
 lLj
 unV
 aHj
@@ -64988,15 +64772,15 @@ vMD
 fkF
 jvL
 qXH
-qXH
-qXH
+dnJ
+goQ
 uzL
-bvi
+uTr
 guh
 jxs
-jxs
-jxs
-sEk
+wsW
+kaT
+vNG
 kep
 cQu
 qjh
@@ -65187,18 +64971,18 @@ hfv
 pZQ
 wEq
 uKJ
-rRA
-ghL
-oVB
-ffh
-gIs
-lXC
 uTr
-qMd
-qMd
-qMd
-qMd
-sEk
+uTr
+uTr
+uTr
+uTr
+uTr
+uTr
+kGX
+wsW
+wsW
+kaT
+vNG
 xMV
 fpj
 tdv
@@ -65389,15 +65173,15 @@ wbV
 tcX
 uSS
 rnA
-ctM
+kGX
 iic
-oVB
+gBT
 tjP
 xzd
 rom
-oVB
-oVB
-vyd
+rgR
+kGX
+pXp
 kaT
 wAm
 sEk
@@ -65591,17 +65375,17 @@ rbK
 iRq
 wpb
 rnA
-ctM
+kGX
 alr
-oVB
+cAx
 sHY
 cdv
-oVB
-oVB
-xsU
-rRA
+nOJ
 smn
+kGX
+pXp
 kaT
+kZv
 uNK
 elh
 qPI
@@ -65793,17 +65577,17 @@ cer
 gFa
 cda
 xEp
-ctM
-bMJ
-oVB
-oVB
-oVB
-oVB
+kGX
+iic
+dkr
+fEY
+hiq
+sHY
 xGz
-vPg
-ctM
+kGX
 erY
 kaT
+kaT
 uNK
 elh
 qPI
@@ -65995,16 +65779,16 @@ cer
 hIj
 xSA
 kZL
-rRA
-cCC
+kGX
+iic
 gBT
 urh
 tvX
 vLu
-htx
-uGP
-rRA
-vRt
+vLu
+kGX
+vEg
+kaT
 kaT
 uNK
 uNK
@@ -66197,16 +65981,16 @@ cer
 qUz
 oOi
 xzx
-rRA
-rRA
-rRA
-rRA
-rRA
-rRA
 kGX
 kGX
 kGX
 kGX
+kJQ
+kGX
+kGX
+kGX
+wsW
+wsW
 dTj
 wsW
 mst
@@ -66405,10 +66189,10 @@ lhU
 uDd
 fqa
 uon
-kGX
-ndO
-cAx
-kGX
+cjX
+pXp
+kaT
+kaT
 kaT
 kaT
 nvF
@@ -66608,10 +66392,10 @@ dgZ
 rUZ
 uGW
 cjX
-goQ
-dnJ
-kGX
-kGX
+pXp
+kaT
+vRt
+wsW
 kaT
 kaT
 uXV
@@ -66809,11 +66593,11 @@ qFD
 pJy
 nac
 eZp
-kGX
-dkr
-vEg
+cjX
+erY
+kaT
 jwc
-kGX
+wsW
 mEc
 dSI
 nTF
@@ -67010,12 +66794,12 @@ kpi
 xun
 ygL
 nac
-eZp
-kGX
+qFg
+cjX
 rfO
-fEY
+kaT
 eUp
-kGX
+wsW
 hSG
 dSI
 nTF
@@ -67212,12 +66996,12 @@ kpi
 rlX
 rVL
 nac
-eZp
-kGX
-gKG
 qRY
+cjX
 gKG
-kGX
+kaT
+xsU
+wsW
 kaT
 oVe
 uXV
@@ -67415,11 +67199,11 @@ huw
 qIr
 huw
 eZp
-kGX
+cjX
 rbL
-hiq
-rbL
-kGX
+kaT
+xsU
+wsW
 xed
 xuX
 oqW
@@ -67617,11 +67401,11 @@ jjl
 jjl
 wlF
 vVL
-kGX
-kGX
-kGX
-rgR
-rgR
+cjX
+bzh
+kaT
+sYc
+sYc
 sYc
 sYc
 qsg
@@ -67822,7 +67606,7 @@ dxH
 wsW
 aTd
 kaT
-rgR
+sYc
 uoz
 lRx
 ahu
@@ -68024,7 +67808,7 @@ dxH
 wsW
 aTd
 kaT
-rgR
+sYc
 fLU
 crw
 sYc
@@ -68225,8 +68009,8 @@ dOi
 kur
 wsW
 kaT
-kaT
-rgR
+kZv
+sYc
 pIi
 mGZ
 sYc
diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm
index a8fc63eb82f..8b64f3741ee 100644
--- a/maps/sccv_horizon/placeholder-3_deck_3.dmm
+++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm
@@ -1006,15 +1006,18 @@
 /turf/simulated/floor/carpet,
 /area/lawoffice/consular)
 "ck" = (
-/obj/item/hand_tele,
-/obj/structure/table/standard,
-/obj/item/device/radio/intercom{
-	dir = 4;
-	name = "Station Intercom (General)";
-	pixel_x = -25
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 9
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/firealarm/west,
 /turf/simulated/floor/tiled,
-/area/teleporter)
+/area/hallway/primary/port)
 "cm" = (
 /obj/structure/flora/pottedplant/random{
 	pixel_x = -5
@@ -2361,20 +2364,11 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/light{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
-/obj/machinery/firealarm/west,
-/obj/machinery/camera/network/third_deck{
-	c_tag = "Third Deck - Hallway 5";
-	dir = 4
-	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/port)
 "fj" = (
@@ -3074,9 +3068,21 @@
 /turf/simulated/floor/tiled/dark,
 /area/engineering/break_room)
 "hg" = (
-/obj/machinery/suit_storage_unit/standard_unit,
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 9
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/camera/network/third_deck{
+	c_tag = "Third Deck - Hallway 5";
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
-/area/teleporter)
+/area/hallway/primary/port)
 "hh" = (
 /obj/machinery/telecomms/relay/preset/telecomms,
 /turf/simulated/floor/tiled{
@@ -3577,10 +3583,13 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/ward/isolation)
 "im" = (
-/obj/structure/table/standard,
-/obj/item/modular_computer/laptop/preset/command/teleporter,
-/turf/simulated/floor/plating,
-/area/teleporter)
+/obj/machinery/door/airlock/glass,
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 5
+	},
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled,
+/area/hallway/primary/starboard)
 "in" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -4013,13 +4022,6 @@
 "js" = (
 /turf/simulated/open,
 /area/hallway/crew_area)
-"ju" = (
-/obj/machinery/light/small/emergency{
-	dir = 4
-	},
-/obj/structure/table/rack,
-/turf/simulated/floor,
-/area/maintenance/security_starboard)
 "jv" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -4370,12 +4372,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
-"kl" = (
-/obj/item/device/radio/beacon,
-/obj/machinery/firealarm/west,
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/tiled,
-/area/teleporter)
 "km" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 9
@@ -5139,16 +5135,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/starboard)
-"mh" = (
-/obj/structure/table/rack,
-/obj/item/tank/oxygen,
-/obj/item/clothing/mask/gas,
-/obj/machinery/camera/network/command{
-	c_tag = "Third Deck - Teleporter";
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/teleporter)
 "mi" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 5
@@ -6442,22 +6428,11 @@
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/entry/emergency)
 "po" = (
-/obj/machinery/door/airlock/command{
-	name = "Teleport Access";
-	req_access = list(17)
-	},
+/obj/structure/window/shuttle/scc_space_ship,
+/obj/structure/grille,
 /obj/machinery/door/firedoor,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/teleporter)
+/turf/simulated/floor/plating,
+/area/hallway/primary/port)
 "pp" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -7015,18 +6990,6 @@
 	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/toilet)
-"qv" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/turf/simulated/floor/tiled,
-/area/teleporter)
 "qw" = (
 /obj/effect/floor_decal/spline/fancy/wood,
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -8312,9 +8275,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/hallway/crew_area)
-"tD" = (
-/turf/simulated/wall/r_wall,
-/area/teleporter)
 "tE" = (
 /obj/structure/bed/stool/chair/office/bridge{
 	dir = 4
@@ -9202,9 +9162,8 @@
 	},
 /area/tcommsat/chamber)
 "wf" = (
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
-/area/maintenance/security_starboard)
+/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
+/area/hallway/primary/starboard)
 "wg" = (
 /obj/effect/floor_decal/corner/grey/diagonal{
 	dir = 8
@@ -9430,11 +9389,13 @@
 /turf/simulated/floor/tiled,
 /area/bridge)
 "wK" = (
-/obj/effect/floor_decal/corner/paleblue/full{
-	dir = 8
-	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/structure/closet/emcloset,
+/obj/machinery/newscaster{
+	pixel_y = 30
+	},
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 5
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/entry/emergency)
 "wM" = (
@@ -10590,9 +10551,6 @@
 	temperature = 278
 	},
 /area/tcommsat/chamber)
-"zH" = (
-/turf/simulated/floor,
-/area/maintenance/security_starboard)
 "zI" = (
 /obj/machinery/alarm{
 	pixel_y = 28
@@ -12326,13 +12284,11 @@
 /turf/simulated/wall,
 /area/security/forensics_morgue)
 "Ee" = (
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/door/airlock/maintenance{
-	req_access = list(17)
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 5
 	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor,
-/area/maintenance/security_starboard)
+/turf/simulated/floor/tiled,
+/area/hallway/primary/starboard)
 "Ef" = (
 /obj/structure/sink{
 	dir = 8;
@@ -13440,15 +13396,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
-"GS" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled,
-/area/teleporter)
 "GT" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -13482,16 +13429,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/security/forensics_office)
-"GV" = (
-/obj/machinery/alarm{
-	dir = 4;
-	pixel_x = -28
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/simulated/floor/tiled,
-/area/teleporter)
 "GW" = (
 /obj/effect/floor_decal/corner/blue/full{
 	dir = 1
@@ -13549,9 +13486,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/bridge/minibar)
-"Hb" = (
-/turf/simulated/floor/tiled/dark,
-/area/hallway/primary/starboard)
 "Hc" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/machinery/atmospherics/unary/vent_pump/on,
@@ -14392,13 +14326,6 @@
 /obj/machinery/atmospherics/pipe/simple/visible/universal,
 /turf/simulated/floor,
 /area/maintenance/engineering_ladder)
-"Jc" = (
-/obj/machinery/teleport/station,
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/teleporter)
 "Je" = (
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/corner/blue{
@@ -15122,14 +15049,6 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/template_noop)
-"KP" = (
-/obj/machinery/teleport/pad,
-/obj/effect/decal/warning_stripes,
-/turf/simulated/floor/plating,
-/area/teleporter)
-"KQ" = (
-/turf/simulated/wall/r_wall,
-/area/maintenance/security_starboard)
 "KR" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 9
@@ -15426,15 +15345,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
-"Ly" = (
-/obj/effect/floor_decal/corner/paleblue{
-	dir = 6
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/hallway/primary/port)
 "Lz" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -15905,14 +15815,6 @@
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hop/xo)
-"MB" = (
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/door/airlock/maintenance{
-	req_access = list(17)
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor,
-/area/teleporter)
 "MD" = (
 /obj/structure/bed/stool/chair{
 	dir = 4
@@ -17596,13 +17498,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/lawoffice/representative)
-"Qr" = (
-/obj/machinery/shieldwallgen,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/tiled,
-/area/teleporter)
 "Qs" = (
 /obj/structure/bed/stool/chair/padded/brown{
 	dir = 4
@@ -17776,20 +17671,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge/selfdestruct)
-"QQ" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 5
-	},
-/obj/machinery/power/apc{
-	dir = 1;
-	name = "north bump";
-	pixel_y = 24
-	},
-/obj/structure/cable/green{
-	icon_state = "0-2"
-	},
-/turf/simulated/floor/tiled,
-/area/teleporter)
 "QR" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -18196,15 +18077,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
-"Se" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 6
-	},
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
-/turf/simulated/floor/tiled,
-/area/teleporter)
 "Sf" = (
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 8
@@ -19038,9 +18910,6 @@
 "Uc" = (
 /turf/simulated/wall/r_wall,
 /area/hallway/primary/starboard)
-"Ud" = (
-/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/template_noop)
 "Ue" = (
 /obj/structure/lattice,
 /obj/structure/railing/mapped{
@@ -19378,10 +19247,7 @@
 /obj/effect/floor_decal/corner/paleblue/full{
 	dir = 1
 	},
-/obj/machinery/newscaster{
-	pixel_y = 30
-	},
-/obj/structure/flora/pottedplant/random,
+/obj/structure/closet/emcloset,
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/entry/emergency)
 "Vd" = (
@@ -19748,21 +19614,6 @@
 	temperature = 278
 	},
 /area/tcommsat/chamber)
-"VR" = (
-/obj/effect/floor_decal/corner/paleblue{
-	dir = 6
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/hallway/primary/port)
 "VS" = (
 /obj/structure/cable/green{
 	icon_state = "1-4"
@@ -20438,7 +20289,7 @@
 /area/crew_armory)
 "XP" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/teleporter)
+/area/hallway/primary/port)
 "XQ" = (
 /obj/structure/cable/green{
 	icon_state = "1-4"
@@ -44512,10 +44363,10 @@ Ms
 Fr
 Ss
 Sj
-Sj
+ck
 Sj
 fi
-Sj
+hg
 Sj
 rc
 hU
@@ -44716,12 +44567,12 @@ he
 mo
 Gp
 he
-VR
-Ly
+he
+he
 he
 he
 QD
-Hb
+eP
 zW
 Dk
 MY
@@ -44914,16 +44765,16 @@ Gb
 BX
 BX
 OV
-tD
-tD
-tD
-tD
+XP
+XP
+XP
 po
-tD
-tD
-KQ
-KQ
-KQ
+po
+po
+XP
+XP
+wf
+im
 Ht
 rl
 TG
@@ -45116,14 +44967,14 @@ Cx
 BX
 BX
 Be
-tD
-ck
-hg
-kl
-qv
-GV
-MB
-wf
+XP
+at
+at
+at
+at
+at
+at
+at
 wf
 Ee
 zZ
@@ -45318,16 +45169,16 @@ Kp
 Hq
 zi
 wW
-tD
-QQ
-GS
-GS
-Se
-Qr
-tD
-zH
-KQ
-KQ
+XP
+at
+at
+at
+at
+at
+at
+at
+wf
+im
 Qm
 rl
 rl
@@ -45516,18 +45367,18 @@ aK
 aK
 aK
 aK
-uv
-uv
-uv
-uv
 XP
-im
-Jc
-KP
-mh
-Qr
-tD
-ju
+XP
+XP
+XP
+XP
+at
+at
+at
+at
+at
+at
+at
 Cu
 wK
 WQ
@@ -45722,14 +45573,14 @@ at
 at
 at
 at
-Ud
-Ud
-Ud
-Ud
-Ud
-Ud
-Ud
-Ud
+at
+at
+at
+at
+at
+at
+at
+at
 Cu
 Vb
 HU