From 41331cecafb7a9784df52748e887743a434bf073 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <github@cmalu.neomailbox.ch>
Date: Sun, 6 Mar 2022 14:00:45 +0000
Subject: [PATCH 01/20] Adds a tickable horizon define to _maps

---
 _maps/sccv_horizon.dm | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 _maps/sccv_horizon.dm

diff --git a/_maps/sccv_horizon.dm b/_maps/sccv_horizon.dm
new file mode 100644
index 00000000000..8e74420ac07
--- /dev/null
+++ b/_maps/sccv_horizon.dm
@@ -0,0 +1 @@
+#define DEFAULT_MAP "sccv_horizon"
\ No newline at end of file

From 75e17a7230e63a205d01cc534040a2d1ed7bb250 Mon Sep 17 00:00:00 2001
From: mikomyazaki <github@cmalu.neomailbox.ch>
Date: Fri, 4 Mar 2022 04:01:02 +0000
Subject: [PATCH 02/20] Adds sink to D2 garden area.

---
 maps/sccv_horizon/placeholder-2_deck_2.dmm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm
index 1efd1d5f511..493a4e4b2c5 100644
--- a/maps/sccv_horizon/placeholder-2_deck_2.dmm
+++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm
@@ -8754,11 +8754,15 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/research)
 "fEI" = (
-/obj/structure/table/standard,
 /obj/machinery/camera/network/second_deck{
 	c_tag = "Second Deck - Garden";
 	dir = 8
 	},
+/obj/structure/sink/kitchen{
+	dir = 8;
+	name = "sink";
+	pixel_x = 20
+	},
 /turf/simulated/floor/wood,
 /area/hydroponics/garden)
 "fEO" = (

From 380db3dae510cab00fadbd9057124fda890ee478 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <github@cmalu.neomailbox.ch>
Date: Sun, 6 Mar 2022 15:23:13 +0000
Subject: [PATCH 03/20] Fixes all disconnected pipe unit test failures.

---
 maps/sccv_horizon/placeholder-1_deck_1.dmm | 130 ++++++++++++---------
 maps/sccv_horizon/placeholder-3_deck_3.dmm |  25 ++--
 2 files changed, 87 insertions(+), 68 deletions(-)

diff --git a/maps/sccv_horizon/placeholder-1_deck_1.dmm b/maps/sccv_horizon/placeholder-1_deck_1.dmm
index 6e70417c4e6..c81896750c7 100644
--- a/maps/sccv_horizon/placeholder-1_deck_1.dmm
+++ b/maps/sccv_horizon/placeholder-1_deck_1.dmm
@@ -2716,9 +2716,13 @@
 /obj/effect/floor_decal/corner_wide/purple{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "cAq" = (
@@ -4327,17 +4331,13 @@
 /obj/effect/floor_decal/corner_wide/purple{
 	dir = 9
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
-	},
 /obj/machinery/camera/network/research{
 	c_tag = "Research - Xenoarcheology 3";
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "edO" = (
@@ -5921,7 +5921,6 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/visible/red,
 /turf/simulated/floor/airless,
 /area/engineering/atmos)
 "fpp" = (
@@ -6538,7 +6537,6 @@
 /obj/structure/tank_wall/carbon_dioxide{
 	icon_state = "co2-3"
 	},
-/obj/machinery/atmospherics/pipe/simple/visible/black,
 /turf/simulated/floor/airless,
 /area/engineering/atmos)
 "fRj" = (
@@ -8636,11 +8634,23 @@
 /turf/simulated/floor/plating,
 /area/maintenance/research_port)
 "hIx" = (
-/obj/structure/lattice,
-/obj/structure/grille,
-/obj/machinery/atmospherics/pipe/simple/visible/black,
-/turf/space/dynamic,
-/area/template_noop)
+/obj/effect/floor_decal/corner_wide/purple{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner_wide/purple{
+	dir = 6
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/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/xenoarch_atrium)
 "hII" = (
 /obj/effect/floor_decal/corner/brown/full{
 	dir = 1
@@ -10440,7 +10450,6 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/visible/red,
 /turf/simulated/floor/airless,
 /area/engineering/atmos)
 "jvF" = (
@@ -11741,9 +11750,16 @@
 /turf/simulated/floor/wood,
 /area/shuttle/intrepid)
 "kEk" = (
-/obj/machinery/atmospherics/valve,
-/turf/space/dynamic,
-/area/template_noop)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/ramp/bottom{
+	dir = 4
+	},
+/area/rnd/xenoarch_atrium)
 "kEt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
@@ -15524,9 +15540,6 @@
 /turf/simulated/floor/plating,
 /area/rnd/xenoarch_atrium)
 "oam" = (
-/obj/structure/lattice,
-/obj/structure/grille,
-/obj/machinery/atmospherics/pipe/simple/visible/purple,
 /turf/space/dynamic,
 /area/template_noop)
 "oap" = (
@@ -17514,6 +17527,12 @@
 /area/rnd/xenoarch_atrium)
 "qbu" = (
 /obj/machinery/hologram/holopad,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenoarch_atrium)
 "qbC" = (
@@ -20694,12 +20713,6 @@
 "sTw" = (
 /turf/simulated/floor/plating,
 /area/maintenance/wing/port/deck1)
-"sTX" = (
-/obj/structure/lattice,
-/obj/structure/grille,
-/obj/machinery/atmospherics/pipe/simple/visible/red,
-/turf/space/dynamic,
-/area/template_noop)
 "sUS" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -22678,7 +22691,6 @@
 	dir = 1
 	},
 /obj/structure/tank_wall/carbon_dioxide,
-/obj/machinery/atmospherics/pipe/simple/visible/black,
 /turf/simulated/floor/airless,
 /area/engineering/atmos)
 "uKW" = (
@@ -23894,22 +23906,13 @@
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mining)
 "vSF" = (
-/obj/effect/floor_decal/corner_wide/purple{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner_wide/purple{
-	dir = 6
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/tiled/dark,
 /area/rnd/xenoarch_atrium)
 "vSS" = (
 /obj/machinery/light{
@@ -24363,7 +24366,6 @@
 /obj/structure/tank_wall/phoron{
 	icon_state = "ph3"
 	},
-/obj/machinery/atmospherics/pipe/simple/visible/purple,
 /turf/simulated/floor/airless,
 /area/engineering/atmos)
 "wnQ" = (
@@ -24651,6 +24653,17 @@
 /obj/structure/bed/stool/chair/shuttle,
 /turf/simulated/floor/tiled,
 /area/shuttle/intrepid)
+"wHg" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/ramp/bottom{
+	dir = 8
+	},
+/area/rnd/xenoarch_atrium)
 "wHA" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -24926,6 +24939,12 @@
 /area/template_noop)
 "wUz" = (
 /obj/item/device/radio/beacon,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenoarch_atrium)
 "wUM" = (
@@ -26007,7 +26026,6 @@
 	dir = 1
 	},
 /obj/structure/tank_wall/phoron,
-/obj/machinery/atmospherics/pipe/simple/visible/purple,
 /turf/simulated/floor/airless,
 /area/engineering/atmos)
 "xJE" = (
@@ -45910,8 +45928,8 @@ eSV
 eSV
 eSV
 eSV
-sTX
-kEk
+sPo
+oam
 jvE
 lPP
 xHW
@@ -46314,8 +46332,8 @@ eSV
 eSV
 eSV
 eSV
-sTX
-kEk
+sPo
+oam
 foN
 htn
 nnh
@@ -47122,8 +47140,8 @@ eSV
 eSV
 eSV
 eSV
+sPo
 oam
-kEk
 xJv
 ebN
 sEE
@@ -47526,8 +47544,8 @@ eSV
 eSV
 eSV
 eSV
+sPo
 oam
-kEk
 wnz
 bGf
 enn
@@ -48334,8 +48352,8 @@ eSV
 eSV
 eSV
 eSV
-hIx
-kEk
+sPo
+oam
 uKu
 vuB
 jpI
@@ -48738,8 +48756,8 @@ eSV
 eSV
 eSV
 eSV
-hIx
-kEk
+sPo
+oam
 fQZ
 wdX
 onN
@@ -53419,8 +53437,8 @@ cWo
 tlU
 tlU
 pau
-vSF
 pau
+hIx
 tlU
 tlU
 tLq
@@ -53622,7 +53640,7 @@ qbk
 lBH
 qYo
 wAk
-wAk
+kEk
 wVW
 uPk
 nwQ
@@ -53824,7 +53842,7 @@ uyc
 kFL
 jrJ
 jrJ
-jrJ
+vSF
 jrJ
 hSX
 mwu
@@ -54430,7 +54448,7 @@ hGT
 jrJ
 jrJ
 jrJ
-jrJ
+vSF
 jrJ
 jrJ
 hfA
@@ -54632,7 +54650,7 @@ lrC
 hVe
 ufi
 wtV
-wtV
+wHg
 jGW
 nkm
 sad
diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm
index 41626c3d9ac..113b35b3849 100644
--- a/maps/sccv_horizon/placeholder-3_deck_3.dmm
+++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm
@@ -2848,6 +2848,7 @@
 /area/crew_quarters/captain)
 "gy" = (
 /obj/machinery/atmospherics/unary/freezer{
+	dir = 8;
 	icon_state = "freezer_1";
 	set_temperature = 73;
 	use_power = 1
@@ -3455,7 +3456,7 @@
 "hV" = (
 /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/black{
-	dir = 4
+	dir = 9
 	},
 /turf/simulated/floor,
 /area/tcommsat/entrance)
@@ -19369,10 +19370,10 @@
 /area/security/vacantoffice2)
 "Vl" = (
 /obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
 /obj/machinery/light/small/emergency,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor,
 /area/maintenance/engineering_ladder)
 "Vm" = (
@@ -43802,7 +43803,7 @@ at
 at
 at
 em
-Fq
+EG
 DQ
 DQ
 DQ
@@ -44004,7 +44005,7 @@ at
 at
 at
 aK
-Fq
+EG
 DQ
 EZ
 oG
@@ -44206,7 +44207,7 @@ at
 at
 at
 aK
-Fq
+EG
 DQ
 Nf
 Bs
@@ -44408,7 +44409,7 @@ at
 at
 at
 aK
-Fq
+EG
 DQ
 Nd
 Xr
@@ -44610,7 +44611,7 @@ at
 at
 at
 em
-Fq
+EG
 DQ
 Rb
 CR
@@ -44812,7 +44813,7 @@ at
 at
 at
 em
-Fq
+EG
 DQ
 Fx
 CR
@@ -45216,7 +45217,7 @@ at
 at
 at
 em
-Fq
+EG
 DQ
 CJ
 CR
@@ -45418,7 +45419,7 @@ at
 at
 at
 em
-Fq
+EG
 DQ
 DQ
 DQ

From 12f00cd530ca24b355eac5036a736f79a38693ca Mon Sep 17 00:00:00 2001
From: mikomyazaki <github@cmalu.neomailbox.ch>
Date: Sun, 6 Mar 2022 17:26:56 +0000
Subject: [PATCH 04/20] Fixes all bad firedoor unit test failures.

---
 maps/sccv_horizon/placeholder-1_deck_1.dmm | 35 +++++++---------------
 maps/sccv_horizon/placeholder-3_deck_3.dmm |  1 -
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/maps/sccv_horizon/placeholder-1_deck_1.dmm b/maps/sccv_horizon/placeholder-1_deck_1.dmm
index c81896750c7..8bbcad9dd9e 100644
--- a/maps/sccv_horizon/placeholder-1_deck_1.dmm
+++ b/maps/sccv_horizon/placeholder-1_deck_1.dmm
@@ -20393,18 +20393,14 @@
 /turf/simulated/floor/carpet/rubber,
 /area/rnd/xenoarch_atrium)
 "sFA" = (
-/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/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled,
-/area/hangar/operations)
+/turf/simulated/floor/tiled/dark,
+/area/rnd/xenoarch_atrium)
 "sHa" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -23912,7 +23908,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/ramp/bottom{
+	dir = 8
+	},
 /area/rnd/xenoarch_atrium)
 "vSS" = (
 /obj/machinery/light{
@@ -24653,17 +24651,6 @@
 /obj/structure/bed/stool/chair/shuttle,
 /turf/simulated/floor/tiled,
 /area/shuttle/intrepid)
-"wHg" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/ramp/bottom{
-	dir = 8
-	},
-/area/rnd/xenoarch_atrium)
 "wHA" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -43351,7 +43338,7 @@ qvl
 qvl
 lyo
 oOk
-sFA
+vTJ
 kVu
 nWF
 nWF
@@ -53842,7 +53829,7 @@ uyc
 kFL
 jrJ
 jrJ
-vSF
+sFA
 jrJ
 hSX
 mwu
@@ -54448,7 +54435,7 @@ hGT
 jrJ
 jrJ
 jrJ
-vSF
+sFA
 jrJ
 jrJ
 hfA
@@ -54650,7 +54637,7 @@ lrC
 hVe
 ufi
 wtV
-wHg
+vSF
 jGW
 nkm
 sad
diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm
index 113b35b3849..9d79fa83636 100644
--- a/maps/sccv_horizon/placeholder-3_deck_3.dmm
+++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm
@@ -17649,7 +17649,6 @@
 "QI" = (
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/structure/grille,
-/obj/machinery/door/firedoor,
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/maintenance/aux_atmospherics/deck_3)
 "QJ" = (

From 18a7c361754158fcd72b57ba265974e9b4f78d90 Mon Sep 17 00:00:00 2001
From: mikomyazaki <github@cmalu.neomailbox.ch>
Date: Sun, 6 Mar 2022 17:33:54 +0000
Subject: [PATCH 05/20] Fixes all ladder unit test failures.

---
 maps/sccv_horizon/placeholder-2_deck_2.dmm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm
index 493a4e4b2c5..f62fca6cd68 100644
--- a/maps/sccv_horizon/placeholder-2_deck_2.dmm
+++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm
@@ -12334,9 +12334,7 @@
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical)
 "hHM" = (
-/obj/structure/ladder/up{
-	pixel_y = 13
-	},
+/obj/structure/ladder,
 /turf/simulated/open,
 /area/turret_protected/ai)
 "hHV" = (
@@ -13561,6 +13559,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
 "iEd" = (
@@ -25818,6 +25819,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
 "qqs" = (
@@ -27227,9 +27231,7 @@
 /turf/simulated/floor/tiled,
 /area/engineering/smes)
 "rgF" = (
-/obj/structure/ladder{
-	pixel_y = 16
-	},
+/obj/structure/ladder/up,
 /turf/simulated/floor/tiled/dark,
 /area/turret_protected/ai)
 "rgH" = (
@@ -34345,7 +34347,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/open,
 /area/maintenance/wing/starboard)
 "vxK" = (
 /obj/effect/floor_decal/corner/grey/diagonal,

From bf7df9d71f0f2101c573ead12e0fd5d4aa1ea369 Mon Sep 17 00:00:00 2001
From: mikomyazaki <github@cmalu.neomailbox.ch>
Date: Sun, 6 Mar 2022 18:02:57 +0000
Subject: [PATCH 06/20] Fixes mapped cable duplication unit test failures.

---
 maps/sccv_horizon/placeholder-1_deck_1.dmm |  5 +---
 maps/sccv_horizon/placeholder-2_deck_2.dmm | 34 ++++++++++------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/maps/sccv_horizon/placeholder-1_deck_1.dmm b/maps/sccv_horizon/placeholder-1_deck_1.dmm
index 8bbcad9dd9e..0ec921457e1 100644
--- a/maps/sccv_horizon/placeholder-1_deck_1.dmm
+++ b/maps/sccv_horizon/placeholder-1_deck_1.dmm
@@ -4472,10 +4472,10 @@
 /obj/machinery/power/smes/buildable{
 	RCon_tag = "Substation - Engineering Lower Deck"
 	},
+/obj/structure/cable/green,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/obj/structure/cable/green,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/engineering/lower)
 "ekm" = (
@@ -22056,9 +22056,6 @@
 /obj/structure/cable/green{
 	icon_state = "0-2"
 	},
-/obj/structure/cable/green{
-	icon_state = "0-2"
-	},
 /obj/effect/floor_decal/corner_wide/purple/full{
 	dir = 1
 	},
diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm
index f62fca6cd68..956801bd67f 100644
--- a/maps/sccv_horizon/placeholder-2_deck_2.dmm
+++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm
@@ -16128,9 +16128,6 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
 "kgj" = (
-/obj/structure/cable/green{
-	icon_state = "12-0"
-	},
 /obj/effect/map_effect/wingrille_spawn/reinforced/polarized{
 	id = "HoS Windows"
 	},
@@ -19116,10 +19113,8 @@
 /obj/effect/map_effect/wingrille_spawn/reinforced/polarized{
 	id = "HoS Windows"
 	},
-/obj/structure/cable/green{
-	icon_state = "12-0"
-	},
 /obj/machinery/door/firedoor,
+/obj/structure/cable/green,
 /turf/simulated/floor,
 /area/crew_quarters/heads/hos)
 "mgg" = (
@@ -20235,7 +20230,10 @@
 	},
 /obj/machinery/door/firedoor,
 /obj/structure/cable/green{
-	icon_state = "4-8"
+	icon_state = "1-4"
+	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/hos)
@@ -33775,9 +33773,6 @@
 /turf/simulated/floor/tiled/dark/airless,
 /area/maintenance/wing/starboard)
 "vdy" = (
-/obj/structure/cable/green{
-	icon_state = "12-0"
-	},
 /obj/machinery/door/firedoor,
 /obj/effect/map_effect/wingrille_spawn/reinforced/polarized{
 	id = "HoS Windows"
@@ -33785,6 +33780,7 @@
 /obj/structure/cable/green{
 	icon_state = "0-2"
 	},
+/obj/structure/cable/green,
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/hos)
 "vdQ" = (
@@ -38720,16 +38716,16 @@
 /turf/simulated/floor/tiled,
 /area/security/brig)
 "xVz" = (
-/obj/effect/map_effect/wingrille_spawn/reinforced,
-/obj/structure/cable/green{
-	icon_state = "0-8"
+/obj/effect/map_effect/wingrille_spawn/reinforced/polarized{
+	id = "HoS Windows"
 	},
 /obj/machinery/door/firedoor,
 /obj/structure/cable/green{
-	icon_state = "0-8"
+	icon_state = "0-2"
 	},
-/turf/simulated/floor/plating,
-/area/security/prison)
+/obj/structure/cable/green,
+/turf/simulated/floor/tiled,
+/area/crew_quarters/heads/hos)
 "xVB" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -63150,8 +63146,8 @@ efA
 kgj
 mPc
 vdy
-kgj
-kgj
+xVz
+xVz
 mfX
 vsS
 sGm
@@ -63961,7 +63957,7 @@ kkW
 aaa
 gDR
 jAp
-xVz
+fQA
 nFf
 gDR
 lKN

From b1b29a740e2792f4f3b111a2d99a0b3f628bcafc Mon Sep 17 00:00:00 2001
From: mikomyazaki <github@cmalu.neomailbox.ch>
Date: Sun, 6 Mar 2022 18:03:40 +0000
Subject: [PATCH 07/20] Breaker boxes no longer set_state twice (in Initialize
 and LateInitialize) thus spawning overlapping cables in each direction and
 failing unit test for power cables.

---
 code/modules/power/breaker_box.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm
index 60a398e2076..888cc78e61f 100644
--- a/code/modules/power/breaker_box.dm
+++ b/code/modules/power/breaker_box.dm
@@ -141,8 +141,3 @@
 
 /obj/machinery/power/breakerbox/activated
 	icon_state = "bbox_on"
-
-	// Enabled on server startup. Used in substations to keep them in bypass mode.
-/obj/machinery/power/breakerbox/activated/Initialize()
-	. = ..()
-	set_state(1)

From 8f57d19e5559d4d1fb5b25bebf8c9481bf6e7e21 Mon Sep 17 00:00:00 2001
From: mikomyazaki <github@cmalu.neomailbox.ch>
Date: Sun, 6 Mar 2022 23:45:23 +0000
Subject: [PATCH 08/20] Fixes Area APC and Atmos Unit tests.

---
 .../code/sccv_horizon_unittest.dm             |  20 +
 maps/sccv_horizon/placeholder-1_deck_1.dmm    |  93 +++-
 maps/sccv_horizon/placeholder-2_deck_2.dmm    | 420 +++++++++++++++---
 maps/sccv_horizon/placeholder-3_deck_3.dmm    |  98 +++-
 4 files changed, 548 insertions(+), 83 deletions(-)

diff --git a/maps/sccv_horizon/code/sccv_horizon_unittest.dm b/maps/sccv_horizon/code/sccv_horizon_unittest.dm
index d1778da91e7..ce205839324 100644
--- a/maps/sccv_horizon/code/sccv_horizon_unittest.dm
+++ b/maps/sccv_horizon/code/sccv_horizon_unittest.dm
@@ -15,9 +15,11 @@
 		,/area/supply/dock
 		,/area/turbolift
 		,/area/mine
+		,/area/horizonexterior
 	)
 	ut_apc_exempt_areas = list(/area/construction
 		,/area/medical/genetics
+		,/area/horizonexterior
 	)
 	ut_atmos_exempt_areas = list(/area/maintenance
 		,/area/storage
@@ -33,4 +35,22 @@
 		,/area/bridge/selfdestruct
 		,/area/medical/cryo
 		,/area/medical/patient_c
+		,/area/turret_protected/ai
+		,/area/engineering/engine_monitoring/tesla
+		,/area/engineering/smes
+		,/area/horizonexterior
+		,/area/tcommsat/mainlvl_tcomms__relay
+		,/area/tcommsat/mainlvl_tcomms__relay/second
+		,/area/medical/surgery
+		,/area/rnd/isolation_a
+		,/area/rnd/isolation_b
+		,/area/rnd/isolation_c
 	)
+
+/datum/unit_test/zas_area_test
+	name = "ZAS: Operations Bay"
+	area_path = /area/operations/storage
+
+/datum/unit_test/zas_area_test/arrival_maint
+	name = "ZAS: Arrival Maintenance"
+	area_path = /area/maintenance/arrivals
diff --git a/maps/sccv_horizon/placeholder-1_deck_1.dmm b/maps/sccv_horizon/placeholder-1_deck_1.dmm
index 0ec921457e1..2e51b956c73 100644
--- a/maps/sccv_horizon/placeholder-1_deck_1.dmm
+++ b/maps/sccv_horizon/placeholder-1_deck_1.dmm
@@ -1494,6 +1494,15 @@
 	},
 /turf/simulated/floor/grass/alt,
 /area/maintenance/hangar/port)
+"bqg" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/hangar/control)
 "bqi" = (
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -1611,6 +1620,9 @@
 /obj/machinery/atmospherics/pipe/simple/visible/yellow{
 	dir = 10
 	},
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos/air)
 "bwN" = (
@@ -1622,6 +1634,19 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos/air)
+"bxo" = (
+/obj/structure/lattice/catwalk/indoor,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/engineering/atmos/air)
 "bxJ" = (
 /obj/machinery/atmospherics/unary/engine/scc_ship_engine,
 /turf/simulated/floor/reinforced{
@@ -4418,6 +4443,15 @@
 	temperature = 278
 	},
 /area/medical/morgue/lower)
+"egk" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/hangar/control)
 "ehD" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -6084,8 +6118,16 @@
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos/propulsion/starboard)
 "fwA" = (
+/obj/machinery/power/apc{
+	dir = 1;
+	name = "north bump";
+	pixel_y = 24
+	},
 /obj/structure/cable/green{
-	icon_state = "4-8"
+	icon_state = "0-4"
+	},
+/obj/structure/cable/green{
+	icon_state = "0-8"
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/engineering/lower)
@@ -7426,6 +7468,19 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/universal,
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/intrepid)
+"gAY" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/hangar/control)
 "gBl" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -7435,6 +7490,12 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
 /area/maintenance/wing/port/deck1)
