Merge pull request #1208 from SierraBay/dev-sierra

Merge
SierraBay · Oct 27, 2023 · 1c32c57 · 1c32c57
2 parents bfc5d4e + 14efbd2
commit 1c32c57
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 21 deletions.
diff --git a/maps/sierra/_references/map-refs.dmm b/maps/sierra/_references/map-refs.dmm
@@ -155,6 +155,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/airlock/multi_tile/glass/research{
+	dir = 8;
 	icon_state = "closed";
 	id_tag = "PetrovAccess";
 	name = "Petrov Access"

diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm
@@ -3641,7 +3641,9 @@
 /turf/simulated/floor/tiled,
 /area/crew_quarters/docking)
 "aBp" = (
-/obj/machinery/door/airlock/multi_tile/maintenance,
+/obj/machinery/door/airlock/multi_tile/maintenance{
+	dir = 8
+	},
 /obj/machinery/door/firedoor,
 /obj/floor_decal/techfloor,
 /obj/structure/cable{
@@ -14036,7 +14038,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/multi_tile/maintenance,
+/obj/machinery/door/airlock/multi_tile/maintenance{
+	dir = 8
+	},
 /obj/machinery/door/firedoor{
 	dir = 4
 	},
@@ -17297,6 +17301,7 @@
 	name = "Infirmary Entry Shutters"
 	},
 /obj/machinery/door/airlock/multi_tile/glass/medical{
+	dir = 8;
 	id_tag = "MedbayER";
 	name = "Treatment Center"
 	},
@@ -18830,7 +18835,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/multi_tile/maintenance,
+/obj/machinery/door/airlock/multi_tile/maintenance{
+	dir = 8
+	},
 /obj/machinery/door/firedoor{
 	dir = 4
 	},
@@ -21178,7 +21185,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/multi_tile/maintenance,
+/obj/machinery/door/airlock/multi_tile/maintenance{
+	dir = 8
+	},
 /obj/machinery/door/firedoor{
 	dir = 4
 	},
@@ -33926,7 +33935,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/multi_tile/maintenance,
+/obj/machinery/door/airlock/multi_tile/maintenance{
+	dir = 8
+	},
 /obj/machinery/door/firedoor{
 	dir = 4
 	},
@@ -39629,7 +39640,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/multi_tile/maintenance,
+/obj/machinery/door/airlock/multi_tile/maintenance{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/medical/virology/atmos)
 "fZy" = (
@@ -40934,7 +40947,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/multi_tile/maintenance,
+/obj/machinery/door/airlock/multi_tile/maintenance{
+	dir = 8
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -43273,7 +43288,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/multi_tile/maintenance,
+/obj/machinery/door/airlock/multi_tile/maintenance{
+	dir = 8
+	},
 /obj/machinery/door/firedoor{
 	dir = 4
 	},
@@ -59047,6 +59064,7 @@
 /area/rnd/toxins)
 "jdY" = (
 /obj/machinery/door/airlock/multi_tile/research{
+	dir = 8;
 	frequency = 1379;
 	id_tag = "xenolow_airlock_inner";
 	locked = 1;
@@ -63047,7 +63065,9 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/multi_tile/maintenance,
+/obj/machinery/door/airlock/multi_tile/maintenance{
+	dir = 8
+	},
 /obj/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/hallway/primary/seconddeck/center)
@@ -79793,7 +79813,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/multi_tile/maintenance,
+/obj/machinery/door/airlock/multi_tile/maintenance{
+	dir = 8
+	},
 /obj/machinery/door/firedoor{
 	dir = 4
 	},
@@ -81413,7 +81435,9 @@
 	icon_state = "4-8"
 	},
 /obj/floor_decal/industrial/hatch/yellow,
-/obj/machinery/door/airlock/multi_tile/maintenance,
+/obj/machinery/door/airlock/multi_tile/maintenance{
+	dir = 8
+	},
 /obj/machinery/door/firedoor{
 	dir = 4
 	},
@@ -84300,6 +84324,7 @@
 /obj/machinery/door/firedoor,
 /obj/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/airlock/multi_tile/research{
+	dir = 8;
 	frequency = null;
 	id_tag = null;
 	name = "Xenobiology Atmospherics"
@@ -84704,7 +84729,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/multi_tile/maintenance,
+/obj/machinery/door/airlock/multi_tile/maintenance{
+	dir = 8
+	},
 /obj/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/firedoor{
 	dir = 4
@@ -92729,7 +92756,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/multi_tile/maintenance,
+/obj/machinery/door/airlock/multi_tile/maintenance{
+	dir = 8
+	},
 /obj/machinery/door/firedoor{
 	dir = 4
 	},
@@ -94093,7 +94122,9 @@
 /obj/machinery/door/firedoor{
 	dir = 4
 	},
-/obj/machinery/door/airlock/multi_tile/maintenance,
+/obj/machinery/door/airlock/multi_tile/maintenance{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/maintenance/thirddeck/aftstarboard)
 "ozF" = (
@@ -96372,6 +96403,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/door/airlock/multi_tile/maintenance{
+	dir = 8;
 	req_access = newlist()
 	},
 /obj/machinery/door/firedoor{
@@ -96526,6 +96558,7 @@
 	},
 /obj/machinery/door/airlock/multi_tile/glass/security{
 	id_tag = "security_entry_airlock_enter";
+	dir = 8;
 	name = "Security Entry"
 	},
 /turf/simulated/floor/tiled/monotile,
@@ -106845,6 +106878,7 @@
 	},
 /obj/machinery/door/airlock/multi_tile/glass/security{
 	id_tag = "security_entry_airlock_exit";
+	dir = 8;
 	name = "Security Exit"
 	},
 /turf/simulated/floor/tiled/monotile,
@@ -112381,7 +112415,9 @@
 /area/engineering/gravitaional_generator)
 "rpl" = (
 /obj/floor_decal/industrial/hatch/yellow,
-/obj/machinery/door/airlock/multi_tile/glass/maintenance,
+/obj/machinery/door/airlock/multi_tile/glass/maintenance{
+	dir = 8
+	},
 /obj/machinery/door/firedoor{
 	dir = 4
 	},
@@ -116475,7 +116511,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/multi_tile/glass/engineering,
+/obj/machinery/door/airlock/multi_tile/glass/engineering{
+	dir = 8
+	},
 /obj/machinery/door/firedoor{
 	dir = 4
 	},
@@ -117029,7 +117067,9 @@
 /area/maintenance/seconddeck/foreport)
 "rZZ" = (
 /obj/floor_decal/industrial/hatch/yellow,
-/obj/machinery/door/airlock/multi_tile/maintenance,
+/obj/machinery/door/airlock/multi_tile/maintenance{
+	dir = 8
+	},
 /obj/machinery/door/firedoor{
 	dir = 4
 	},
@@ -124571,6 +124611,7 @@
 	dir = 4
 	},
 /obj/machinery/door/airlock/multi_tile/medical{
+	dir = 8;
 	door_color = "#4c535b"
 	},
 /turf/simulated/floor/tiled/dark/monotile,
@@ -131754,6 +131795,7 @@
 "une" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/multi_tile/civilian{
+	dir = 8;
 	name = "Holodeck"
 	},
 /obj/floor_decal/industrial/hatch/yellow,
@@ -132579,6 +132621,7 @@
 	dir = 4
 	},
 /obj/machinery/door/airlock/multi_tile/glass/research{
+	dir = 8;
 	id_tag = "PetrovAccess";
 	name = "Petrov Access"
 	},
@@ -134675,6 +134718,7 @@
 "uKy" = (
 /obj/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/airlock/multi_tile/maintenance{
+	dir = 8;
 	autoset_access = 0
 	},
 /obj/machinery/door/firedoor{
@@ -142313,7 +142357,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/multi_tile/glass/engineering,
+/obj/machinery/door/airlock/multi_tile/glass/engineering{
+	dir = 8
+	},
 /obj/machinery/door/firedoor{
 	dir = 4
 	},
@@ -146174,7 +146220,8 @@
 "wxd" = (
 /obj/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/airlock/multi_tile/glass/engineering{
-	req_access = newlist()
+	req_access = newlist();
+	dir = 8
 	},
 /obj/machinery/door/firedoor{
 	dir = 4
@@ -152117,6 +152164,7 @@
 	dir = 4
 	},
 /obj/machinery/door/airlock/multi_tile/atmos{
+	dir = 8;
 	name = "Bridge Atmospherics Supply"
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
@@ -153633,7 +153681,8 @@
 /obj/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/airlock/multi_tile/medical{
 	id_tag = "MedbayER2";
-	name = "Critical Wing"
+	name = "Critical Wing";
+	dir = 8
 	},
 /turf/simulated/floor/tiled/dark/monotile,
 /area/medical/sleeper)

diff --git a/maps/sierra/z6_admin.dmm b/maps/sierra/z6_admin.dmm
@@ -12116,7 +12116,9 @@
 	},
 /area/centcom/living)
 "kTF" = (
-/obj/machinery/door/airlock/multi_tile,
+/obj/machinery/door/airlock/multi_tile{
+	dir = 8
+	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},