cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 20:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron

Browse Source 
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
This commit is contained in:
Ravensdale
2014-04-16 21:44:26 -07:00
parent 1d6655850f 20e2991af3
commit 68eda5201b
51 changed files with 11267 additions and 11129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
+1 -1
View File
@@ -104,7 +104,7 @@
var/datum/gas_mixture/environment = loc.return_air()
if(scrubbing)
if((environment.phoron>0) || (environment.carbon_dioxide>0) || (environment.trace_gases.len>0))
if((environment.phoron>0.001) || (environment.carbon_dioxide>0.001) || (environment.trace_gases.len>0))
var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles()
//Take a gas sample