From cb43d51829127952fccb22fb90b8d328407f3668 Mon Sep 17 00:00:00 2001 From: Phantastic-Swan Date: Sun, 11 May 2025 10:02:36 +0200 Subject: [PATCH] fixes rad fat not making players immune to radiation effects --- code/modules/mob/living/carbon/human/species.dm | 3 +++ code/modules/mob/living/carbon/life.dm | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 4373c26c9f..96955c8a37 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1683,6 +1683,9 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) radiation = 0 return TRUE + if(HAS_TRAIT(H, TRAIT_RADRESONANCE)) + return TRUE + if(HAS_TRAIT(H, TRAIT_ROBOTIC_ORGANISM)) return //Robots are hardened against radiation, but suffer system corruption at very high levels. diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index f146e0f9b9..594afa18a4 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -439,7 +439,7 @@ dna.remove_mutation(HM.type) radiation -= min(radiation, RAD_LOSS_PER_TICK) - if(radiation > RAD_MOB_SAFE) + if(radiation > RAD_MOB_SAFE && !HAS_TRAIT(src, TRAIT_RADRESONANCE)) if(!HAS_TRAIT(src, TRAIT_ROBOTIC_ORGANISM)) adjustToxLoss(log(radiation-RAD_MOB_SAFE)*RAD_TOX_COEFFICIENT) else