Update mass_hallucination.dm

2017-11-17 23:21:13 -05:00
parent 38f7b829c3
commit 127846549d
1 changed files with 0 additions and 5 deletions
--- a/code/modules/events/mass_hallucination.dm
+++ b/code/modules/events/mass_hallucination.dm
@@ -9,10 +9,5 @@
 	fakeable = FALSE

 /datum/round_event/mass_hallucination/start()
-<<<<<<< HEAD
-	for(var/mob/living/carbon/C in GLOB.living_mob_list)
-		C.hallucination += rand(20, 50)
-=======
 	for(var/mob/living/carbon/C in GLOB.alive_mob_list)
 		C.hallucination += rand(20, 50)
->>>>>>> 39375d5... Replaces a bunch of mob loops with hopefully better ones (#32786)