From fb59290f7cd8920854fe53d075c0fafdab294ebf Mon Sep 17 00:00:00 2001 From: quotefox Date: Sat, 26 Mar 2022 13:54:49 +0000 Subject: [PATCH] people asleep, never go into shock. for medical. --- hyperstation/code/modules/mob/living/carbon/carbon.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hyperstation/code/modules/mob/living/carbon/carbon.dm b/hyperstation/code/modules/mob/living/carbon/carbon.dm index 29282c038..63729b9d9 100644 --- a/hyperstation/code/modules/mob/living/carbon/carbon.dm +++ b/hyperstation/code/modules/mob/living/carbon/carbon.dm @@ -63,7 +63,7 @@ if (pain_effect > 10) pain_effect = 0 //reset the timer 10 seconds. - if(stat != DEAD) + if(stat == 0) //awake, not dead or asleep //status effects for pain.. var/mob/living/H = src if (total_pain > 50 && total_pain < 80) @@ -89,7 +89,8 @@ jitteriness += 3 //shake stuttering += 3 //stutter words - if (total_pain > 110 && stat != DEAD) //taking 77 all damage at once from full health, will put you into shock and kill you. This cant be achived with chip damage (or fist fights), because youll die before you reach this pain level. + //if they are asleep, this wont trigger. + if (total_pain > 110 && stat == 0) //taking 77 all damage at once from full health, will put you into shock and kill you. This cant be achived with chip damage (or fist fights), because youll die before you reach this pain level. to_chat(src, "You give into the pain...") visible_message("[src] goes into shock!") death() // kill.