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

Radiation damage fix

Browse Source
This commit is contained in:
Markolie
2015-09-12 18:51:24 +02:00
parent 8947709afd
commit f281dff7fc
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/radiation_storm.dm
+2 -1
View File
@@ -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)
code/modules/mob/living/damage_procs.dm
+1 -1
View File
@@ -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)