From 0d755bef9917da08b457c5fd64ba89d550afb662 Mon Sep 17 00:00:00 2001 From: Verkister Date: Mon, 1 Mar 2021 17:38:08 +0200 Subject: [PATCH] Fixes pain shock emotes leaking from bellies Digesting or otherwise hurt prey will no longer broadcast their agony for the whole room. --- code/modules/mob/living/carbon/human/life.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index fe1c4b5c7e1..25303971b15 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1555,7 +1555,8 @@ 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) emote("me",1,"is having trouble keeping their eyes open.") + if(shock_stage == 30 && !isbelly(loc)) //VOREStation Edit + emote("me",1,"is having trouble keeping their eyes open.") eye_blurry = max(2, eye_blurry) stuttering = max(stuttering, 5) @@ -1563,7 +1564,8 @@ 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) emote("me",1,"'s body becomes limp.") + if(shock_stage == 60 && !isbelly(loc)) //VOREStation Edit + emote("me",1,"'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")]!") Weaken(20) @@ -1579,7 +1581,8 @@ Paralyse(5) if(shock_stage == 150) - emote("me",1,"can no longer stand, collapsing!") + if(!isbelly(loc)) //VOREStation Edit + emote("me",1,"can no longer stand, collapsing!") Weaken(20) if(shock_stage >= 150)