From f281dff7fc4533f81c9669f9559dd71e2089e5cf Mon Sep 17 00:00:00 2001 From: Markolie Date: Sat, 12 Sep 2015 18:51:24 +0200 Subject: [PATCH] Radiation damage fix --- code/modules/events/radiation_storm.dm | 3 ++- code/modules/mob/living/damage_procs.dm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index 2018558a055..021e266d917 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -39,7 +39,8 @@ for(var/i = 0, i < 10, i++) for(var/mob/living/carbon/human/H in living_mob_list) - if(H.species.flags & NO_DNA_RAD) // Leave synthetics completely unaffected + var/armor = H.getarmor(attack_flag = "rad") + if((H.species.flags & NO_DNA_RAD) || armor >= 100) // Leave DNA-less species/fully rad armored players completely unaffected continue var/turf/T = get_turf(H) if(!T) diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 92a85a4ced3..dd514743aff 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -59,7 +59,7 @@ halloss += effect // Useful for objects that cause "subdual" damage. PAIN! if(IRRADIATE) var/rad_damage = effect - if(negate_armor) // Setting negate_armor overrides radiation armor checks, which are automatic otherwise + if(!negate_armor) // Setting negate_armor overrides radiation armor checks, which are automatic otherwise rad_damage = max(effect * ((100-run_armor_check(null, "rad", "Your clothes feel warm.", "Your clothes feel warm."))/100),0) radiation += rad_damage if(SLUR)