From 5bd27677f5c0161d0f4bdf34d2eb3109e5367a04 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Mon, 25 Jan 2016 20:32:20 -0500 Subject: [PATCH 1/2] Fixes Radiation Runtimes --- code/modules/events/radiation_storm.dm | 2 +- code/modules/mob/living/damage_procs.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index 9562e51c385..b297f898feb 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -36,7 +36,7 @@ for(var/i = 0, i < 10, i++) for(var/mob/living/carbon/human/H in living_mob_list) - var/armor = H.getarmor(attack_flag = "rad") + var/armor = H.getarmor(type = "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) diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index dd514743aff..999ebacb58d 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -46,7 +46,7 @@ /mob/living/proc/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0, var/negate_armor = 0) blocked = (100-blocked)/100 - if(!effect || (blocked <= 0)) + if(!effect || (blocked <= 0)) return 0 switch(effecttype) if(STUN) @@ -77,7 +77,7 @@ updatehealth() return 1 -/mob/living/carbon/human/apply_effect(var/effect = 0, var/effecttype = STUN, var/blocked = 0) +/mob/living/carbon/human/apply_effect(var/effect = 0, var/effecttype = STUN, var/blocked = 0, var/negate_armor = 0) if((effecttype == IRRADIATE) && (species.flags & NO_DNA_RAD)) return 0 return ..() From 666a6d6228df2c905d95547d1b9dae81f4968972 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Mon, 25 Jan 2016 20:36:21 -0500 Subject: [PATCH 2/2] mass hallucination runtime --- code/modules/events/mass_hallucination.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/events/mass_hallucination.dm b/code/modules/events/mass_hallucination.dm index 0ed99cb5698..1d5ac326517 100644 --- a/code/modules/events/mass_hallucination.dm +++ b/code/modules/events/mass_hallucination.dm @@ -3,10 +3,10 @@ /datum/event/mass_hallucination/start() for(var/mob/living/carbon/human/H in living_mob_list) - var/armor = H.getarmor(attack_flag = "rad") + var/armor = H.getarmor(type = "rad") if((H.species.flags & NO_DNA_RAD) || armor >= 75) // Leave DNA-less species/rad armored players completely unaffected continue H.hallucination += rand(50, 100) - + /datum/event/mass_hallucination/announce() command_announcement.Announce("It seems that station [station_name()] is passing through a minor radiation field, this may cause some hallucination, but no further damage") \ No newline at end of file