From c854cd149c95155491fe9fcba6364bb9e9cb0540 Mon Sep 17 00:00:00 2001
From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Date: Wed, 18 May 2022 14:22:31 +0200
Subject: [PATCH] Fixes CCIA Shuttle Venting Mining Dock (#13947)

---
 html/changelogs/ccia_shuttle_bugfix.yml     |   6 +
 maps/aurora/code/aurora_shuttles.dm         |   1 +
 maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 244 +++++++++++++-------
 maps/sccv_horizon/sccv_horizon-3_deck_3.dmm | 160 ++++++-------
 4 files changed, 242 insertions(+), 169 deletions(-)
 create mode 100644 html/changelogs/ccia_shuttle_bugfix.yml

diff --git a/html/changelogs/ccia_shuttle_bugfix.yml b/html/changelogs/ccia_shuttle_bugfix.yml
new file mode 100644
index 00000000000..f2d80e48476
--- /dev/null
+++ b/html/changelogs/ccia_shuttle_bugfix.yml
@@ -0,0 +1,6 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixes the CCIA shuttle venting the mining shuttle dock."
\ No newline at end of file
diff --git a/maps/aurora/code/aurora_shuttles.dm b/maps/aurora/code/aurora_shuttles.dm
index 0ed2f55f58d..5554fbffcb6 100644
--- a/maps/aurora/code/aurora_shuttles.dm
+++ b/maps/aurora/code/aurora_shuttles.dm
@@ -216,6 +216,7 @@ AURORA_ESCAPE_POD(4)
 	name = "Agent Shuttle Dock"
 	landmark_tag = "nav_ccia_dock"
 	docking_controller = "centcom_shuttle_dock_airlock"
+	base_turf = /turf/simulated/floor/reinforced/airless
 	landmark_flags = SLANDMARK_FLAG_AUTOSET
 
 //-// ERT Shuttle (the NT one) //-//
diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
index ad2e237916c..054fdc8ed6a 100644
--- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
@@ -172,6 +172,14 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hydroponics)
+"adb" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/railing/mapped,
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/turf/space/dynamic,
+/area/template_noop)
 "adw" = (
 /obj/effect/floor_decal/spline/fancy{
 	dir = 10
@@ -4816,7 +4824,7 @@
 /obj/structure/railing/mapped{
 	dir = 8
 	},
-/turf/template_noop,
+/turf/space/dynamic,
 /area/template_noop)
 "cHM" = (
 /obj/structure/lattice/catwalk/indoor/grate,
@@ -5106,6 +5114,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/maintenance/wing/starboard/far)
+"cPB" = (
+/obj/structure/railing/mapped,
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/reinforced/airless,
+/area/template_noop)
 "cQd" = (
 /obj/structure/flora/pottedplant/random,
 /turf/simulated/floor/tiled,
@@ -7072,7 +7085,7 @@
 /obj/structure/railing/mapped{
 	dir = 4
 	},
-/turf/template_noop,
+/turf/space/dynamic,
 /area/template_noop)
 "dVN" = (
 /obj/structure/cable{
@@ -8796,12 +8809,9 @@
 /area/hallway/engineering/tesla)
 "eYX" = (
 /obj/structure/lattice/catwalk,
-/obj/structure/railing/mapped{
-	dir = 1
-	},
 /obj/structure/railing/mapped,
 /obj/item/hullbeacon/red,
-/turf/template_noop,
+/turf/space/dynamic,
 /area/template_noop)
 "eZc" = (
 /obj/machinery/firealarm/south,
@@ -9322,6 +9332,15 @@
 /obj/effect/floor_decal/corner/brown/full,
 /turf/simulated/floor/tiled,
 /area/operations/office)
+"fln" = (
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/template_noop)
 "flS" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/cyan{
 	dir = 4
@@ -12972,6 +12991,15 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/security/prison)
+"hha" = (
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 10
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/template_noop)
 "hhx" = (
 /obj/structure/cable/green{
 	icon_state = "0-2"
@@ -17559,8 +17587,15 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/or1)
 "jPc" = (
-/obj/structure/lattice,
-/turf/template_noop,
+/obj/structure/lattice/catwalk,
+/obj/structure/railing/mapped{
+	dir = 4
+	},
+/obj/structure/railing/mapped{
+	dir = 1
+	},
+/obj/item/hullbeacon/red,
+/turf/space/dynamic,
 /area/template_noop)
 "jPj" = (
 /obj/machinery/atm{
@@ -19685,8 +19720,10 @@
 "lgS" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/railing/mapped,
-/obj/item/hullbeacon/red,
-/turf/template_noop,
+/obj/structure/railing/mapped{
+	dir = 1
+	},
+/turf/space/dynamic,
 /area/template_noop)
 "lhH" = (
 /obj/structure/disposalpipe/segment{
@@ -21700,10 +21737,7 @@
 /area/engineering/storage_hard)
 "mpN" = (
 /obj/structure/lattice/catwalk,
-/obj/structure/railing/mapped{
-	dir = 8
-	},
-/turf/template_noop,
+/turf/space/dynamic,
 /area/template_noop)
 "mpV" = (
 /obj/structure/cable/green{
@@ -22036,6 +22070,13 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled,
 /area/security/checkpoint2)
+"mwQ" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/railing/mapped{
+	dir = 1
+	},
+/turf/space/dynamic,
+/area/template_noop)
 "mxh" = (
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
 	dir = 5
@@ -22622,6 +22663,17 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/security/brig)
+"mOy" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/obj/structure/railing/mapped{
+	dir = 4
+	},
+/obj/item/hullbeacon/red,
+/turf/space/dynamic,
+/area/template_noop)
 "mOH" = (
 /obj/machinery/chem_master/condimaster{
 	pixel_y = 1
@@ -24370,6 +24422,16 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hydroponics)
+"nJQ" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/obj/structure/railing/mapped{
+	dir = 4
+	},
+/turf/space/dynamic,
+/area/template_noop)
 "nKc" = (
 /obj/effect/floor_decal/industrial/loading/yellow{
 	dir = 4
@@ -25931,7 +25993,7 @@
 /obj/structure/railing/mapped{
 	dir = 4
 	},
-/turf/template_noop,
+/turf/space/dynamic,
 /area/template_noop)
 "oGm" = (
 /obj/structure/cable/green{
@@ -33400,6 +33462,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/storage/primary)
+"sJq" = (
+/obj/structure/lattice,
+/turf/space/dynamic,
+/area/template_noop)
 "sJS" = (
 /obj/structure/cable/orange{
 	icon_state = "4-8"
@@ -33776,7 +33842,7 @@
 	dir = 1
 	},
 /obj/structure/railing/mapped,
-/turf/template_noop,
+/turf/space/dynamic,
 /area/template_noop)
 "sVB" = (
 /obj/structure/lattice/catwalk/indoor/grate,
@@ -34490,7 +34556,7 @@
 /area/medical/or2)
 "tqC" = (
 /obj/effect/shuttle_landmark/ccia/dock,
-/turf/template_noop,
+/turf/simulated/floor/reinforced/airless,
 /area/template_noop)
 "tqF" = (
 /obj/structure/table/standard,
@@ -38862,7 +38928,7 @@
 	dir = 8
 	},
 /obj/structure/railing/mapped,
-/turf/template_noop,
+/turf/space/dynamic,
 /area/template_noop)
 "vKf" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -57046,13 +57112,13 @@ ieM
 aQb
 udR
 xer
-qgN
-qgN
-qgN
-qgN
-qgN
-qgN
-qgN
+mOy
+nJQ
+nJQ
+nJQ
+nJQ
+nJQ
+vJX
 qgN
 qgN
 qgN
@@ -57251,10 +57317,10 @@ xer
 qgN
 qgN
 qgN
+sJq
 qgN
 qgN
-qgN
-qgN
+lgS
 qgN
 qgN
 qgN
@@ -57450,14 +57516,14 @@ eWm
 tAN
 udR
 xer
-qgN
-qgN
-qgN
-qgN
-qgN
-qgN
-qgN
-qgN
+sJq
+sJq
+kgp
+kgp
+kgp
+sJq
+jPc
+adb
 qgN
 qgN
 qgN
@@ -57654,12 +57720,12 @@ udR
 xer
 qgN
 qgN
+kgp
+kgp
+kgp
 qgN
 qgN
-qgN
-qgN
-qgN
-qgN
+lgS
 qgN
 qgN
 qgN
@@ -57855,13 +57921,13 @@ aFJ
 udR
 xer
 qgN
+kgp
+kgp
+kgp
+kgp
+kgp
 qgN
-qgN
-qgN
-qgN
-qgN
-qgN
-qgN
+lgS
 qgN
 qgN
 qgN
@@ -58056,14 +58122,14 @@ sXT
 aQb
 udR
 xer
-qgN
-qgN
-qgN
-qgN
-qgN
-qgN
-qgN
-qgN
+sJq
+kgp
+kgp
+kgp
+kgp
+kgp
+sJq
+lgS
 qgN
 qgN
 qgN
@@ -58259,13 +58325,13 @@ ebR
 wFj
 xer
 qgN
+kgp
+kgp
+kgp
+kgp
+kgp
 qgN
-qgN
-qgN
-qgN
-qgN
-qgN
-qgN
+lgS
 qgN
 qgN
 qgN
@@ -58461,13 +58527,13 @@ aQb
 wFj
 wFj
 wFj
-qgN
-qgN
+kgp
+kgp
 tqC
+kgp
+kgp
 qgN
-qgN
-qgN
-qgN
+lgS
 qgN
 qgN
 qgN
@@ -58663,13 +58729,13 @@ aSd
 qqK
 hoZ
 blJ
+kgp
+kgp
+kgp
+kgp
+kgp
 qgN
-qgN
-qgN
-qgN
-qgN
-qgN
-qgN
+lgS
 qgN
 qgN
 qgN
@@ -58865,11 +58931,11 @@ jWV
 wFj
 wFj
 wFj
-mLU
-mLU
-mLU
-eTQ
-qgN
+kgp
+kgp
+kgp
+kgp
+kgp
 cHC
 mpN
 vJX
@@ -59066,15 +59132,15 @@ hwM
 spn
 lNQ
 kgp
+cPB
 kgp
 kgp
 kgp
 kgp
-xer
-jPc
-lCL
+kgp
+mwQ
 hUK
-lgS
+eYX
 qgN
 qgN
 qgN
@@ -59268,14 +59334,14 @@ kOW
 eyu
 lCF
 kgp
+cPB
+kgp
 kgp
 kgp
 kgp
 kgp
-xer
-qgN
 oFC
-jMJ
+mpN
 dVE
 qgN
 qgN
@@ -59470,11 +59536,11 @@ jEL
 oWC
 lCF
 kgp
-kgp
-kgp
-kgp
-kgp
-xer
+tMp
+fln
+fln
+fln
+hha
 qgN
 qgN
 sVv
@@ -59879,8 +59945,8 @@ kgp
 kgp
 kgp
 xer
-qgN
-qgN
+nJQ
+nJQ
 eYX
 qgN
 qgN
diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
index 1c9d66de919..2e062079021 100644
--- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
+++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
@@ -41188,13 +41188,13 @@ Mc
 at
 fh
 aa
-Wm
-Wm
-Wm
-Wm
-Wm
-Wm
-Wm
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 Wm
 Wm
 Wm
@@ -41396,7 +41396,7 @@ Wm
 Wm
 Wm
 Wm
-Wm
+aa
 Wm
 Wm
 Wm
@@ -41594,12 +41594,12 @@ fh
 aa
 Wm
 Wm
+aa
+aa
+aa
 Wm
-Wm
-Wm
-Wm
-Wm
-Wm
+aa
+aa
 Wm
 Wm
 Wm
@@ -41796,12 +41796,12 @@ fh
 aa
 Wm
 Wm
+aa
+aa
+aa
 Wm
 Wm
-Wm
-Wm
-Wm
-Wm
+aa
 Wm
 Wm
 Wm
@@ -41997,13 +41997,13 @@ at
 fh
 aa
 Wm
+aa
+aa
+aa
+aa
+aa
 Wm
-Wm
-Wm
-Wm
-Wm
-Wm
-Wm
+aa
 Wm
 Wm
 Wm
@@ -42199,13 +42199,13 @@ at
 fh
 aa
 Wm
+aa
+aa
+aa
+aa
+aa
 Wm
-Wm
-Wm
-Wm
-Wm
-Wm
-Wm
+aa
 Wm
 Wm
 Wm
@@ -42401,13 +42401,13 @@ at
 fh
 aa
 Wm
+aa
+aa
+aa
+aa
+aa
 Wm
-Wm
-Wm
-Wm
-Wm
-Wm
-Wm
+aa
 Wm
 Wm
 Wm
@@ -42603,13 +42603,13 @@ at
 VM
 KN
 Mo
+aa
+aa
+aa
+aa
+aa
 Wm
-Wm
-Wm
-Wm
-Wm
-Wm
-Wm
+aa
 Wm
 Wm
 Wm
@@ -42805,13 +42805,13 @@ at
 at
 at
 fh
+aa
+aa
+aa
+aa
+aa
 Wm
-Wm
-Wm
-Wm
-Wm
-Wm
-Wm
+aa
 Wm
 Wm
 Wm
@@ -43007,14 +43007,14 @@ at
 Rh
 Tr
 PF
-Wm
-Wm
-Wm
-Wm
-Wm
-Wm
-Wm
-Wm
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 Wm
 Wm
 Wm
@@ -43210,13 +43210,13 @@ fh
 aa
 aa
 aa
-Wm
-Wm
-Wm
-Wm
-Wm
-Wm
-Wm
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 Wm
 Wm
 Wm
@@ -43414,11 +43414,11 @@ aa
 aa
 aa
 aa
-Wm
-Wm
-Wm
-Wm
-Wm
+aa
+aa
+aa
+aa
+aa
 Wm
 Wm
 Wm
@@ -43616,10 +43616,10 @@ aa
 aa
 aa
 aa
+aa
 Wm
 Wm
-Wm
-Wm
+aa
 Wm
 Wm
 Wm
@@ -43818,10 +43818,10 @@ aa
 aa
 aa
 aa
+aa
 Wm
 Wm
-Wm
-Wm
+aa
 Wm
 Wm
 Wm
@@ -44020,10 +44020,10 @@ aa
 aa
 aa
 aa
-Wm
-Wm
-Wm
-Wm
+aa
+aa
+aa
+aa
 Wm
 Wm
 Wm
@@ -44222,10 +44222,10 @@ aa
 aa
 aa
 aa
+aa
 Wm
 Wm
-Wm
-Wm
+aa
 Wm
 Wm
 Wm
@@ -44424,10 +44424,10 @@ Vu
 aa
 aa
 aa
+aa
 Wm
 Wm
-Wm
-Wm
+aa
 Wm
 Wm
 Wm
@@ -44633,7 +44633,7 @@ aa
 aa
 aa
 aa
-aa
+Wm
 Wm
 Wm
 Wm