+"gBo" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/engineering/atmos/air)
 "gBw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
@@ -8843,6 +8904,18 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/hangar/control)
+"hTd" = (
+/obj/machinery/power/apc/super{
+	dir = 4;
+	name = "east bump";
+	pixel_x = 24
+	},
+/obj/structure/cable/green{
+	d2 = 2;
+	icon_state = "0-2"
+	},
+/turf/simulated/floor/plating,
+/area/engineering/atmos/air)
 "hTk" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/maintenance/wing/port/deck1)
@@ -14660,6 +14733,9 @@
 	c_tag = "Engineering - Atmospherics Tanks 3";
 	dir = 4
 	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos/air)
 "nkm" = (
@@ -23194,6 +23270,9 @@
 	c_tag = "Engineering - Atmospherics Tanks 5";
 	dir = 8
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos/air)
 "vjl" = (
@@ -49599,7 +49678,7 @@ lKY
 cBF
 aWP
 vai
-ttK
+egk
 ttK
 hTa
 vJe
@@ -49801,7 +49880,7 @@ tYN
 qgi
 gnn
 pYu
-tKi
+gAY
 tKi
 tKi
 fZX
@@ -49963,7 +50042,7 @@ bZU
 oWe
 twQ
 fnL
-lIE
+bxo
 bvb
 lIE
 coo
@@ -50003,7 +50082,7 @@ xgP
 weO
 aWP
 rEl
-aUg
+bqg
 aUg
 wSd
 vcp
@@ -50165,7 +50244,7 @@ mDH
 nrY
 itD
 uVL
-lUr
+gBo
 aom
 lUr
 bZp
@@ -51381,7 +51460,7 @@ lUr
 lUr
 qJg
 lUr
-lUr
+hTd
 viX
 bvN
 uEJ
diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm
index 956801bd67f..b48bd7ce07a 100644
--- a/maps/sccv_horizon/placeholder-2_deck_2.dmm
+++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm
@@ -616,6 +616,14 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/engineering/lobby)
+"aqo" = (
+/obj/effect/map_effect/wingrille_spawn/reinforced_phoron,
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/simulated/floor/plating,
+/area/engineering/engine_monitoring/tesla)
 "aqT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -1437,6 +1445,8 @@
 	req_one_access = list(11,24)
 	},
 /obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark,
 /area/engineering/smes/tesla)
 "aQp" = (
@@ -2624,6 +2634,12 @@
 	c_tag = "Research - Telescience";
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
 /turf/simulated/floor/carpet/rubber,
 /area/rnd/telesci)
 "bzh" = (
@@ -2987,6 +3003,9 @@
 /obj/item/modular_computer/console/preset/engineering{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_monitoring/tesla)
 "bNd" = (
@@ -3701,15 +3720,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/checkpoint2)
-"chw" = (
-/obj/structure/window/phoronreinforced{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/engineering/engine_room)
 "chz" = (
 /obj/machinery/atmospherics/pipe/simple/visible/green{
 	dir = 5
@@ -4146,6 +4156,8 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/white,
 /area/rnd/research)
 "cAs" = (
@@ -5792,6 +5804,9 @@
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 8
 	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/hallway/engineering/tesla)
 "dFG" = (
@@ -6252,9 +6267,13 @@
 	icon_state = "2-4"
 	},
 /obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
 /area/engineering/smes/tesla)
 "dWk" = (
@@ -7461,6 +7480,12 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
 /area/security/brig/processing)
+"eOs" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/turf/simulated/floor/plating,
+/area/engineering/engine_monitoring/tesla)
 "ePb" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
@@ -9027,6 +9052,10 @@
 	pixel_y = 32
 	},
 /obj/structure/railing/mapped,
