From 458fb9f83d510549ddc0098b14cb34a1a29d584a Mon Sep 17 00:00:00 2001
From: Tad Hardesty <tad@platymuus.com>
Date: Thu, 7 Jun 2018 15:07:05 -0700
Subject: [PATCH 1/2] Remove mobs from idle NPC pool on Destroy (#38333)

* Remove mobs from idle NPC pool on Destroy

* Combine simple_animal Destroy procs
---
 .../mob/living/simple_animal/simple_animal.dm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 61e7153434..dc917f4210 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -108,6 +108,15 @@
 
 /mob/living/simple_animal/Destroy()
 	GLOB.simple_animals[AIStatus] -= src
+
+	if(nest)
+		nest.spawned_mobs -= src
+		nest = null
+
+	var/turf/T = get_turf(src)
+	if (T && AIStatus == AI_Z_OFF)
+		SSidlenpcpool.idle_mobs_by_zlevel[T.z] -= src
+
 	return ..()
 
 /mob/living/simple_animal/updatehealth()
@@ -424,16 +433,6 @@
 	if(changed)
 		animate(src, transform = ntransform, time = 2, easing = EASE_IN|EASE_OUT)
 
-
-
-/mob/living/simple_animal/Destroy()
-	if(nest)
-		nest.spawned_mobs -= src
-	nest = null
-	GLOB.simple_animals -= src
-	return ..()
-
-
 /mob/living/simple_animal/proc/sentience_act() //Called when a simple animal gains sentience via gold slime potion
 	toggle_ai(AI_OFF) // To prevent any weirdness.