Replaces a bunch of mob loops with hopefully better ones

2017-11-16 16:09:15 -06:00
parent 0e0eb351b3
commit 6ce69fb2c8
84 changed files with 405 additions and 154 deletions
@@ -9,5 +9,10 @@
 	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)