+/obj/structure/cable/green{
+	d2 = 4;
+	icon_state = "0-4"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
 "fLu" = (
@@ -9391,6 +9420,16 @@
 	},
 /turf/simulated/floor/grass/alt,
 /area/hydroponics)
+"fWp" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1;
+	external_pressure_bound = 102;
+	external_pressure_bound_default = 102;
+	icon_state = "map_vent_in";
+	pump_direction = 0
+	},
+/turf/simulated/floor/plating,
+/area/engineering/engine_monitoring/tesla)
 "fWw" = (
 /obj/machinery/power/breakerbox{
 	RCon_tag = "Tesla Grid Bypass"
@@ -9478,6 +9517,8 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
 /area/engineering/smes/tesla)
 "fZV" = (
@@ -10298,6 +10339,10 @@
 /area/crew_quarters/bar)
 "gwP" = (
 /obj/effect/floor_decal/industrial/warning,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_waste)
 "gwY" = (
@@ -13082,6 +13127,9 @@
 /area/engineering/engine_room)
 "ikB" = (
 /obj/machinery/light,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
 /turf/simulated/floor/carpet/rubber,
 /area/rnd/telesci)
 "ikT" = (
@@ -13341,6 +13389,15 @@
 "iwo" = (
 /turf/simulated/wall/r_wall,
 /area/rnd/xenobiology)
+"iwu" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/turf/simulated/floor/plating,
+/area/engineering/smes/tesla)
 "iwC" = (
 /obj/effect/floor_decal/corner/paleblue/full{
 	dir = 8
@@ -13672,6 +13729,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/hallway/engineering)
+"iHq" = (
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plating,
+/area/engineering/smes/tesla)
 "iHH" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -13858,6 +13921,8 @@
 	name = "Telescience";
 	req_access = list(7)
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/carpet/rubber,
 /area/rnd/telesci)
 "iLD" = (
@@ -14824,6 +14889,11 @@
 /obj/item/pipewrench,
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos/storage)
+"jnV" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/tiled/dark,
+/area/engineering/aft_airlock)
 "jow" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -15190,6 +15260,12 @@
 	pixel_x = 6;
 	pixel_y = -25
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
 /turf/simulated/floor/carpet/rubber,
 /area/rnd/telesci)
 "jBj" = (
@@ -16090,6 +16166,9 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
 "kep" = (
@@ -17287,6 +17366,21 @@
 	dir = 8
 	},
 /area/maintenance/wing/port/far)
