shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3476 from Citadel-Station-13/upstream-merge-31831

Browse Source 
[MIRROR] Filters allow air to pass through when not set to filter any gas
This commit is contained in:
LetterJay
2017-10-18 07:39:26 -04:00
committed by GitHub
parent 45c96ae08e 56501637b8
commit c2be4a21a6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
+3 -2
View File
@@ -69,7 +69,7 @@
var/output_starting_pressure = air3.return_pressure()
if(output_starting_pressure >= target_pressure || air2.return_pressure() >= target_pressure)
if(output_starting_pressure >= target_pressure)
//No need to transfer if target is already full!
return
@@ -106,7 +106,8 @@
removed.gases[filter_type][MOLES] = 0
removed.garbage_collect()
air2.merge(filtered_out)
var/datum/gas_mixture/target = (air2.return_pressure() < target_pressure ? air2 : air1) //if there's no room for the filtered gas; just leave it in air1
target.merge(filtered_out)
air3.merge(removed)