From 5ddcd7133f0e027ebc80a9331cab84d991e3076a Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Fri, 18 May 2018 07:15:12 -0400 Subject: [PATCH] Fixes radimmune mobs being killed by radiation (#37875) --- code/modules/mob/living/living.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index e4aee188e0..b6c210ae44 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -941,7 +941,7 @@ /mob/living/rad_act(amount) . = ..() - if(!amount || amount < RAD_MOB_SKIN_PROTECTION) + if(!amount || (amount < RAD_MOB_SKIN_PROTECTION) || has_trait(TRAIT_RADIMMUNE)) return amount -= RAD_BACKGROUND_RADIATION // This will always be at least 1 because of how skin protection is calculated