+"kZr" = (
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+	dir = 4
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/engineering/engine_room)
 "kZv" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/light/small/emergency,
@@ -17359,6 +17453,10 @@
 /obj/item/device/radio/headset/headset_service,
 /turf/simulated/floor/carpet,
 /area/library)
+"lbf" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/tiled/dark,
+/area/engineering/aft_airlock)
 "lbv" = (
 /obj/structure/table/standard,
 /obj/effect/floor_decal/corner/mauve{
@@ -17810,6 +17908,17 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
+"lrD" = (
+/obj/structure/cable{
+	d2 = 4;
+	icon_state = "0-4"
+	},
+/obj/machinery/power/apc/super/critical{
+	dir = 8;
+	pixel_x = -24
+	},
+/turf/simulated/floor/plating,
+/area/engineering/engine_room/tesla)
 "lrQ" = (
 /obj/machinery/light/small/red{
 	dir = 4
@@ -18174,6 +18283,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
+"lER" = (
+/obj/effect/floor_decal/industrial/warning,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/engineering/engine_waste)
 "lES" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 4
@@ -18209,6 +18325,15 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_monitoring/tesla)
 "lGm" = (
@@ -20237,6 +20362,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/hos)
+"mPh" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plating,
+/area/engineering/engine_room/tesla)
 "mPl" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/crew_quarters/kitchen)
@@ -20380,6 +20514,12 @@
 	},
 /turf/simulated/floor/carpet/rubber,
 /area/crew_quarters/heads/hor)
+"mUe" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/engineering/engine_room/tesla)
 "mUy" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/engineering{
@@ -21463,9 +21603,10 @@
 /obj/structure/window/phoronreinforced{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
 "nzn" = (
@@ -21760,6 +21901,11 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
 /area/maintenance/aft)
+"nHY" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/dark,
+/area/engineering/aft_airlock)
 "nIi" = (
 /turf/simulated/wall,
 /area/hallway/medical)
@@ -23894,6 +24040,8 @@
 	req_one_access = list(11,24)
 	},
 /obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
 /area/engineering/smes/tesla)
 "pbS" = (
@@ -24588,6 +24736,17 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology)
+"pBi" = (
+/obj/effect/map_effect/wingrille_spawn/reinforced/polarized{
+	id = "HoS Windows"
+	},
+/obj/machinery/door/firedoor,
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
+/obj/structure/cable/green,
+/turf/simulated/floor/tiled,
+/area/crew_quarters/heads/hos)
 "pBn" = (
 /obj/effect/floor_decal/corner/mauve{
 	dir = 4
@@ -24938,6 +25097,12 @@
 /obj/machinery/atmospherics/pipe/manifold/visible/cyan{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_waste)
 "pLI" = (
@@ -25080,6 +25245,13 @@
 	dir = 4
 	},
 /area/hallway/primary/central_two)
+"pOV" = (
+/obj/machinery/light,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/engineering/engine_monitoring/tesla)
 "pPM" = (
 /obj/structure/table/standard,
 /obj/item/storage/box/syringes{
@@ -25462,6 +25634,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/engineering/lobby)
+"qao" = (
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/plating,
+/area/engineering/engine_room/tesla)
 "qar" = (
 /obj/structure/lattice,
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
@@ -26526,8 +26702,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/hallway/primary/central_two)
 "qMd" = (
-/turf/simulated/wall/r_wall,
-/area/assembly/robotics/workshop)
+/obj/effect/floor_decal/corner_wide/yellow{
+	dir = 5
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/tiled/dark,
+/area/hallway/engineering/tesla)
 "qMJ" = (
 /obj/structure/shuttle_part/scc_space_ship{
 	icon_state = "d3-6-f"
@@ -27359,6 +27542,9 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_waste)
 "rlj" = (
@@ -27382,12 +27568,10 @@
 	dir = 10
 	},
 /obj/effect/floor_decal/industrial/warning,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/floor/tiled/white,
 /area/rnd/research)
 "rls" = (
@@ -27551,6 +27735,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/white,
 /area/rnd/research)
 "rpj" = (
@@ -28137,6 +28322,9 @@
 "rGU" = (
 /obj/effect/map_effect/wingrille_spawn/reinforced_phoron,
 /obj/machinery/door/firedoor,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/engineering/engine_monitoring/tesla)
 "rGX" = (
@@ -28459,6 +28647,24 @@
 	dir = 8
 	},
 /area/maintenance/wing/port/far)
+"rPY" = (
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+	dir = 4
+	},
+/obj/machinery/door/blast/regular{
+	dir = 2;
+	id = "EngineEmitterPortWest";
+	layer = 3.3;
+	name = "Engine Waste Handling Access"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/engineering/engine_waste)
 "rQf" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -29382,6 +29588,13 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/engineering/smes/tesla)
 "svf" = (
@@ -30922,13 +31135,13 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
 /obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/engineering/smes/tesla)
 "txc" = (
@@ -31868,9 +32081,10 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/white,
 /area/rnd/research)
 "tYB" = (
@@ -32717,6 +32931,17 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora_hazard)
+"uvM" = (
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/turf/simulated/floor/plating,
+/area/engineering/engine_room/tesla)
 "uwe" = (
 /obj/machinery/door/firedoor,
 /obj/structure/extinguisher_cabinet{
@@ -32850,6 +33075,12 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/reinforced,
 /area/engineering/storage/tech)
+"uzy" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plating,
+/area/engineering/engine_room/tesla)
 "uzL" = (
 /obj/structure/table/standard,
 /obj/item/modular_computer/laptop/preset/command/teleporter,
@@ -33685,6 +33916,8 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
 /area/engineering/smes/tesla)
 "uZD" = (
@@ -34277,6 +34510,19 @@
 	},
 /turf/simulated/floor/tiled,
 /area/maintenance/wing/starboard/far)
+"vvh" = (
+/obj/structure/railing/mapped,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/apc{
+	dir = 1;
+	name = "north bump";
+	pixel_y = 24
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/wing/starboard)
 "vvS" = (
 /obj/structure/cable/green{
 	icon_state = "0-8"
@@ -34999,6 +35245,13 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/engineering/smes/tesla)
 "vQs" = (
@@ -35437,6 +35690,12 @@
 	req_one_access = list(11,24)
 	},
 /obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/engineering/smes/tesla)
 "vZx" = (
@@ -35752,8 +36011,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/hallway/engineering/tesla)
@@ -36160,6 +36422,18 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/engineering/storage/tech)
+"wsL" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plating,
+/area/engineering/engine_room/tesla)
 "wsV" = (
 /obj/structure/table/rack{
 	dir = 8;
@@ -37032,6 +37306,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/security_office)
+"wQS" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/turf/simulated/floor/plating,
+/area/engineering/engine_monitoring/tesla)
 "wRd" = (
 /obj/item/modular_computer/console/preset/security{
 	dir = 8
@@ -38015,6 +38298,8 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/white,
 /area/rnd/research)
 "xxw" = (
@@ -38716,16 +39001,11 @@
 /turf/simulated/floor/tiled,
 /area/security/brig)
 "xVz" = (
-/obj/effect/map_effect/wingrille_spawn/reinforced/polarized{
-	id = "HoS Windows"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
 	},
-/obj/machinery/door/firedoor,
-/obj/structure/cable/green{
-	icon_state = "0-2"
-	},
-/obj/structure/cable/green,
-/turf/simulated/floor/tiled,
-/area/crew_quarters/heads/hos)
+/turf/simulated/floor/plating,
+/area/engineering/engine_waste)
 "xVB" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -38893,10 +39173,10 @@
 /obj/structure/window/phoronreinforced{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
 "yay" = (
@@ -39040,6 +39320,12 @@
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
 "ycL" = (
@@ -54632,7 +54918,7 @@ wrA
 xbv
 oTE
 laB
-lpB
+vvh
 fsf
 wxr
 quV
@@ -56225,7 +56511,7 @@ mWY
 mWY
 ycD
 nzf
-chw
+nzf
 yag
 ndD
 tlh
@@ -56425,7 +56711,7 @@ wcr
 wcr
 sNe
 xGT
-oJM
+kZr
 gON
 gON
 fQa
@@ -56627,7 +56913,7 @@ tNa
 tNa
 gsz
 gsz
-jfp
+rPY
 xQp
 xQp
 gsz
@@ -56827,7 +57113,7 @@ rMw
 rrN
 tNa
 tNa
-ily
+xVz
 gwP
 pLA
 gXu
@@ -57030,7 +57316,7 @@ oSQ
 tNa
 tNa
 rlf
-gwP
+lER
 erh
 jgZ
 lCV
@@ -59261,7 +59547,7 @@ qjS
 rwy
 ydI
 lMD
-mtf
+qMd
 whx
 vxY
 ftj
@@ -62085,11 +62371,11 @@ mzh
 mzh
 cQS
 dcX
-rLn
-rLn
-rLn
+lbf
+jnV
+nHY
 aQc
-bTg
+iHq
 twC
 dVN
 xHd
@@ -62489,9 +62775,9 @@ jKV
 jKV
 tZr
 hax
+mUe
 hMt
-hMt
-hMt
+lrD
 wfD
 fWw
 cKB
@@ -62690,14 +62976,14 @@ hMt
 hMt
 hMt
 ddA
-hMt
-vTu
-iIB
-iIB
+qao
+uvM
+mPh
+wsL
 pbN
 fZI
 uZt
-vQl
+iwu
 xvZ
 wfD
 uxE
@@ -62895,7 +63181,7 @@ iFp
 hMt
 uGp
 hMt
-hMt
+uzy
 wfD
 wfD
 wfD
@@ -63097,7 +63383,7 @@ eQw
 iIB
 gqP
 hMt
-tiJ
+aqo
 rGU
 bLB
 bLB
@@ -63146,8 +63432,8 @@ efA
 kgj
 mPc
 vdy
-xVz
-xVz
+pBi
+pBi
 mfX
 vsS
 sGm
@@ -63303,8 +63589,8 @@ tiJ
 qdq
 tPU
 tPU
-ecV
-ecV
+wQS
+fWp
 uEq
 uxE
 bGh
@@ -63505,8 +63791,8 @@ dAw
 ecV
 ecV
 ecV
-ecV
-uQQ
+eOs
+pOV
 uEq
 uxE
 bGh
@@ -64140,7 +64426,7 @@ uTr
 uTr
 uTr
 uTr
-qMd
+vyd
 vyd
 vyd
 xSO
diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm
index 9d79fa83636..71be02c24eb 100644
--- a/maps/sccv_horizon/placeholder-3_deck_3.dmm
+++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm
@@ -3523,9 +3523,6 @@
 	name = "Security - Investigations Office"
 	})
 "ib" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
@@ -3535,6 +3532,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/locker)
 "ic" = (
@@ -4908,6 +4906,15 @@
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/lounge/secondary)
+"lx" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/crew_quarters/locker)
 "ly" = (
 /obj/structure/table/wood,
 /obj/item/folder/sec{
@@ -6903,6 +6910,25 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
+"qb" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/simulated/floor,
+/area/maintenance/bridge)
 "qc" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 10
@@ -9324,6 +9350,18 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/crew_area)
+"wk" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/dark,
+/area/crew_quarters/locker)
 "wl" = (
 /obj/structure/railing/mapped{
 	dir = 1
@@ -9588,6 +9626,19 @@
 /obj/structure/closet/secure_closet/xo,
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hop/xo)
+"wU" = (
+/obj/structure/railing/mapped,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc/low{
+	dir = 8;
+	name = "west bump";
+	pixel_x = -24
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/simulated/floor,
+/area/maintenance/bridge)
 "wV" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/carpet,
@@ -12674,6 +12725,25 @@
 "Fj" = (
 /turf/simulated/wall,
 /area/security/investigations_storage)
+"Fk" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/power/apc{
+	dir = 8;
+	name = "west bump";
+	pixel_x = -24
+	},
+/obj/structure/cable/green{
+	d2 = 2;
+	icon_state = "0-2"
+	},
+/obj/structure/cable/green,
+/turf/simulated/floor/tiled,
+/area/hallway/primary/port)
 "Fl" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -16999,6 +17069,16 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
 /area/maintenance/aux_atmospherics/deck_3)
