diff --git a/maps/sccv_horizon/placeholder-1_deck_1.dmm b/maps/sccv_horizon/placeholder-1_deck_1.dmm
index 5e96dbf5291..bde86faab67 100644
--- a/maps/sccv_horizon/placeholder-1_deck_1.dmm
+++ b/maps/sccv_horizon/placeholder-1_deck_1.dmm
@@ -398,7 +398,6 @@
 	layer = 2.9;
 	reversed = 1
 	},
-/obj/machinery/mineral/input,
 /turf/simulated/floor/plating,
 /area/outpost/mining_main/refinery)
 "avE" = (
@@ -1016,7 +1015,12 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/effect/floor_decal/corner/black{
+	dir = 6
+	},
+/obj/structure/railing/mapped{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/hangar/intrepid)
 "aXC" = (
@@ -1892,7 +1896,6 @@
 	id = "mining_2";
 	layer = 2.9
 	},
-/obj/machinery/mineral/output,
 /obj/structure/plasticflaps/mining,
 /turf/simulated/floor/plating,
 /area/outpost/mining_main/refinery)
@@ -2149,7 +2152,7 @@
 /turf/simulated/floor/plating,
 /area/engineering/atmos/air)
 "bZC" = (
-/obj/machinery/computer/shuttle_control/explore/mining_shuttle{
+/obj/machinery/computer/ship/helm{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
@@ -2168,14 +2171,22 @@
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos/propulsion)
 "caN" = (
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "mining_1";
-	layer = 2.9
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/obj/machinery/mineral/output,
-/turf/simulated/floor/plating,
-/area/outpost/mining_main/refinery)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/item/reagent_containers/spray/cleaner,
+/obj/structure/table/steel,
+/turf/simulated/floor/tiled{
+	name = "cooled floor";
+	temperature = 278
+	},
+/area/medical/morgue/lower)
 "cch" = (
 /obj/machinery/atmospherics/omni/filter{
 	tag_east = 2;
@@ -3134,9 +3145,11 @@
 /turf/simulated/floor/plating,
 /area/engineering/drone_fabrication)
 "cWd" = (
-/obj/machinery/mineral/unloading_machine,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/door/firedoor,
+/obj/machinery/mineral/unloading_machine{
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/outpost/mining_main/refinery)
 "cWk" = (
@@ -3257,14 +3270,18 @@
 /turf/simulated/floor/plating,
 /area/maintenance/hangar/port)
 "ddL" = (
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "mining_2";
-	layer = 2.9
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/obj/machinery/mineral/input,
-/turf/simulated/floor/plating,
-/area/outpost/mining_main/refinery)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/effect/floor_decal/corner/black{
+	dir = 9
+	},
+/turf/simulated/floor/tiled,
+/area/hangar/intrepid)
 "ded" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -3982,6 +3999,9 @@
 "dNv" = (
 /obj/structure/bed/stool/chair/shuttle,
 /obj/structure/closet/walllocker/emerglocker/east,
+/obj/machinery/atmospherics/pipe/simple/visible/black{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mining)
 "dOa" = (
@@ -4659,6 +4679,9 @@
 /area/maintenance/engineering)
 "evA" = (
 /obj/effect/floor_decal/industrial/warning,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/medical/morgue/lower)
 "evK" = (
@@ -5240,9 +5263,6 @@
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 9
 	},
-/obj/machinery/atmospherics/pipe/simple/visible/black{
-	dir = 4
-	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mining)
 "eQH" = (
@@ -5518,8 +5538,8 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 9
 	},
-/obj/structure/disposalpipe/junction{
-	dir = 8
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/loading)
@@ -5541,8 +5561,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/structure/disposalpipe/junction{
+	dir = 8;
+	icon_state = "pipe-j2"
 	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/loading)
@@ -5862,18 +5883,25 @@
 /turf/simulated/floor/airless,
 /area/engineering/atmos)
 "fpp" = (
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "mining_1";
-	layer = 2.9
+/obj/structure/railing/mapped{
+	dir = 4
 	},
-/obj/machinery/mineral/input,
-/turf/simulated/floor/plating,
-/area/outpost/mining_main/refinery)
+/obj/effect/floor_decal/corner/black{
+	dir = 6
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/hangar/intrepid)
 "fpy" = (
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/loading)
 "fpW" = (
@@ -6175,7 +6203,9 @@
 /obj/effect/floor_decal/corner/black{
 	dir = 6
 	},
-/obj/effect/floor_decal/industrial/loading/yellow,
+/obj/effect/floor_decal/industrial/loading/yellow{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark,
 /area/hangar/intrepid)
 "fEM" = (
@@ -7019,10 +7049,11 @@
 /area/maintenance/hangar/port)
 "gqn" = (
 /obj/effect/floor_decal/industrial/warning,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
-	},
 /obj/machinery/firealarm/west,
+/obj/machinery/computer/shuttle_control/lift{
+	pixel_y = -1;
+	shuttle_tag = "Morgue Lift"
+	},
 /turf/simulated/floor/tiled,
 /area/medical/morgue/lower)
 "gqR" = (
@@ -7048,8 +7079,10 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 9
 	},
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
+/obj/machinery/computer/shuttle_control/lift{
+	pixel_y = -1;
+	shuttle_tag = "Cargo Lift"
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/loading)
 "grm" = (
@@ -7622,15 +7655,15 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /obj/machinery/camera/network/medbay{
 	c_tag = "Medical -  Lower Lift"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
@@ -7686,7 +7719,9 @@
 	pixel_x = -24;
 	pixel_y = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/visible/black,
+/obj/machinery/atmospherics/pipe/simple/visible/black{
+	dir = 10
+	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mining)
 "gVe" = (
@@ -7745,10 +7780,14 @@
 /turf/simulated/floor/plating,
 /area/hangar/auxiliary)
 "gYd" = (
-/obj/effect/floor_decal/industrial/warning/corner{
-	dir = 8
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/machinery/door/firedoor,
+/obj/machinery/door/window/eastleft,
+/turf/simulated/floor/tiled/ramp{
+	dir = 4
 	},
-/turf/simulated/floor/plating,
 /area/hangar/intrepid)
 "gYN" = (
 /obj/machinery/light{
@@ -7979,7 +8018,6 @@
 	dir = 1
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/mineral/input,
 /turf/simulated/floor/tiled,
 /area/outpost/mining_main/refinery)
 "hhS" = (
@@ -8396,7 +8434,6 @@
 	layer = 2.9;
 	reversed = 1
 	},
-/obj/machinery/mineral/output,
 /obj/machinery/door/firedoor,
 /obj/structure/plasticflaps/mining,
 /turf/simulated/floor/plating,
@@ -10878,12 +10915,12 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/machinery/alarm{
 	pixel_y = 28
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
@@ -11340,14 +11377,13 @@
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos/propulsion/starboard)
 "kzH" = (
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "mining_2";
-	layer = 2.9
+/obj/machinery/door/window/eastright,
+/obj/structure/window/reinforced,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled/ramp{
+	dir = 4
 	},
-/obj/machinery/mineral/output,
-/turf/simulated/floor/plating,
-/area/outpost/mining_main/refinery)
+/area/hangar/intrepid)
 "kAn" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
@@ -12051,11 +12087,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/checkpoint)
 "lho" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 10
+/obj/machinery/atmospherics/pipe/simple/visible/black{
+	dir = 5
 	},
-/turf/simulated/floor/plating,
-/area/hangar/intrepid)
+/turf/simulated/wall/shuttle/scc/cardinal,
+/area/shuttle/mining)
 "lhE" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -12414,7 +12450,7 @@
 /turf/simulated/floor/carpet/rubber,
 /area/operations/storage)
 "lAo" = (
-/obj/machinery/computer/ship/helm{
+/obj/machinery/computer/shuttle_control/explore/mining_shuttle{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
@@ -12631,17 +12667,14 @@
 /turf/simulated/floor/shuttle/dark_blue,
 /area/shuttle/escape_pod/pod4)
 "lMA" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+/obj/structure/railing/mapped{
+	dir = 4
 	},
 /obj/effect/floor_decal/corner/black{
-	dir = 9
+	dir = 6
 	},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/industrial/loading/yellow,
+/turf/simulated/floor/tiled/dark,
 /area/hangar/intrepid)
 "lMS" = (
 /obj/structure/cable/green{
@@ -13049,7 +13082,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled,
 /area/quartermaster/loading)
 "mbI" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -13167,15 +13200,15 @@
 /area/hangar/auxiliary)
 "miT" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/atmospherics/pipe/simple/visible/black{
-	dir = 5
-	},
 /obj/machinery/computer/ship/engines{
 	dir = 4
 	},
 /obj/machinery/light/small{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/manifold/visible/black{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mining)
 "mky" = (
@@ -15334,8 +15367,10 @@
 /turf/simulated/floor/tiled,
 /area/shuttle/intrepid)
 "ohS" = (
-/obj/machinery/mineral/processing_unit,
 /obj/effect/floor_decal/industrial/warning/full,
+/obj/machinery/mineral/processing_unit{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/outpost/mining_main/refinery)
 "oiS" = (
@@ -15810,17 +15845,11 @@
 /turf/simulated/floor/reinforced,
 /area/rnd/test_range)
 "oSA" = (
-/obj/structure/railing/mapped{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/visible/black{
+	dir = 9
 	},
-/obj/effect/floor_decal/corner/black{
-	dir = 6
-	},
-/obj/effect/floor_decal/industrial/loading/yellow{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/dark,
-/area/hangar/intrepid)
+/turf/simulated/wall/shuttle/scc/cardinal,
+/area/shuttle/mining)
 "oSD" = (
 /obj/effect/shuttle_landmark/merc_ship/first_deck,
 /turf/template_noop,
@@ -16931,7 +16960,6 @@
 	id = "mining_1";
 	layer = 2.9
 	},
-/obj/machinery/mineral/output,
 /obj/structure/plasticflaps/mining,
 /turf/simulated/floor/plating,
 /area/outpost/mining_main/refinery)
@@ -18945,6 +18973,9 @@
 	name = "Station Intercom (General)";
 	pixel_x = -25
 	},
+/obj/machinery/atmospherics/pipe/simple/visible/black{
+	dir = 5
+	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mining)
 "rNe" = (
@@ -20362,12 +20393,6 @@
 "tfR" = (
 /turf/simulated/floor/tiled,
 /area/shuttle/intrepid)
-"tgo" = (
-/obj/machinery/atmospherics/pipe/simple/visible/black{
-	dir = 9
-	},
-/turf/simulated/wall/shuttle/scc/cardinal,
-/area/shuttle/mining)
 "tgR" = (
 /turf/simulated/floor/tiled,
 /area/outpost/mining_main/refinery)
@@ -21286,7 +21311,6 @@
 	layer = 2.9;
 	reversed = 1
 	},
-/obj/machinery/mineral/input,
 /turf/simulated/floor/plating,
 /area/outpost/mining_main/refinery)
 "uaM" = (
@@ -22020,16 +22044,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos/propulsion/starboard)
-"uJP" = (
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window/eastleft,
-/turf/simulated/floor/tiled/ramp{
-	dir = 4
-	},
-/area/hangar/intrepid)
 "uKh" = (
 /obj/machinery/atmospherics/binary/pump/high_power{
 	dir = 8;
@@ -22220,9 +22234,6 @@
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/manifold/visible/black{
-	dir = 1
-	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mining)
 "uUZ" = (
@@ -22504,6 +22515,9 @@
 "vhg" = (
 /obj/structure/bed/stool/chair/shuttle,
 /obj/effect/overmap/visitable/ship/landable/mining_shuttle,
+/obj/machinery/atmospherics/pipe/simple/visible/black{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mining)
 "vht" = (
@@ -22875,12 +22889,6 @@
 	temperature = 278
 	},
 /area/crew_quarters/kitchen/freezer)
-"vvx" = (
-/obj/machinery/atmospherics/pipe/simple/visible/black{
-	dir = 5
-	},
-/turf/simulated/wall/shuttle/scc/cardinal,
-/area/shuttle/mining)
 "vvU" = (
 /obj/structure/window/reinforced,
 /obj/machinery/door/window/westleft,
@@ -23113,8 +23121,8 @@
 	layer = 2.9;
 	reversed = 1
 	},
-/obj/machinery/mineral/output,
 /obj/machinery/door/firedoor,
+/obj/structure/plasticflaps/mining,
 /turf/simulated/floor/plating,
 /area/outpost/mining_main/refinery)
 "vKy" = (
@@ -23878,9 +23886,6 @@
 	id_tag = "mining_shuttle_in"
 	},
 /obj/machinery/atmospherics/pipe/manifold4w/visible,
-/obj/machinery/atmospherics/pipe/simple/visible/black{
-	dir = 4
-	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mining)
 "wtB" = (
@@ -25185,14 +25190,6 @@
 	temperature = 278
 	},
 /area/medical/morgue/lower)
-"xAS" = (
-/obj/machinery/door/window/eastright,
-/obj/structure/window/reinforced,
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled/ramp{
-	dir = 4
-	},
-/area/hangar/intrepid)
 "xBw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -40651,7 +40648,7 @@ rNH
 rNH
 rNH
 rNH
-qEk
+caN
 lIg
 xNb
 vif
@@ -40861,8 +40858,8 @@ vif
 vif
 ifD
 vul
-kzH
-caN
+oDv
+tIS
 wkD
 gKG
 qOf
@@ -41265,8 +41262,8 @@ fCT
 fCT
 nnw
 vul
-ddL
-fpp
+oDv
+tIS
 wkD
 gKG
 obc
@@ -41487,8 +41484,8 @@ jbr
 rcA
 fdb
 qqS
-vvx
-ucE
+qqS
+lho
 ucE
 ucE
 ucE
@@ -42295,10 +42292,10 @@ ukS
 xij
 fdb
 mWV
-tgo
-ucE
-ucE
-ucE
+qqS
+qqS
+qqS
+oSA
 ucE
 fSl
 aXi
@@ -44110,8 +44107,8 @@ mVJ
 koQ
 koQ
 koQ
-koQ
-lMA
+ddL
+dGo
 dGo
 dGo
 tXo
@@ -44306,17 +44303,17 @@ xVU
 pEO
 xVU
 xVU
-oSA
-mNH
+xVU
+xVU
 aXq
+xVU
+xVU
+xVU
+fpp
 fEy
-xVU
-xVU
-xVU
-pEO
-xVU
-xVU
-xVU
+mNH
+mNH
+lMA
 xVU
 xVU
 xVU
@@ -44508,9 +44505,16 @@ kEJ
 kEJ
 kEJ
 kEJ
-lho
-uJP
-xAS
+kEJ
+kEJ
+kEJ
+kEJ
+kEJ
+kEJ
+kEJ
+kEJ
+gYd
+kzH
 lBY
 kEJ
 kEJ
@@ -44518,13 +44522,6 @@ kEJ
 kEJ
 kEJ
 kEJ
-kEJ
-kEJ
-kEJ
-kEJ
-kEJ
-kEJ
-kEJ
 lBY
 cLV
 iRC
@@ -44710,10 +44707,10 @@ iRC
 amw
 iRC
 iRC
-gYd
-kEJ
-kEJ
-blb
+iRC
+iRC
+iRC
+iRC
 iRC
 rmT
 rmT
diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm
index 5cfe5484f54..b60817e6ce6 100644
--- a/maps/sccv_horizon/placeholder-2_deck_2.dmm
+++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm
@@ -78,7 +78,11 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/sortjunction{
+	dir = 1;
+	name = "CE Office";
+	sortType = "CE Office"
+	},
 /turf/simulated/floor/plating,
 /area/hallway/engineering)
 "abd" = (
@@ -361,8 +365,8 @@
 /turf/simulated/floor/tiled/dark,
 /area/engineering/lobby)
 "ajO" = (
-/obj/structure/table/standard,
 /obj/effect/floor_decal/corner/grey/diagonal,
+/obj/structure/filingcabinet/chestdrawer,
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "ajV" = (
@@ -549,6 +553,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos/storage)
 "apd" = (
@@ -1427,9 +1432,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
-/obj/effect/landmark/start{
-	name = "First Responder"
-	},
 /turf/simulated/floor/tiled,
 /area/medical/first_responder)
 "aQR" = (
@@ -2818,6 +2820,7 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -32
 	},
+/obj/machinery/disposal/small/north,
 /turf/simulated/floor/tiled/white,
 /area/rnd/research)
 "bGI" = (
@@ -3053,6 +3056,10 @@
 	name = "Reception Desk";
 	req_access = list(66)
 	},
+/obj/item/reagent_containers/spray/cleaner{
+	pixel_x = -7;
+	pixel_y = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "bPh" = (
@@ -3343,6 +3350,20 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/hydroponics)
+"bXS" = (
+/obj/effect/floor_decal/corner/mauve/diagonal,
+/obj/effect/floor_decal/corner/grey{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/white{
+	dir = 4
+	},
+/obj/machinery/disposal/small/west,
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/rnd/conference)
 "bYl" = (
 /obj/structure/shuttle_part/scc_space_ship{
 	icon_state = "d2-1"
@@ -3373,6 +3394,10 @@
 /area/engineering/atmos/storage)
 "bYW" = (
 /obj/machinery/space_heater,
+/obj/machinery/disposal/small/north,
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos/storage)
 "bYY" = (
@@ -3488,6 +3513,9 @@
 /obj/effect/floor_decal/corner/white{
 	dir = 4
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/conference)
 "ccS" = (
@@ -8067,6 +8095,7 @@
 	name = "Robotics";
 	req_access = list(29)
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/carpet/rubber,
 /area/assembly/robotics)
 "fkZ" = (
@@ -9129,6 +9158,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
 /area/hallway/engineering/tesla)
 "fUc" = (
@@ -9445,6 +9475,7 @@
 /obj/effect/floor_decal/corner_wide/green/full{
 	dir = 4
 	},
+/obj/item/storage/box/rxglasses,
 /turf/simulated/floor/tiled/white,
 /area/medical/main_storage)
 "gem" = (
@@ -9570,6 +9601,10 @@
 	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" = (
@@ -9830,6 +9865,10 @@
 /obj/effect/floor_decal/spline/plain/corner{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/conference)
 "gqF" = (
@@ -10286,8 +10325,10 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 1
 	},
-/obj/structure/disposalpipe/junction{
-	dir = 4
+/obj/structure/disposalpipe/sortjunction/flipped{
+	dir = 8;
+	name = "Cargo";
+	sortType = "Cargo"
 	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
@@ -11044,6 +11085,10 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/spline/plain,
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/conference)
 "hep" = (
@@ -11264,6 +11309,10 @@
 	dir = 4
 	},
 /obj/structure/window/reinforced,
+/obj/item/reagent_containers/spray/cleaner{
+	pixel_x = -7;
+	pixel_y = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical)
 "hlK" = (
@@ -12297,12 +12346,13 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
-/obj/structure/disposalpipe/junction{
-	dir = 8;
-	icon_state = "pipe-j2"
-	},
 /obj/machinery/iv_drip,
 /obj/effect/floor_decal/industrial/outline/red,
+/obj/structure/disposalpipe/sortjunction{
+	dir = 4;
+	name = "Chemistry";
+	sortType = "Chemistry"
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/gen_treatment)
 "hQE" = (
@@ -12470,6 +12520,16 @@
 "hYk" = (
 /turf/simulated/floor/reinforced,
 /area/turret_protected/ai)
+"hYo" = (
+/obj/effect/floor_decal/corner/mauve{
+	dir = 10
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/rnd/hallway)
 "hYt" = (
 /obj/machinery/light{
 	dir = 4
@@ -13050,6 +13110,14 @@
 	name = "Psychiatric Wing";
 	req_access = list(5)
 	},
+/obj/machinery/door/blast/shutters{
+	density = 0;
+	dir = 8;
+	icon_state = "shutter0";
+	id = "LCKDshutters";
+	name = "MedBay Lockdown Shutters";
+	opacity = 0
+	},
 /turf/simulated/floor/wood,
 /area/medical/psych)
 "ivN" = (
@@ -13703,15 +13771,17 @@
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
+/obj/structure/disposalpipe/sortjunction/flipped{
+	dir = 8;
+	name = "Research Conference Room";
+	sortType = "Research Conference Room"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/hallway)
 "iOI" = (
@@ -14305,6 +14375,7 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/white,
 /area/rnd/conference)
 "jjr" = (
@@ -14739,6 +14810,18 @@
 /obj/effect/floor_decal/spline/fancy,
 /turf/simulated/floor/reinforced,
 /area/hallway/primary/central_two)
+"jvL" = (
+/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"
+	},
+/turf/simulated/floor/tiled,
+/area/assembly/robotics)
 "jvV" = (
 /turf/simulated/wall,
 /area/engineering/storage_eva)
@@ -15079,12 +15162,23 @@
 /turf/simulated/floor/lino/grey,
 /area/crew_quarters/cafeteria)
 "jFu" = (
-/obj/effect/floor_decal/corner/white/diagonal,
-/obj/effect/landmark/start{
-	name = "First Responder"
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled,
-/area/medical/first_responder)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/disposalpipe/sortjunction/flipped{
+	dir = 8;
+	name = "Atmospherics";
+	sortType = "Atmospherics"
+	},
+/turf/simulated/floor/plating,
+/area/hallway/engineering/tesla)
 "jFS" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 10
@@ -15150,6 +15244,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/hallway)
+"jIU" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/engineering/atmos/storage)
 "jIY" = (
 /obj/structure/railing/mapped,
 /obj/structure/railing/mapped{
@@ -15965,6 +16065,9 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/spline/plain,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/conference)
 "kpC" = (
@@ -16092,16 +16195,17 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
-/obj/structure/disposalpipe/junction{
-	dir = 8;
-	icon_state = "pipe-j2"
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
+/obj/structure/disposalpipe/sortjunction{
+	dir = 4;
+	name = "Psychiatry";
+	sortType = "Psychiatry"
+	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical)
 "kug" = (
@@ -16259,9 +16363,9 @@
 /turf/simulated/floor/plating,
 /area/maintenance/hangar/port)
 "kyV" = (
-/obj/effect/map_effect/wingrille_spawn/reinforced,
-/turf/simulated/floor/plating,
-/area/medical/reception)
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/dark,
+/area/engineering/atmos/storage)
 "kyX" = (
 /obj/structure/railing/mapped,
 /obj/structure/window/reinforced,
@@ -16511,7 +16615,10 @@
 /area/maintenance/hangar/port)
 "kHn" = (
 /obj/structure/table/reinforced,
-/obj/machinery/door/window/brigdoor/southleft,
+/obj/machinery/door/window/brigdoor/southleft{
+	name = "Pharmacy Access";
+	req_access = list(33)
+	},
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/shutters{
 	dir = 2;
@@ -16856,6 +16963,15 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos/storage)
+"kVk" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/corner/mauve{
+	dir = 10
+	},
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/dark,
+/area/rnd/hallway)
 "kWg" = (
 /obj/effect/floor_decal/corner/green/diagonal,
 /obj/structure/curtain/medical,
@@ -17060,6 +17176,9 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/spline/plain,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/conference)
 "lcL" = (
@@ -18247,9 +18366,6 @@
 /turf/simulated/floor/grass/alt,
 /area/rnd/xenobiology/xenoflora)
 "lRe" = (
-/obj/structure/disposalpipe/junction{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
@@ -18259,6 +18375,11 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/structure/disposalpipe/sortjunction/flipped{
+	dir = 2;
+	name = "Bar";
+	sortType = "Bar"
+	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/bar)
 "lRq" = (
@@ -21753,9 +21874,6 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -21765,6 +21883,9 @@
 /obj/effect/floor_decal/corner/mauve{
 	dir = 1
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/hallway)
 "nZZ" = (
@@ -22750,7 +22871,6 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/alarm{
@@ -23430,9 +23550,12 @@
 /obj/effect/floor_decal/corner_wide/lime{
 	dir = 6
 	},
-/obj/machinery/smartfridge/secure/medbay{
-	name = "\improper Secure Refrigerated Medicine Storage";
-	req_one_access = list(33)
+/obj/effect/floor_decal/corner_wide/orange{
+	dir = 6
+	},
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 12
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/pharmacy)
@@ -25262,9 +25385,6 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -25274,6 +25394,11 @@
 /obj/effect/floor_decal/corner/mauve{
 	dir = 5
 	},
+/obj/structure/disposalpipe/sortjunction/flipped{
+	dir = 8;
+	name = "Robotics";
+	sortType = "Robotics"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/hallway)
 "qja" = (
@@ -26227,25 +26352,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/wing/starboard)
 "qRh" = (
-/obj/effect/map_effect/wingrille_spawn/reinforced,
-/obj/machinery/door/blast/shutters{
-	density = 0;
-	dir = 2;
-	icon_state = "shutter0";
-	id = "LCKDshutters";
-	name = "MedBay Lockdown Shutters";
-	opacity = 0
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
 	},
-/obj/machinery/door/blast/shutters{
-	density = 0;
-	dir = 2;
-	icon_state = "shutter0";
-	id = "LCKDshutters";
-	name = "MedBay Lockdown Shutters";
-	opacity = 0
-	},
-/turf/simulated/floor/plating,
-/area/medical/reception)
+/turf/simulated/floor/tiled/dark,
+/area/engineering/atmos/storage)
 "qRE" = (
 /obj/structure/cable/green{
 	icon_state = "2-8"
@@ -26563,11 +26675,11 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/structure/disposalpipe/junction{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/hallway/engineering)
 "qZI" = (
@@ -27151,16 +27263,15 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/hallway/engineering)
 "rpl" = (
@@ -27396,6 +27507,7 @@
 	name = "Atmospherics Storage";
 	req_access = list(24)
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos/storage)
 "rvJ" = (
@@ -29923,6 +30035,11 @@
 	dir = 9
 	},
 /obj/effect/floor_decal/sign/cmo,
+/obj/machinery/button/remote/airlock{
+	id = "medaltdoor";
+	name = "Auxiliary Exit Door Control";
+	pixel_y = -26
+	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical)
 "tcW" = (
@@ -30010,10 +30127,11 @@
 /obj/effect/floor_decal/corner_wide/orange{
 	dir = 6
 	},
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = 12
-	},
+/obj/structure/closet/wardrobe/pharmacy_white,
+/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,
 /turf/simulated/floor/tiled/white,
 /area/medical/pharmacy)
 "tfL" = (
@@ -30489,7 +30607,6 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/dark,
@@ -30582,12 +30699,14 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/disposalpipe/junction{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
 /obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/disposalpipe/sortjunction{
+	dir = 1;
+	name = "Engineering";
+	sortType = "Engineering"
+	},
 /turf/simulated/floor/plating,
 /area/hallway/engineering)
 "tAS" = (
@@ -34121,13 +34240,23 @@
 /area/crew_quarters/cafeteria)
 "vHp" = (
 /obj/structure/table/standard,
-/obj/item/cane/crutch,
 /obj/machinery/light,
-/obj/item/storage/box/bloodpacks,
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 10
 	},
+/obj/item/cane/crutch,
+/obj/item/cane/crutch,
+/obj/item/cane/crutch,
+/obj/item/cane,
+/obj/item/cane,
 /obj/item/bodybag/cryobag,
+/obj/item/bodybag/cryobag,
+/obj/item/bodybag/cryobag,
+/obj/item/bodybag/cryobag,
+/obj/item/storage/box/bloodpacks,
+/obj/item/storage/box/bloodpacks,
+/obj/item/storage/box/syringes,
+/obj/item/storage/box/syringes,
 /obj/item/auto_cpr,
 /turf/simulated/floor/tiled/white,
 /area/medical/main_storage)
@@ -34267,6 +34396,10 @@
 /obj/effect/floor_decal/corner/mauve{
 	dir = 10
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/hallway)
 "vMF" = (
@@ -35188,6 +35321,15 @@
 /obj/structure/bed/roller,
 /turf/simulated/floor/tiled/white,
 /area/medical/gen_treatment)
+"whU" = (
+/obj/machinery/door/firedoor,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 12
+	},
+/turf/simulated/floor/tiled,
+/area/medical/icu)
 "wia" = (
 /turf/simulated/wall,
 /area/medical/icu)
@@ -35269,6 +35411,23 @@
 /obj/structure/lattice,
 /turf/simulated/open,
 /area/hallway/primary/central_two)
+"wlF" = (
+/obj/effect/floor_decal/corner/mauve/diagonal,
+/obj/effect/floor_decal/corner/grey{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/white{
+	dir = 4
+	},
+/obj/effect/floor_decal/spline/plain{
+	dir = 8
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled/white,
+/area/rnd/conference)
 "wlJ" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/random/junk,
@@ -37444,6 +37603,7 @@
 /area/engineering/engine_room)
 "xzM" = (
 /obj/machinery/door/airlock/glass_medical{
+	id_tag = "medaltdoor";
 	name = "Medbay";
 	req_access = list(5)
 	},
@@ -38128,6 +38288,7 @@
 	req_access = list(47)
 	},
 /obj/effect/map_effect/door_helper/unres,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/rnd/conference)
 "xWc" = (
@@ -38153,6 +38314,13 @@
 /obj/structure/table/wood,
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
+"xWL" = (
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/engineering/atmos/storage)
 "xWV" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -56010,7 +56178,7 @@ ydL
 wfy
 wfy
 uky
-laF
+whU
 fyx
 jhM
 nLS
@@ -57439,7 +57607,7 @@ cfw
 gDq
 fOp
 sxt
-qRh
+uyd
 wbE
 sbI
 fqr
@@ -58030,7 +58198,7 @@ oUt
 auj
 axS
 avl
-jFu
+avl
 aZR
 ruV
 jBw
@@ -58045,7 +58213,7 @@ bPd
 gDq
 fOp
 njl
-kyV
+uyd
 dKH
 ghX
 fqr
@@ -59629,7 +59797,7 @@ fnn
 aau
 biI
 biI
-sDz
+qRh
 bYW
 fnn
 rNE
@@ -59831,7 +59999,7 @@ fnn
 aor
 sDz
 sDz
-sDz
+jIU
 sDz
 cCy
 rNE
@@ -60027,13 +60195,13 @@ hvU
 xsX
 lMD
 mtf
-gci
+jFu
 fTZ
 rvC
 aoQ
-sDz
-sDz
-sDz
+kyV
+kyV
+xWL
 gAt
 fnn
 svh
@@ -64291,7 +64459,7 @@ cer
 cer
 xxy
 qhA
-rnA
+hYo
 rRA
 goc
 baq
@@ -64495,7 +64663,7 @@ taf
 fKk
 vMD
 fkF
-qXH
+jvL
 qXH
 qXH
 qXH
@@ -66311,7 +66479,7 @@ sig
 sig
 dZU
 iOD
-vJv
+kVk
 xWb
 heg
 qFD
@@ -67124,7 +67292,7 @@ bSD
 gqz
 jjl
 jjl
-jjl
+wlF
 vVL
 jwc
 kGX
@@ -67528,7 +67696,7 @@ bSD
 gXD
 ouk
 ncA
-ccO
+bXS
 dxH
 wsW
 aTd
diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm
index 6f35018c788..3841e068d6e 100644
--- a/maps/sccv_horizon/placeholder-3_deck_3.dmm
+++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm
@@ -199,6 +199,7 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "ay" = (
@@ -330,6 +331,7 @@
 	dir = 6
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "aO" = (
@@ -362,6 +364,9 @@
 	},
 /obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/heads/hop/xo)
 "aQ" = (
@@ -1106,6 +1111,7 @@
 	req_access = list(40)
 	},
 /obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "cx" = (
@@ -1224,6 +1230,10 @@
 /obj/effect/floor_decal/corner_wide/paleblue{
 	dir = 5
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
 "cJ" = (
@@ -1662,6 +1672,10 @@
 	pixel_x = 4;
 	pixel_y = 4
 	},
+/obj/item/cane,
+/obj/item/cane,
+/obj/item/cane,
+/obj/item/cane,
 /turf/simulated/floor/tiled/white,
 /area/medical/equipment)
 "dE" = (
@@ -1705,6 +1719,9 @@
 	pixel_y = 8
 	},
 /obj/item/gun/launcher/syringe,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
 /turf/simulated/floor/tiled/white,
 /area/medical/equipment)
 "dI" = (
@@ -2731,6 +2748,16 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/fitness/pool)
+"go" = (
+/obj/effect/floor_decal/corner_wide/paleblue{
+	dir = 5
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled/white,
+/area/hallway/medical/upper)
 "gq" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/table/standard,
@@ -4780,6 +4807,16 @@
 	},
 /turf/simulated/open,
 /area/hallway/primary/starboard)
+"lv" = (
+/obj/effect/floor_decal/corner_wide/green{
+	dir = 9
+	},
+/obj/machinery/vending/medical{
+	density = 0;
+	pixel_x = -32
+	},
+/turf/simulated/floor/tiled/white,
+/area/hallway/medical/upper)
 "lw" = (
 /obj/structure/table/wood,
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -9403,6 +9440,9 @@
 "wR" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/heads/hop/xo)
 "wT" = (
@@ -11531,6 +11571,9 @@
 	dir = 1;
 	icon_state = "pipe-c"
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/heads/hop/xo)
 "Cj" = (
@@ -12004,6 +12047,12 @@
 /area/tcommsat/chamber)
 "Dx" = (
 /obj/structure/table/wood,
+/obj/machinery/power/apc{
+	is_critical = 1;
+	name = "south bump";
+	pixel_y = -24
+	},
+/obj/structure/cable/green,
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hop/xo)
 "Dy" = (
@@ -12492,6 +12541,9 @@
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 10
 	},
+/obj/effect/landmark/start{
+	name = "First Responder"
+	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
 "EW" = (
@@ -12542,6 +12594,9 @@
 /obj/machinery/disposal/small/west{
 	pixel_y = -5
 	},
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "Fc" = (
@@ -13570,6 +13625,9 @@
 /area/hallway/primary/starboard)
 "Hv" = (
 /obj/structure/bed/stool/chair/padded/brown,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hop/xo)
 "Hw" = (
@@ -13597,6 +13655,9 @@
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 10
 	},
+/obj/effect/landmark/start{
+	name = "First Responder"
+	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
 "Hy" = (
@@ -15598,6 +15659,10 @@
 "Mf" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "conpipe-c"
+	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "Mg" = (
@@ -15731,6 +15796,26 @@
 "My" = (
 /turf/simulated/open,
 /area/hallway/medical/upper)
+"Mz" = (
+/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
+	},
+/obj/effect/floor_decal/corner_wide/green{
+	dir = 10
+	},
+/obj/structure/disposalpipe/sortjunction{
+	dir = 8;
+	name = "CMO Office";
+	sortType = "CMO Office"
+	},
+/turf/simulated/floor/tiled/white,
+/area/hallway/medical/upper)
 "MA" = (
 /obj/structure/bed/stool/chair/padded/brown{
 	dir = 8
@@ -16469,6 +16554,9 @@
 "Oj" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/heads/hop/xo)
 "Ok" = (
@@ -17029,6 +17117,9 @@
 	pixel_y = -34;
 	req_access = list(40)
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "PF" = (
@@ -17108,6 +17199,9 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/starboard)
 "PL" = (
@@ -19749,6 +19843,9 @@
 /area/crew_quarters/locker)
 "Wp" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "Wq" = (
@@ -19799,6 +19896,9 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/hallway/primary/starboard)
 "Wx" = (
@@ -35054,7 +35154,7 @@ aM
 wp
 cH
 ks
-dK
+lv
 ua
 do
 jk
@@ -35456,8 +35556,8 @@ Wp
 az
 aZ
 vh
-dQ
-Ew
+go
+Mz
 xG
 uo
 dC