Merge pull request #3393 from Citadel-Station-13/upstream-merge-31684

[MIRROR] [s] Removes scrubber and filter infinite pressure exploits.
This commit is contained in:
LetterJay
2017-10-15 08:48:56 -04:00
committed by GitHub
2 changed files with 5 additions and 4 deletions
@@ -69,8 +69,8 @@
var/output_starting_pressure = air3.return_pressure()
if(output_starting_pressure >= target_pressure)
//No need to mix if target is already full!
if(output_starting_pressure >= target_pressure || air2.return_pressure() >= target_pressure)
//No need to transfer if target is already full!
return
//Calculate necessary moles to transfer using PV=nRT
@@ -171,6 +171,9 @@
var/datum/gas_mixture/air_contents = AIR1
var/list/env_gases = environment.gases
if(air_contents.return_pressure() >= 50*ONE_ATMOSPHERE)
return FALSE
if(scrubbing & SCRUBBING)
var/should_we_scrub = FALSE
for(var/id in env_gases)
@@ -238,8 +241,6 @@
tile.air_update_turf()
else //Just siphoning all air
if(air_contents.return_pressure()>=50*ONE_ATMOSPHERE)
return FALSE
var/transfer_moles = environment.total_moles()*(volume_rate/environment.volume)