From 49ca5ee0ca4bae3becd2431ec603a3695f845fe2 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 27 Dec 2014 08:28:20 +1030 Subject: [PATCH] NO_PAIN will now properly stop hard stun from taking effect. --- code/modules/mob/living/carbon/human/life.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 03dae189d9..3a9c32451e 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1753,6 +1753,8 @@ return slurring /mob/living/carbon/human/handle_stunned() + if(species.flags & NO_PAIN) + return 0 if(..()) speech_problem_flag = 1 return stunned