+"Pp" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1;
+	external_pressure_bound = 102;
+	external_pressure_bound_default = 102;
+	icon_state = "map_vent_in";
+	pump_direction = 0
+	},
+/turf/simulated/floor/tiled/dark,
+/area/crew_quarters/locker)
 "Pq" = (
 /obj/structure/cable/green{
 	icon_state = "1-4"
@@ -36945,8 +37025,8 @@ CX
 km
 Um
 nZ
-DW
-Ny
+wk
+Pp
 Ny
 Ny
 Ec
@@ -37151,7 +37231,7 @@ DW
 yz
 yz
 yz
-Ec
+lx
 Da
 eX
 jM
@@ -40004,8 +40084,8 @@ dg
 mY
 SK
 cq
-pl
-yV
+wU
+qb
 VC
 VC
 VC
@@ -44423,7 +44503,7 @@ Fr
 Ss
 Sj
 ck
-Sj
+Fk
 fi
 hg
 Sj

From 2593b99bb33bba5956e2fded1edb80572cea4f7f Mon Sep 17 00:00:00 2001
From: mikomyazaki <github@cmalu.neomailbox.ch>
Date: Mon, 7 Mar 2022 00:07:43 +0000
Subject: [PATCH 09/20] Transfer only takes 10 minutes rather than 15.

---
 code/controllers/subsystems/evacuation/evacuation_pods.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/controllers/subsystems/evacuation/evacuation_pods.dm b/code/controllers/subsystems/evacuation/evacuation_pods.dm
index d8c4b773aa1..eb7c4a0c804 100644
--- a/code/controllers/subsystems/evacuation/evacuation_pods.dm
+++ b/code/controllers/subsystems/evacuation/evacuation_pods.dm
@@ -8,8 +8,8 @@
 /datum/evacuation_controller/starship
 	name = "escape pod controller"
 
-	transfer_prep_additional_delay     = 5 MINUTES
-	autotransfer_prep_additional_delay = 5 MINUTES
+	transfer_prep_additional_delay     = 0 MINUTES
+	autotransfer_prep_additional_delay = 0 MINUTES
 	emergency_prep_additional_delay    = 0 MINUTES
 
 	evacuation_options = list(

From f7791a4e15069f124010cf7dfdb0e0ef00db6eed Mon Sep 17 00:00:00 2001
From: mikomyazaki <github@cmalu.neomailbox.ch>
Date: Mon, 7 Mar 2022 00:39:02 +0000
Subject: [PATCH 10/20] Simple pipes with dir set to WEST or NORTH can now
 spawn correctly.

---
 code/ATMOSPHERICS/pipes.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm
index f049c6c0238..1da6891512a 100644
--- a/code/ATMOSPHERICS/pipes.dm
+++ b/code/ATMOSPHERICS/pipes.dm
@@ -190,9 +190,9 @@
 	alpha = 255
 
 	switch(dir)
-		if(SOUTH || NORTH)
+		if(SOUTH, NORTH)
 			initialize_directions = SOUTH|NORTH
-		if(EAST || WEST)
+		if(EAST, WEST)
 			initialize_directions = EAST|WEST
 		if(NORTHEAST)
 			initialize_directions = NORTH|EAST

From 205e15e5ace5af0fe330e682d5d1d2309421e0bd Mon Sep 17 00:00:00 2001
From: mikomyazaki <github@cmalu.neomailbox.ch>
Date: Mon, 7 Mar 2022 00:39:32 +0000
Subject: [PATCH 11/20] More APC / Atmos Unit Test fixes.

---
 maps/sccv_horizon/placeholder-1_deck_1.dmm |  97 +++++++++---------
 maps/sccv_horizon/placeholder-3_deck_3.dmm | 108 ++++++++++-----------
 2 files changed, 107 insertions(+), 98 deletions(-)

diff --git a/maps/sccv_horizon/placeholder-1_deck_1.dmm b/maps/sccv_horizon/placeholder-1_deck_1.dmm
index 2e51b956c73..bad943edd67 100644
--- a/maps/sccv_horizon/placeholder-1_deck_1.dmm
+++ b/maps/sccv_horizon/placeholder-1_deck_1.dmm
@@ -484,6 +484,15 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
 /area/hangar/auxiliary)
+"aAl" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/hangar/control)
 "aAQ" = (
 /obj/machinery/atmospherics/pipe/simple/visible/yellow{
 	dir = 6
@@ -1040,6 +1049,19 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/hangar/intrepid)
+"aXA" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/hangar/control)
 "aXC" = (
 /obj/structure/cable/green{
 	icon_state = "0-4"
@@ -1494,15 +1516,6 @@
 	},
 /turf/simulated/floor/grass/alt,
 /area/maintenance/hangar/port)
-"bqg" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
-	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/dark,
-/area/hangar/control)
 "bqi" = (
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -4125,6 +4138,15 @@
 /obj/effect/shuttle_landmark/horizon/nav2,
 /turf/simulated/floor/plating,
 /area/hangar/auxiliary)
+"dTV" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/hangar/control)
 "dUK" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -4443,15 +4465,6 @@
 	temperature = 278
 	},
 /area/medical/morgue/lower)
-"egk" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
-/area/hangar/control)
 "ehD" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -4783,15 +4796,15 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/intrepid)
 "exw" = (
@@ -7468,19 +7481,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/universal,
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/intrepid)
-"gAY" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/hangar/control)
 "gBl" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -9303,7 +9303,7 @@
 	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 8
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -16869,6 +16869,15 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
 /area/maintenance/hangar/starboard)
+"psK" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/hangar/control)
 "pth" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -21458,15 +21467,15 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/intrepid)
 "tEc" = (
@@ -25651,15 +25660,15 @@
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/intrepid)
 "xpX" = (
@@ -49678,7 +49687,7 @@ lKY
 cBF
 aWP
 vai
-egk
+dTV
 ttK
 hTa
 vJe
@@ -49880,7 +49889,7 @@ tYN
 qgi
 gnn
 pYu
-gAY
+aXA
 tKi
 tKi
 fZX
@@ -50082,7 +50091,7 @@ xgP
 weO
 aWP
 rEl
-bqg
+psK
 aUg
 wSd
 vcp
diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm
index 71be02c24eb..628718b89e4 100644
--- a/maps/sccv_horizon/placeholder-3_deck_3.dmm
+++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm
@@ -4906,15 +4906,6 @@
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/lounge/secondary)
-"lx" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
-/area/crew_quarters/locker)
 "ly" = (
 /obj/structure/table/wood,
 /obj/item/folder/sec{
@@ -8996,6 +8987,15 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/hallway/primary/starboard)
+"vc" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/crew_quarters/locker)
 "vd" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -9350,18 +9350,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/crew_area)
-"wk" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/dark,
-/area/crew_quarters/locker)
 "wl" = (
 /obj/structure/railing/mapped{
 	dir = 1
@@ -12725,25 +12713,6 @@
 "Fj" = (
 /turf/simulated/wall,
 /area/security/investigations_storage)
-"Fk" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/floor_decal/corner/paleblue{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/power/apc{
-	dir = 8;
-	name = "west bump";
-	pixel_x = -24
-	},
-/obj/structure/cable/green{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/obj/structure/cable/green,
-/turf/simulated/floor/tiled,
-/area/hallway/primary/port)
 "Fl" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -14733,6 +14702,16 @@
 "JQ" = (
 /turf/simulated/wall/r_wall,
 /area/crew_quarters/captain)
+"JS" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1;
+	external_pressure_bound = 102;
+	external_pressure_bound_default = 102;
+	icon_state = "map_vent_in";
+	pump_direction = 0
+	},
+/turf/simulated/floor/tiled/dark,
+/area/crew_quarters/locker)
 "JT" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/carpet/rubber,
@@ -16323,6 +16302,25 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/hallway/primary/starboard)
+"NH" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/power/apc{
+	dir = 8;
+	name = "west bump";
+	pixel_x = -24
+	},
+/obj/structure/cable/green{
+	d2 = 2;
+	icon_state = "0-2"
+	},
+/obj/structure/cable/green,
+/turf/simulated/floor/tiled,
+/area/hallway/primary/port)
 "NI" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -17069,16 +17067,6 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
 /area/maintenance/aux_atmospherics/deck_3)
