cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4329 from d3athrow/GasMathsStrip

Browse Source 
Gas maths stripping
This commit is contained in:
d3athrow
2015-05-09 20:05:12 -05:00
parent 02ac722250 e228853ea1
commit 9f4a47b488
106 changed files with 632 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
View File

@@ -126,7 +126,7 @@
if(scrubbing)
if(scrubbing_gases.len)
var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles()
var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles
//Take a gas sample
var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
@@ -139,15 +139,13 @@
if(!(gasid in scrubbing_gases))
continue
filtered_out.adjust_gas(gasid, removed.get_moles_by_id(gasid), 0) //move to filtered
removed.set_gas(gasid, 0, 0) //set to 0
filtered_out.adjust_gas(gasid, removed.gases[gasid]) //move to filtered
removed.set_gas(gasid, 0) //set to 0
//Filter it
filtered_out.temperature = removed.temperature
filtered_out.set_temperature(removed.temperature)
filtered_out.update_values()
removed.update_values()
//Remix the resulting gases
air_contents.merge(filtered_out)
@@ -158,10 +156,10 @@
network.update = 1
else //Just siphoning all air
if (air_contents.return_pressure()>=50*ONE_ATMOSPHERE)
if (air_contents.pressure>=50*ONE_ATMOSPHERE)
return
var/transfer_moles = environment.total_moles()*(volume_rate/environment.volume)
var/transfer_moles = environment.total_moles*(volume_rate/environment.volume)
var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)