Merge pull request #6787 from Citadel-Station-13/upstream-merge-37875

[MIRROR] Fixes radimmune mobs being killed by high bursts of radiation
2018-05-19 09:11:08 -05:00
parent 8803db5ad5 7104860dc7
commit f0a8499efe
1 changed files with 1 additions and 1 deletions
@@ -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