diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
index 6fd614754d..8d52fc9180 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
@@ -140,7 +140,7 @@
icon_state = "blood1";
dir = 1
},
-/obj/machinery/door/airlock/survival_pod,
+/obj/machinery/door/airlock/survival_pod/glass,
/obj/structure/fans/tiny,
/turf/open/floor/pod/dark,
/area/ruin/powered)
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm
index d50777c92f..713385d0e4 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm
@@ -109,7 +109,7 @@
icon_state = "blood1";
dir = 1
},
-/obj/machinery/door/airlock/survival_pod,
+/obj/machinery/door/airlock/survival_pod/glass,
/turf/open/floor/pod/dark,
/area/ruin/powered)
"u" = (
diff --git a/_maps/RandomRuins/SpaceRuins/DJstation.dmm b/_maps/RandomRuins/SpaceRuins/DJstation.dmm
index 6a859fccdc..f60b3bd4a5 100644
--- a/_maps/RandomRuins/SpaceRuins/DJstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/DJstation.dmm
@@ -172,7 +172,7 @@
/turf/open/floor/plasteel/bar,
/area/ruin/space/djstation)
"aG" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Kitchen"
},
/turf/open/floor/plasteel/cafeteria,
@@ -193,7 +193,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/djstation)
"aJ" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Rest Room"
},
/turf/open/floor/plasteel/cafeteria,
diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
index e5de6294f9..ced41e0d81 100644
--- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
+++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
@@ -1030,7 +1030,7 @@
/turf/open/floor/plasteel,
/area/ruin/space/derelict/bridge/access)
"dp" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -2759,7 +2759,7 @@
/turf/open/floor/plasteel/airless/white,
/area/ruin/space/derelict/medical)
"ja" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Med-Sci";
req_access_txt = "9"
},
diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
index 6c20d55fdf..04e9d6ba68 100644
--- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
@@ -950,7 +950,7 @@
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"cy" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/obj/machinery/door/poddoor{
id = "bigderelictcheckpoint";
name = "checkpoint security doors"
diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
index a5b3c5b9c7..9ff1aad4c6 100644
--- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -879,7 +879,7 @@
},
/area/ruin/space/has_grav/deepstorage)
"bQ" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Hydroponics"
},
/turf/open/floor/plasteel/hydrofloor{
@@ -962,7 +962,7 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Kitchen"
},
/turf/open/floor/plasteel/cafeteria{
@@ -1929,7 +1929,7 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Dorms"
},
/turf/open/floor/plasteel/floorgrime{
diff --git a/_maps/RandomRuins/SpaceRuins/derelict6.dmm b/_maps/RandomRuins/SpaceRuins/derelict6.dmm
index 1dfd9b90cd..6b714814af 100644
--- a/_maps/RandomRuins/SpaceRuins/derelict6.dmm
+++ b/_maps/RandomRuins/SpaceRuins/derelict6.dmm
@@ -197,11 +197,11 @@
/turf/open/floor/plating/airless,
/area/ruin/unpowered)
"aF" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel/airless/bar,
/area/ruin/unpowered)
"aG" = (
-/obj/structure/door_assembly/door_assembly_glass{
+/obj/structure/door_assembly/door_assembly_public{
name = "broken airlock"
},
/turf/open/floor/plasteel/airless/bar,
diff --git a/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm b/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm
index b7a5910b1e..5b0387bb39 100644
--- a/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm
+++ b/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm
@@ -81,7 +81,9 @@
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space/has_grav)
"u" = (
-/obj/machinery/door/airlock/survival_pod/vertical,
+/obj/machinery/door/airlock/survival_pod/glass{
+ dir = 4
+ },
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space/has_grav)
diff --git a/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm b/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm
index d46e880401..636eb1f614 100644
--- a/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm
@@ -106,7 +106,7 @@
/turf/open/floor/mineral/titanium/purple,
/area/ruin/space/has_grav/powered/authorship)
"u" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/space/has_grav/powered/authorship)
"v" = (
diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
index d0c8abc18e..e81ef97e5a 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -1468,7 +1468,7 @@
"eo" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Hydroponics"
},
/turf/open/floor/plasteel/floorgrime,
@@ -1502,7 +1502,7 @@
/area/ruin/space/has_grav/ancientstation/hydroponics)
"es" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Hydroponics"
},
/obj/machinery/door/firedoor/closed,
@@ -3143,14 +3143,14 @@
"ii" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Dining Area"
},
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/ancientstation/kitchen)
"ij" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Dining Area"
},
/obj/machinery/door/firedoor/closed,
@@ -3881,7 +3881,7 @@
/area/ruin/space/has_grav/ancientstation)
"jU" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Cryogenics Room"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
index f9e61815c4..7b2e8f6751 100644
--- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm
+++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
@@ -511,7 +511,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -631,7 +631,7 @@
/turf/open/floor/plasteel/airless,
/area/ruin/space/has_grav/onehalf/hallway)
"bC" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/obj/structure/disposalpipe/segment{
dir = 4
},
diff --git a/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm b/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm
index 3cc67daaec..ecadecdd04 100644
--- a/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm
+++ b/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm
@@ -11,7 +11,7 @@
/turf/closed/indestructible/oldshuttle,
/area/ruin/powered)
"d" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/oldshuttle,
/area/ruin/powered)
"e" = (
diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
index f4f1711b41..2eab719806 100644
--- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
@@ -1242,12 +1242,12 @@
name = "Hotel Guest Room 1"
})
"df" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/obj/machinery/door/firedoor,
/turf/open/floor/carpet,
/area/ruin/space/has_grav/hotel)
"dg" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/carpet,
@@ -2228,7 +2228,7 @@
/turf/open/floor/carpet,
/area/ruin/space/has_grav/hotel)
"fW" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -2283,7 +2283,7 @@
/turf/open/floor/carpet,
/area/ruin/space/has_grav/hotel)
"gf" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/obj/machinery/door/firedoor,
/turf/open/floor/carpet,
/area/ruin/space/has_grav/hotel/dock)
@@ -3023,7 +3023,7 @@
/turf/open/floor/carpet,
/area/ruin/space/has_grav/hotel)
"il" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -3475,7 +3475,7 @@
/turf/closed/wall,
/area/ruin/space/has_grav/hotel/pool)
"ju" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -3491,7 +3491,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/hotel/pool)
"jw" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -3893,7 +3893,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/hotel/power)
"kJ" = (
-/obj/machinery/door/airlock/glass_external,
+/obj/machinery/door/airlock/external/glass,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
diff --git a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
index 4146ec1df6..f55f7cf0e6 100644
--- a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
+++ b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
@@ -108,7 +108,7 @@
},
/area/ruin/space/has_grav/turretedoutpost)
"aw" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/turretedoutpost)
"ax" = (
@@ -172,7 +172,7 @@
/turf/open/floor/plasteel/vault,
/area/ruin/space/has_grav/turretedoutpost)
"aI" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/turretedoutpost)
"aJ" = (
diff --git a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm
index 34ddbb265e..71196719a4 100644
--- a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm
+++ b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm
@@ -69,7 +69,7 @@
/turf/open/floor/mineral/titanium,
/area/ruin/space/has_grav/whiteship/box)
"ao" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plating,
/area/ruin/space/has_grav/whiteship/box)
"ap" = (
@@ -181,7 +181,7 @@
/turf/open/floor/mineral/titanium,
/area/ruin/space/has_grav/whiteship/box)
"aH" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/mineral/titanium,
/area/ruin/space/has_grav/whiteship/box)
"aI" = (
diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm
index a724ded444..4e943346f2 100644
--- a/_maps/RandomZLevels/Academy.dmm
+++ b/_maps/RandomZLevels/Academy.dmm
@@ -1273,12 +1273,12 @@
/turf/open/floor/plating,
/area/awaymission/academy)
"eA" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/obj/machinery/door/airlock/external,
/turf/open/floor/plating,
/area/awaymission/academy/classrooms)
"eB" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plating,
/area/awaymission/academy/classrooms)
"eC" = (
diff --git a/_maps/RandomZLevels/centcomAway.dmm b/_maps/RandomZLevels/centcomAway.dmm
index a80fa51a30..0c7fd7f713 100644
--- a/_maps/RandomZLevels/centcomAway.dmm
+++ b/_maps/RandomZLevels/centcomAway.dmm
@@ -1600,7 +1600,7 @@
/turf/open/floor/carpet,
/area/awaymission/centcomAway/courtroom)
"fU" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Med-Sci";
req_access_txt = "9"
},
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index 9277b95a79..f6815d7b1d 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -786,7 +786,7 @@
},
/area/awaymission/moonoutpost19/syndicate)
"bO" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Break Room"
},
/turf/open/floor/plasteel{
@@ -1127,7 +1127,7 @@
},
/area/awaymission/moonoutpost19/syndicate)
"cr" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
density = 0;
emagged = 1;
icon_state = "open";
@@ -5322,7 +5322,7 @@
/area/awaymission/moonoutpost19/arrivals)
"km" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Diner"
},
/turf/open/floor/plasteel{
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index 7e416c0aae..7fb4fa76f1 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -720,7 +720,7 @@
/turf/open/floor/plating/asteroid/snow,
/area/awaymission/snowdin)
"bN" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel/cafeteria{
baseturf = /turf/open/floor/plating/asteroid/snow
},
@@ -1493,7 +1493,7 @@
},
/area/awaymission/snowdin/post)
"dV" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
req_access_txt = "150"
},
/turf/open/floor/plasteel{
@@ -2453,7 +2453,7 @@
},
/area/awaymission/snowdin/post)
"gJ" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/obj/structure/barricade/wooden,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/snow;
@@ -2490,7 +2490,7 @@
/turf/open/floor/plating/snowed/colder,
/area/awaymission/snowdin/dungeon1)
"gP" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel/cafeteria{
baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 180
@@ -2549,7 +2549,7 @@
},
/area/awaymission/snowdin/post)
"gX" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
@@ -4299,7 +4299,7 @@
},
/area/awaymission/snowdin/sekret)
"lE" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel/cafeteria{
baseturf = /turf/open/floor/plating/asteroid/snow
},
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index a3eb4d1afd..ea4d57fd29 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -1307,7 +1307,7 @@
/area/awaymission/undergroundoutpost45/central)
"da" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
/turf/open/floor/plasteel{
@@ -1784,7 +1784,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Hydroponics";
req_access_txt = "201"
},
@@ -1918,7 +1918,7 @@
/area/awaymission/undergroundoutpost45/central)
"eo" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Hydroponics";
req_access_txt = "201"
},
@@ -2796,7 +2796,7 @@
"ge" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
/turf/open/floor/plasteel{
@@ -3545,7 +3545,7 @@
/area/awaymission/undergroundoutpost45/crew_quarters)
"hP" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Kitchen";
req_access_txt = "201"
},
@@ -4349,7 +4349,7 @@
"jt" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
/turf/open/floor/plasteel{
@@ -4358,7 +4358,7 @@
/area/awaymission/undergroundoutpost45/crew_quarters)
"ju" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
/turf/open/floor/plasteel{
@@ -4843,7 +4843,7 @@
/area/awaymission/undergroundoutpost45/crew_quarters)
"kp" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Diner"
},
/turf/open/floor/plasteel{
@@ -5796,7 +5796,7 @@
"lV" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Diner"
},
/turf/open/floor/plasteel{
@@ -5810,7 +5810,7 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Diner"
},
/turf/open/floor/plasteel{
@@ -6348,7 +6348,7 @@
"mV" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Dormitories"
},
/obj/effect/decal/cleanable/dirt,
@@ -6359,7 +6359,7 @@
"mW" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Dormitories"
},
/turf/open/floor/plasteel{
@@ -6721,7 +6721,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Dormitories"
},
/turf/open/floor/plasteel{
@@ -7209,7 +7209,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Dormitories"
},
/turf/open/floor/plasteel{
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 9b5e5bf265..295507f2b8 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -777,7 +777,7 @@
id = "permacell3";
name = "cell blast door"
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
id_tag = "permabolt3";
name = "Cell 3"
},
@@ -788,7 +788,7 @@
id = "permacell2";
name = "cell blast door"
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
id_tag = "permabolt2";
name = "Cell 2"
},
@@ -803,7 +803,7 @@
id = "permacell1";
name = "cell blast door"
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
id_tag = "permabolt1";
name = "Cell 1"
},
@@ -5351,7 +5351,7 @@
/turf/open/floor/plating,
/area/security/courtroom)
"amt" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Courtroom";
req_access_txt = "42"
},
@@ -5975,7 +5975,7 @@
id = "seclobby";
name = "security shutters"
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Courtroom"
},
/turf/open/floor/plasteel/dark,
@@ -8208,7 +8208,7 @@
/area/security/vacantoffice/b)
"atZ" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Holodeck Door"
},
/turf/open/floor/plasteel,
@@ -8409,7 +8409,7 @@
/area/crew_quarters/dorms)
"auy" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Holodeck Door"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -9245,7 +9245,7 @@
/area/crew_quarters/fitness)
"awz" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Fitness"
},
/turf/open/floor/plasteel,
@@ -9803,7 +9803,7 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Fitness"
},
/turf/open/floor/plasteel,
@@ -9862,7 +9862,7 @@
/area/crew_quarters/fitness)
"axZ" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Holodeck Door"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -13752,7 +13752,7 @@
/area/ai_monitored/nuke_storage)
"aHH" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Dormitory"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -13807,14 +13807,14 @@
/area/ai_monitored/storage/eva)
"aHP" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aHQ" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
/turf/open/floor/plasteel/blue/corner{
@@ -13823,7 +13823,7 @@
/area/hallway/primary/central)
"aHR" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
/turf/open/floor/plasteel/blue/side{
@@ -13844,7 +13844,7 @@
/area/maintenance/starboard/fore)
"aHT" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Dormitory"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -14729,7 +14729,7 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Primary Tool Storage"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -14737,7 +14737,7 @@
/area/storage/primary)
"aKa" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Primary Tool Storage"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -14835,7 +14835,7 @@
/area/hallway/secondary/entry)
"aKm" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Garden"
},
/turf/open/floor/plasteel,
@@ -15829,7 +15829,7 @@
/area/hallway/secondary/entry)
"aNc" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -16067,7 +16067,7 @@
/area/crew_quarters/kitchen)
"aNN" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Hydroponics";
req_access_txt = "35"
},
@@ -16137,7 +16137,7 @@
/turf/open/floor/wood,
/area/library)
"aNW" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Chapel Office";
req_access_txt = "22"
},
@@ -16399,7 +16399,7 @@
/area/hallway/primary/port)
"aOB" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -16781,7 +16781,7 @@
/turf/closed/wall,
/area/storage/art)
"aPH" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Art Storage"
},
/turf/open/floor/plasteel,
@@ -17281,7 +17281,7 @@
/area/storage/tools)
"aRf" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Auxiliary Tool Storage";
req_access_txt = "12"
},
@@ -17831,7 +17831,7 @@
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
"aSI" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Kitchen";
req_access_txt = "28"
},
@@ -19059,7 +19059,7 @@
dir = 4
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Library"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -19100,7 +19100,7 @@
/area/library)
"aWe" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Chapel"
},
/turf/open/floor/carpet,
@@ -19731,7 +19731,7 @@
/area/crew_quarters/locker)
"aXy" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Chapel"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -19878,7 +19878,7 @@
/area/hydroponics)
"aXT" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Library"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -20371,7 +20371,7 @@
/area/library)
"aZe" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Chapel"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -21222,7 +21222,7 @@
/area/crew_quarters/heads/captain)
"bbx" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Diner"
},
/turf/open/floor/plasteel,
@@ -21248,7 +21248,7 @@
/area/hallway/primary/starboard)
"bbB" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Hydroponics";
req_access_txt = "35"
},
@@ -31309,7 +31309,7 @@
/area/quartermaster/miningdock)
"bzG" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -32524,7 +32524,7 @@
"bCu" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -47257,7 +47257,7 @@
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
"cmf" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
autoclose = 0;
frequency = 1449;
heat_proof = 1;
@@ -47732,7 +47732,7 @@
/turf/closed/wall,
/area/construction)
"cnC" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
autoclose = 0;
frequency = 1449;
heat_proof = 1;
@@ -51288,7 +51288,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"cwX" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Cockpit";
req_access_txt = "19"
},
@@ -51347,7 +51347,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"cxf" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Brig";
req_access_txt = "2"
},
@@ -51591,7 +51591,7 @@
/turf/open/floor/plating,
/area/maintenance/solars/starboard/fore)
"cxO" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Infirmary"
},
/turf/open/floor/mineral/titanium/blue,
@@ -51910,7 +51910,7 @@
/turf/open/floor/plating,
/area/shuttle/abandoned)
"cyz" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plating,
/area/shuttle/abandoned)
"cyA" = (
@@ -52137,7 +52137,7 @@
/turf/open/floor/plating,
/area/shuttle/supply)
"cza" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"czb" = (
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index a05ca17d4b..4a3f322e34 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -1059,10 +1059,8 @@
desc = "A thin layer of dust coating the floor.";
name = "dust"
},
-/obj/machinery/door/airlock{
- glass = 1;
- name = "Dormitory";
- opacity = 0
+/obj/machinery/door/airlock/glass{
+ name = "Dormitory"
},
/turf/open/floor/plasteel/neutral,
/area/shuttle/abandoned)
@@ -1419,10 +1417,8 @@
desc = "A thin layer of dust coating the floor.";
name = "dust"
},
-/obj/machinery/door/airlock{
- glass = 1;
- name = "Crew Quarters";
- opacity = 0
+/obj/machinery/door/airlock/glass{
+ name = "Crew Quarters"
},
/turf/open/floor/plasteel/neutral/side{
dir = 1
@@ -10242,7 +10238,7 @@
/area/crew_quarters/toilet/auxiliary)
"avM" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Fore Primary Hallway"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -10257,7 +10253,7 @@
/area/hallway/primary/fore)
"avN" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Fore Primary Hallway"
},
/obj/effect/turf_decal/stripes/line{
@@ -10271,7 +10267,7 @@
"avO" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Fore Primary Hallway"
},
/obj/effect/turf_decal/stripes/line{
@@ -17467,7 +17463,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Garden"
},
/turf/open/floor/plasteel,
@@ -18800,7 +18796,7 @@
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"aNS" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
autoclose = 0;
frequency = 1449;
heat_proof = 1;
@@ -18827,7 +18823,7 @@
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
"aNU" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
autoclose = 0;
frequency = 1449;
heat_proof = 1;
@@ -20012,7 +20008,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Atrium"
},
/obj/effect/turf_decal/stripes/line{
@@ -20833,7 +20829,7 @@
/area/crew_quarters/bar/atrium)
"aSc" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Atrium"
},
/obj/effect/turf_decal/stripes/line{
@@ -21110,7 +21106,7 @@
id = "permacell3";
name = "Cell Shutters"
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
id_tag = "permabolt3";
name = "Cell 3"
},
@@ -21128,7 +21124,7 @@
id = "permacell2";
name = "Cell Shutters"
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
id_tag = "permabolt2";
name = "Cell 2"
},
@@ -21148,7 +21144,7 @@
id = "permacell1";
name = "Cell Shutters"
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
id_tag = "permabolt1";
name = "Cell 1"
},
@@ -21742,7 +21738,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Atrium"
},
/obj/effect/turf_decal/stripes/line{
@@ -31215,7 +31211,7 @@
/area/hallway/secondary/service)
"bno" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Service Foyer"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -31260,7 +31256,7 @@
"bns" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Fore Primary Hallway"
},
/obj/effect/turf_decal/stripes/line{
@@ -31273,7 +31269,7 @@
/area/hallway/primary/fore)
"bnt" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Fore Primary Hallway"
},
/obj/structure/cable/white{
@@ -48542,7 +48538,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Port Primary Hallway"
},
/obj/effect/turf_decal/stripes/line{
@@ -48704,7 +48700,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Starboard Primary Hallway"
},
/obj/structure/disposalpipe/segment{
@@ -49689,7 +49685,7 @@
/area/hallway/primary/port)
"bWK" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Port Primary Hallway"
},
/obj/effect/turf_decal/stripes/line{
@@ -49960,7 +49956,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Starboard Primary Hallway"
},
/obj/effect/turf_decal/stripes/line{
@@ -50915,7 +50911,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Port Primary Hallway"
},
/obj/effect/turf_decal/stripes/line{
@@ -51103,7 +51099,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Starboard Primary Hallway"
},
/obj/structure/disposalpipe/segment{
@@ -51807,7 +51803,7 @@
/turf/open/floor/plating,
/area/library)
"caI" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Library Access"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -51816,7 +51812,7 @@
},
/area/library)
"caJ" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Library Access"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -56145,7 +56141,7 @@
/turf/open/floor/plasteel/grimy,
/area/library)
"cjv" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Library Access"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -56375,7 +56371,7 @@
/area/security/courtroom)
"cjX" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Courtroom";
req_access_txt = "42"
},
@@ -56808,7 +56804,7 @@
/turf/open/floor/plasteel/grimy,
/area/library)
"ckU" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Library Access"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -60289,7 +60285,7 @@
/area/hallway/primary/central)
"cso" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Command Hallway"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -61054,7 +61050,7 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Command Hallway"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -61761,14 +61757,14 @@
},
/area/maintenance/port)
"cvi" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Library Game Room"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/grimy,
/area/library)
"cvj" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Library Game Room"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -61971,7 +61967,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Starboard Auxiliary Hallway"
},
/obj/structure/disposalpipe/segment{
@@ -62629,7 +62625,7 @@
/area/hallway/primary/central)
"cwZ" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Starboard Auxiliary Hallway"
},
/obj/effect/turf_decal/stripes/line{
@@ -63397,7 +63393,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Starboard Auxiliary Hallway"
},
/obj/structure/disposalpipe/segment{
@@ -68752,7 +68748,7 @@
},
/area/crew_quarters/fitness/recreation)
"cJA" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Holodeck Access"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -68778,7 +68774,7 @@
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"cJC" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Holodeck Access"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -68793,7 +68789,7 @@
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"cJD" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Holodeck Access"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -70759,7 +70755,7 @@
"cNv" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Aft Primary Hallway"
},
/obj/structure/disposalpipe/segment,
@@ -70773,7 +70769,7 @@
/area/hallway/primary/central)
"cNw" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Aft Primary Hallway"
},
/obj/effect/turf_decal/stripes/line{
@@ -70787,7 +70783,7 @@
"cNx" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Aft Primary Hallway"
},
/obj/structure/disposalpipe/segment,
@@ -70994,7 +70990,7 @@
/turf/open/floor/plasteel/neutral/corner,
/area/crew_quarters/fitness/recreation)
"cOb" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Holodeck Access"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -71019,7 +71015,7 @@
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"cOd" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Holodeck Access"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -71034,7 +71030,7 @@
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"cOe" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Holodeck Access"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -95629,7 +95625,7 @@
/area/hallway/primary/aft)
"dNP" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Departures Lounge"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -95644,7 +95640,7 @@
/area/hallway/primary/aft)
"dNQ" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Departures Lounge"
},
/obj/effect/turf_decal/stripes/line{
@@ -95657,7 +95653,7 @@
/area/hallway/primary/aft)
"dNR" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Departures Lounge"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -97995,7 +97991,7 @@
/area/hallway/secondary/exit/departure_lounge)
"dSQ" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Departures Lounge"
},
/obj/structure/disposalpipe/segment,
@@ -98009,7 +98005,7 @@
/area/hallway/secondary/exit/departure_lounge)
"dSR" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Departures Lounge"
},
/obj/effect/turf_decal/stripes/line{
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index d2d6386ef9..8fddd39b5a 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -346,7 +346,7 @@
/turf/open/floor/plating,
/area/security/prison)
"abb" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
id_tag = "permahydro";
name = "Hydroponics Module"
},
@@ -1318,7 +1318,7 @@
id = "permacell3";
name = "Cell Shutters"
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
id_tag = "permabolt3";
name = "Cell 3"
},
@@ -1333,7 +1333,7 @@
id = "permacell2";
name = "Cell Shutters"
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
id_tag = "permabolt2";
name = "Cell 2"
},
@@ -1348,7 +1348,7 @@
id = "permacell1";
name = "Cell Shutters"
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
id_tag = "permabolt1";
name = "Cell 1"
},
@@ -3793,7 +3793,7 @@
dir = 9
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Holodeck Door"
},
/turf/open/floor/plasteel,
@@ -3803,7 +3803,7 @@
dir = 5
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Holodeck Door"
},
/turf/open/floor/plasteel,
@@ -5295,7 +5295,7 @@
dir = 10
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Holodeck Door"
},
/turf/open/floor/plasteel,
@@ -5305,7 +5305,7 @@
dir = 6
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Holodeck Door"
},
/turf/open/floor/plasteel,
@@ -8437,7 +8437,7 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"arY" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "space-bridge access"
},
/obj/machinery/button/door{
@@ -8479,7 +8479,7 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"asc" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "space-bridge access"
},
/obj/machinery/button/door{
@@ -15374,7 +15374,7 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Vault Storage"
},
/turf/open/floor/plasteel/vault{
@@ -17316,7 +17316,7 @@
/area/storage/primary)
"aJP" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Primary Tool Storage"
},
/turf/open/floor/plasteel/brown{
@@ -17325,7 +17325,7 @@
/area/storage/primary)
"aJQ" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Primary Tool Storage"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -19849,7 +19849,7 @@
/area/security/courtroom)
"aPC" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Courtroom";
req_access_txt = "42"
},
@@ -22238,7 +22238,7 @@
"aUC" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Fore Primary Hallway"
},
/turf/open/floor/plasteel/red/corner{
@@ -22250,7 +22250,7 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Fore Primary Hallway"
},
/turf/open/floor/plasteel,
@@ -22258,7 +22258,7 @@
"aUE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Fore Primary Hallway"
},
/turf/open/floor/plasteel/red/corner{
@@ -22813,7 +22813,7 @@
/area/storage/primary)
"aVS" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Primary Tool Storage"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -22826,7 +22826,7 @@
/area/storage/primary)
"aVT" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Primary Tool Storage"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -22987,7 +22987,7 @@
"aWm" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Crew Quarters Access"
},
/obj/structure/cable/yellow{
@@ -22997,7 +22997,7 @@
/area/crew_quarters/locker)
"aWn" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Crew Quarters Access"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -24712,7 +24712,7 @@
/area/security/checkpoint/engineering)
"aZO" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Library"
},
/turf/open/floor/wood,
@@ -27689,7 +27689,7 @@
/area/storage/tools)
"bfI" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Auxiliary Tool Storage";
req_access_txt = "12"
},
@@ -28622,7 +28622,7 @@
dir = 4
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Starboard Primary Hallway"
},
/turf/open/floor/plasteel/yellow/corner{
@@ -29449,7 +29449,7 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Starboard Primary Hallway"
},
/obj/structure/disposalpipe/segment{
@@ -30334,7 +30334,7 @@
dir = 4
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Starboard Primary Hallway"
},
/turf/open/floor/plasteel/caution/corner{
@@ -31240,7 +31240,7 @@
/area/storage/art)
"bmN" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Art Storage"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -31965,7 +31965,7 @@
dir = 4
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Port Primary Hallway"
},
/turf/open/floor/plasteel/neutral/corner{
@@ -33072,7 +33072,7 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Port Primary Hallway"
},
/turf/open/floor/plasteel,
@@ -34307,7 +34307,7 @@
dir = 4
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Port Primary Hallway"
},
/turf/open/floor/plasteel/neutral/corner{
@@ -34992,7 +34992,7 @@
"bug" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Library"
},
/turf/open/floor/wood,
@@ -35000,7 +35000,7 @@
"buh" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Library"
},
/turf/open/floor/wood,
@@ -39144,7 +39144,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Command Hallway"
},
/turf/open/floor/plasteel/neutral/corner{
@@ -39418,7 +39418,7 @@
dir = 4
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Command Hallway"
},
/obj/structure/disposalpipe/segment{
@@ -39465,7 +39465,7 @@
/area/hallway/primary/central)
"bDC" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Bar"
},
/turf/open/floor/plasteel,
@@ -39865,7 +39865,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Command Hallway"
},
/turf/open/floor/plasteel/neutral/corner{
@@ -40245,7 +40245,7 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Command Hallway"
},
/turf/open/floor/plasteel/neutral/corner{
@@ -40298,7 +40298,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Bar"
},
/turf/open/floor/plasteel,
@@ -45419,7 +45419,7 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Gateway Chamber"
},
/obj/structure/cable/yellow{
@@ -49143,7 +49143,7 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Hydroponics Storage"
},
/turf/open/floor/plasteel/hydrofloor,
@@ -49679,7 +49679,7 @@
"bZf" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Aft Primary Hallway"
},
/turf/open/floor/plasteel/blue/corner{
@@ -49691,7 +49691,7 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Aft Primary Hallway"
},
/turf/open/floor/plasteel,
@@ -49699,7 +49699,7 @@
"bZh" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Aft Primary Hallway"
},
/turf/open/floor/plasteel/purple/corner{
@@ -54525,7 +54525,7 @@
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
"cja" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
autoclose = 0;
frequency = 1449;
heat_proof = 1;
@@ -55929,7 +55929,7 @@
/turf/open/space,
/area/space/nearstation)
"cmd" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
autoclose = 0;
frequency = 1449;
heat_proof = 1;
@@ -67879,7 +67879,7 @@
"cJE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Departure Lounge"
},
/turf/open/floor/plasteel/neutral/corner{
@@ -67891,7 +67891,7 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Departure Lounge"
},
/turf/open/floor/plasteel,
@@ -67899,7 +67899,7 @@
"cJG" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Departure Lounge"
},
/turf/open/floor/plasteel/neutral/corner{
@@ -69930,7 +69930,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Chapel"
},
/turf/open/floor/plasteel/dark,
@@ -70211,7 +70211,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Chapel"
},
/turf/open/floor/plasteel/dark,
@@ -70634,7 +70634,7 @@
/area/chapel/office)
"cPl" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Chapel Office";
req_access_txt = "22"
},
@@ -71041,7 +71041,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Funeral Parlour"
},
/turf/open/floor/plasteel/dark,
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 0d0ee8e152..bbf998aaba 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -1762,10 +1762,8 @@
/area/mine/living_quarters)
"eR" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/airlock{
- glass = 1;
- name = "Break Room";
- opacity = 0
+/obj/machinery/door/airlock/glass{
+ name = "Break Room"
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index 30d3b8b4cc..4bc1594c20 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -7686,7 +7686,7 @@
"anR" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Atrium"
},
/obj/structure/cable/white{
@@ -7702,7 +7702,7 @@
/area/hallway/primary/central)
"anS" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Atrium"
},
/obj/effect/turf_decal/stripes/line{
@@ -7716,7 +7716,7 @@
"anT" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Atrium"
},
/obj/effect/turf_decal/stripes/line{
@@ -9511,7 +9511,7 @@
"arc" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Atrium"
},
/obj/structure/cable/white{
@@ -9527,7 +9527,7 @@
/area/crew_quarters/bar/atrium)
"ard" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Atrium"
},
/obj/effect/turf_decal/stripes/line{
@@ -9541,7 +9541,7 @@
"are" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Atrium"
},
/obj/effect/turf_decal/stripes/line{
@@ -14521,7 +14521,7 @@
/area/hallway/primary/central)
"aAD" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Lockerroom"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -15119,7 +15119,7 @@
/area/hallway/primary/central)
"aBM" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Lockerroom"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -16621,7 +16621,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Engineering Foyer"
},
/obj/effect/turf_decal/stripes/line{
@@ -16936,7 +16936,7 @@
/area/hallway/primary/central)
"aFj" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Departure Lounge"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -17198,7 +17198,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Engineering Foyer"
},
/obj/structure/cable/white{
@@ -17355,7 +17355,7 @@
/area/hallway/primary/central)
"aFZ" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Departure Lounge"
},
/obj/effect/turf_decal/stripes/line{
@@ -21294,7 +21294,7 @@
/area/hydroponics)
"aNy" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Atrium"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -21311,7 +21311,7 @@
/area/crew_quarters/bar/atrium)
"aNz" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Atrium"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -23156,7 +23156,7 @@
/area/library)
"aQY" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Library Access"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -23170,7 +23170,7 @@
/area/library)
"aQZ" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Library Access"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -31040,7 +31040,7 @@
/area/hallway/secondary/entry)
"bgR" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Arrivals Port"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -31054,7 +31054,7 @@
/area/hallway/secondary/entry)
"bgS" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Arrivals Port"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -31083,7 +31083,7 @@
/area/hallway/secondary/entry)
"bgW" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Arrivals Port"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -33473,7 +33473,7 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"blL" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Departure Lounge"
},
/obj/effect/turf_decal/stripes/line{
@@ -33524,7 +33524,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"blY" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Departure Lounge"
},
/obj/effect/turf_decal/stripes/line{
@@ -33629,7 +33629,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bsB" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Departure Lounge"
},
/obj/effect/turf_decal/stripes/line{
@@ -33702,7 +33702,7 @@
/area/hallway/secondary/exit)
"bsN" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Departure Lounge"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 67a8b2ec47..e6187cf236 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -1801,7 +1801,7 @@
id = "permacell2";
name = "cell blast door"
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
id_tag = "permabolt2";
name = "Cell 2"
},
@@ -1820,7 +1820,7 @@
id = "permacell1";
name = "cell blast door"
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
id_tag = "permabolt1";
name = "Cell 1"
},
@@ -3459,7 +3459,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "space-bridge access"
},
/obj/effect/turf_decal/stripes/line{
@@ -3499,7 +3499,7 @@
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
"akp" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "space-bridge access"
},
/obj/structure/cable{
@@ -9138,7 +9138,7 @@
/area/crew_quarters/fitness/recreation)
"axy" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Holodeck Door"
},
/turf/open/floor/plasteel,
@@ -9481,7 +9481,7 @@
/area/crew_quarters/dorms)
"ayt" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Recreation Room"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -9981,7 +9981,7 @@
/area/crew_quarters/dorms)
"azB" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Recreation Room"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -12753,7 +12753,7 @@
/area/security/detectives_office)
"aGb" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -12761,14 +12761,14 @@
/area/hallway/primary/fore)
"aGc" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aGd" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -13092,7 +13092,7 @@
/area/storage/primary)
"aGY" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Primary Tool Storage"
},
/obj/structure/cable{
@@ -13103,7 +13103,7 @@
/area/storage/primary)
"aGZ" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Primary Tool Storage"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -13645,7 +13645,7 @@
/area/hallway/primary/central)
"aIg" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Dormitory"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -14052,7 +14052,7 @@
/area/hallway/primary/central)
"aJf" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Dormitory"
},
/obj/structure/cable{
@@ -14526,7 +14526,7 @@
/area/hallway/primary/central)
"aKb" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Dormitory"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -14644,7 +14644,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aKv" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Cockpit";
req_access_txt = "19"
},
@@ -14738,7 +14738,7 @@
/turf/open/floor/plating,
/area/storage/art)
"aKL" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Art Storage"
},
/obj/structure/cable{
@@ -14757,7 +14757,7 @@
/area/crew_quarters/cafeteria/lunchroom)
"aKO" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Lunchroom"
},
/obj/structure/cable{
@@ -14903,7 +14903,7 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"aLp" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Cargo Hold";
req_access_txt = "0"
},
@@ -14916,7 +14916,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aLr" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Brig";
req_access_txt = "2"
},
@@ -16671,7 +16671,7 @@
/area/hallway/secondary/exit/departure_lounge)
"aPv" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Departure Lounge"
},
/turf/open/floor/plasteel,
@@ -17060,7 +17060,7 @@
/area/hallway/secondary/exit/departure_lounge)
"aQz" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Departure Lounge"
},
/obj/structure/disposalpipe/segment{
@@ -17889,7 +17889,7 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"aSp" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Infirmary"
},
/turf/open/floor/mineral/titanium/blue,
@@ -18921,7 +18921,7 @@
/area/hallway/secondary/exit/departure_lounge)
"aUJ" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Departure Lounge"
},
/obj/structure/cable{
@@ -19484,7 +19484,7 @@
/area/hallway/secondary/exit/departure_lounge)
"aVQ" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Departure Lounge"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -19526,7 +19526,7 @@
/area/janitor)
"aVV" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Hydroponics";
req_access_txt = "35"
},
@@ -22165,7 +22165,7 @@
/area/crew_quarters/bar)
"bcw" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Bar"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -22447,7 +22447,7 @@
/area/hallway/secondary/entry)
"bdf" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
/turf/open/floor/plasteel,
@@ -22547,7 +22547,7 @@
/area/crew_quarters/bar)
"bdy" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Bar"
},
/obj/machinery/door/poddoor/shutters/preopen{
@@ -22849,7 +22849,7 @@
/area/hydroponics)
"bek" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
cyclelinkeddir = 4;
name = "Hydroponics";
req_access_txt = "35"
@@ -22896,7 +22896,7 @@
/area/hallway/primary/central)
"beo" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
cyclelinkeddir = 8;
name = "Kitchen";
req_access_txt = "28"
@@ -23213,7 +23213,7 @@
/area/hallway/secondary/entry)
"bfe" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
/obj/structure/cable{
@@ -23614,7 +23614,7 @@
/area/crew_quarters/lounge)
"bgb" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Lounge"
},
/obj/structure/cable{
@@ -23768,7 +23768,7 @@
/area/hallway/primary/central)
"bgt" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Bar"
},
/turf/open/floor/plasteel,
@@ -23776,7 +23776,7 @@
"bgu" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Bar"
},
/turf/open/floor/plasteel,
@@ -24901,14 +24901,14 @@
"biV" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Medbay"
},
/turf/open/floor/plasteel/white/side,
/area/medical/medbay/zone3)
"biW" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Medbay"
},
/turf/open/floor/plasteel/white/side,
@@ -24916,7 +24916,7 @@
"biX" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Medbay"
},
/turf/open/floor/plasteel/white/side,
@@ -25318,18 +25318,18 @@
"bkj" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bkk" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bkl" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bkm" = (
@@ -27686,7 +27686,7 @@
"bqd" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Research Division"
},
/obj/effect/turf_decal/delivery,
@@ -27697,7 +27697,7 @@
"bqe" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Research Division"
},
/obj/effect/turf_decal/delivery,
@@ -27705,7 +27705,7 @@
/area/science/research/lobby)
"bqf" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Research Division"
},
/obj/effect/turf_decal/delivery,
@@ -28964,7 +28964,7 @@
"bsH" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Medbay"
},
/turf/open/floor/plasteel/whiteblue/corner{
@@ -28975,7 +28975,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Medbay"
},
/turf/open/floor/plasteel/whiteblue/corner,
@@ -30671,7 +30671,7 @@
/area/shuttle/transport)
"bwq" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Monastery Transit"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -30679,7 +30679,7 @@
/area/hallway/secondary/entry)
"bwr" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Monastery Transit"
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
@@ -35692,7 +35692,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Research Division"
},
/obj/effect/turf_decal/delivery,
@@ -36262,7 +36262,7 @@
dir = 4
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Research Division"
},
/obj/structure/cable{
@@ -36395,7 +36395,7 @@
/turf/closed/wall/r_wall,
/area/science/mixing)
"bIL" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
autoclose = 0;
frequency = 1449;
heat_proof = 1;
@@ -36727,7 +36727,7 @@
dir = 4
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Research Division"
},
/obj/effect/turf_decal/delivery,
@@ -37389,7 +37389,7 @@
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
"bLf" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
autoclose = 0;
frequency = 1449;
heat_proof = 1;
@@ -43898,7 +43898,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
autoclose = 0;
frequency = 1449;
heat_proof = 1;
@@ -43921,7 +43921,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
autoclose = 0;
frequency = 1449;
heat_proof = 1;
@@ -46325,7 +46325,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"cin" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Shuttle Airlock"
},
/turf/open/floor/plasteel/dark,
@@ -46711,7 +46711,7 @@
/turf/open/floor/plating/abductor,
/area/shuttle/abandoned)
"cjB" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Shuttle Airlock"
},
/obj/docking_port/mobile{
diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm
index 4692a11ef3..ec1b5d800d 100644
--- a/_maps/map_files/debug/runtimestation.dmm
+++ b/_maps/map_files/debug/runtimestation.dmm
@@ -836,7 +836,7 @@
/turf/open/floor/plasteel,
/area/bridge)
"cx" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"cy" = (
@@ -961,7 +961,7 @@
/turf/closed/wall/r_wall,
/area/construction)
"cQ" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel,
/area/construction)
"cR" = (
@@ -982,7 +982,7 @@
/turf/closed/wall/r_wall,
/area/storage/primary)
"cV" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel,
/area/storage/primary)
"cW" = (
diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm
index a117bdbec8..6ba0875a66 100644
--- a/_maps/shuttles/emergency_bar.dmm
+++ b/_maps/shuttles/emergency_bar.dmm
@@ -131,7 +131,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"az" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Cockpit";
req_access_txt = "19"
},
@@ -201,7 +201,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aJ" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Brig";
req_access_txt = "2"
},
diff --git a/_maps/shuttles/emergency_birdboat.dmm b/_maps/shuttles/emergency_birdboat.dmm
index 460211f03c..3b2617bfe1 100644
--- a/_maps/shuttles/emergency_birdboat.dmm
+++ b/_maps/shuttles/emergency_birdboat.dmm
@@ -141,7 +141,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aA" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel/white,
/area/shuttle/escape)
"aB" = (
diff --git a/_maps/shuttles/emergency_box.dmm b/_maps/shuttles/emergency_box.dmm
index ab0c739939..65cc9803cb 100644
--- a/_maps/shuttles/emergency_box.dmm
+++ b/_maps/shuttles/emergency_box.dmm
@@ -122,7 +122,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ay" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Cockpit";
req_access_txt = "19"
},
@@ -185,7 +185,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aH" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Brig";
req_access_txt = "2"
},
@@ -297,7 +297,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aZ" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Infirmary"
},
/turf/open/floor/mineral/titanium/blue,
diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm
index bbdbd8a763..2090fbe199 100644
--- a/_maps/shuttles/emergency_cere.dmm
+++ b/_maps/shuttles/emergency_cere.dmm
@@ -244,7 +244,7 @@
/turf/open/floor/plasteel/darkred,
/area/shuttle/escape)
"aR" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Cockpit";
req_access_txt = "19"
},
@@ -423,7 +423,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bq" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Brig";
req_access_txt = "2"
},
diff --git a/_maps/shuttles/emergency_clown.dmm b/_maps/shuttles/emergency_clown.dmm
index 96bd21e8b7..b0cd4e7113 100644
--- a/_maps/shuttles/emergency_clown.dmm
+++ b/_maps/shuttles/emergency_clown.dmm
@@ -99,7 +99,7 @@
/turf/open/floor/noslip,
/area/shuttle/escape)
"as" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Premium Lounge";
req_access_txt = "0"
},
@@ -143,7 +143,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aA" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Greentext";
req_access_txt = "0"
},
@@ -275,7 +275,7 @@
/turf/open/floor/bluespace,
/area/shuttle/escape)
"aU" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Infirmary"
},
/turf/open/floor/bluespace,
diff --git a/_maps/shuttles/emergency_goon.dmm b/_maps/shuttles/emergency_goon.dmm
index 7a80420f56..25e4e603eb 100644
--- a/_maps/shuttles/emergency_goon.dmm
+++ b/_maps/shuttles/emergency_goon.dmm
@@ -104,7 +104,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"w" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Infirmary"
},
/turf/open/floor/mineral/titanium,
@@ -157,7 +157,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"E" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Cockpit";
req_access_txt = "19"
},
@@ -193,7 +193,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"K" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Brig";
req_access_txt = "2"
},
diff --git a/_maps/shuttles/emergency_pubby.dmm b/_maps/shuttles/emergency_pubby.dmm
index be05c317c8..9c84d5883b 100644
--- a/_maps/shuttles/emergency_pubby.dmm
+++ b/_maps/shuttles/emergency_pubby.dmm
@@ -149,7 +149,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aB" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Cockpit";
req_access_txt = "19"
},
@@ -169,7 +169,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"aE" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Cargo Hold";
req_access_txt = "0"
},
@@ -182,7 +182,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aG" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Brig";
req_access_txt = "2"
},
@@ -262,7 +262,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aU" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Infirmary"
},
/turf/open/floor/mineral/titanium/blue,
diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm
index a48f766a08..c8178fd9a2 100644
--- a/_maps/shuttles/emergency_raven.dmm
+++ b/_maps/shuttles/emergency_raven.dmm
@@ -893,7 +893,7 @@
},
/area/shuttle/escape)
"cf" = (
-/obj/machinery/door/airlock/glass_titanium{
+/obj/machinery/door/airlock/titanium/glass{
name = "Shuttle Engine Room"
},
/turf/open/floor/plasteel/darkgreen/side{
@@ -901,7 +901,7 @@
},
/area/shuttle/escape)
"cg" = (
-/obj/machinery/door/airlock/glass_titanium{
+/obj/machinery/door/airlock/titanium/glass{
name = "Shuttle Engine Room"
},
/turf/open/floor/plasteel/darkgreen/side{
diff --git a/_maps/shuttles/emergency_russiafightpit.dmm b/_maps/shuttles/emergency_russiafightpit.dmm
index 127c22daab..1adc770925 100644
--- a/_maps/shuttles/emergency_russiafightpit.dmm
+++ b/_maps/shuttles/emergency_russiafightpit.dmm
@@ -117,7 +117,7 @@
/turf/closed/wall/rust,
/area/shuttle/escape)
"at" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Glorious Leaders";
req_access_txt = "19"
},
diff --git a/_maps/shuttles/emergency_scrapheap.dmm b/_maps/shuttles/emergency_scrapheap.dmm
index 53733b1437..c2452c1761 100644
--- a/_maps/shuttles/emergency_scrapheap.dmm
+++ b/_maps/shuttles/emergency_scrapheap.dmm
@@ -95,7 +95,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"ar" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Cockpit";
req_access_txt = "19"
},
@@ -148,7 +148,7 @@
/area/shuttle/escape)
"az" = (
/obj/structure/grille,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Brig";
req_access_txt = "2"
},
diff --git a/_maps/shuttles/emergency_wabbajack.dmm b/_maps/shuttles/emergency_wabbajack.dmm
index 87e90155e8..9c7fe55f74 100644
--- a/_maps/shuttles/emergency_wabbajack.dmm
+++ b/_maps/shuttles/emergency_wabbajack.dmm
@@ -139,7 +139,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aB" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Brig";
req_access_txt = "2"
},
@@ -255,7 +255,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aU" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aV" = (
diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm
index 8f52b0bf49..f1c6c838b1 100644
--- a/_maps/shuttles/whiteship_box.dmm
+++ b/_maps/shuttles/whiteship_box.dmm
@@ -110,7 +110,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"aw" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plating,
/area/shuttle/abandoned)
"ax" = (
@@ -220,7 +220,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"aR" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"aS" = (
@@ -288,7 +288,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"be" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"bf" = (
diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm
index 5961fef79f..78dabd2576 100644
--- a/_maps/shuttles/whiteship_delta.dmm
+++ b/_maps/shuttles/whiteship_delta.dmm
@@ -584,10 +584,8 @@
desc = "A thin layer of dust coating the floor.";
name = "dust"
},
-/obj/machinery/door/airlock{
- glass = 1;
- name = "Dormitory";
- opacity = 0
+/obj/machinery/door/airlock/glass{
+ name = "Dormitory"
},
/turf/open/floor/plasteel/neutral,
/area/shuttle/abandoned)
@@ -722,10 +720,8 @@
desc = "A thin layer of dust coating the floor.";
name = "dust"
},
-/obj/machinery/door/airlock{
- glass = 1;
- name = "Crew Quarters";
- opacity = 0
+/obj/machinery/door/airlock/glass{
+ name = "Crew Quarters"
},
/turf/open/floor/plasteel/neutral/side{
dir = 1
diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm
index f76c0bb251..1ea9db3063 100644
--- a/_maps/shuttles/whiteship_pubby.dmm
+++ b/_maps/shuttles/whiteship_pubby.dmm
@@ -12,7 +12,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"d" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Shuttle Airlock"
},
/turf/open/floor/plasteel/dark,
@@ -81,7 +81,7 @@
/turf/open/floor/plating/abductor,
/area/shuttle/abandoned)
"o" = (
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Shuttle Airlock"
},
/obj/docking_port/mobile{
diff --git a/_maps/templates/medium_shuttle1.dmm b/_maps/templates/medium_shuttle1.dmm
index aea32eb2f4..4b2df43281 100644
--- a/_maps/templates/medium_shuttle1.dmm
+++ b/_maps/templates/medium_shuttle1.dmm
@@ -49,7 +49,7 @@
name = "Shuttle"
})
"h" = (
-/obj/machinery/door/airlock/glass_external,
+/obj/machinery/door/airlock/external/glass,
/turf/open/floor/plating,
/area/ruin/powered{
name = "Shuttle"
@@ -65,7 +65,7 @@
name = "Shuttle"
})
"k" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel/dark,
/area/ruin/powered{
name = "Shuttle"
@@ -89,7 +89,7 @@
name = "Shuttle"
})
"o" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel,
/area/ruin/powered{
name = "Shuttle"
diff --git a/_maps/templates/medium_shuttle2.dmm b/_maps/templates/medium_shuttle2.dmm
index f676819f8a..5039f5174c 100644
--- a/_maps/templates/medium_shuttle2.dmm
+++ b/_maps/templates/medium_shuttle2.dmm
@@ -75,7 +75,7 @@
name = "Shuttle"
})
"l" = (
-/obj/machinery/door/airlock/glass_external,
+/obj/machinery/door/airlock/external/glass,
/turf/open/floor/plating,
/area/ruin/powered{
name = "Shuttle"
@@ -86,7 +86,7 @@
name = "Shuttle"
})
"n" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel/dark,
/area/ruin/powered{
name = "Shuttle"
diff --git a/_maps/templates/medium_shuttle3.dmm b/_maps/templates/medium_shuttle3.dmm
index 61842f022b..edc267f44a 100644
--- a/_maps/templates/medium_shuttle3.dmm
+++ b/_maps/templates/medium_shuttle3.dmm
@@ -62,7 +62,7 @@
name = "Shuttle"
})
"j" = (
-/obj/machinery/door/airlock/glass_external,
+/obj/machinery/door/airlock/external/glass,
/turf/open/floor/plating,
/area/ruin/powered{
name = "Shuttle"
@@ -100,7 +100,7 @@
name = "Shuttle"
})
"p" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel,
/area/ruin/powered{
name = "Shuttle"
diff --git a/_maps/templates/medium_shuttle4.dmm b/_maps/templates/medium_shuttle4.dmm
index d3af27d0c4..bfb7f5d88e 100644
--- a/_maps/templates/medium_shuttle4.dmm
+++ b/_maps/templates/medium_shuttle4.dmm
@@ -11,7 +11,7 @@
/turf/closed/indestructible/oldshuttle,
/area/ruin/powered)
"d" = (
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/oldshuttle,
/area/ruin/powered)
"e" = (
diff --git a/_maps/templates/pirate_ship.dmm b/_maps/templates/pirate_ship.dmm
index a2170c29ee..e9be381c99 100644
--- a/_maps/templates/pirate_ship.dmm
+++ b/_maps/templates/pirate_ship.dmm
@@ -929,7 +929,7 @@
/area/shuttle/pirate)
"cg" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Bar"
},
/turf/open/floor/plasteel,
@@ -1740,7 +1740,7 @@
icon_state = "1-2";
pixel_y = 0
},
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
heat_proof = 1;
id_tag = "pirateturbinebolt";
locked = 1;
diff --git a/_maps/templates/shelter_1.dmm b/_maps/templates/shelter_1.dmm
index 42e8ec7540..fff5f4c2cd 100644
--- a/_maps/templates/shelter_1.dmm
+++ b/_maps/templates/shelter_1.dmm
@@ -61,7 +61,7 @@
/area/survivalpod)
"n" = (
/obj/structure/fans/tiny,
-/obj/machinery/door/airlock/survival_pod,
+/obj/machinery/door/airlock/survival_pod/glass,
/turf/open/floor/pod,
/area/survivalpod)
"o" = (
diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm
index e9489df641..69e7369af7 100644
--- a/_maps/templates/shelter_2.dmm
+++ b/_maps/templates/shelter_2.dmm
@@ -203,7 +203,7 @@
/area/survivalpod)
"D" = (
/obj/structure/fans/tiny,
-/obj/machinery/door/airlock/survival_pod,
+/obj/machinery/door/airlock/survival_pod/glass,
/turf/open/floor/pod,
/area/survivalpod)
"E" = (
diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm
index ae3f9f6fe9..b3a9a05119 100644
--- a/code/__DEFINES/construction.dm
+++ b/code/__DEFINES/construction.dm
@@ -23,6 +23,11 @@
#define WINDOW_IN_FRAME 1
#define WINDOW_SCREWED_TO_FRAME 2
+//airlock assembly construction states
+#define AIRLOCK_ASSEMBLY_NEEDS_WIRES 0
+#define AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS 1
+#define AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER 2
+
//plastic flaps construction states
#define PLASTIC_FLAPS_NORMAL 0
#define PLASTIC_FLAPS_DETACHED 1
diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
index f136abdfcb..38da5bf736 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
@@ -698,31 +698,8 @@ Congratulations! You are now trained for invasive xenobiology research!"}
/obj/structure/door_assembly/door_assembly_abductor
name = "alien airlock assembly"
icon = 'icons/obj/doors/airlocks/abductor/abductor_airlock.dmi'
+ base_name = "alien airlock"
overlays_file = 'icons/obj/doors/airlocks/abductor/overlays.dmi'
- typetext = "abductor"
- icontext = "abductor"
airlock_type = /obj/machinery/door/airlock/abductor
- anchored = TRUE
- state = 1
-
-/obj/structure/door_assembly/door_assembly_abductor/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/weldingtool) && !anchored )
- var/obj/item/weldingtool/WT = W
- if(WT.remove_fuel(0,user))
- user.visible_message("[user] disassembles the airlock assembly.", \
- "You start to disassemble the airlock assembly...")
- playsound(src.loc, 'sound/items/welder2.ogg', 50, 1)
- if(do_after(user, 40*W.toolspeed, target = src))
- if( !WT.isOn() )
- return
- to_chat(user, "You disassemble the airlock assembly.")
- new /obj/item/stack/sheet/mineral/abductor(get_turf(src), 4)
- qdel(src)
- else
- return
- else if(istype(W, /obj/item/airlock_painter))
- return // no repainting
- else if(istype(W, /obj/item/stack/sheet))
- return // no material modding
- else
- ..()
+ material_type = /obj/item/stack/sheet/mineral/abductor
+ noglass = TRUE
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 2f97bc458b..d30554d258 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -64,7 +64,7 @@
var/obj/machinery/door/airlock/closeOther = null
var/closeOtherId = null
var/lockdownbyai = FALSE
- assemblytype = /obj/structure/door_assembly/door_assembly_0
+ assemblytype = /obj/structure/door_assembly
var/justzap = FALSE
normalspeed = 1
var/obj/item/electronics/airlock/electronics = null
@@ -80,7 +80,7 @@
var/boltUp = 'sound/machines/boltsup.ogg'
var/boltDown = 'sound/machines/boltsdown.ogg'
var/noPower = 'sound/machines/doorclick.ogg'
-
+ var/previous_airlock //what airlock assembly mineral plating was applied to
var/airlock_material = null //material of inner filling; if its an airlock with glass, this should be set to "glass"
var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock
@@ -1026,14 +1026,6 @@
if(density && !open(2))
to_chat(user, "Despite your attempts, [src] refuses to open.")
-/obj/machinery/door/airlock/plasma/attackby(obj/item/C, mob/user, params)
- if(C.is_hot() > 300)//If the temperature of the object is over 300, then ignite
- message_admins("Plasma airlock ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(src)]")
- log_game("Plasma wall ignited by [key_name(user)] in [COORD(src)]")
- ignite(C.is_hot())
- else
- return ..()
-
/obj/machinery/door/airlock/open(forced=0)
if( operating || welded || locked )
return FALSE
@@ -1154,22 +1146,22 @@
var/list/optionlist
if(airlock_material == "glass")
- optionlist = list("Public", "Public2", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Mining", "Maintenance")
+ optionlist = list("Standard", "Public", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Science", "Virology", "Mining", "Maintenance", "External", "External Maintenance")
else
- optionlist = list("Public", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Mining", "Maintenance", "External", "High Security")
+ optionlist = list("Standard", "Public", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Freezer", "Science", "Virology", "Mining", "Maintenance", "External", "External Maintenance")
var/paintjob = input(user, "Please select a paintjob for this airlock.") in optionlist
if((!in_range(src, usr) && src.loc != usr) || !W.use(user))
return
switch(paintjob)
- if("Public")
+ if("Standard")
icon = 'icons/obj/doors/airlocks/station/public.dmi'
overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
- assemblytype = /obj/structure/door_assembly/door_assembly_0
- if("Public2")
+ assemblytype = /obj/structure/door_assembly
+ if("Public")
icon = 'icons/obj/doors/airlocks/station2/glass.dmi'
overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi'
- assemblytype = /obj/structure/door_assembly/door_assembly_glass
+ assemblytype = /obj/structure/door_assembly/door_assembly_public
if("Engineering")
icon = 'icons/obj/doors/airlocks/station/engineering.dmi'
overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
@@ -1194,6 +1186,18 @@
icon = 'icons/obj/doors/airlocks/station/research.dmi'
overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_research
+ if("Freezer")
+ icon = 'icons/obj/doors/airlocks/station/freezer.dmi'
+ overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
+ assemblytype = /obj/structure/door_assembly/door_assembly_fre
+ if("Science")
+ icon = 'icons/obj/doors/airlocks/station/science.dmi'
+ overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
+ assemblytype = /obj/structure/door_assembly/door_assembly_science
+ if("Virology")
+ icon = 'icons/obj/doors/airlocks/station/virology.dmi'
+ overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
+ assemblytype = /obj/structure/door_assembly/door_assembly_viro
if("Mining")
icon = 'icons/obj/doors/airlocks/station/mining.dmi'
overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
@@ -1206,10 +1210,10 @@
icon = 'icons/obj/doors/airlocks/external/external.dmi'
overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_ext
- if("High Security")
- icon = 'icons/obj/doors/airlocks/highsec/highsec.dmi'
- overlays_file = 'icons/obj/doors/airlocks/highsec/overlays.dmi'
- assemblytype = /obj/structure/door_assembly/door_assembly_highsecurity
+ if("External Maintenance")
+ icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi'
+ overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
+ assemblytype = /obj/structure/door_assembly/door_assembly_extmai
update_icon()
/obj/machinery/door/airlock/CanAStarPass(obj/item/card/id/ID)
@@ -1302,11 +1306,17 @@
var/obj/structure/door_assembly/A
if(assemblytype)
A = new assemblytype(src.loc)
- A.heat_proof_finished = src.heat_proof //tracks whether there's rglass in
else
- A = new /obj/structure/door_assembly/door_assembly_0(src.loc)
+ A = new /obj/structure/door_assembly(loc)
//If you come across a null assemblytype, it will produce the default assembly instead of disintegrating.
+ A.heat_proof_finished = src.heat_proof //tracks whether there's rglass in
+ A.anchored = TRUE
+ A.glass = src.glass
+ A.state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
A.created_name = name
+ A.previous_assembly = previous_airlock
+ A.update_name()
+ A.update_icon()
if(!disassembled)
if(A)
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index 8b41cf3748..f303b892b3 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -1,6 +1,7 @@
/*
Station Airlocks Regular
*/
+
/obj/machinery/door/airlock/abandoned
abandoned = TRUE
@@ -17,7 +18,7 @@
/obj/machinery/door/airlock/engineering
icon = 'icons/obj/doors/airlocks/station/engineering.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_eng
-
+
/obj/machinery/door/airlock/engineering/abandoned
abandoned = TRUE
@@ -37,8 +38,7 @@
/obj/machinery/door/airlock/maintenance/external
name = "external airlock access"
icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi'
- assemblytype = /obj/structure/door_assembly/door_assembly_mai
- normal_integrity = 250
+ assemblytype = /obj/structure/door_assembly/door_assembly_extmai
/obj/machinery/door/airlock/mining
name = "mining airlock"
@@ -75,23 +75,27 @@
Station Airlocks Glass
*/
+/obj/machinery/door/airlock/glass
+ opacity = 0
+ glass = TRUE
+
/obj/machinery/door/airlock/glass_command
icon = 'icons/obj/doors/airlocks/station/command.dmi'
opacity = 0
- assemblytype = /obj/structure/door_assembly/door_assembly_com/glass
+ assemblytype = /obj/structure/door_assembly/door_assembly_com
glass = TRUE
normal_integrity = 400
/obj/machinery/door/airlock/glass_engineering
icon = 'icons/obj/doors/airlocks/station/engineering.dmi'
opacity = 0
- assemblytype = /obj/structure/door_assembly/door_assembly_eng/glass
+ assemblytype = /obj/structure/door_assembly/door_assembly_eng
glass = TRUE
/obj/machinery/door/airlock/glass_security
icon = 'icons/obj/doors/airlocks/station/security.dmi'
opacity = 0
- assemblytype = /obj/structure/door_assembly/door_assembly_sec/glass
+ assemblytype = /obj/structure/door_assembly/door_assembly_sec
glass = TRUE
normal_integrity = 400
@@ -101,45 +105,50 @@
/obj/machinery/door/airlock/glass_medical
icon = 'icons/obj/doors/airlocks/station/medical.dmi'
opacity = 0
- assemblytype = /obj/structure/door_assembly/door_assembly_med/glass
+ assemblytype = /obj/structure/door_assembly/door_assembly_med
glass = TRUE
/obj/machinery/door/airlock/glass_research
icon = 'icons/obj/doors/airlocks/station/research.dmi'
opacity = 0
- assemblytype = /obj/structure/door_assembly/door_assembly_research/glass
+ assemblytype = /obj/structure/door_assembly/door_assembly_research
glass = TRUE
/obj/machinery/door/airlock/glass_mining
icon = 'icons/obj/doors/airlocks/station/mining.dmi'
opacity = 0
- assemblytype = /obj/structure/door_assembly/door_assembly_min/glass
+ assemblytype = /obj/structure/door_assembly/door_assembly_min
glass = TRUE
/obj/machinery/door/airlock/glass_atmos
icon = 'icons/obj/doors/airlocks/station/atmos.dmi'
opacity = 0
- assemblytype = /obj/structure/door_assembly/door_assembly_atmo/glass
+ assemblytype = /obj/structure/door_assembly/door_assembly_atmo
glass = TRUE
/obj/machinery/door/airlock/glass_science
icon = 'icons/obj/doors/airlocks/station/science.dmi'
opacity = 0
- assemblytype = /obj/structure/door_assembly/door_assembly_science/glass
+ assemblytype = /obj/structure/door_assembly/door_assembly_science
glass = TRUE
/obj/machinery/door/airlock/glass_virology
icon = 'icons/obj/doors/airlocks/station/virology.dmi'
opacity = 0
- assemblytype = /obj/structure/door_assembly/door_assembly_viro/glass
+ assemblytype = /obj/structure/door_assembly/door_assembly_viro
glass = TRUE
/obj/machinery/door/airlock/glass_maintenance
icon = 'icons/obj/doors/airlocks/station/maintenance.dmi'
opacity = 0
- assemblytype = /obj/structure/door_assembly/door_assembly_mai/glass
+ assemblytype = /obj/structure/door_assembly/door_assembly_mai
glass = TRUE
+/obj/machinery/door/airlock/maintenance/external/glass
+ opacity = 0
+ glass = TRUE
+ normal_integrity = 200
+
//////////////////////////////////
/*
Station Airlocks Mineral
@@ -148,27 +157,36 @@
/obj/machinery/door/airlock/gold
name = "gold airlock"
icon = 'icons/obj/doors/airlocks/station/gold.dmi'
- var/mineral = "gold"
assemblytype = /obj/structure/door_assembly/door_assembly_gold
+/obj/machinery/door/airlock/gold/glass
+ opacity = 0
+ glass = TRUE
+
/obj/machinery/door/airlock/silver
name = "silver airlock"
icon = 'icons/obj/doors/airlocks/station/silver.dmi'
- var/mineral = "silver"
assemblytype = /obj/structure/door_assembly/door_assembly_silver
+/obj/machinery/door/airlock/silver/glass
+ opacity = 0
+ glass = TRUE
+
/obj/machinery/door/airlock/diamond
name = "diamond airlock"
icon = 'icons/obj/doors/airlocks/station/diamond.dmi'
- var/mineral = "diamond"
assemblytype = /obj/structure/door_assembly/door_assembly_diamond
normal_integrity = 1000
explosion_block = 2
+/obj/machinery/door/airlock/diamond/glass
+ normal_integrity = 950
+ opacity = 0
+ glass = TRUE
+
/obj/machinery/door/airlock/uranium
name = "uranium airlock"
icon = 'icons/obj/doors/airlocks/station/uranium.dmi'
- var/mineral = "uranium"
assemblytype = /obj/structure/door_assembly/door_assembly_uranium
var/last_event = 0
@@ -183,11 +201,14 @@
radiation_pulse(get_turf(src), 150)
return
+/obj/machinery/door/airlock/uranium/glass
+ opacity = 0
+ glass = TRUE
+
/obj/machinery/door/airlock/plasma
name = "plasma airlock"
desc = "No way this can end badly."
icon = 'icons/obj/doors/airlocks/station/plasma.dmi'
- var/mineral = "plasma"
assemblytype = /obj/structure/door_assembly/door_assembly_plasma
/obj/machinery/door/airlock/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
@@ -200,62 +221,84 @@
/obj/machinery/door/airlock/plasma/proc/PlasmaBurn(temperature)
atmos_spawn_air("plasma=500;TEMP=1000")
- new/obj/structure/door_assembly/door_assembly_0( src.loc )
+ var/obj/structure/door_assembly/DA
+ DA = new /obj/structure/door_assembly(loc)
+ if(glass)
+ DA.glass = TRUE
+ if(heat_proof)
+ DA.heat_proof_finished = TRUE
+ DA.update_icon()
+ DA.update_name()
qdel(src)
/obj/machinery/door/airlock/plasma/BlockSuperconductivity() //we don't stop the heat~
return 0
+/obj/machinery/door/airlock/plasma/attackby(obj/item/C, mob/user, params)
+ if(C.is_hot() > 300)//If the temperature of the object is over 300, then ignite
+ message_admins("Plasma airlock ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(src)]")
+ log_game("Plasma airlock ignited by [key_name(user)] in [COORD(src)]")
+ ignite(C.is_hot())
+ else
+ return ..()
+
+/obj/machinery/door/airlock/plasma/glass
+ opacity = 0
+ glass = TRUE
+
/obj/machinery/door/airlock/clown
name = "bananium airlock"
desc = "Honkhonkhonk"
icon = 'icons/obj/doors/airlocks/station/bananium.dmi'
- var/mineral = "bananium"
+ assemblytype = /obj/structure/door_assembly/door_assembly_bananium
doorOpen = 'sound/items/bikehorn.ogg'
- assemblytype = /obj/structure/door_assembly/door_assembly_clown
+
+/obj/machinery/door/airlock/clown/glass
+ opacity = 0
+ glass = TRUE
/obj/machinery/door/airlock/sandstone
name = "sandstone airlock"
icon = 'icons/obj/doors/airlocks/station/sandstone.dmi'
- var/mineral = "sandstone"
assemblytype = /obj/structure/door_assembly/door_assembly_sandstone
+/obj/machinery/door/airlock/sandstone/glass
+ opacity = 0
+ glass = TRUE
/obj/machinery/door/airlock/wood
name = "wooden airlock"
icon = 'icons/obj/doors/airlocks/station/wood.dmi'
- var/mineral = "wood"
assemblytype = /obj/structure/door_assembly/door_assembly_wood
+/obj/machinery/door/airlock/wood/glass
+ opacity = 0
+ glass = TRUE
+
/obj/machinery/door/airlock/titanium
name = "shuttle airlock"
- var/mineral = "titanium"
+ assemblytype = /obj/structure/door_assembly/door_assembly_titanium
icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi'
overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi'
- assemblytype = /obj/structure/door_assembly/door_assembly_titanium
normal_integrity = 400
-/obj/machinery/door/airlock/glass_titanium
- name = "shuttle airlock"
- var/mineral = "titanium"
- icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi'
- overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi'
- opacity = 0
- assemblytype = /obj/structure/door_assembly/door_assembly_titanium/glass
- glass = TRUE
+/obj/machinery/door/airlock/titanium/glass
normal_integrity = 350
+ opacity = 0
+ glass = TRUE
//////////////////////////////////
/*
Station2 Airlocks
*/
-/obj/machinery/door/airlock/glass
- name = "glass airlock"
+/obj/machinery/door/airlock/public
icon = 'icons/obj/doors/airlocks/station2/glass.dmi'
overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi'
+ assemblytype = /obj/structure/door_assembly/door_assembly_public
+
+/obj/machinery/door/airlock/public/glass
opacity = 0
- assemblytype = /obj/structure/door_assembly/door_assembly_glass
glass = TRUE
//////////////////////////////////
@@ -269,13 +312,8 @@
overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi'
note_overlay_file = 'icons/obj/doors/airlocks/external/overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_ext
- explosion_block = 1
-/obj/machinery/door/airlock/glass_external
- name = "external airlock"
- icon = 'icons/obj/doors/airlocks/external/external.dmi'
- overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi'
- assemblytype = /obj/structure/door_assembly/door_assembly_ext/glass
+/obj/machinery/door/airlock/external/glass
opacity = 0
glass = TRUE
@@ -287,7 +325,6 @@
/obj/machinery/door/airlock/centcom
icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi'
overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi'
- opacity = 1
assemblytype = /obj/structure/door_assembly/door_assembly_centcom
normal_integrity = 1000
security_level = 6
@@ -305,7 +342,6 @@
name = "vault door"
icon = 'icons/obj/doors/airlocks/vault/vault.dmi'
overlays_file = 'icons/obj/doors/airlocks/vault/overlays.dmi'
- opacity = 1
assemblytype = /obj/structure/door_assembly/door_assembly_vault
explosion_block = 2
normal_integrity = 400 // reverse engieneerd: 400 * 1.5 (sec lvl 6) = 600 = original
@@ -321,7 +357,6 @@
icon = 'icons/obj/doors/airlocks/hatch/centcom.dmi'
overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi'
note_overlay_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi'
- opacity = 1
assemblytype = /obj/structure/door_assembly/door_assembly_hatch
/obj/machinery/door/airlock/maintenance_hatch
@@ -329,7 +364,6 @@
icon = 'icons/obj/doors/airlocks/hatch/maintenance.dmi'
overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi'
note_overlay_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi'
- opacity = 1
assemblytype = /obj/structure/door_assembly/door_assembly_mhatch
/obj/machinery/door/airlock/maintenance_hatch/abandoned
@@ -361,6 +395,10 @@
overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_shuttle
+/obj/machinery/door/airlock/shuttle/glass
+ opacity = 0
+ glass = TRUE
+
/obj/machinery/door/airlock/abductor
name = "alien airlock"
desc = "With humanity's current technological level, it could take years to hack this advanced airlock... or maybe we should give a screwdriver a try?"
@@ -369,7 +407,6 @@
assemblytype = /obj/structure/door_assembly/door_assembly_abductor
note_overlay_file = 'icons/obj/doors/airlocks/external/overlays.dmi'
damage_deflection = 30
- opacity = 1
explosion_block = 3
hackProof = TRUE
aiControlDisabled = 1
@@ -422,7 +459,6 @@
friendly = TRUE
/obj/machinery/door/airlock/cult/glass
- assemblytype = /obj/structure/door_assembly/door_assembly_cult/glass
glass = TRUE
opacity = 0
@@ -439,7 +475,6 @@
friendly = TRUE
/obj/machinery/door/airlock/cult/unruned/glass
- assemblytype = /obj/structure/door_assembly/door_assembly_cult/unruned/glass
glass = TRUE
opacity = 0
@@ -452,7 +487,6 @@
desc = "A massive cogwheel set into two heavy slabs of brass."
icon = 'icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi'
overlays_file = 'icons/obj/doors/airlocks/clockwork/overlays.dmi'
- opacity = 1
hackProof = TRUE
aiControlDisabled = TRUE
req_access = list(ACCESS_CLOCKCULT)
diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm
index 3733c71844..5630b3ffb0 100644
--- a/code/game/machinery/doors/alarmlock.dm
+++ b/code/game/machinery/doors/alarmlock.dm
@@ -1,45 +1,44 @@
-/obj/machinery/door/airlock/alarmlock
-
- name = "glass alarm airlock"
- icon = 'icons/obj/doors/airlocks/station2/glass.dmi'
- overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi'
- opacity = 0
- assemblytype = /obj/structure/door_assembly/door_assembly_glass
+/obj/machinery/door/airlock/alarmlock
+ name = "glass alarm airlock"
+ icon = 'icons/obj/doors/airlocks/station2/glass.dmi'
+ overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi'
+ opacity = 0
+ assemblytype = /obj/structure/door_assembly/door_assembly_public
glass = TRUE
-
- var/datum/radio_frequency/air_connection
- var/air_frequency = 1437
+
+ var/datum/radio_frequency/air_connection
+ var/air_frequency = 1437
autoclose = FALSE
-
-/obj/machinery/door/airlock/alarmlock/New()
- ..()
- air_connection = new
-
-/obj/machinery/door/airlock/alarmlock/Destroy()
+
+/obj/machinery/door/airlock/alarmlock/New()
+ ..()
+ air_connection = new
+
+/obj/machinery/door/airlock/alarmlock/Destroy()
SSradio.remove_object(src,air_frequency)
- air_connection = null
- return ..()
-
-/obj/machinery/door/airlock/alarmlock/Initialize()
+ air_connection = null
+ return ..()
+
+/obj/machinery/door/airlock/alarmlock/Initialize()
. = ..()
- SSradio.remove_object(src, air_frequency)
- air_connection = SSradio.add_object(src, air_frequency, GLOB.RADIO_TO_AIRALARM)
- open()
-
-/obj/machinery/door/airlock/alarmlock/receive_signal(datum/signal/signal)
- ..()
- if(stat & (NOPOWER|BROKEN))
- return
-
- var/alarm_area = signal.data["zone"]
- var/alert = signal.data["alert"]
-
- var/area/our_area = get_area(src)
- if(alarm_area == our_area.name)
- switch(alert)
- if("severe")
+ SSradio.remove_object(src, air_frequency)
+ air_connection = SSradio.add_object(src, air_frequency, GLOB.RADIO_TO_AIRALARM)
+ open()
+
+/obj/machinery/door/airlock/alarmlock/receive_signal(datum/signal/signal)
+ ..()
+ if(stat & (NOPOWER|BROKEN))
+ return
+
+ var/alarm_area = signal.data["zone"]
+ var/alert = signal.data["alert"]
+
+ var/area/our_area = get_area(src)
+ if(alarm_area == our_area.name)
+ switch(alert)
+ if("severe")
autoclose = TRUE
- close()
- if("minor", "clear")
+ close()
+ if("minor", "clear")
autoclose = FALSE
- open()
\ No newline at end of file
+ open()
diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm
index 7c0f4dd99b..7914df19ba 100644
--- a/code/game/objects/items/RCD.dm
+++ b/code/game/objects/items/RCD.dm
@@ -242,10 +242,12 @@ ARCD
switch(airlockcat)
if("Solid")
if(advanced_airlock_setting == 1)
- var/airlockpaint = input(usr, "Select the paintjob of the airlock.") in list("Default", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Mining", "Maintenance", "External", "High Security")
+ var/airlockpaint = input(usr, "Select the type of the airlock.") in list("Standard", "Public", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Freezer", "Science", "Virology", "Mining", "Maintenance", "External", "External Maintenance", "Airtight Hatch", "Maintenance Hatch")
switch(airlockpaint)
- if("Default")
+ if("Standard")
airlock_type = /obj/machinery/door/airlock
+ if("Public")
+ airlock_type = /obj/machinery/door/airlock/public
if("Engineering")
airlock_type = /obj/machinery/door/airlock/engineering
if("Atmospherics")
@@ -258,14 +260,24 @@ ARCD
airlock_type = /obj/machinery/door/airlock/medical
if("Research")
airlock_type = /obj/machinery/door/airlock/research
+ if("Freezer")
+ airlock_type = /obj/machinery/door/airlock/freezer
+ if("Science")
+ airlock_type = /obj/machinery/door/airlock/science
+ if("Virology")
+ airlock_type = /obj/machinery/door/airlock/virology
if("Mining")
airlock_type = /obj/machinery/door/airlock/mining
if("Maintenance")
airlock_type = /obj/machinery/door/airlock/maintenance
if("External")
airlock_type = /obj/machinery/door/airlock/external
- if("High Security")
- airlock_type = /obj/machinery/door/airlock/highsecurity
+ if("External Maintenance")
+ airlock_type = /obj/machinery/door/airlock/maintenance/external
+ if("Airtight Hatch")
+ airlock_type = /obj/machinery/door/airlock/hatch
+ if("Maintenance Hatch")
+ airlock_type = /obj/machinery/door/airlock/maintenance_hatch
airlock_glass = FALSE
else
airlock_type = /obj/machinery/door/airlock
@@ -273,10 +285,12 @@ ARCD
if("Glass")
if(advanced_airlock_setting == 1)
- var/airlockpaint = input(usr, "Select the paintjob of the airlock.") in list("Default", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Mining")
+ var/airlockpaint = input(usr, "Select the type of the airlock.") in list("Standard", "Public", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Science", "Virology", "Mining", "Maintenance", "External", "External Maintenance")
switch(airlockpaint)
- if("Default")
+ if("Standard")
airlock_type = /obj/machinery/door/airlock/glass
+ if("Public")
+ airlock_type = /obj/machinery/door/airlock/public/glass
if("Engineering")
airlock_type = /obj/machinery/door/airlock/glass_engineering
if("Atmospherics")
@@ -289,8 +303,18 @@ ARCD
airlock_type = /obj/machinery/door/airlock/glass_medical
if("Research")
airlock_type = /obj/machinery/door/airlock/glass_research
+ if("Science")
+ airlock_type = /obj/machinery/door/airlock/glass_science
+ if("Virology")
+ airlock_type = /obj/machinery/door/airlock/glass_virology
if("Mining")
airlock_type = /obj/machinery/door/airlock/glass_mining
+ if("Maintenance")
+ airlock_type = /obj/machinery/door/airlock/glass_maintenance
+ if("External")
+ airlock_type = /obj/machinery/door/airlock/external/glass
+ if("External Maintenance")
+ airlock_type = /obj/machinery/door/airlock/maintenance/external/glass
airlock_glass = TRUE
else
airlock_type = /obj/machinery/door/airlock/glass
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index c22cbbc0bc..96bfdee954 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -49,7 +49,27 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("computer frame", /obj/structure/frame/computer, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("modular console", /obj/machinery/modular_computer/console/buildable/, 10, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("machine frame", /obj/structure/frame/machine, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
+ null, \
+ new /datum/stack_recipe_list("airlock assemblies", list( \
+ new /datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("public airlock assembly", /obj/structure/door_assembly/door_assembly_public, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("security airlock assembly", /obj/structure/door_assembly/door_assembly_sec, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("engineering airlock assembly", /obj/structure/door_assembly/door_assembly_eng, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("mining airlock assembly", /obj/structure/door_assembly/door_assembly_min, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("atmospherics airlock assembly", /obj/structure/door_assembly/door_assembly_atmo, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("research airlock assembly", /obj/structure/door_assembly/door_assembly_research, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("freezer airlock assembly", /obj/structure/door_assembly/door_assembly_fre, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("science airlock assembly", /obj/structure/door_assembly/door_assembly_science, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("medical airlock assembly", /obj/structure/door_assembly/door_assembly_med, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("virology airlock assembly", /obj/structure/door_assembly/door_assembly_viro, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_mai, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("external airlock assembly", /obj/structure/door_assembly/door_assembly_ext, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("external maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_extmai, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("airtight hatch assembly", /obj/structure/door_assembly/door_assembly_hatch, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("maintenance hatch assembly", /obj/structure/door_assembly/door_assembly_mhatch, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ )), \
+ null, \
new/datum/stack_recipe("firelock frame", /obj/structure/firelock_frame, 3, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("meatspike frame", /obj/structure/kitchenspike_frame, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
@@ -113,6 +133,11 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
GLOBAL_LIST_INIT(plasteel_recipes, list ( \
new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = TRUE), \
new/datum/stack_recipe("bomb assembly", /obj/machinery/syndicatebomb/empty, 10, time = 50), \
+ null, \
+ new /datum/stack_recipe_list("airlock assemblies", list( \
+ new/datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 6, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("vault door assembly", /obj/structure/door_assembly/door_assembly_vault, 8, time = 50, one_per_turf = 1, on_floor = 1), \
+ )), \
))
/obj/item/stack/sheet/plasteel
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index c6af589cb5..43bb540375 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -1,8 +1,3 @@
-
-#define AIRLOCK_ASSEMBLY_NEEDS_WIRES 0
-#define AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS 1
-#define AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER 2
-
/obj/structure/door_assembly
name = "airlock assembly"
icon = 'icons/obj/doors/airlocks/station/public.dmi'
@@ -12,376 +7,279 @@
density = TRUE
max_integrity = 200
var/state = AIRLOCK_ASSEMBLY_NEEDS_WIRES
+ var/base_name = "airlock"
var/mineral = null
- var/typetext = ""
- var/icontext = ""
var/obj/item/electronics/airlock/electronics = null
var/airlock_type = /obj/machinery/door/airlock //the type path of the airlock once completed
var/glass_type = /obj/machinery/door/airlock/glass
+ var/glass = 0 // 0 = glass can be installed. 1 = glass is already installed.
var/created_name = null
var/heat_proof_finished = 0 //whether to heat-proof the finished airlock
- var/material = null //icon state logic
+ var/previous_assembly = /obj/structure/door_assembly
+ var/noglass = FALSE //airlocks with no glass version, also cannot be modified with sheets
+ var/material_type = /obj/item/stack/sheet/metal
+ var/material_amt = 4
/obj/structure/door_assembly/New()
update_icon()
+ update_name()
..()
-/obj/structure/door_assembly/door_assembly_0
- name = "airlock assembly"
- airlock_type = /obj/machinery/door/airlock
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
+/obj/structure/door_assembly/door_assembly_public
+ name = "public airlock assembly"
+ icon = 'icons/obj/doors/airlocks/station2/glass.dmi'
+ overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi'
+ glass_type = /obj/machinery/door/airlock/public/glass
+ airlock_type = /obj/machinery/door/airlock/public
/obj/structure/door_assembly/door_assembly_com
name = "command airlock assembly"
icon = 'icons/obj/doors/airlocks/station/command.dmi'
- typetext = "command"
- icontext = "com"
+ base_name = "command airlock"
glass_type = /obj/machinery/door/airlock/glass_command
airlock_type = /obj/machinery/door/airlock/command
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
-
-/obj/structure/door_assembly/door_assembly_com/glass
- mineral = "glass"
- material = "glass"
/obj/structure/door_assembly/door_assembly_sec
name = "security airlock assembly"
icon = 'icons/obj/doors/airlocks/station/security.dmi'
- typetext = "security"
- icontext = "sec"
+ base_name = "security airlock"
glass_type = /obj/machinery/door/airlock/glass_security
airlock_type = /obj/machinery/door/airlock/security
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
-
-/obj/structure/door_assembly/door_assembly_sec/glass
- mineral = "glass"
- material = "glass"
/obj/structure/door_assembly/door_assembly_eng
name = "engineering airlock assembly"
icon = 'icons/obj/doors/airlocks/station/engineering.dmi'
- typetext = "engineering"
- icontext = "eng"
+ base_name = "engineering airlock"
glass_type = /obj/machinery/door/airlock/glass_engineering
airlock_type = /obj/machinery/door/airlock/engineering
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
-
-/obj/structure/door_assembly/door_assembly_eng/glass
- mineral = "glass"
- material = "glass"
/obj/structure/door_assembly/door_assembly_min
name = "mining airlock assembly"
icon = 'icons/obj/doors/airlocks/station/mining.dmi'
- typetext = "mining"
- icontext = "min"
+ base_name = "mining airlock"
glass_type = /obj/machinery/door/airlock/glass_mining
airlock_type = /obj/machinery/door/airlock/mining
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
-
-/obj/structure/door_assembly/door_assembly_min/glass
- mineral = "glass"
- material = "glass"
/obj/structure/door_assembly/door_assembly_atmo
name = "atmospherics airlock assembly"
icon = 'icons/obj/doors/airlocks/station/atmos.dmi'
- typetext = "atmos"
- icontext = "atmo"
+ base_name = "atmospherics airlock"
glass_type = /obj/machinery/door/airlock/glass_atmos
airlock_type = /obj/machinery/door/airlock/atmos
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
-
-/obj/structure/door_assembly/door_assembly_atmo/glass
- mineral = "glass"
- material = "glass"
/obj/structure/door_assembly/door_assembly_research
name = "research airlock assembly"
icon = 'icons/obj/doors/airlocks/station/research.dmi'
- typetext = "research"
- icontext = "res"
+ base_name = "research airlock"
glass_type = /obj/machinery/door/airlock/glass_research
airlock_type = /obj/machinery/door/airlock/research
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
-
-/obj/structure/door_assembly/door_assembly_research/glass
- mineral = "glass"
- material = "glass"
/obj/structure/door_assembly/door_assembly_science
name = "science airlock assembly"
icon = 'icons/obj/doors/airlocks/station/science.dmi'
- typetext = "science"
- icontext = "sci"
+ base_name = "science airlock"
glass_type = /obj/machinery/door/airlock/glass_science
airlock_type = /obj/machinery/door/airlock/science
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
-
-/obj/structure/door_assembly/door_assembly_science/glass
- mineral = "glass"
- material = "glass"
/obj/structure/door_assembly/door_assembly_med
name = "medical airlock assembly"
icon = 'icons/obj/doors/airlocks/station/medical.dmi'
- typetext = "medical"
- icontext = "med"
+ base_name = "medical airlock"
glass_type = /obj/machinery/door/airlock/glass_medical
airlock_type = /obj/machinery/door/airlock/medical
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
-
-/obj/structure/door_assembly/door_assembly_med/glass
- mineral = "glass"
- material = "glass"
/obj/structure/door_assembly/door_assembly_mai
name = "maintenance airlock assembly"
icon = 'icons/obj/doors/airlocks/station/maintenance.dmi'
- typetext = "maintenance"
- icontext = "mai"
+ base_name = "maintenance airlock"
glass_type = /obj/machinery/door/airlock/glass_maintenance
airlock_type = /obj/machinery/door/airlock/maintenance
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
-/obj/structure/door_assembly/door_assembly_mai/glass
- mineral = "glass"
- material = "glass"
+/obj/structure/door_assembly/door_assembly_extmai
+ name = "external maintenance airlock assembly"
+ icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi'
+ base_name = "external maintenance airlock"
+ glass_type = /obj/machinery/door/airlock/maintenance/external/glass
+ airlock_type = /obj/machinery/door/airlock/maintenance/external
/obj/structure/door_assembly/door_assembly_ext
name = "external airlock assembly"
icon = 'icons/obj/doors/airlocks/external/external.dmi'
+ base_name = "external airlock"
overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi'
- typetext = "external"
- icontext = "ext"
- glass_type = /obj/machinery/door/airlock/glass_external
+ glass_type = /obj/machinery/door/airlock/external/glass
airlock_type = /obj/machinery/door/airlock/external
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
-
-/obj/structure/door_assembly/door_assembly_ext/glass
- mineral = "glass"
- material = "glass"
/obj/structure/door_assembly/door_assembly_fre
name = "freezer airlock assembly"
icon = 'icons/obj/doors/airlocks/station/freezer.dmi'
- typetext = "freezer"
- icontext = "fre"
+ base_name = "freezer airlock"
airlock_type = /obj/machinery/door/airlock/freezer
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
+ noglass = TRUE
/obj/structure/door_assembly/door_assembly_hatch
name = "airtight hatch assembly"
icon = 'icons/obj/doors/airlocks/hatch/centcom.dmi'
+ base_name = "airtight hatch"
overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi'
- typetext = "hatch"
- icontext = "hatch"
airlock_type = /obj/machinery/door/airlock/hatch
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
+ noglass = TRUE
/obj/structure/door_assembly/door_assembly_mhatch
name = "maintenance hatch assembly"
icon = 'icons/obj/doors/airlocks/hatch/maintenance.dmi'
+ base_name = "maintenance hatch"
overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi'
- typetext = "maintenance_hatch"
- icontext = "mhatch"
airlock_type = /obj/machinery/door/airlock/maintenance_hatch
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
-
-/obj/structure/door_assembly/door_assembly_glass
- name = "glass airlock assembly"
- icon = 'icons/obj/doors/airlocks/station2/glass.dmi'
- overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi'
- airlock_type = /obj/machinery/door/airlock/glass
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
- mineral = "glass"
- material = "glass"
-
-/obj/structure/door_assembly/door_assembly_gold
- name = "gold airlock assembly"
- icon = 'icons/obj/doors/airlocks/station/gold.dmi'
- airlock_type = /obj/machinery/door/airlock/gold
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
- mineral = "gold"
-
-/obj/structure/door_assembly/door_assembly_silver
- name = "silver airlock assembly"
- icon = 'icons/obj/doors/airlocks/station/silver.dmi'
- airlock_type = /obj/machinery/door/airlock/silver
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
- mineral = "silver"
-
-/obj/structure/door_assembly/door_assembly_diamond
- name = "diamond airlock assembly"
- icon = 'icons/obj/doors/airlocks/station/diamond.dmi'
- airlock_type = /obj/machinery/door/airlock/diamond
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
- mineral = "diamond"
-
-/obj/structure/door_assembly/door_assembly_uranium
- name = "uranium airlock assembly"
- icon = 'icons/obj/doors/airlocks/station/uranium.dmi'
- airlock_type = /obj/machinery/door/airlock/uranium
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
- mineral = "uranium"
-
-/obj/structure/door_assembly/door_assembly_plasma
- name = "plasma airlock assembly"
- icon = 'icons/obj/doors/airlocks/station/plasma.dmi'
- airlock_type = /obj/machinery/door/airlock/plasma
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
- mineral = "plasma"
-
-/obj/structure/door_assembly/door_assembly_clown
- name = "bananium airlock assembly"
- desc = "Honk."
- icon = 'icons/obj/doors/airlocks/station/bananium.dmi'
- airlock_type = /obj/machinery/door/airlock/clown
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
- mineral = "bananium"
-
-/obj/structure/door_assembly/door_assembly_sandstone
- name = "sandstone airlock assembly"
- icon = 'icons/obj/doors/airlocks/station/sandstone.dmi'
- airlock_type = /obj/machinery/door/airlock/sandstone
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
- mineral = "sandstone"
-
-/obj/structure/door_assembly/door_assembly_titanium
- name = "titanium airlock assembly"
- icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi'
- overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi'
- typetext = "titanium"
- icontext = "titanium"
- glass_type = /obj/machinery/door/airlock/glass_titanium
- airlock_type = /obj/machinery/door/airlock/titanium
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
- mineral = "titanium"
-
-/obj/structure/door_assembly/door_assembly_titanium/glass
- mineral = "glass"
- material = "glass"
+ noglass = TRUE
/obj/structure/door_assembly/door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly
name = "high security airlock assembly"
icon = 'icons/obj/doors/airlocks/highsec/highsec.dmi'
+ base_name = "high security airlock"
overlays_file = 'icons/obj/doors/airlocks/highsec/overlays.dmi'
- typetext = "highsecurity"
- icontext = "highsec"
airlock_type = /obj/machinery/door/airlock/highsecurity
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
+ noglass = TRUE
+ material_type = /obj/item/stack/sheet/plasteel
+ material_amt = 6
/obj/structure/door_assembly/door_assembly_vault
name = "vault door assembly"
icon = 'icons/obj/doors/airlocks/vault/vault.dmi'
+ base_name = "vault door"
overlays_file = 'icons/obj/doors/airlocks/vault/overlays.dmi'
- typetext = "vault"
- icontext = "vault"
airlock_type = /obj/machinery/door/airlock/vault
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
+ noglass = TRUE
+ material_type = /obj/item/stack/sheet/plasteel
+ material_amt = 8
/obj/structure/door_assembly/door_assembly_shuttle
name = "shuttle airlock assembly"
icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi'
+ base_name = "shuttle airlock"
overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi'
- typetext = "shuttle"
- icontext = "shuttle"
airlock_type = /obj/machinery/door/airlock/shuttle
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
+ glass_type = /obj/machinery/door/airlock/shuttle/glass
/obj/structure/door_assembly/door_assembly_cult
name = "cult airlock assembly"
icon = 'icons/obj/doors/airlocks/cult/runed/cult.dmi'
+ base_name = "cult airlock"
overlays_file = 'icons/obj/doors/airlocks/cult/runed/overlays.dmi'
- typetext = "cult"
- icontext = "cult"
airlock_type = /obj/machinery/door/airlock/cult
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
-
-/obj/structure/door_assembly/door_assembly_cult/glass
- mineral = "glass"
- material = "glass"
+ glass_type = /obj/machinery/door/airlock/cult/glass
/obj/structure/door_assembly/door_assembly_cult/unruned
icon = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi'
overlays_file = 'icons/obj/doors/airlocks/cult/unruned/overlays.dmi'
-
-/obj/structure/door_assembly/door_assembly_cult/unruned/glass
- mineral = "glass"
- material = "glass"
-
-/obj/structure/door_assembly/door_assembly_wood
- name = "wooden airlock assembly"
- icon = 'icons/obj/doors/airlocks/station/wood.dmi'
- airlock_type = /obj/machinery/door/airlock/wood
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
- mineral = "wood"
+ airlock_type = /obj/machinery/door/airlock/cult/unruned
+ glass_type = /obj/machinery/door/airlock/cult/unruned/glass
/obj/structure/door_assembly/door_assembly_viro
name = "virology airlock assembly"
icon = 'icons/obj/doors/airlocks/station/virology.dmi'
- typetext = "virology"
- icontext = "viro"
+ base_name = "virology airlock"
glass_type = /obj/machinery/door/airlock/glass_virology
airlock_type = /obj/machinery/door/airlock/virology
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
-
-/obj/structure/door_assembly/door_assembly_viro/glass
- mineral = "glass"
- material = "glass"
/obj/structure/door_assembly/door_assembly_centcom
- typetext = "centcom"
icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi'
overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi'
- icontext = "ele"
airlock_type = /obj/machinery/door/airlock/centcom
- anchored = TRUE
- state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
+ noglass = TRUE
+
+/obj/structure/door_assembly/door_assembly_gold
+ name = "gold airlock assembly"
+ icon = 'icons/obj/doors/airlocks/station/gold.dmi'
+ base_name = "gold airlock"
+ airlock_type = /obj/machinery/door/airlock/gold
+ mineral = "gold"
+ glass_type = /obj/machinery/door/airlock/gold/glass
+
+/obj/structure/door_assembly/door_assembly_silver
+ name = "silver airlock assembly"
+ icon = 'icons/obj/doors/airlocks/station/silver.dmi'
+ base_name = "silver airlock"
+ airlock_type = /obj/machinery/door/airlock/silver
+ mineral = "silver"
+ glass_type = /obj/machinery/door/airlock/silver/glass
+
+/obj/structure/door_assembly/door_assembly_diamond
+ name = "diamond airlock assembly"
+ icon = 'icons/obj/doors/airlocks/station/diamond.dmi'
+ base_name = "diamond airlock"
+ airlock_type = /obj/machinery/door/airlock/diamond
+ mineral = "diamond"
+ glass_type = /obj/machinery/door/airlock/diamond/glass
+
+/obj/structure/door_assembly/door_assembly_uranium
+ name = "uranium airlock assembly"
+ icon = 'icons/obj/doors/airlocks/station/uranium.dmi'
+ base_name = "uranium airlock"
+ airlock_type = /obj/machinery/door/airlock/uranium
+ mineral = "uranium"
+ glass_type = /obj/machinery/door/airlock/uranium/glass
+
+/obj/structure/door_assembly/door_assembly_plasma
+ name = "plasma airlock assembly"
+ icon = 'icons/obj/doors/airlocks/station/plasma.dmi'
+ base_name = "plasma airlock"
+ airlock_type = /obj/machinery/door/airlock/plasma
+ mineral = "plasma"
+ glass_type = /obj/machinery/door/airlock/plasma/glass
+
+/obj/structure/door_assembly/door_assembly_bananium
+ name = "bananium airlock assembly"
+ desc = "Honk."
+ icon = 'icons/obj/doors/airlocks/station/bananium.dmi'
+ base_name = "bananium airlock"
+ airlock_type = /obj/machinery/door/airlock/clown
+ mineral = "bananium"
+ glass_type = /obj/machinery/door/airlock/clown/glass
+
+/obj/structure/door_assembly/door_assembly_sandstone
+ name = "sandstone airlock assembly"
+ icon = 'icons/obj/doors/airlocks/station/sandstone.dmi'
+ base_name = "sandstone airlock"
+ airlock_type = /obj/machinery/door/airlock/sandstone
+ mineral = "sandstone"
+ glass_type = /obj/machinery/door/airlock/sandstone/glass
+
+/obj/structure/door_assembly/door_assembly_titanium
+ name = "titanium airlock assembly"
+ icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi'
+ base_name = "shuttle airlock"
+ overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi'
+ glass_type = /obj/machinery/door/airlock/titanium/glass
+ airlock_type = /obj/machinery/door/airlock/titanium
+ mineral = "titanium"
+
+/obj/structure/door_assembly/door_assembly_wood
+ name = "wooden airlock assembly"
+ icon = 'icons/obj/doors/airlocks/station/wood.dmi'
+ base_name = "wooden airlock"
+ airlock_type = /obj/machinery/door/airlock/wood
+ mineral = "wood"
+ glass_type = /obj/machinery/door/airlock/wood/glass
/obj/structure/door_assembly/examine(mob/user)
..()
switch(state)
- if(0)
+ if(AIRLOCK_ASSEMBLY_NEEDS_WIRES)
if(anchored)
to_chat(user, "The anchoring bolts are wrenched in place, but the maintenance panel lacks wiring.")
else
to_chat(user, "The assembly is welded together, but the anchoring bolts are unwrenched.")
- if(1)
+ if(AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS)
to_chat(user, "The maintenance panel is wired, but the circuit slot is empty.")
- if(2)
+ if(AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER)
to_chat(user, "The circuit is connected loosely to its slot, but the maintenance panel is unscrewed and open.")
- if(!mineral || !material)
- to_chat(user, "There is a small paper placard on the assembly. There are empty slots for glass windows or mineral covers.")
+ if(!mineral && !glass && !noglass)
+ to_chat(user, "There is a small paper placard on the assembly. There are empty slots for glass windows and mineral covers.")
+ else if(!mineral && glass && !noglass)
+ to_chat(user, "There is a small paper placard on the assembly. There are empty slots for mineral covers.")
+ else if(mineral && !glass && !noglass)
+ to_chat(user, "There is a small paper placard on the assembly. There are empty slots for glass windows.")
else
to_chat(user, "There is a small paper placard on the assembly.")
@@ -394,148 +292,41 @@
return
created_name = t
- else if(istype(W, /obj/item/airlock_painter)) // |- Ricotez
- //INFORMATION ABOUT ADDING A NEW AIRLOCK TO THE PAINT LIST:
- //If your airlock has a regular version, add it to the list with regular versions.
- //If your airlock has a glass version, add it to the list with glass versions.
- //Don't forget to also set has_solid and has_glass to the proper value.
- //Do NOT add your airlock to a list if it does not have a version for that list,
- // or you will get broken icons.
- var/obj/item/airlock_painter/WT = W
- if(WT.can_use(user))
- var/icontype
- var/optionlist
- if(mineral && mineral == "glass")
- //These airlocks have a glass version.
- optionlist = list("Public", "Public2", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Science", "Mining")
- else
- //These airlocks have a regular version.
- optionlist = list("Public", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Science", "Mining", "Maintenance", "External", "High Security")
-
-
- icontype = input(user, "Please select a paintjob for this airlock.") in optionlist
- if((!in_range(src, usr) && loc != usr) || !WT.use(user))
- return
- var/has_solid = FALSE
- var/has_glass = FALSE
- switch(icontype)
- if("Public")
- icon = 'icons/obj/doors/airlocks/station/public.dmi'
- overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
- typetext = ""
- icontext = ""
- has_solid = TRUE
- has_glass = TRUE
- if("Public2")
- icon = 'icons/obj/doors/airlocks/station2/glass.dmi'
- overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi'
- typetext = ""
- icontext = ""
- has_solid = TRUE
- has_glass = TRUE
- if("Engineering")
- icon = 'icons/obj/doors/airlocks/station/engineering.dmi'
- overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
- typetext = "engineering"
- icontext = "eng"
- has_solid = TRUE
- has_glass = TRUE
- if("Atmospherics")
- icon = 'icons/obj/doors/airlocks/station/atmos.dmi'
- overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
- typetext = "atmos"
- icontext = "atmo"
- has_solid = TRUE
- has_glass = TRUE
- if("Security")
- icon = 'icons/obj/doors/airlocks/station/security.dmi'
- overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
- typetext = "security"
- icontext = "sec"
- has_solid = TRUE
- has_glass = TRUE
- if("Command")
- icon = 'icons/obj/doors/airlocks/station/command.dmi'
- overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
- typetext = "command"
- icontext = "com"
- has_solid = TRUE
- has_glass = TRUE
- if("Medical")
- icon = 'icons/obj/doors/airlocks/station/medical.dmi'
- overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
- typetext = "medical"
- icontext = "med"
- has_solid = TRUE
- has_glass = TRUE
- if("Research")
- icon = 'icons/obj/doors/airlocks/station/research.dmi'
- overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
- typetext = "research"
- icontext = "res"
- has_solid = TRUE
- has_glass = TRUE
- if("Science")
- icon = 'icons/obj/doors/airlocks/station/science.dmi'
- overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
- typetext = "research"
- icontext = "res"
- has_solid = TRUE
- has_glass = TRUE
- if("Mining")
- icon = 'icons/obj/doors/airlocks/station/mining.dmi'
- overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
- typetext = "mining"
- icontext = "min"
- has_solid = TRUE
- has_glass = TRUE
- if("Maintenance")
- icon = 'icons/obj/doors/airlocks/station/maintenance.dmi'
- overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
- typetext = "maintenance"
- icontext = "mai"
- has_solid = TRUE
- has_glass = FALSE
- if("External")
- icon = 'icons/obj/doors/airlocks/external/external.dmi'
- overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi'
- typetext = "external"
- icontext = "ext"
- has_solid = TRUE
- has_glass = FALSE
- if("High Security")
- icon = 'icons/obj/doors/airlocks/highsec/highsec.dmi'
- overlays_file = 'icons/obj/doors/airlocks/highsec/overlays.dmi'
- typetext = "highsecurity"
- icontext = "highsec"
- has_solid = TRUE
- has_glass = FALSE
- if(has_solid)
- airlock_type = text2path("/obj/machinery/door/airlock/[typetext]")
- else
- airlock_type = /obj/machinery/door/airlock
-
- if(has_glass)
- glass_type = text2path("/obj/machinery/door/airlock/glass_[typetext]")
- else
- glass_type = /obj/machinery/door/airlock/glass
-
- if(mineral && mineral != "glass")
- mineral = null //I know this is stupid, but until we change glass to a boolean it's how this code works.
- to_chat(user, "You change the paintjob on the airlock assembly.")
-
- else if(istype(W, /obj/item/weldingtool) && !anchored )
+ else if(istype(W, /obj/item/weldingtool) && (mineral || glass || !anchored ))
var/obj/item/weldingtool/WT = W
if(WT.remove_fuel(0,user))
- user.visible_message("[user] disassembles the airlock assembly.", \
- "You start to disassemble the airlock assembly...")
playsound(src, 'sound/items/welder2.ogg', 50, 1)
+ if(mineral)
+ var/obj/item/stack/sheet/mineral/mineral_path = text2path("/obj/item/stack/sheet/mineral/[mineral]")
+ user.visible_message("[user] welds the [mineral] plating off the airlock assembly.", "You start to weld the [mineral] plating off the airlock assembly...")
+ if(do_after(user, 40 * WT.toolspeed, target = src))
+ if(!src || !WT.isOn())
+ return
+ to_chat(user, "You weld the [mineral] plating off.")
+ new mineral_path(loc, 2)
+ var/obj/structure/door_assembly/PA = new previous_assembly(loc)
+ transfer_assembly_vars(src, PA)
- if(do_after(user, 40*W.toolspeed, target = src))
- if( !WT.isOn() )
- return
- to_chat(user, "You disassemble the airlock assembly.")
- deconstruct(TRUE)
+ else if(glass)
+ user.visible_message("[user] welds the glass panel out of the airlock assembly.", "You start to weld the glass panel out of the airlock assembly...")
+ if(do_after(user, 40 * WT.toolspeed, target = src))
+ if(!src || !WT.isOn())
+ return
+ to_chat(user, "You weld the glass panel out.")
+ if(heat_proof_finished)
+ new /obj/item/stack/sheet/rglass(get_turf(src))
+ heat_proof_finished = 0
+ else
+ new /obj/item/stack/sheet/glass(get_turf(src))
+ glass = 0
+ else if(!anchored)
+ user.visible_message("[user] disassembles the airlock assembly.", \
+ "You start to disassemble the airlock assembly...")
+ if(do_after(user, 40*W.toolspeed, target = src))
+ if(!WT.isOn())
+ return
+ to_chat(user, "You disassemble the airlock assembly.")
+ deconstruct(TRUE)
else if(istype(W, /obj/item/wrench))
if(!anchored )
@@ -572,7 +363,7 @@
name = "airlock assembly"
anchored = FALSE
- else if(istype(W, /obj/item/stack/cable_coil) && state == 0 && anchored )
+ else if(istype(W, /obj/item/stack/cable_coil) && state == AIRLOCK_ASSEMBLY_NEEDS_WIRES && anchored )
var/obj/item/stack/cable_coil/C = W
if (C.get_amount() < 1)
to_chat(user, "You need one length of cable to wire the airlock assembly!")
@@ -580,32 +371,32 @@
user.visible_message("[user] wires the airlock assembly.", \
"You start to wire the airlock assembly...")
if(do_after(user, 40, target = src))
- if(C.get_amount() < 1 || state != 0)
+ if(C.get_amount() < 1 || state != AIRLOCK_ASSEMBLY_NEEDS_WIRES)
return
C.use(1)
state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
to_chat(user, "You wire the airlock assembly.")
name = "wired airlock assembly"
- else if(istype(W, /obj/item/wirecutters) && state == 1 )
+ else if(istype(W, /obj/item/wirecutters) && state == AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS )
playsound(src, W.usesound, 100, 1)
user.visible_message("[user] cuts the wires from the airlock assembly.", \
"You start to cut the wires from the airlock assembly...")
if(do_after(user, 40*W.toolspeed, target = src))
- if(state != 1)
+ if(state != AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS)
return
to_chat(user, "You cut the wires from the airlock assembly.")
new/obj/item/stack/cable_coil(get_turf(user), 1)
state = AIRLOCK_ASSEMBLY_NEEDS_WIRES
name = "secured airlock assembly"
- else if(istype(W, /obj/item/electronics/airlock) && state == 1 )
+ else if(istype(W, /obj/item/electronics/airlock) && state == AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS )
playsound(src, W.usesound, 100, 1)
user.visible_message("[user] installs the electronics into the airlock assembly.", \
"You start to install electronics into the airlock assembly...")
if(do_after(user, 40, target = src))
- if( state != 1 )
+ if( state != AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS )
return
if(!user.transferItemToLoc(W, src))
return
@@ -616,13 +407,13 @@
electronics = W
- else if(istype(W, /obj/item/crowbar) && state == 2 )
+ else if(istype(W, /obj/item/crowbar) && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER )
playsound(src, W.usesound, 100, 1)
user.visible_message("[user] removes the electronics from the airlock assembly.", \
"You start to remove electronics from the airlock assembly...")
if(do_after(user, 40*W.toolspeed, target = src))
- if(state != 2)
+ if(state != AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER)
return
to_chat(user, "You remove the airlock electronics.")
state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
@@ -634,66 +425,65 @@
ae = electronics
electronics = null
ae.forceMove(src.loc)
- else if(istype(W, /obj/item/stack/sheet) && !mineral)
+
+ else if(istype(W, /obj/item/stack/sheet) && (!glass || !mineral))
var/obj/item/stack/sheet/G = W
if(G)
if(G.get_amount() >= 1)
- if(is_glass_sheet(G))
- playsound(src, 'sound/items/crowbar.ogg', 100, 1)
- user.visible_message("[user] adds [G.name] to the airlock assembly.", \
- "You start to install [G.name] into the airlock assembly...")
- if(do_after(user, 40, target = src))
- if(G.get_amount() < 1 || mineral)
- return
- if(!istype(G, /obj/item/stack/sheet/glass))
- to_chat(user, "You install [G.name] windows into the airlock assembly.")
- heat_proof_finished = 1 //plasma & reinforced glass makes the airlock heat-proof
- name = "near finished heat-proofed window airlock assembly"
- else
- to_chat(user, "You install regular glass windows into the airlock assembly.")
- name = "near finished window airlock assembly"
- G.use(1)
- mineral = "glass"
- material = "glass"
- //This list contains the airlock paintjobs that have a glass version:
- if(icontext in list("eng", "atmo", "sec", "com", "med", "res", "min"))
- airlock_type = text2path("/obj/machinery/door/airlock/[typetext]")
- glass_type = text2path("/obj/machinery/door/airlock/glass_[typetext]")
- else
- //This airlock is default or does not have a glass version, so we revert to the default glass airlock. |- Ricotez
- airlock_type = /obj/machinery/door/airlock
- glass_type = /obj/machinery/door/airlock/glass
- typetext = ""
- icontext = ""
- else if(istype(G, /obj/item/stack/sheet/mineral))
- var/M = G.sheettype
- if(G.get_amount() >= 2)
- playsound(src, 'sound/items/crowbar.ogg', 100, 1)
- user.visible_message("[user] adds [G.name] to the airlock assembly.", \
- "You start to install [G.name] into the airlock assembly...")
- if(do_after(user, 40, target = src))
- if(G.get_amount() < 2 || mineral)
- return
- to_chat(user, "You install [M] plating into the airlock assembly.")
- G.use(2)
- mineral = "[M]"
- name = "near finished [M] airlock assembly"
- airlock_type = text2path ("/obj/machinery/door/airlock/[M]")
- glass_type = /obj/machinery/door/airlock/glass
+ if(!noglass)
+ if(!glass)
+ if(istype(G, /obj/item/stack/sheet/rglass) || istype(G, /obj/item/stack/sheet/glass))
+ playsound(src, 'sound/items/crowbar.ogg', 100, 1)
+ user.visible_message("[user] adds [G.name] to the airlock assembly.", \
+ "You start to install [G.name] into the airlock assembly...")
+ if(do_after(user, 40, target = src))
+ if(G.get_amount() < 1 || glass)
+ return
+ if(G.type == /obj/item/stack/sheet/rglass)
+ to_chat(user, "You install [G.name] windows into the airlock assembly.")
+ heat_proof_finished = 1 //reinforced glass makes the airlock heat-proof
+ name = "near finished heat-proofed window airlock assembly"
+ else
+ to_chat(user, "You install regular glass windows into the airlock assembly.")
+ name = "near finished window airlock assembly"
+ G.use(1)
+ glass = TRUE
+ if(!mineral)
+ if(istype(G, /obj/item/stack/sheet/mineral) && G.sheettype)
+ var/M = G.sheettype
+ if(G.get_amount() >= 2)
+ playsound(src, 'sound/items/crowbar.ogg', 100, 1)
+ user.visible_message("[user] adds [G.name] to the airlock assembly.", \
+ "You start to install [G.name] into the airlock assembly...")
+ if(do_after(user, 40, target = src))
+ if(G.get_amount() < 2 || mineral)
+ return
+ to_chat(user, "You install [M] plating into the airlock assembly.")
+ G.use(2)
+ var/mineralassembly = text2path("/obj/structure/door_assembly/door_assembly_[M]")
+ var/obj/structure/door_assembly/MA = new mineralassembly(loc)
+ transfer_assembly_vars(src, MA, TRUE)
+ else
+ to_chat(user, "You need at least two sheets add a mineral cover!")
+ else
+ to_chat(user, "You cannot add [G] to [src]!")
+ else
+ to_chat(user, "You cannot add [G] to [src]!")
- else if(istype(W, /obj/item/screwdriver) && state == 2 )
+ else if(istype(W, /obj/item/screwdriver) && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER )
playsound(src, W.usesound, 100, 1)
user.visible_message("[user] finishes the airlock.", \
"You start finishing the airlock...")
if(do_after(user, 40*W.toolspeed, target = src))
- if(loc && state == 2)
+ if(loc && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER)
to_chat(user, "You finish the airlock.")
var/obj/machinery/door/airlock/door
- if(mineral == "glass")
+ if(glass)
door = new glass_type( loc )
else
door = new airlock_type( loc )
+ door.setDir(dir)
//door.req_access = req_access
door.electronics = electronics
door.heat_proof = heat_proof_finished
@@ -703,38 +493,66 @@
door.req_access = electronics.accesses
if(created_name)
door.name = created_name
+ else
+ door.name = base_name
+ door.previous_airlock = previous_assembly
electronics.forceMove(door)
qdel(src)
else
return ..()
+ update_name()
update_icon()
/obj/structure/door_assembly/update_icon()
cut_overlays()
- if(!material)
+ if(!glass)
add_overlay(get_airlock_overlay("fill_construction", icon))
- else
- add_overlay(get_airlock_overlay("[material]_construction", overlays_file))
+ else if(glass)
+ add_overlay(get_airlock_overlay("glass_construction", overlays_file))
add_overlay(get_airlock_overlay("panel_c[state+1]", overlays_file))
+/obj/structure/door_assembly/proc/update_name()
+ name = ""
+ switch(state)
+ if(AIRLOCK_ASSEMBLY_NEEDS_WIRES)
+ if(anchored)
+ name = "secured "
+ if(AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS)
+ name = "wired "
+ if(AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER)
+ name = "near finished "
+ name += "[heat_proof_finished ? "heat-proofed " : ""][glass ? "window " : ""][base_name] assembly"
+
+/obj/structure/door_assembly/proc/transfer_assembly_vars(obj/structure/door_assembly/source, obj/structure/door_assembly/target, previous = FALSE)
+ target.glass = source.glass
+ target.heat_proof_finished = source.heat_proof_finished
+ target.created_name = source.created_name
+ target.state = source.state
+ target.anchored = source.anchored
+ if(previous)
+ target.previous_assembly = source.type
+ if(electronics)
+ target.electronics = source.electronics
+ source.electronics.forceMove(target)
+ target.update_icon()
+ target.update_name()
+ qdel(source)
/obj/structure/door_assembly/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
var/turf/T = get_turf(src)
- var/metal_amt = 4
if(!disassembled)
- metal_amt = rand(2,4)
- new /obj/item/stack/sheet/metal(T, metal_amt)
- if(mineral)
- if (mineral == "glass")
- if(disassembled)
- if (heat_proof_finished)
- new /obj/item/stack/sheet/rglass(T)
- else
- new /obj/item/stack/sheet/glass(T)
+ material_amt = rand(2,4)
+ new material_type(T, material_amt)
+ if(glass)
+ if(disassembled)
+ if(heat_proof_finished)
+ new /obj/item/stack/sheet/rglass(T)
else
- new /obj/item/shard(T)
+ new /obj/item/stack/sheet/glass(T)
else
- var/obj/item/stack/sheet/mineral/mineral_path = text2path("/obj/item/stack/sheet/mineral/[mineral]")
- new mineral_path(T, 2)
+ new /obj/item/shard(T)
+ if(mineral)
+ var/obj/item/stack/sheet/mineral/mineral_path = text2path("/obj/item/stack/sheet/mineral/[mineral]")
+ new mineral_path(T, 2)
qdel(src)
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index 5fe25b1d1f..1e34440d87 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -94,38 +94,19 @@
name = "airlock"
icon = 'icons/obj/doors/airlocks/survival/survival.dmi'
overlays_file = 'icons/obj/doors/airlocks/survival/survival_overlays.dmi'
- note_overlay_file = 'icons/obj/doors/airlocks/survival/survival_overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_pod
+
+/obj/machinery/door/airlock/survival_pod/glass
opacity = FALSE
glass = TRUE
- var/expected_dir = SOUTH //we visually turn when shuttle rotated, but need to not turn for any other reason
-
-/obj/machinery/door/airlock/survival_pod/setDir(direction)
- direction = expected_dir
- ..()
-
-/obj/machinery/door/airlock/survival_pod/vertical
- dir = EAST
- expected_dir = EAST
/obj/structure/door_assembly/door_assembly_pod
name = "pod airlock assembly"
icon = 'icons/obj/doors/airlocks/survival/survival.dmi'
+ base_name = "pod airlock"
overlays_file = 'icons/obj/doors/airlocks/survival/survival_overlays.dmi'
airlock_type = /obj/machinery/door/airlock/survival_pod
- anchored = TRUE
- state = 1
- mineral = "glass"
- material = "glass"
- var/expected_dir = SOUTH
-
-/obj/structure/door_assembly/door_assembly_pod/setDir(direction)
- direction = expected_dir
- ..()
-
-/obj/structure/door_assembly/door_assembly_pod/vertical
- dir = EAST
- expected_dir = EAST
+ glass_type = /obj/machinery/door/airlock/survival_pod/glass
//Windoor
/obj/machinery/door/window/survival_pod
diff --git a/code/modules/shuttle/shuttle_rotate.dm b/code/modules/shuttle/shuttle_rotate.dm
index d322f2cd32..49c7396dba 100644
--- a/code/modules/shuttle/shuttle_rotate.dm
+++ b/code/modules/shuttle/shuttle_rotate.dm
@@ -48,10 +48,6 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
/************************************Structure rotate procs************************************/
-/obj/structure/door_assembly/door_assembly_pod/shuttleRotate(rotation, params)
- . = ..()
- expected_dir = angle2dir(rotation+dir2angle(dir))
-
/obj/structure/cable/shuttleRotate(rotation, params)
params &= ~ROTATE_DIR
. = ..()
@@ -105,10 +101,6 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
params = NONE
return ..()
-/obj/machinery/door/airlock/survival_pod/shuttleRotate(rotation, params)
- expected_dir = angle2dir(rotation+dir2angle(dir))
- return ..()
-
//prevents shuttles attempting to rotate this since it messes up sprites
/obj/machinery/gravity_generator/shuttleRotate(rotation, params)
params = NONE
diff --git a/icons/obj/doors/airlocks/shuttle/overlays.dmi b/icons/obj/doors/airlocks/shuttle/overlays.dmi
index 50b2e25d8f..b2bb2cfa04 100644
Binary files a/icons/obj/doors/airlocks/shuttle/overlays.dmi and b/icons/obj/doors/airlocks/shuttle/overlays.dmi differ
diff --git a/icons/obj/doors/airlocks/station2/glass.dmi b/icons/obj/doors/airlocks/station2/glass.dmi
index 94d7ed7429..e10efd4282 100644
Binary files a/icons/obj/doors/airlocks/station2/glass.dmi and b/icons/obj/doors/airlocks/station2/glass.dmi differ
diff --git a/icons/obj/doors/airlocks/survival/survival.dmi b/icons/obj/doors/airlocks/survival/survival.dmi
index b796b4c8e0..478834eb93 100644
Binary files a/icons/obj/doors/airlocks/survival/survival.dmi and b/icons/obj/doors/airlocks/survival/survival.dmi differ
diff --git a/icons/obj/doors/airlocks/survival/survival_overlays.dmi b/icons/obj/doors/airlocks/survival/survival_overlays.dmi
index 94c1a9fa34..f6b0d8eb69 100644
Binary files a/icons/obj/doors/airlocks/survival/survival_overlays.dmi and b/icons/obj/doors/airlocks/survival/survival_overlays.dmi differ