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 branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2

Browse Source 
# Conflicts:
#	code/defines/procs/announce.dm
#	code/modules/events/mass_hallucination.dm
This commit is contained in:
Markolie
2016-10-31 14:46:58 +01:00
parent 4ed58cc839 054365fa82
commit f63a9c279c
191 changed files with 3112 additions and 3434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/mass_hallucination.dm
+2 -2
View File
@@ -6,7 +6,7 @@
var/armor = H.getarmor(type = "rad")
if((H.species.flags & RADIMMUNE) || armor >= 75) // Leave radiation-immune species/rad armored players completely unaffected
continue
H.hallucination += rand(50, 100)
H.AdjustHallucinate(rand(50, 100))
/datum/event/mass_hallucination/announce()
event_announcement.Announce("It seems that station [station_name()] is passing through a minor radiation field, this may cause some hallucination, but no further damage")
event_announcement.Announce("It seems that station [station_name()] is passing through a minor radiation field, this may cause some hallucination, but no further damage")