From 1f26c670318a285248d0da230b54452ef30a5ca8 Mon Sep 17 00:00:00 2001 From: Scriblon Date: Sat, 22 Oct 2016 15:25:44 +0200 Subject: [PATCH] Scrubbers now respect air alarm settings. Scrubbers only worked when there was CO2, Toxins, or trace gasses in the atmosphere, ignoring settings on the Air Alarm. This commit fixes that and makes the scrubber respect the settings. --- code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm index 8570977d617..244e9c26aa3 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm @@ -213,7 +213,7 @@ var/datum/gas_mixture/environment = tile.return_air() if(scrubbing) - if((environment.toxins>0.001) || (environment.carbon_dioxide>0.001) || (environment.trace_gases.len>0)) + if((scrub_O2 && environment.oxygen>0.001) || (scrub_N2 && environment.nitrogen>0.001) || (scrub_CO2 && environment.carbon_dioxide>0.001) || (scrub_Toxins && environment.toxins>0.001) || (environment.trace_gases.len>0)) var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles() //Take a gas sample