-"Pp" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1;
-	external_pressure_bound = 102;
-	external_pressure_bound_default = 102;
-	icon_state = "map_vent_in";
-	pump_direction = 0
-	},
-/turf/simulated/floor/tiled/dark,
-/area/crew_quarters/locker)
 "Pq" = (
 /obj/structure/cable/green{
 	icon_state = "1-4"
@@ -18267,6 +18255,18 @@
 	},
 /turf/simulated/open,
 /area/hallway/primary/starboard)
+"Si" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/dark,
+/area/crew_quarters/locker)
 "Sj" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/corner/paleblue{
@@ -37025,8 +37025,8 @@ CX
 km
 Um
 nZ
-wk
-Pp
+Si
+JS
 Ny
 Ny
 Ec
@@ -37231,7 +37231,7 @@ DW
 yz
 yz
 yz
-lx
+vc
 Da
 eX
 jM
@@ -44503,7 +44503,7 @@ Fr
 Ss
 Sj
 ck
-Fk
+NH
 fi
 hg
 Sj

From 78201cc4721b948371acf4c4eacf3d078c92a005 Mon Sep 17 00:00:00 2001
From: mikomyazaki <github@cmalu.neomailbox.ch>
Date: Mon, 7 Mar 2022 00:57:49 +0000
Subject: [PATCH 12/20] Fixes operations conveyor belt going the wrong way.

---
 maps/sccv_horizon/placeholder-1_deck_1.dmm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/maps/sccv_horizon/placeholder-1_deck_1.dmm b/maps/sccv_horizon/placeholder-1_deck_1.dmm
index bad943edd67..88f0f0f5336 100644
--- a/maps/sccv_horizon/placeholder-1_deck_1.dmm
+++ b/maps/sccv_horizon/placeholder-1_deck_1.dmm
@@ -484,15 +484,6 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
 /area/hangar/auxiliary)
-"aAl" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
-/area/hangar/control)
 "aAQ" = (
 /obj/machinery/atmospherics/pipe/simple/visible/yellow{
 	dir = 6
@@ -2144,7 +2135,7 @@
 	dir = 9;
 	id = "QMLoad";
 	layer = 2.9;
-	reversed = 1
+	reversed = null
 	},
 /turf/simulated/floor/plating,
 /area/operations/loading)

From c0a4b10bd80a8b3323720e27de0648ae10cc6181 Mon Sep 17 00:00:00 2001
From: mikomyazaki <github@cmalu.neomailbox.ch>
Date: Mon, 7 Mar 2022 01:00:10 +0000
Subject: [PATCH 13/20] Fixes Captain's Office window blast door missing.

---
 maps/sccv_horizon/placeholder-3_deck_3.dmm | 117 +++++++++++----------
 1 file changed, 63 insertions(+), 54 deletions(-)

diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm
index 628718b89e4..211a8d6d23c 100644
--- a/maps/sccv_horizon/placeholder-3_deck_3.dmm
+++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm
@@ -2844,6 +2844,15 @@
 "gx" = (
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/structure/grille,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "bridge blast";
+	name = "Bridge Blast Doors";
+	opacity = 0
+	},
 /turf/simulated/floor,
 /area/crew_quarters/captain)
 "gy" = (
@@ -3322,6 +3331,25 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/hallway/primary/starboard)
+"hC" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/power/apc{
+	dir = 8;
+	name = "west bump";
+	pixel_x = -24
+	},
+/obj/structure/cable/green{
+	d2 = 2;
+	icon_state = "0-2"
+	},
+/obj/structure/cable/green,
+/turf/simulated/floor/tiled,
+/area/hallway/primary/port)
 "hE" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -3408,6 +3436,18 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/locker)
+"hQ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/dark,
+/area/crew_quarters/locker)
 "hR" = (
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/structure/grille,
@@ -8987,15 +9027,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/hallway/primary/starboard)
-"vc" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
-/area/crew_quarters/locker)
 "vd" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -10174,6 +10205,15 @@
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/lounge)
+"yq" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/crew_quarters/locker)
 "yr" = (
 /obj/machinery/firealarm/west,
 /turf/simulated/floor/wood,
@@ -14298,6 +14338,16 @@
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/bridge_crew)
+"IV" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1;
+	external_pressure_bound = 102;
+	external_pressure_bound_default = 102;
+	icon_state = "map_vent_in";
+	pump_direction = 0
+	},
+/turf/simulated/floor/tiled/dark,
+/area/crew_quarters/locker)
 "IW" = (
 /obj/machinery/requests_console{
 	department = "Engineering";
@@ -14702,16 +14752,6 @@
 "JQ" = (
 /turf/simulated/wall/r_wall,
 /area/crew_quarters/captain)
-"JS" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1;
-	external_pressure_bound = 102;
-	external_pressure_bound_default = 102;
-	icon_state = "map_vent_in";
-	pump_direction = 0
-	},
-/turf/simulated/floor/tiled/dark,
-/area/crew_quarters/locker)
 "JT" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/carpet/rubber,
@@ -16302,25 +16342,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/hallway/primary/starboard)
-"NH" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/floor_decal/corner/paleblue{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/power/apc{
-	dir = 8;
-	name = "west bump";
-	pixel_x = -24
-	},
-/obj/structure/cable/green{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/obj/structure/cable/green,
-/turf/simulated/floor/tiled,
-/area/hallway/primary/port)
 "NI" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -18255,18 +18276,6 @@
 	},
 /turf/simulated/open,
 /area/hallway/primary/starboard)
-"Si" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/dark,
-/area/crew_quarters/locker)
 "Sj" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/corner/paleblue{
@@ -37025,8 +37034,8 @@ CX
 km
 Um
 nZ
-Si
-JS
+hQ
+IV
 Ny
 Ny
 Ec
@@ -37231,7 +37240,7 @@ DW
 yz
 yz
 yz
-vc
+yq
 Da
 eX
 jM
@@ -44503,7 +44512,7 @@ Fr
 Ss
 Sj
 ck
-NH
+hC
 fi
 hg
 Sj

From 89216b22216c75146a505e6e6a7e58f1339e87a1 Mon Sep 17 00:00:00 2001
From: mikomyazaki <github@cmalu.neomailbox.ch>
Date: Mon, 7 Mar 2022 01:01:20 +0000
Subject: [PATCH 14/20] More atmos/apc unit test fixes.

---
 maps/sccv_horizon/placeholder-1_deck_1.dmm | 68 +++++++++++-----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/maps/sccv_horizon/placeholder-1_deck_1.dmm b/maps/sccv_horizon/placeholder-1_deck_1.dmm
index 88f0f0f5336..c5be95d76e5 100644
--- a/maps/sccv_horizon/placeholder-1_deck_1.dmm
+++ b/maps/sccv_horizon/placeholder-1_deck_1.dmm
@@ -1040,19 +1040,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/hangar/intrepid)
-"aXA" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/hangar/control)
 "aXC" = (
 /obj/structure/cable/green{
 	icon_state = "0-4"
@@ -3747,6 +3734,15 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
+"dxv" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/hangar/control)
 "dzg" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/atmospherics/binary/pump/high_power{
@@ -4129,15 +4125,6 @@
 /obj/effect/shuttle_landmark/horizon/nav2,
 /turf/simulated/floor/plating,
 /area/hangar/auxiliary)
-"dTV" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
-/area/hangar/control)
 "dUK" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -4414,6 +4401,19 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hangar/operations)
+"eev" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/hangar/control)
 "eeD" = (
 /obj/machinery/vending/wallmed1{
 	pixel_x = -1;
@@ -9620,6 +9620,15 @@
 	},
 /turf/simulated/floor/plating,
 /area/rnd/xenoarch_atrium)
+"iCI" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/hangar/control)
 "iCX" = (
 /obj/machinery/atmospherics/pipe/simple/visible/black{
 	dir = 5
@@ -16860,15 +16869,6 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
 /area/maintenance/hangar/starboard)
-"psK" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
-	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/dark,
-/area/hangar/control)
 "pth" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -49678,7 +49678,7 @@ lKY
 cBF
 aWP
 vai
-dTV
+dxv
 ttK
 hTa
 vJe
@@ -49880,7 +49880,7 @@ tYN
 qgi
 gnn
 pYu
-aXA
+eev
 tKi
 tKi
 fZX
@@ -50082,7 +50082,7 @@ xgP
 weO
 aWP
 rEl
-psK
+iCI
 aUg
 wSd
 vcp

From c16664df7b5ca3ec911f8d5d82eef0aa3d9597f7 Mon Sep 17 00:00:00 2001
From: mikomyazaki <github@cmalu.neomailbox.ch>
Date: Mon, 7 Mar 2022 01:38:19 +0000
Subject: [PATCH 15/20] SCC Engines now output exhaust out the back instead of
 inside themselves.

---
 code/modules/overmap/ships/engines/gas_thruster.dm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/code/modules/overmap/ships/engines/gas_thruster.dm b/code/modules/overmap/ships/engines/gas_thruster.dm
index 6b6ffcbf833..00dadd2e7bd 100644
--- a/code/modules/overmap/ships/engines/gas_thruster.dm
+++ b/code/modules/overmap/ships/engines/gas_thruster.dm
@@ -72,6 +72,8 @@
 	var/boot_time = 35
 	var/next_on
 	var/blockage
+	var/exhaust_offset = 1 // for engines that are longer
+	var/exhaust_width = 1 //for engines that are wider
 
 /obj/machinery/atmospherics/unary/engine/scc_ship_engine
 	name = "ship thruster"
