From 64aa4104fc453a22684d42efc57783738ca47a6d Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 26 Jun 2014 21:07:25 +0930 Subject: [PATCH] Fixed an oversight with RAD_ABSORB and collapsing. Conflicts: code/modules/mob/living/carbon/human/life.dm --- code/modules/mob/living/carbon/human/life.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 4a69a2b2350..2afb026b905 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -314,10 +314,12 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc if (radiation) if (radiation > 100) - Weaken(10) - if(!lying) - src << "\red You feel weak." - emote("collapse") + radiation = 100 + if(!(species.flags & RAD_ABSORB)) + Weaken(10) + if(!lying) + src << "\red You feel weak." + emote("collapse") if (radiation < 0) radiation = 0