Merge pull request #7145 from Citadel-Station-13/upstream-merge-38523

[MIRROR] Fix Meta and Delta escape pod rooms having no air
This commit is contained in:
LetterJay
2018-06-18 10:11:06 -05:00
committed by GitHub
2 changed files with 26 additions and 14 deletions
+12 -6
View File
@@ -204,6 +204,7 @@
roundstart_template = /datum/map_template/shuttle/escape_pod/default;
width = 3
},
/obj/structure/fans/tiny/invisible,
/turf/open/space/basic,
/area/space)
"abv" = (
@@ -22725,6 +22726,7 @@
roundstart_template = /datum/map_template/shuttle/escape_pod/default;
width = 3
},
/obj/structure/fans/tiny/invisible,
/turf/open/space/basic,
/area/space)
"bbz" = (
@@ -100478,6 +100480,10 @@
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxins_mixing_output,
/turf/open/floor/engine/vacuum,
/area/science/mixing)
"xZM" = (
/obj/structure/fans/tiny/invisible,
/turf/open/space/basic,
/area/space)
"yiv" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{
@@ -136773,7 +136779,7 @@ aaa
aaa
aaa
aaa
aaa
xZM
abE
aaO
aca
@@ -137287,7 +137293,7 @@ aaa
aaa
aaa
aaa
aaa
xZM
abG
aaO
acc
@@ -141399,7 +141405,7 @@ aaa
aaa
aaa
aaa
aaa
xZM
abE
aaO
aca
@@ -141913,7 +141919,7 @@ aaa
aaa
aaa
aaa
aaa
xZM
abG
aaO
acc
@@ -158676,9 +158682,9 @@ aaa
ajr
aad
aKV
aaa
xZM
bbv
aaa
xZM
aKV
aad
aad
+14 -8
View File
@@ -466,6 +466,7 @@
roundstart_template = /datum/map_template/shuttle/escape_pod/default;
width = 3
},
/obj/structure/fans/tiny/invisible,
/turf/open/space/basic,
/area/space)
"abv" = (
@@ -1519,6 +1520,7 @@
roundstart_template = /datum/map_template/shuttle/escape_pod/default;
width = 3
},
/obj/structure/fans/tiny/invisible,
/turf/open/space/basic,
/area/space)
"adG" = (
@@ -76916,6 +76918,10 @@
"wOE" = (
/turf/open/floor/plating,
/area/maintenance/aft)
"wOY" = (
/obj/structure/fans/tiny/invisible,
/turf/open/space/basic,
/area/space)
"wPk" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -86362,7 +86368,7 @@ aaa
aaa
aaa
aaa
aaa
wOY
aSH
aUb
aVt
@@ -86876,7 +86882,7 @@ aaa
aaa
aaa
aaa
aaa
wOY
aSI
aRA
aVv
@@ -101998,7 +102004,7 @@ aaa
aaa
aaa
aaa
aaa
wOY
abL
acf
acy
@@ -102512,7 +102518,7 @@ aaa
aaa
aaa
aaa
aaa
wOY
abN
ach
aax
@@ -114596,9 +114602,9 @@ aaa
aaf
aaa
acP
aaa
wOY
adF
aaa
wOY
acP
afB
agz
@@ -120295,9 +120301,9 @@ dgp
cXI
cYj
atm
aaa
wOY
adF
aaa
wOY
bhT
bpv
brL