From 0bd7896b252b96bd79c3a03d39c7c5aa7c130421 Mon Sep 17 00:00:00 2001 From: Phantastic-Swan Date: Sun, 6 Jul 2025 13:18:21 +0200 Subject: [PATCH] fixes burn damage from radiation when having fatrad mutation --- code/modules/mob/living/living.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 863b087361..bd6c716b89 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1164,7 +1164,9 @@ var/blocked = getarmor(null, RAD) - if(amount > RAD_BURN_THRESHOLD) + // GS13 EDIT allows us to bypass burn damage from rads + // if(amount > RAD_BURN_THRESHOLD) + if(amount > RAD_BURN_THRESHOLD && !HAS_TRAIT(src, TRAIT_RADRESONANCE)) // GS13 END EDIT apply_damage((amount-RAD_BURN_THRESHOLD)/RAD_BURN_THRESHOLD, BURN, null, blocked) apply_effect((amount*RAD_MOB_COEFFICIENT)/max(1, (radiation**2)*RAD_OVERDOSE_REDUCTION), EFFECT_IRRADIATE, blocked)