From cc49f70de812e49903f9f048283456175ef9adc3 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 22 Sep 2017 20:11:50 -0500 Subject: [PATCH] [MIRROR] Make scrubber code use temporary vars consistently (#2862) * Make scrubber code use temporary vars consistently * fixes merge mess --- .../components/unary_devices/vent_scrubber.dm | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) 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 d1a010df48..d92b061cec 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -196,39 +196,39 @@ filtered_out.temperature = removed.temperature if(scrub_Toxins && removed_gases["plasma"]) - filtered_out.assert_gas("plasma") + filtered_out.add_gas("plasma") filtered_gases["plasma"][MOLES] = removed_gases["plasma"][MOLES] removed.gases["plasma"][MOLES] = 0 if(scrub_CO2 && removed_gases["co2"]) - filtered_out.assert_gas("co2") - filtered_out.gases["co2"][MOLES] = removed_gases["co2"][MOLES] - removed.gases["co2"][MOLES] = 0 + filtered_out.add_gas("co2") + filtered_gases["co2"][MOLES] = removed_gases["co2"][MOLES] + removed_gases["co2"][MOLES] = 0 if(removed_gases["agent_b"]) - filtered_out.assert_gas("agent_b") - filtered_out.gases["agent_b"][MOLES] = removed_gases["agent_b"][MOLES] - removed.gases["agent_b"][MOLES] = 0 + filtered_out.add_gas("agent_b") + filtered_gases["agent_b"][MOLES] = removed_gases["agent_b"][MOLES] + removed_gases["agent_b"][MOLES] = 0 if(scrub_N2O && removed_gases["n2o"]) - filtered_out.assert_gas("n2o") - filtered_out.gases["n2o"][MOLES] = removed_gases["n2o"][MOLES] - removed.gases["n2o"][MOLES] = 0 + filtered_out.add_gas("n2o") + filtered_gases["n2o"][MOLES] = removed_gases["n2o"][MOLES] + removed_gases["n2o"][MOLES] = 0 if(scrub_BZ && removed_gases["bz"]) - filtered_out.assert_gas("bz") - filtered_out.gases["bz"][MOLES] = removed_gases["bz"][MOLES] - removed.gases["bz"][MOLES] = 0 + filtered_out.add_gas("bz") + filtered_gases["bz"][MOLES] = removed_gases["bz"][MOLES] + removed_gases["bz"][MOLES] = 0 if(scrub_Freon && removed_gases["freon"]) - filtered_out.assert_gas("freon") - filtered_out.gases["freon"][MOLES] = removed_gases["freon"][MOLES] - removed.gases["freon"][MOLES] = 0 + filtered_out.add_gas("freon") + filtered_gases["freon"][MOLES] = removed_gases["freon"][MOLES] + removed_gases["freon"][MOLES] = 0 if(scrub_WaterVapor && removed_gases["water_vapor"]) - filtered_out.assert_gas("water_vapor") - filtered_out.gases["water_vapor"][MOLES] = removed_gases["water_vapor"][MOLES] - removed.gases["water_vapor"][MOLES] = 0 + filtered_out.add_gas("water_vapor") + filtered_gases["water_vapor"][MOLES] = removed_gases["water_vapor"][MOLES] + removed_gases["water_vapor"][MOLES] = 0 removed.garbage_collect()