cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 10:03:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Radiation Runtimes

Browse Source
This commit is contained in:
Fox-McCloud
2016-01-25 20:32:20 -05:00
parent 280eb9fab3
commit 5bd27677f5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/radiation_storm.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/damage_procs.dm
+2 -2
View File
@@ -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 ..()