From 3c4d3791a42079cae8769b7c19ceb1089fe14424 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Fri, 26 Jun 2020 17:21:20 -0700 Subject: [PATCH] Update life.dm --- code/modules/mob/living/carbon/life.dm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 3f82033760..4209e020e4 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -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()