Oxygen toxicity fix. Whoops.

This commit is contained in:
Zuhayr
2013-06-10 17:50:15 -07:00
parent bc2db268cc
commit 630db203f9

View File

@@ -394,7 +394,7 @@
var/oxygen_used = 0
var/nitrogen_used = 0
var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME
var/safe_oxygen_max = 1 // For vox.
var/vox_oxygen_max = 1 // For vox.
//Partial pressure of the O2 in our breath
var/O2_pp = (breath.oxygen/breath.total_moles())*breath_pressure
@@ -438,11 +438,6 @@
failed_last_breath = 1
oxygen_alert = max(oxygen_alert, 1)
if(O2_pp > safe_oxygen_max) //Oxygen is toxic to vox.
var/ratio = (breath.oxygen/safe_oxygen_max) * 10
adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
toxins_alert = max(toxins_alert, 1)
else // We're in safe limits
failed_last_breath = 0
adjustOxyLoss(-5)
@@ -474,6 +469,10 @@
if(reagents)
reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
toxins_alert = max(toxins_alert, 1)
else if(O2_pp > vox_oxygen_max && src.dna.mutantrace=="vox") //Oxygen is toxic to vox.
var/ratio = (breath.oxygen/vox_oxygen_max) * 10
adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
toxins_alert = max(toxins_alert, 1)
else
toxins_alert = 0