From edc78b2077205e6bb45366722093acf6fc45acff Mon Sep 17 00:00:00 2001 From: Casey Date: Sat, 30 Apr 2022 23:07:50 -0400 Subject: [PATCH 1/2] Merge pull request #12859 from Runa-Dacino/teshari_succumb_bugfix Fixes species with custom MaxHealth being unable to Succumb to death --- code/modules/mob/living/living.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 0b243236b9..1c0e524c89 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -80,11 +80,15 @@ /mob/living/verb/succumb() set hidden = 1 - if ((src.health < 0 && src.health > (5-src.getMaxHealth()))) // Health below Zero but above 5-away-from-death, as before, but variable +// if ((src.health < 0 && src.health > (5-src.getMaxHealth()))) // Health below Zero but above 5-away-from-death, as before, but variable + if (src.health < 0 && stat != DEAD) src.death() to_chat(src, "You have given up life and succumbed to death.") else - to_chat(src, "You are not injured enough to succumb to death!") + if(stat == DEAD) + to_chat(src, "As much as you'd like, you can't die when already dead") + else + to_chat(src, "You are not injured enough to succumb to death!") /mob/living/proc/updatehealth() if(status_flags & GODMODE)