@@ -79,6 +81,7 @@
 	icon_state = "engine_0"
 	opacity = FALSE
 	pixel_x = -64
+	exhaust_offset = 3
 
 /obj/machinery/atmospherics/unary/engine/scc_ship_engine/check_blockage()
 	return 0
@@ -158,7 +161,9 @@
 /obj/machinery/atmospherics/unary/engine/proc/check_blockage()
 	blockage = FALSE
 	var/exhaust_dir = reverse_direction(dir)
-	var/turf/A = get_step(src, exhaust_dir)
+	var/turf/A = get_turf(src)
+	for(var/i in 1 to exhaust_offset)
+		A = get_step(A, exhaust_dir)
 	var/turf/B = A
 	while(isturf(A) && !(isspace(A) || isopenspace(A)))
 		if((B.c_airblock(A)) & AIR_BLOCKED)
@@ -185,7 +190,9 @@
 		network.update = 1
 
 	var/exhaust_dir = reverse_direction(dir)
-	var/turf/T = get_step(src,exhaust_dir)
+	var/turf/T = get_turf(src)
+	for(var/i in 1 to exhaust_offset)
+		T = get_step(T, exhaust_dir)
 	if(T)
 		T.assume_air(removed)
 		new/obj/effect/engine_exhaust(T, exhaust_dir, air_contents.check_combustability() && air_contents.temperature >= PHORON_MINIMUM_BURN_TEMPERATURE)

From 75b6701b2515017536dd94e1bbda5511d6fe1a0e Mon Sep 17 00:00:00 2001
From: mikomyazaki <github@cmalu.neomailbox.ch>
Date: Mon, 7 Mar 2022 01:41:05 +0000
Subject: [PATCH 16/20] D2 Garden hydroponics crate spawns with contents.

---
 maps/sccv_horizon/placeholder-2_deck_2.dmm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm
index b48bd7ce07a..81860030b6c 100644
--- a/maps/sccv_horizon/placeholder-2_deck_2.dmm
+++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm
@@ -35726,7 +35726,7 @@
 /area/maintenance/wing/starboard/far)
 "vZJ" = (
 /obj/structure/table/standard,
-/obj/structure/closet/crate/hydroponics,
+/obj/structure/closet/crate/hydroponics/prespawned,
 /turf/simulated/floor/wood,
 /area/hydroponics/garden)
 "vZY" = (

From 59909f2e5604f2d812b29a9edd69ab382ea9a3dc Mon Sep 17 00:00:00 2001
From: mikomyazaki <github@cmalu.neomailbox.ch>
Date: Mon, 7 Mar 2022 02:13:10 +0000
Subject: [PATCH 17/20] Removes RD's door to the AI upload foyer.

---
 maps/sccv_horizon/placeholder-2_deck_2.dmm | 127 ++++++++++++---------
 1 file changed, 73 insertions(+), 54 deletions(-)

diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm
index 81860030b6c..c6d6df400e2 100644
--- a/maps/sccv_horizon/placeholder-2_deck_2.dmm
+++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm
@@ -1797,6 +1797,9 @@
 /obj/effect/floor_decal/corner/mauve{
 	dir = 6
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/turret_protected/ai_upload)
 "aXX" = (
@@ -3271,6 +3274,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/turret_protected/ai_upload)
 "bTy" = (
@@ -3919,6 +3925,9 @@
 /obj/machinery/computer/cryopod/robot{
 	pixel_y = 32
 	},
+/obj/structure/cable/orange{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/reinforced,
 /area/turret_protected/ai_upload)
 "cpl" = (
@@ -4876,8 +4885,8 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/industrial/outline/red,
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/structure/cable/orange{
+	icon_state = "1-8"
 	},
 /turf/simulated/floor/tiled/dark,
 /area/turret_protected/ai_upload_foyer)
@@ -7111,6 +7120,9 @@
 	name = "AI core maintenance hatch";
 	opacity = 0
 	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/reinforced,
 /area/turret_protected/ai)
 "eAw" = (
@@ -7165,6 +7177,9 @@
 	req_access = list(47)
 	},
 /obj/machinery/door/firedoor/multi_tile,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/hallway)
 "eBy" = (
@@ -9463,9 +9478,6 @@
 /area/security/armory)
 "fZk" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /obj/structure/cable/green{
 	icon_state = "2-4"
 	},
@@ -12253,7 +12265,7 @@
 "hEs" = (
 /obj/structure/lattice,
 /obj/structure/cable/orange{
-	icon_state = "1-2"
+	icon_state = "2-8"
 	},
 /turf/simulated/open,
 /area/turret_protected/ai)
@@ -12608,6 +12620,9 @@
 /obj/machinery/camera/network/command{
 	c_tag = "AI Core - Second Deck Airlock"
 	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/reinforced,
 /area/turret_protected/ai)
 "hSp" = (
@@ -12761,6 +12776,9 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_waste)
 "hYk" = (
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/reinforced,
 /area/turret_protected/ai)
 "hYo" = (
@@ -16024,6 +16042,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
 	},
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/reinforced,
 /area/turret_protected/ai_upload)
 "kat" = (
@@ -18049,7 +18070,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/red,
 /obj/structure/cable/orange{
-	icon_state = "1-8"
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/dark,
 /area/turret_protected/ai_upload_foyer)
@@ -18435,9 +18456,6 @@
 /turf/simulated/floor/plating,
 /area/crew_quarters/sleep/cryo/living_quarters_lift)
 "lJp" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /obj/structure/railing/mapped,
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -18993,6 +19011,9 @@
 /obj/machinery/camera/network/command{
 	c_tag = "AI Core - Main Core"
 	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/bluegrid,
 /area/turret_protected/ai)
 "lYV" = (
@@ -25691,6 +25712,9 @@
 /area/maintenance/wing/starboard)
 "qcc" = (
 /obj/structure/railing/mapped,
+/obj/structure/cable/orange{
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/reinforced,
 /area/turret_protected/ai_upload)
 "qcs" = (
@@ -26381,6 +26405,9 @@
 /obj/effect/floor_decal/corner/mauve{
 	dir = 9
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/hallway)
 "qBt" = (
@@ -27362,23 +27389,15 @@
 /turf/simulated/floor/tiled,
 /area/security/brig)
 "rfG" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/structure/lattice,
+/obj/machinery/light{
+	dir = 8
 	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/highsecurity{
-	name = "AI Upload Access";
-	req_access = list(16)
+/obj/structure/cable/orange{
+	icon_state = "1-4"
 	},
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "AICore";
-	name = "AI core maintenance hatch";
-	opacity = 0
-	},
-/turf/simulated/floor/tiled/dark,
-/area/turret_protected/ai_upload_foyer)
+/turf/simulated/open,
+/area/turret_protected/ai)
 "rfO" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/reagent_dispensers/watertank,
@@ -29461,7 +29480,7 @@
 	pixel_y = 25
 	},
 /obj/structure/cable/orange{
-	icon_state = "2-4"
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/bluegrid,
 /area/turret_protected/ai)
@@ -29912,7 +29931,7 @@
 	pixel_y = 24
 	},
 /obj/structure/cable/orange{
-	icon_state = "0-2"
+	icon_state = "0-8"
 	},
 /turf/simulated/floor/reinforced,
 /area/turret_protected/ai_upload)
@@ -31204,8 +31223,8 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/dark,
-/area/turret_protected/ai_upload_foyer)
+/turf/simulated/floor/tiled/ramp,
+/area/turret_protected/ai_upload)
 "tzf" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_atmos{
@@ -31325,6 +31344,9 @@
 "tCP" = (
 /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/turret_protected/ai_upload)
 "tDc" = (
@@ -31694,7 +31716,7 @@
 	dir = 4
 	},
 /obj/structure/cable/orange{
-	icon_state = "1-4"
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/dark,
 /area/turret_protected/ai_upload)
@@ -32675,22 +32697,16 @@
 /turf/simulated/open/airless,
 /area/horizonexterior)
 "upm" = (
-/obj/structure/window/shuttle/scc_space_ship,
-/obj/structure/grille,
 /obj/machinery/door/blast/regular{
-	density = 0;
 	dir = 4;
-	icon_state = "pdoor0";
-	id = "AICore";
-	name = "AI core maintenance hatch";
-	opacity = 0
+	id = "ai_upload";
+	name = "AI Upload Blast Doors"
 	},
-/obj/machinery/door/firedoor,
-/obj/structure/cable/orange{
+/obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/plating,
-/area/turret_protected/ai)
+/turf/simulated/floor/tiled,
+/area/turret_protected/ai_upload)
 "upn" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -33163,6 +33179,9 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/conference)
 "uDs" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/turret_protected/ai_upload)
 "uEg" = (
@@ -34985,6 +35004,9 @@
 /obj/effect/landmark/start{
 	name = "Cyborg"
 	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/turret_protected/ai_upload)
 "vJK" = (
@@ -37646,9 +37668,6 @@
 	pixel_x = 28;
 	req_one_access = list(24,11,55)
 	},
-/obj/structure/cable/orange{
-	icon_state = "1-2"
-	},
 /turf/simulated/floor/tiled/ramp,
 /area/turret_protected/ai_upload)
 "xcK" = (
@@ -38319,10 +38338,10 @@
 	pixel_y = 24
 	},
 /obj/structure/cable/orange{
-	icon_state = "4-8"
+	icon_state = "0-4"
 	},
 /obj/structure/cable/orange{
-	icon_state = "0-4"
+	icon_state = "0-8"
 	},
 /turf/simulated/floor/bluegrid,
 /area/turret_protected/ai)
@@ -64812,8 +64831,8 @@ qcc
 uXX
 vJw
 uDs
-pEu
-obZ
+tyZ
+upm
 bTo
 tCP
 aXf
@@ -65614,8 +65633,8 @@ iXI
 jSY
 qnb
 ool
-qnb
-ool
+hEs
+rfG
 qnb
 iXI
 xdu
