diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index c5f9698682c5..5276cf514d65 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -710,7 +710,9 @@ //Fire and Brute damage overlay (BSSR) var/hurtdamage = getBruteLoss() + getFireLoss() + damageoverlaytemp - if(hurtdamage) + if(HAS_TRAIT(src, TRAIT_PAIN_RESIST)) + hurtdamage = round(hurtdamage/2) + if(hurtdamage && !HAS_TRAIT(src, TRAIT_ANALGESIA)) var/severity = 0 switch(hurtdamage) if(5 to 15)