From 4f40d955b197fa8eafff7c4fdae75fbfd5f26b23 Mon Sep 17 00:00:00 2001 From: A-t48 Date: Sun, 4 Sep 2016 13:24:29 -0700 Subject: [PATCH] Fix scrubbing freon\water vapor + fix labelling canisters with freon\water vapor (#20301) * Fix a bunch of atmos stuff * undo whitespace fixes * remove whitespace fixes --- .../atmospherics/machinery/airalarm.dm | 20 +++++++++---------- .../components/unary_devices/vent_scrubber.dm | 4 ++-- .../machinery/portable/canister.dm | 2 ++ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 1d5476c4d4f..9d2c5627bc2 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -231,16 +231,16 @@ if(!info || info["frequency"] != frequency) continue data["scrubbers"] += list(list( - "id_tag" = id_tag, - "long_name" = sanitize(long_name), - "power" = info["power"], - "scrubbing" = info["scrubbing"], - "widenet" = info["widenet"], - "filter_co2" = info["filter_co2"], - "filter_toxins" = info["filter_toxins"], - "filter_n2o" = info["filter_n2o"], - "filter_bz" = info["filter_bz"], - "filter_freon" = info["filter_freon"], + "id_tag" = id_tag, + "long_name" = sanitize(long_name), + "power" = info["power"], + "scrubbing" = info["scrubbing"], + "widenet" = info["widenet"], + "filter_co2" = info["filter_co2"], + "filter_toxins" = info["filter_toxins"], + "filter_n2o" = info["filter_n2o"], + "filter_bz" = info["filter_bz"], + "filter_freon" = info["filter_freon"], "filter_water_vapor" = info["filter_water_vapor"] )) data["mode"] = mode diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index b5e4ee2146a..f95900688ec 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -126,8 +126,8 @@ "filter_toxins" = scrub_Toxins, "filter_n2o" = scrub_N2O, "filter_bz" = scrub_BZ, - "filter_Freon" = scrub_Freon, - "filter_WaterVapor" = scrub_WaterVapor, + "filter_freon" = scrub_Freon, + "filter_water_vapor" = scrub_WaterVapor, "sigtype" = "status" ) diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index f679764fefa..2188de76733 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -31,6 +31,8 @@ "n2o" = /obj/machinery/portable_atmospherics/canister/nitrous_oxide, "bz" = /obj/machinery/portable_atmospherics/canister/bz, "air" = /obj/machinery/portable_atmospherics/canister/air, + "freon" = /obj/machinery/portable_atmospherics/canister/freon, + "water vapor" = /obj/machinery/portable_atmospherics/canister/water_vapor, "caution" = /obj/machinery/portable_atmospherics/canister, )