Merge branch 'master' into upstream-merge-32188

code/modules/mob/living/carbon/alien/alien.dm

@@ -110,11 +110,12 @@ Des: Gives the client of the alien an image on each infected mob.
 ----------------------------------------*/
 /mob/living/carbon/alien/proc/AddInfectionImages()
 	if (client)
-		for (var/mob/living/C in GLOB.mob_list)
-			if(C.status_flags & XENO_HOST)
-				var/obj/item/organ/body_egg/alien_embryo/A = C.getorgan(/obj/item/organ/body_egg/alien_embryo)
+		for (var/i in GLOB.mob_living_list)
+			var/mob/living/L = i
+			if(L.status_flags & XENO_HOST)
+				var/obj/item/organ/body_egg/alien_embryo/A = L.getorgan(/obj/item/organ/body_egg/alien_embryo)
 				if(A)
-					var/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected[A.stage]")
+					var/I = image('icons/mob/alien.dmi', loc = L, icon_state = "infected[A.stage]")
 					client.images += I
 	return
 

code/modules/mob/living/carbon/alien/humanoid/death.dm

@@ -1,23 +1,23 @@
-/mob/living/carbon/alien/humanoid/death(gibbed)
-	if(stat == DEAD)
-		return
-
-	. = ..()
-
-	update_canmove()
-	update_icons()
-	status_flags |= CANPUSH
-
-//When the alien queen dies, all others must pay the price for letting her die.
-/mob/living/carbon/alien/humanoid/royal/queen/death(gibbed)
-	if(stat == DEAD)
-		return
-
-	for(var/mob/living/carbon/C in GLOB.living_mob_list)
-		if(C == src) //Make sure not to proc it on ourselves.
-			continue
-		var/obj/item/organ/alien/hivenode/node = C.getorgan(/obj/item/organ/alien/hivenode)
-		if(istype(node)) // just in case someone would ever add a diffirent node to hivenode slot
-			node.queen_death()
-
-	return ..()
+/mob/living/carbon/alien/humanoid/death(gibbed)
+	if(stat == DEAD)
+		return
+
+	. = ..()
+
+	update_canmove()
+	update_icons()
+	status_flags |= CANPUSH
+
+//When the alien queen dies, all others must pay the price for letting her die.
+/mob/living/carbon/alien/humanoid/royal/queen/death(gibbed)
+	if(stat == DEAD)
+		return
+
+	for(var/mob/living/carbon/C in GLOB.alive_mob_list)
+		if(C == src) //Make sure not to proc it on ourselves.
+			continue
+		var/obj/item/organ/alien/hivenode/node = C.getorgan(/obj/item/organ/alien/hivenode)
+		if(istype(node)) // just in case someone would ever add a diffirent node to hivenode slot
+			node.queen_death()
+
+	return ..()

code/modules/mob/living/carbon/alien/humanoid/humanoid.dm

@@ -111,7 +111,7 @@
 
 //For alien evolution/promotion/queen finder procs. Checks for an active alien of that type
 /proc/get_alien_type(var/alienpath)
-	for(var/mob/living/carbon/alien/humanoid/A in GLOB.living_mob_list)
+	for(var/mob/living/carbon/alien/humanoid/A in GLOB.alive_mob_list)
 		if(!istype(A, alienpath))
 			continue
 		if(!A.key || A.stat == DEAD) //Only living aliens with a ckey are valid.

code/modules/mob/living/carbon/alien/humanoid/queen.dm

@@ -46,7 +46,7 @@
 
 /mob/living/carbon/alien/humanoid/royal/queen/Initialize()
 	//there should only be one queen
-	for(var/mob/living/carbon/alien/humanoid/royal/queen/Q in GLOB.living_mob_list)
+	for(var/mob/living/carbon/alien/humanoid/royal/queen/Q in GLOB.carbon_list)
 		if(Q == src)
 			continue
 		if(Q.stat == DEAD)

code/modules/mob/living/carbon/carbon.dm

@@ -2,9 +2,10 @@
 	blood_volume = BLOOD_VOLUME_NORMAL
 
 /mob/living/carbon/Initialize()
+	. = ..()
 	create_reagents(1000)
 	update_body_parts() //to update the carbon's new bodyparts appearance
-	..()
+	GLOB.carbon_list += src
 
 /mob/living/carbon/Destroy()
 //This must be done first, so the mob ghosts correctly before DNA etc is nulled
@@ -16,6 +17,7 @@
 	QDEL_LIST(implants)
 	remove_from_all_data_huds()
 	QDEL_NULL(dna)
+	GLOB.carbon_list -= src
 
 /mob/living/carbon/relaymove(mob/user, direction)
 	if(user in src.stomach_contents)