Merge pull request #12621 from Citadel-Station-13/silicons-patch-6

fixes a few things with the new Life()
This commit is contained in:
Lin
2020-06-28 13:36:55 -05:00
committed by GitHub
+6 -8
View File
@@ -1,9 +1,13 @@
/mob/living/carbon/BiologicalLife(seconds, times_fired)
//Reagent processing needs to come before breathing, to prevent edge cases.
handle_organs()
. = ..() // if . is false, we are dead.
if(stat == DEAD)
return FALSE
if(!(. = ..()))
stop_sound_channel(CHANNEL_HEARTBEAT)
handle_death()
rot()
. = FALSE
if(!.)
return
handle_blood()
// handle_blood *could* kill us.
@@ -21,12 +25,6 @@
if(stat != DEAD)
handle_liver()
if(stat == DEAD)
stop_sound_channel(CHANNEL_HEARTBEAT)
handle_death()
rot()
. = FALSE
//Updates the number of stored chemicals for powers
handle_changeling()