From 391cddcbbf23f3b6c0ae3b5ccf0f5ae63bfcedd7 Mon Sep 17 00:00:00 2001 From: Phantastic-Swan Date: Sun, 11 May 2025 19:27:11 +0200 Subject: [PATCH] added GS13 edit comments --- code/modules/mob/living/carbon/human/species.dm | 2 ++ code/modules/mob/living/carbon/life.dm | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 96955c8a37..ebce4913d9 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1683,8 +1683,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) radiation = 0 return TRUE + // GS13 EDIT - allows for skipping negative effects of rad without removing them if(HAS_TRAIT(H, TRAIT_RADRESONANCE)) return TRUE + // GS13 END EDIT 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 594afa18a4..ac44cfcba1 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -439,7 +439,9 @@ dna.remove_mutation(HM.type) radiation -= min(radiation, RAD_LOSS_PER_TICK) - if(radiation > RAD_MOB_SAFE && !HAS_TRAIT(src, TRAIT_RADRESONANCE)) + // GS13 EDIT allows for skipping of toxic damage from rads + // if(radiation > RAD_MOB_SAFE) + if(radiation > RAD_MOB_SAFE && !HAS_TRAIT(src, TRAIT_RADRESONANCE)) // GS13 END EDIT if(!HAS_TRAIT(src, TRAIT_ROBOTIC_ORGANISM)) adjustToxLoss(log(radiation-RAD_MOB_SAFE)*RAD_TOX_COEFFICIENT) else