From 10d4ce619f346dac2fdbdae4ea58a8cbf71a3bd5 Mon Sep 17 00:00:00 2001
From: oranges <email@oranges.net.nz>
Date: Thu, 15 Sep 2016 02:08:40 +0000
Subject: [PATCH] Prevent loops with del_on_death var for simple mobs

Same principle as the fix for DROPDEL
---
 code/modules/mob/living/simple_animal/simple_animal.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index edca0beac1d..7afc1fa3132 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -301,6 +301,9 @@
 	if(del_on_death)
 		ghostize()
 		stat = DEAD
+		//Prevent infinite loops if the mob Destroy() is overriden in such
+		//a manner as to cause a call to death() again
+		del_on_death = FALSE
 		qdel(src)
 	else
 		health = 0