Fixes radimmune mobs being killed by radiation (#37875)

2018-05-18 07:15:12 -04:00
parent bfcaceb4e1
commit 5ddcd7133f
1 changed files with 1 additions and 1 deletions
--- 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