@@ -66020,8 +66039,8 @@ hHM
 iXI
 wLz
 spR
-hEs
-upm
+qnb
+cyG
 lxN
 iYw
 cyZ
@@ -66225,8 +66244,8 @@ xxw
 mQe
 mHH
 cZT
-tyZ
-rfG
+gfN
+cyZ
 lJp
 fZk
 xFR

From 8115b9c675ebc213b6a1dbde4f620cc5646c66e6 Mon Sep 17 00:00:00 2001
From: mikomyazaki <github@cmalu.neomailbox.ch>
Date: Mon, 7 Mar 2022 02:25:16 +0000
Subject: [PATCH 18/20] Adds disposal bin to cryo room D3.

---
 maps/sccv_horizon/placeholder-3_deck_3.dmm | 47 ++++++++++++++++++++--
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm
index 211a8d6d23c..29d10c39a6f 100644
--- a/maps/sccv_horizon/placeholder-3_deck_3.dmm
+++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm
@@ -775,6 +775,7 @@
 "bH" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/sleep/cryo)
 "bI" = (
@@ -1395,6 +1396,22 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge/selfdestruct)
+"de" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/disposalpipe/junction{
+	dir = 8;
+	icon_state = "pipe-j2"
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/primary/starboard)
 "df" = (
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -7150,6 +7167,7 @@
 "qy" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/sleep/cryo)
 "qB" = (
@@ -7691,6 +7709,7 @@
 /obj/effect/landmark{
 	name = "JoinLateCryo"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/sleep/cryo)
 "rL" = (
@@ -9974,6 +9993,10 @@
 	name = "Station Intercom (General)";
 	pixel_y = -24
 	},
+/obj/machinery/disposal/small/north,
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/sleep/cryo)
 "xL" = (
@@ -15190,6 +15213,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/sleep/cryo)
 "KW" = (
@@ -15649,6 +15673,16 @@
 	},
 /turf/simulated/open,
 /area/hallway/primary/starboard)
+"LW" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 10
+	},
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/dark,
+/area/hallway/primary/starboard)
 "LY" = (
 /obj/structure/railing/mapped{
 	dir = 1
@@ -15930,6 +15964,7 @@
 /obj/effect/landmark{
 	name = "JoinLate"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/sleep/cryo)
 "MJ" = (
@@ -17994,6 +18029,11 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/locker)
+"Ru" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/sleep/cryo)
 "Rv" = (
 /obj/structure/cable/green{
 	icon_state = "2-4"
@@ -18558,6 +18598,7 @@
 /obj/machinery/door/firedoor/multi_tile{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/crew_quarters/sleep/cryo)
 "SX" = (
@@ -39670,10 +39711,10 @@ Ye
 Ye
 Ye
 co
-Lg
-iY
+de
+LW
 SW
-sT
+Ru
 qy
 bH
 KU

From 4d99de60444740830b8a13f14c0bc83388857b44 Mon Sep 17 00:00:00 2001
From: mikomyazaki <github@cmalu.neomailbox.ch>
Date: Mon, 7 Mar 2022 13:25:00 +0000
Subject: [PATCH 19/20] Bridge now has a requests console and intercom.

Adds additional light to each OR.

Adds soap to public shower area.

Adds regular holopad to bridge area.
---
 maps/sccv_horizon/placeholder-2_deck_2.dmm | 26 ++++++++++++++++------
 maps/sccv_horizon/placeholder-3_deck_3.dmm | 16 ++++++++++++-
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm
index c6d6df400e2..0aa2973bea6 100644
--- a/maps/sccv_horizon/placeholder-2_deck_2.dmm
+++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm
@@ -6903,6 +6903,11 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/alarm{
+	dir = 8;
+	pixel_x = 28;
+	req_one_access = list(24,11,55)
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/or1)
 "eui" = (
@@ -13640,15 +13645,15 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
 "iEd" = (
-/obj/machinery/alarm{
-	pixel_y = 28
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/or2)
 "iEi" = (
@@ -19462,9 +19467,6 @@
 /turf/simulated/floor/tiled,
 /area/operations/mail_room)
 "mlD" = (
-/obj/machinery/alarm{
-	pixel_y = 28
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -19474,6 +19476,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/or1)
 "mmS" = (
@@ -26581,6 +26586,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/conference)
+"qFN" = (
+/obj/machinery/alarm{
+	dir = 4;
+	pixel_x = -28
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/or2)
 "qFQ" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -55748,7 +55760,7 @@ ibx
 jvV
 fsf
 oGm
-fai
+qFN
 tpy
 cVe
 hQa
diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm
index 29d10c39a6f..859264f8061 100644
--- a/maps/sccv_horizon/placeholder-3_deck_3.dmm
+++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm
@@ -5359,6 +5359,14 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 5
 	},
+/obj/machinery/requests_console{
+	department = "Bridge";
+	pixel_y = 32
+	},
+/obj/item/device/radio/intercom/department{
+	dir = 8;
+	pixel_x = 24
+	},
 /turf/simulated/floor/carpet/rubber,
 /area/bridge)
 "mw" = (
@@ -17867,6 +17875,10 @@
 	},
 /turf/simulated/floor/wood,
 /area/hallway/primary/starboard)
+"QV" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/carpet/rubber,
+/area/bridge)
 "QW" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 5
@@ -19296,6 +19308,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
+/obj/random/soap,
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/toilet)
 "UJ" = (
@@ -19840,6 +19853,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
+/obj/random/soap,
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/toilet)
 "We" = (
@@ -41774,7 +41788,7 @@ SH
 Fn
 US
 Xe
-Oo
+QV
 AQ
 Hg
 FQ

From 384db3882dc917b54c4946e17772ac8045aa121b Mon Sep 17 00:00:00 2001
From: mikomyazaki <github@cmalu.neomailbox.ch>
Date: Mon, 7 Mar 2022 13:34:53 +0000
Subject: [PATCH 20/20] Aux atmos rooms have an emergency closet and one box of
 inflatables. Atmospherics storage has some inflatable boxes.

---
 maps/sccv_horizon/placeholder-2_deck_2.dmm | 36 ++++++++++++++++------
 maps/sccv_horizon/placeholder-3_deck_3.dmm | 14 ++++-----
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm
index 0aa2973bea6..9175b170088 100644
--- a/maps/sccv_horizon/placeholder-2_deck_2.dmm
+++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm
@@ -2172,6 +2172,7 @@
 /obj/item/clothing/mask/breath,
 /obj/item/clothing/suit/space/void/atmos,
 /obj/item/clothing/head/helmet/space/void/atmos,
+/obj/item/storage/bag/inflatable,
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos/storage)
 "biZ" = (
@@ -6835,6 +6836,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_two)
+"eqK" = (
+/obj/machinery/alarm{
+	dir = 4;
+	pixel_x = -28
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/or2)
 "eqR" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/white,
@@ -10156,6 +10164,7 @@
 	dir = 10
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/emcloset,
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/aux_atmospherics/deck_2/starboard)
 "gsh" = (
@@ -11794,6 +11803,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/rnd/hallway)
+"hqC" = (
+/obj/structure/table/rack,
+/obj/random/loot,
+/obj/item/storage/bag/inflatable,
+/turf/simulated/floor/tiled/dark,
+/area/maintenance/aux_atmospherics/deck_2/starboard)
 "hrf" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -12431,6 +12446,7 @@
 	dir = 5
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/closet/emcloset,
 /turf/simulated/floor/plating,
 /area/maintenance/aux_atmospherics/deck_2/starboard)
 "hIV" = (
@@ -26586,13 +26602,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/conference)
-"qFN" = (
-/obj/machinery/alarm{
-	dir = 4;
-	pixel_x = -28
-	},
-/turf/simulated/floor/tiled/white,
-/area/medical/or2)
 "qFQ" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -28258,6 +28267,12 @@
 /obj/effect/floor_decal/spline/plain,
 /turf/simulated/floor/tiled/white,
 /area/rnd/conference)
+"rDw" = (
+/obj/structure/closet/crate,
+/obj/random/loot,
+/obj/item/storage/bag/inflatable,
+/turf/simulated/floor/tiled/dark,
+/area/maintenance/aux_atmospherics/deck_2/starboard)
 "rDH" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/machinery/alarm{
@@ -37398,6 +37413,7 @@
 /obj/item/clothing/suit/space/void/atmos,
 /obj/item/clothing/head/helmet/space/void/atmos,
 /obj/machinery/firealarm/west,
+/obj/item/storage/bag/inflatable,
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos/storage)
 "wSE" = (
@@ -47703,7 +47719,7 @@ qxy
 pEt
 pBB
 gyu
-rYx
+rDw
 sfk
 whe
 qgN
@@ -51916,7 +51932,7 @@ fxw
 bKd
 hGX
 vVv
-vVv
+hqC
 fdF
 bwR
 apd
@@ -55760,7 +55776,7 @@ ibx
 jvV
 fsf
 oGm
-qFN
+eqK
 tpy
 cVe
 hQa
diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm
index 859264f8061..e094f5635f5 100644
--- a/maps/sccv_horizon/placeholder-3_deck_3.dmm
+++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm
@@ -13225,6 +13225,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/port)
+"Gq" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/carpet/rubber,
+/area/bridge)
 "Gr" = (
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 9
@@ -14664,11 +14668,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/hallway/primary/starboard)
 "JC" = (
-/obj/structure/table/rack,
-/obj/random/arcade,
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 4
 	},
+/obj/structure/closet/emcloset,
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/aux_atmospherics/deck_3)
 "JD" = (
@@ -17177,6 +17180,7 @@
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 4
 	},
+/obj/item/storage/bag/inflatable,
 /turf/simulated/floor,
 /area/maintenance/aux_atmospherics/deck_3)
 "Pw" = (
@@ -17875,10 +17879,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/hallway/primary/starboard)
-"QV" = (
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/carpet/rubber,
-/area/bridge)
 "QW" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 5
@@ -41788,7 +41788,7 @@ SH
 Fn
 US
 Xe
-QV
+Gq
 AQ
 Hg
 FQ