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

[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
52 changed files with 425 additions and 412 deletions
+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,