cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +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/events/mass_hallucination.dm
+2 -2
View File
@@ -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")
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 ..()