From 059e3cf6c358b3576d98754b2d42bad0eaa9826f Mon Sep 17 00:00:00 2001 From: Runa Dacino Date: Sun, 22 May 2022 06:52:39 +0200 Subject: [PATCH] Fixes numbing_belly NOT blocking shock messages Adds a check for traumatic shock before sending pain messages. Traumatic shock is a sum of injuries, multiplied by sensitivity, and offset by painkillers. To receive pain messages, you must take at least 233 damage to begin feeling pain while in a numbing belly, by which time you are already dead. --- code/modules/mob/living/carbon/human/life.dm | 21 +++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index a2f11c94ee4..56c54d1fdbb 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -84,7 +84,7 @@ handle_shock() handle_pain() - + handle_allergens() handle_medical_side_effects() @@ -1621,32 +1621,39 @@ return 0 if(shock_stage == 10) - custom_pain("[pick("It hurts so much", "You really need some painkillers", "Dear god, the pain")]!", 40) + if(traumatic_shock >= 80) + custom_pain("[pick("It hurts so much", "You really need some painkillers", "Dear god, the pain")]!", 40) if(shock_stage >= 30) if(shock_stage == 30 && !isbelly(loc)) //VOREStation Edit custom_emote(VISIBLE_MESSAGE, "is having trouble keeping their eyes open.") eye_blurry = max(2, eye_blurry) - stuttering = max(stuttering, 5) + if(traumatic_shock >= 80) + stuttering = max(stuttering, 5) + if(shock_stage == 40) - to_chat(src, "[pick("The pain is excruciating", "Please, just end the pain", "Your whole body is going numb")]!") + if(traumatic_shock >= 80) + to_chat(src, "[pick("The pain is excruciating", "Please, just end the pain", "Your whole body is going numb")]!") if (shock_stage >= 60) if(shock_stage == 60 && !isbelly(loc)) //VOREStation Edit custom_emote(VISIBLE_MESSAGE, "'s body becomes limp.") if (prob(2)) - to_chat(src, "[pick("The pain is excruciating", "Please, just end the pain", "Your whole body is going numb")]!") + if(traumatic_shock >= 80) + to_chat(src, "[pick("The pain is excruciating", "Please, just end the pain", "Your whole body is going numb")]!") Weaken(20) if(shock_stage >= 80) if (prob(5)) - to_chat(src, "[pick("The pain is excruciating", "Please, just end the pain", "Your whole body is going numb")]!") + if(traumatic_shock >= 80) + to_chat(src, "[pick("The pain is excruciating", "Please, just end the pain", "Your whole body is going numb")]!") Weaken(20) if(shock_stage >= 120) if (prob(2)) - to_chat(src, "[pick("You black out", "You feel like you could die any moment now", "You are about to lose consciousness")]!") + if(traumatic_shock >= 80) + to_chat(src, "[pick("You black out", "You feel like you could die any moment now", "You are about to lose consciousness")]!") Paralyse(5) if(shock_stage == 150)