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

Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528

Browse Source 
[MIRROR] Minor refactor of how gas IDs are handled
This commit is contained in:
LetterJay
2017-10-12 07:19:30 -04:00
committed by GitHub
parent 813e54e5ae 301dbad665
commit f93733576e
52 changed files with 425 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+2 -2
View File
@@ -3305,7 +3305,7 @@
"ga" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 1;
filter_type = "o2";
filter_type = /datum/gas/oxygen;
on = 1
},
/turf/open/floor/plasteel/floorgrime{
@@ -3719,7 +3719,7 @@
"gO" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 1;
filter_type = "n2o";
filter_type = /datum/gas/nitrous_oxide;
on = 1
},
/turf/open/floor/plasteel/floorgrime{
_maps/RandomZLevels/undergroundoutpost45.dmm
+2 -2
View File
@@ -14187,7 +14187,7 @@
"um" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 4;
filter_type = "n2";
filter_type = /datum/gas/nitrogen;
on = 1
},
/turf/open/floor/plasteel/red/side{
@@ -14236,7 +14236,7 @@
"up" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 4;
filter_type = "o2";
filter_type = /datum/gas/oxygen;
on = 1
},
/turf/open/floor/plasteel/blue/side{
_maps/map_files/BoxStation/BoxStation.dmm
+7 -7
View File
@@ -43123,7 +43123,7 @@
"bWb" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 1;
filter_type = "n2o";
filter_type = /datum/gas/nitrous_oxide;
on = 1
},
/turf/open/floor/plasteel,
@@ -44684,7 +44684,7 @@
"bZJ" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 1;
filter_type = "plasma";
filter_type = /datum/gas/plasma;
on = 1
},
/turf/open/floor/plasteel,
@@ -46475,7 +46475,7 @@
"cdB" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 1;
filter_type = "co2";
filter_type = /datum/gas/carbon_dioxide;
on = 1
},
/turf/open/floor/plasteel,
@@ -47103,7 +47103,7 @@
"cfi" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 2;
filter_type = "n2";
filter_type = /datum/gas/nitrogen;
on = 1
},
/turf/open/floor/plasteel,
@@ -47355,7 +47355,7 @@
"cfR" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 4;
filter_type = "o2";
filter_type = /datum/gas/oxygen;
on = 1
},
/turf/open/floor/plasteel,
@@ -57434,7 +57434,7 @@
"cGf" = (
/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
dir = 8;
filter_type = "n2"
filter_type = /datum/gas/nitrogen
},
/turf/open/floor/engine,
/area/engine/engineering)
@@ -58550,7 +58550,7 @@
"cSJ" = (
/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
dir = 8;
filter_type = "freon";
filter_type = /datum/gas/freon;
name = "gas filter (freon)"
},
/turf/open/floor/engine,
_maps/map_files/Deltastation/DeltaStation2.dmm
+8 -8
View File
@@ -6987,7 +6987,7 @@
},
/obj/machinery/atmospherics/components/trinary/filter/critical{
dir = 4;
filter_type = "n2"
filter_type = /datum/gas/nitrogen
},
/turf/open/floor/plasteel/neutral,
/area/engine/atmospherics_engine)
@@ -10811,7 +10811,7 @@
/area/shuttle/supply)
"aza" = (
/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
filter_type = "n2";
filter_type = /datum/gas/nitrogen;
name = "nitrogen filter"
},
/turf/open/floor/plasteel/yellow,
@@ -23007,7 +23007,7 @@
/obj/structure/window/reinforced,
/obj/machinery/atmospherics/components/trinary/filter{
dir = 2;
filter_type = "co2";
filter_type = /datum/gas/carbon_dioxide;
name = "co2 filter";
on = 1
},
@@ -24580,7 +24580,7 @@
/obj/structure/window/reinforced,
/obj/machinery/atmospherics/components/trinary/filter{
dir = 1;
filter_type = "o2";
filter_type = /datum/gas/oxygen;
name = "oxygen filter";
on = 1
},
@@ -25841,7 +25841,7 @@
/obj/structure/window/reinforced,
/obj/machinery/atmospherics/components/trinary/filter{
dir = 2;
filter_type = "plasma";
filter_type = /datum/gas/plasma;
name = "waste filter";
on = 1
},
@@ -27484,7 +27484,7 @@
/obj/structure/window/reinforced,
/obj/machinery/atmospherics/components/trinary/filter{
dir = 1;
filter_type = "n2";
filter_type = /datum/gas/nitrogen;
name = "nitrogen filter";
on = 1
},
@@ -29207,7 +29207,7 @@
/obj/structure/window/reinforced,
/obj/machinery/atmospherics/components/trinary/filter{
dir = 2;
filter_type = "n2o";
filter_type = /datum/gas/nitrous_oxide;
name = "n2o filter";
on = 1
},
@@ -105710,7 +105710,7 @@
},
/obj/machinery/atmospherics/components/trinary/filter/critical{
dir = 4;
filter_type = "freon";
filter_type = /datum/gas/freon;
name = "gas filter (freon)"
},
/turf/open/floor/plasteel/neutral,
_maps/map_files/MetaStation/MetaStation.dmm
+7 -7
View File
@@ -46860,7 +46860,7 @@
"bMk" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 1;
filter_type = "n2o";
filter_type = /datum/gas/nitrous_oxide;
on = 1
},
/obj/structure/window/reinforced{
@@ -49917,7 +49917,7 @@
"bSj" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 1;
filter_type = "plasma";
filter_type = /datum/gas/plasma;
on = 1
},
/obj/structure/window/reinforced{
@@ -52636,7 +52636,7 @@
"bXq" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 1;
filter_type = "co2";
filter_type = /datum/gas/carbon_dioxide;
on = 1
},
/obj/structure/window/reinforced{
@@ -54520,7 +54520,7 @@
"cbd" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 4;
filter_type = "n2";
filter_type = /datum/gas/nitrogen;
on = 1
},
/obj/structure/window/reinforced,
@@ -54575,7 +54575,7 @@
/obj/structure/window/reinforced,
/obj/machinery/atmospherics/components/trinary/filter{
dir = 4;
filter_type = "o2";
filter_type = /datum/gas/oxygen;
on = 1
},
/turf/open/floor/plasteel/blue,
@@ -82679,7 +82679,7 @@
dir = 4
},
/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
filter_type = "freon";
filter_type = /datum/gas/freon;
name = "gas filter (freon)"
},
/turf/open/floor/engine,
@@ -82879,7 +82879,7 @@
dir = 4
},
/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
filter_type = "n2"
filter_type = /datum/gas/nitrogen
},
/turf/open/floor/engine,
/area/engine/engineering)
_maps/map_files/OmegaStation/OmegaStation.dmm
+5 -5
View File
@@ -11009,7 +11009,7 @@
"asz" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 2;
filter_type = "n2";
filter_type = /datum/gas/nitrogen;
name = "nitrogen filter";
on = 1
},
@@ -13296,7 +13296,7 @@
"awD" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 2;
filter_type = "o2";
filter_type = /datum/gas/oxygen;
name = "oxygen filter";
on = 1
},
@@ -14109,7 +14109,7 @@
"ayf" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 1;
filter_type = "plasma";
filter_type = /datum/gas/plasma;
name = "waste filter";
on = 1
},
@@ -21607,7 +21607,7 @@
},
/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
dir = 1;
filter_type = "n2"
filter_type = /datum/gas/nitrogen
},
/turf/open/floor/plasteel,
/area/engine/engineering)
@@ -23873,7 +23873,7 @@
},
/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
dir = 1;
filter_type = "freon";
filter_type = /datum/gas/freon;
name = "gas filter (freon)"
},
/turf/open/floor/plasteel,
_maps/map_files/PubbyStation/PubbyStation.dmm
+4 -4
View File
@@ -41924,7 +41924,7 @@
"bQN" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 1;
filter_type = "n2o";
filter_type = /datum/gas/nitrous_oxide;
on = 1
},
/turf/open/floor/plasteel,
@@ -43351,7 +43351,7 @@
"bTU" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 1;
filter_type = "plasma";
filter_type = /datum/gas/plasma;
on = 1
},
/turf/open/floor/plasteel,
@@ -44738,7 +44738,7 @@
"bWK" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 4;
filter_type = "o2";
filter_type = /datum/gas/oxygen;
on = 1
},
/turf/open/floor/plasteel,
@@ -44777,7 +44777,7 @@
"bWQ" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 1;
filter_type = "co2";
filter_type = /datum/gas/carbon_dioxide;
on = 1
},
/turf/open/floor/plasteel,