Merge pull request #4340 from deathride58/fixesmetabolism

Fixes mob metabolism
This commit is contained in:
LetterJay
2017-12-12 15:09:16 -06:00
committed by GitHub
+11 -6
View File
@@ -2,13 +2,16 @@
set invisibility = 0
set background = BACKGROUND_ENABLED
if (notransform)
if(notransform)
return
if(damageoverlaytemp)
damageoverlaytemp = 0
update_damage_hud()
if(stat != DEAD) //Reagent processing needs to come before breathing, to prevent edge cases.
handle_organs()
if(..()) //not dead
handle_blood()
@@ -24,10 +27,6 @@
//Updates the number of stored chemicals for powers
handle_changeling()
if(stat != DEAD)
handle_liver()
if(stat != DEAD)
return 1
@@ -54,6 +53,7 @@
return
if(ismob(loc))
return
var/datum/gas_mixture/environment
if(loc)
environment = loc.return_air()
@@ -67,7 +67,6 @@
else if(health <= HEALTH_THRESHOLD_CRIT)
losebreath += 0.25 //You're having trouble breathing in soft crit, so you'll miss a breath one in four times
//Suffocate
if(losebreath >= 1) //You've missed a breath, take oxy damage
losebreath--
@@ -121,6 +120,7 @@
if(reagents.has_reagent("epinephrine") && lungs)
return
adjustOxyLoss(1)
failed_last_breath = 1
throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
return 0
@@ -244,6 +244,11 @@
/mob/living/carbon/proc/handle_blood()
return
/mob/living/carbon/proc/handle_organs()
for(var/V in internal_organs)
var/obj/item/organ/O = V
O.on_life()
/mob/living/carbon/handle_diseases()
for(var/thing in viruses)
var/datum/disease/D = thing