cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Atmos grille purge (#19824)

Browse Source 
* atmos grille purge

* merge error
This commit is contained in:
S34N
2022-12-28 12:19:01 -05:00
committed by GitHub
parent 7e1e1b167d
commit 6ec12bd917
3 changed files with 7664 additions and 7759 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/Delta/delta.dmm
+6445 -6484
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/MetaStation/MetaStation.dmm
+1087 -1135
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/cyberiad/cyberiad.dmm
+132 -140
View File
@@ -58014,10 +58014,6 @@
},
/turf/simulated/floor/plasteel,
/area/atmos/distribution)
"cQZ" = (
/obj/structure/grille,
/turf/simulated/wall/r_wall,
/area/atmos)
"cRa" = (
/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
dir = 8
@@ -58551,16 +58547,6 @@
},
/turf/simulated/floor/plasteel,
/area/atmos/distribution)
"cSn" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/obj/structure/grille,
/obj/machinery/atmospherics/meter{
layer = 2.9
},
/turf/simulated/wall/r_wall,
/area/atmos)
"cSo" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
@@ -64463,14 +64449,6 @@
},
/turf/simulated/floor/grass,
/area/hydroponics)
"djB" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/structure/grille,
/obj/machinery/atmospherics/meter{
layer = 2.9
},
/turf/simulated/wall/r_wall,
/area/atmos)
"djC" = (
/obj/machinery/camera{
c_tag = "Aft Starboard Solar Access";
@@ -64621,26 +64599,6 @@
icon_state = "dark"
},
/area/turret_protected/aisat_interior)
"djS" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/structure/grille,
/obj/machinery/atmospherics/meter{
id_tag = "mair_in_meter";
layer = 2.9;
name = "Mixed Air Tank In"
},
/turf/simulated/wall/r_wall,
/area/atmos)
"djU" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/structure/grille,
/obj/machinery/atmospherics/meter{
id_tag = "mair_out_meter";
layer = 2.9;
name = "Mixed Air Tank Out"
},
/turf/simulated/wall/r_wall,
/area/atmos)
"djV" = (
/obj/machinery/power/apc{
dir = 1;
@@ -66348,12 +66306,6 @@
},
/turf/simulated/floor/plating,
/area/turret_protected/aisat_interior)
"dod" = (
/obj/machinery/atmospherics/unary/outlet_injector/on{
dir = 1
},
/turf/simulated/floor/plating/airless,
/area/turret_protected/aisat_interior)
"doe" = (
/obj/structure/sign/securearea{
pixel_y = -32
@@ -69837,6 +69789,15 @@
icon_state = "dark"
},
/area/engine/engineering)
"fdB" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/atmospherics/meter{
id_tag = "mair_out_meter";
layer = 2.9;
name = "Mixed Air Tank Out"
},
/turf/simulated/wall/r_wall,
/area/atmos)
"fdK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
@@ -70652,6 +70613,16 @@
},
/turf/simulated/floor/plasteel,
/area/toxins/hallway)
"fIe" = (
/obj/machinery/atmospherics/unary/outlet_injector/on{
dir = 1;
frequency = 1441;
id = "engine-waste_out";
name = "engine outlet injector";
volume_rate = 200
},
/turf/simulated/floor/plating/airless,
/area/engine/engineering)
"fIB" = (
/obj/structure/chair/stool{
dir = 1
@@ -72002,6 +71973,12 @@
icon_state = "whitehall"
},
/area/medical/reception)
"gJl" = (
/obj/machinery/atmospherics/unary/outlet_injector/on{
dir = 1
},
/turf/simulated/floor/plating/airless,
/area/turret_protected/aisat_interior)
"gJU" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/purple,
@@ -74098,16 +74075,6 @@
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"idy" = (
/obj/machinery/atmospherics/unary/outlet_injector/on{
dir = 1;
frequency = 1441;
id = "engine-waste_out";
name = "engine outlet injector";
volume_rate = 200
},
/turf/simulated/floor/plating/airless,
/area/engine/engineering)
"idz" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -76245,6 +76212,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
"jYu" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/obj/machinery/atmospherics/meter{
layer = 2.9
},
/turf/simulated/wall/r_wall,
/area/atmos)
"jYv" = (
/obj/structure/railing{
dir = 8
@@ -83215,6 +83191,15 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
"pFX" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/atmospherics/meter{
id_tag = "mair_in_meter";
layer = 2.9;
name = "Mixed Air Tank In"
},
/turf/simulated/wall/r_wall,
/area/atmos)
"pGa" = (
/obj/structure/window/reinforced,
/obj/structure/grille,
@@ -87242,6 +87227,13 @@
},
/turf/simulated/floor/plating,
/area/engine/engineering)
"taa" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/atmospherics/meter{
layer = 2.9
},
/turf/simulated/wall/r_wall,
/area/atmos)
"taM" = (
/mob/living/simple_animal/slime,
/turf/simulated/floor/engine,
@@ -124821,7 +124813,7 @@ tky
fFY
ubz
iEE
idy
fIe
aaa
aaa
aaa
@@ -126356,11 +126348,11 @@ dgM
dcF
dhI
aab
cQZ
cQZ
cQZ
cQZ
cQZ
cZS
cZS
cZS
cZS
cZS
dcq
dok
dcq
@@ -126613,11 +126605,11 @@ dgN
dhB
dik
diU
djB
taa
dki
dkO
dkO
cQZ
cZS
dcq
ddr
dcq
@@ -126874,7 +126866,7 @@ cTo
dkh
bbM
dlv
cQZ
cZS
dcq
dfm
dcq
@@ -127127,11 +127119,11 @@ dgP
dhC
dip
mpD
djB
taa
dkk
dkO
dkO
cQZ
cZS
cYz
aaa
dcq
@@ -127384,11 +127376,11 @@ dgQ
dhx
dhI
cQp
cQZ
cQZ
cQZ
cQZ
cQZ
cZS
cZS
cZS
cZS
cZS
aab
aaa
dcq
@@ -127641,11 +127633,11 @@ dgR
dhE
dit
wdL
djB
taa
dkq
dkT
dkT
cQZ
cZS
aab
aaa
aaa
@@ -127902,7 +127894,7 @@ cTo
dkp
bbO
dlw
cQZ
cZS
aab
aaa
aaa
@@ -128155,11 +128147,11 @@ dgP
dhF
dip
mpD
djB
taa
dks
dkT
dkT
cQZ
cZS
aab
aab
aab
@@ -128412,11 +128404,11 @@ dgQ
cSd
dhI
cQp
cQZ
cQZ
cQZ
cQZ
cQZ
cZS
cZS
cZS
cZS
cZS
aaa
aab
aaa
@@ -128669,11 +128661,11 @@ dgP
dhH
cYb
dja
djS
pFX
dkw
dkV
dkV
cQZ
cZS
aaa
aab
aaa
@@ -128930,7 +128922,7 @@ cTo
dku
bdG
dlx
cQZ
cZS
aaa
aab
aaa
@@ -129183,11 +129175,11 @@ deQ
dhJ
cYb
dja
djU
fdB
dkx
dkV
dkV
cQZ
cZS
aaa
aab
aab
@@ -129440,11 +129432,11 @@ dgW
dhI
dhI
cQp
cQZ
cQZ
cQZ
cQZ
cQZ
cZS
cZS
cZS
cZS
cZS
aaa
aab
aaa
@@ -129933,23 +129925,23 @@ cKj
cLO
cxO
cQp
cQZ
cSn
cZS
jYu
cTo
cSn
cQZ
cSn
jYu
cZS
jYu
cTo
cSn
cQZ
cSn
jYu
cZS
jYu
cTo
cSn
cQZ
cSn
jYu
cZS
jYu
cTo
cSn
cQZ
jYu
cZS
aaa
aaa
aaa
@@ -130190,23 +130182,23 @@ fEv
uOG
cxO
cQp
cQZ
cZS
cSu
cTv
cUW
cQZ
cZS
cXe
cYf
cZi
cQZ
cZS
dbc
dbS
dcT
cQZ
cZS
den
deX
dfO
cQZ
cZS
aaa
aaa
aaa
@@ -130447,23 +130439,23 @@ fEv
cLP
cxO
cQp
cQZ
cZS
cSs
cSw
cSw
cQZ
cZS
cWZ
cIf
cWZ
cQZ
cZS
dbb
cLV
dbb
cQZ
cZS
dem
cRi
dem
cQZ
cZS
aaa
hSD
hSD
@@ -130704,23 +130696,23 @@ sWc
cts
cxO
cQp
cQZ
cZS
cSw
cTw
cSw
cQZ
cZS
cWZ
cXZ
cWZ
cQZ
cZS
dbb
dbW
dbb
cQZ
cZS
dem
deY
dem
cQZ
cZS
aaa
aab
aaa
@@ -130961,23 +130953,23 @@ vzf
xYd
cxO
cQp
cQZ
cQZ
cQZ
cQZ
cQZ
cQZ
cQZ
cQZ
cQZ
cQZ
cQZ
cQZ
cQZ
cQZ
cQZ
cQZ
cQZ
cZS
cZS
cZS
cZS
cZS
cZS
cZS
cZS
cZS
cZS
cZS
cZS
cZS
cZS
cZS
cZS
cZS
diu
djd
xzG
@@ -131251,7 +131243,7 @@ aaa
aaa
aaa
fmG
dod
gJl
dnZ
diL
djp