Update vent_scrubber.dm

2017-11-18 00:36:11 -05:00
parent 8bc84c23db
commit 5f055aa492
1 changed files with 0 additions and 11 deletions
@@ -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