cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3408 from Fox-McCloud/radiation-fixes

Browse Source 
Fixes Radiation Runtimes
This commit is contained in:
TheDZD
2016-01-25 23:42:02 -05:00
parent 2214523b10 666a6d6228
commit 4677f4ed64
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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 ..()