From 348d45f5611d64af922d558ecc207d7fa698fb5f Mon Sep 17 00:00:00 2001 From: Blossom <127415623+StudentBlossom@users.noreply.github.com> Date: Mon, 19 Aug 2024 17:26:31 +0200 Subject: [PATCH] =?UTF-8?q?Fixed=20the=20last=20word=20pop=20up=20window?= =?UTF-8?q?=20instantly=20killing=20you=20if=20you=20are=20fu=E2=80=A6=20(?= =?UTF-8?q?#26507)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixed the last word pop up window instantly killing you if you are full health * Update code/modules/mob/living/living.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> --- code/modules/mob/living/living.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 7dd6b5182af..a26c0248b81 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -306,7 +306,10 @@ if(stat == DEAD) // cancel em out if they died while they had the message box up last_words = null - + if(health >= HEALTH_THRESHOLD_CRIT) + to_chat(src, "You are unable to succumb to death! This life continues!") + last_words = null + return if(!isnull(last_words)) create_log(MISC_LOG, "gave their final words, [last_words]") src.last_words = last_words // sorry