Merge branch 'master' into upstream-merge-32188

code/game/objects/items/devices/PDA/cart.dm

@@ -505,7 +505,7 @@ Code:
 				menu += "<h4>Located Cleanbots:</h4>"
 
 				ldat = null
-				for (var/mob/living/simple_animal/bot/cleanbot/B in GLOB.living_mob_list)
+				for (var/mob/living/simple_animal/bot/cleanbot/B in GLOB.alive_mob_list)
 					var/turf/bl = get_turf(B)
 
 					if(bl)
@@ -715,7 +715,7 @@ Code:
 		var/turf/current_turf = get_turf(src)
 		var/zlevel = current_turf.z
 		var/botcount = 0
-		for(Bot in GLOB.living_mob_list) //Git da botz
+		for(Bot in GLOB.alive_mob_list) //Git da botz
 			if(!Bot.on || Bot.z != zlevel || Bot.remote_disabled || !(bot_access_flags & Bot.bot_type)) //Only non-emagged bots on the same Z-level are detected!
 				continue //Also, the PDA must have access to the bot type.
 			menu += "<A href='byond://?src=[REF(src)];op=control;bot=[REF(Bot)]'><b>[Bot.name]</b> ([Bot.get_mode()])<BR>"

code/game/objects/items/pinpointer.dm

@@ -103,7 +103,7 @@
 	var/list/name_counts = list()
 	var/list/names = list()
 
-	for(var/mob/living/carbon/human/H in GLOB.mob_list)
+	for(var/mob/living/carbon/human/H in GLOB.carbon_list)
 		if(!trackable(H))
 			continue
 
@@ -147,4 +147,3 @@
 		return PROCESS_KILL
 	scan_for_target()
 	update_icon()
-