shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update mass_hallucination.dm

Browse Source
This commit is contained in:
LetterJay
2017-11-12 08:12:21 -06:00
committed by GitHub
parent eb193ef22b
commit a29c317a1d
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/mass_hallucination.dm
+1 -13
View File
@@ -1,14 +1,3 @@
<<<<<<< HEAD
/datum/round_event_control/mass_hallucination
name = "Mass Hallucination"
typepath = /datum/round_event/mass_hallucination
weight = 7
max_occurrences = 2
min_players = 1
/datum/round_event/mass_hallucination/start()
for(var/mob/living/carbon/C in GLOB.living_mob_list)
=======
/datum/round_event_control/mass_hallucination
name = "Mass Hallucination"
typepath = /datum/round_event/mass_hallucination
@@ -21,5 +10,4 @@
/datum/round_event/mass_hallucination/start()
for(var/mob/living/carbon/C in GLOB.living_mob_list)
>>>>>>> 3093d86... Makes false alarm use more explicit in event code. (#32559)
C.hallucination += rand(20, 50)
C.hallucination += rand(20, 50)