Merge branch 'master' into upstream-merge-32188

code/modules/mob/living/simple_animal/friendly/drone/say.dm

@@ -18,17 +18,19 @@
 
 //Base proc for anything to call
 /proc/_alert_drones(msg, dead_can_hear = 0, atom/source, mob/living/faction_checked_mob, exact_faction_match)
-	for(var/W in GLOB.mob_list)
-		var/mob/living/simple_animal/drone/M = W
-		if(istype(M) && M.stat != DEAD)
-			if(faction_checked_mob)
-				if(M.faction_check_mob(faction_checked_mob, exact_faction_match))
-					to_chat(M, msg)
-			else
-				to_chat(M, msg)
-		if(dead_can_hear && source && (M in GLOB.dead_mob_list))
+	if (dead_can_hear && source)
+		for (var/mob/M in GLOB.dead_mob_list)
 			var/link = FOLLOW_LINK(M, source)
 			to_chat(M, "[link] [msg]")
+	for(var/i in GLOB.drones_list)
+		var/mob/living/simple_animal/drone/D = i
+		if(istype(D) && D.stat != DEAD)
+			if(faction_checked_mob)
+				if(D.faction_check_mob(faction_checked_mob, exact_faction_match))
+					to_chat(D, msg)
+			else
+				to_chat(D, msg)
+
 
 
 //Wrapper for drones to handle factions

code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm

@@ -150,7 +150,8 @@
 	staticOverlays.len = 0
 
 	if(seeStatic)
-		for(var/mob/living/L in GLOB.mob_list)
+		for(var/i in GLOB.mob_living_list)
+			var/mob/living/L = i
 			if(isdrone(L))
 				continue
 			var/image/chosen

code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm

@@ -106,7 +106,7 @@ Difficulty: Hard
 
 /mob/living/simple_animal/hostile/megafauna/bubblegum/Initialize()
 	. = ..()
-	for(var/mob/living/simple_animal/hostile/megafauna/bubblegum/B in GLOB.mob_list)
+	for(var/mob/living/simple_animal/hostile/megafauna/bubblegum/B in GLOB.mob_living_list)
 		if(B != src)
 			return INITIALIZE_HINT_QDEL //There can be only one
 	var/obj/effect/proc_holder/spell/bloodcrawl/bloodspell = new

code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm

@@ -129,7 +129,7 @@ Difficulty: Medium
 		visible_message("<span class='boldannounce'>[src] splits in twain!</span>")
 	else
 		var/last_legion = TRUE
-		for(var/mob/living/simple_animal/hostile/megafauna/legion/other in GLOB.mob_list)
+		for(var/mob/living/simple_animal/hostile/megafauna/legion/other in GLOB.mob_living_list)
 			if(other != src)
 				last_legion = FALSE
 				break

code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm

@@ -50,7 +50,7 @@
 #define MEDAL_PREFIX "Tendril"
 /mob/living/simple_animal/hostile/spawner/lavaland/death()
 	var/last_tendril = TRUE
-	for(var/mob/living/simple_animal/hostile/spawner/lavaland/other in GLOB.mob_list)
+	for(var/mob/living/simple_animal/hostile/spawner/lavaland/other in GLOB.mob_living_list)
 		if(other != src)
 			last_tendril = FALSE
 			break

code/modules/mob/living/simple_animal/hostile/statue.dm

@@ -185,7 +185,7 @@
 	range = 10
 
 /obj/effect/proc_holder/spell/aoe_turf/blindness/cast(list/targets,mob/user = usr)
-	for(var/mob/living/L in GLOB.living_mob_list)
+	for(var/mob/living/L in GLOB.alive_mob_list)
 		var/turf/T = get_turf(L.loc)
 		if(T && T in targets)
 			L.blind_eyes(4)