From a29c317a1d03b921f62a707d96a4063d6f1bd346 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 12 Nov 2017 08:12:21 -0600 Subject: [PATCH] Update mass_hallucination.dm --- code/modules/events/mass_hallucination.dm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/code/modules/events/mass_hallucination.dm b/code/modules/events/mass_hallucination.dm index 41d5b17b10..09ef6a2b01 100644 --- a/code/modules/events/mass_hallucination.dm +++ b/code/modules/events/mass_hallucination.dm @@ -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) \ No newline at end of file + C.hallucination += rand(20, 50)