From 8bc84c23db0ed8b7ce0173215f6cd94da2681e6b Mon Sep 17 00:00:00 2001 From: duncathan salt Date: Fri, 17 Nov 2017 12:48:53 -0600 Subject: [PATCH 1/2] fixes scrubbers being unable to scrub --- .../machinery/components/unary_devices/vent_scrubber.dm | 4 ++++ 1 file changed, 4 insertions(+) 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 87e218c199..a860ad4122 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -175,6 +175,7 @@ return FALSE if(scrubbing & SCRUBBING) +<<<<<<< HEAD var/should_we_scrub = FALSE for(var/id in env_gases) if(id == /datum/gas/nitrogen || id == /datum/gas/oxygen) @@ -183,6 +184,9 @@ should_we_scrub = TRUE break if(should_we_scrub) +======= + if(length(env_gases & filter_types)) +>>>>>>> 841a321... fixes scrubbers being unable to scrub (#32823) var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles() //Take a gas sample From 5f055aa492e4bebea8a1235135bdb90045551222 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sat, 18 Nov 2017 00:36:11 -0500 Subject: [PATCH 2/2] Update vent_scrubber.dm --- .../components/unary_devices/vent_scrubber.dm | 11 ----------- 1 file changed, 11 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 a860ad4122..c1aea7ca7e 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -175,18 +175,7 @@ return FALSE if(scrubbing & SCRUBBING) -<<<<<<< HEAD - var/should_we_scrub = FALSE - for(var/id in env_gases) - if(id == /datum/gas/nitrogen || id == /datum/gas/oxygen) - continue - if(env_gases[id][MOLES]) - should_we_scrub = TRUE - break - if(should_we_scrub) -======= if(length(env_gases & filter_types)) ->>>>>>> 841a321... fixes scrubbers being unable to scrub (#32823) var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles() //Take a gas sample