shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152

Browse Source 
[MIRROR] Airlock Construction Update
This commit is contained in:
deathride58
2017-12-10 23:49:51 +00:00
committed by GitHub
parent c116054efc 9d50222ef6
commit 57ab98d8bc
62 changed files with 822 additions and 965 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
+1 -1
View File
@@ -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)
_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm
+1 -1
View File
@@ -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" = (
_maps/RandomRuins/SpaceRuins/DJstation.dmm
+2 -2
View File
@@ -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,
_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
+2 -2
View File
@@ -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"
},
_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
+1 -1
View File
@@ -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"
_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+3 -3
View File
@@ -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{
_maps/RandomRuins/SpaceRuins/derelict6.dmm
+2 -2
View File
@@ -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,
_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm
+3 -1
View File
@@ -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)
_maps/RandomRuins/SpaceRuins/intactemptyship.dmm
+1 -1
View File
@@ -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" = (
_maps/RandomRuins/SpaceRuins/oldstation.dmm
+5 -5
View File
@@ -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,
_maps/RandomRuins/SpaceRuins/onehalf.dmm
+2 -2
View File
@@ -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
},
_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm
+1 -1
View File
@@ -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" = (
_maps/RandomRuins/SpaceRuins/spacehotel.dmm
+8 -8
View File
@@ -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"
},
_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
+2 -2
View File
@@ -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" = (
_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm
+2 -2
View File
@@ -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" = (