Merge pull request #3389

2017-10-14 13:36:22 -07:00
parent e8bb77ba2c 7d5db29a2f
commit 80ac0313a7
2 changed files with 10 additions and 0 deletions
@@ -101,6 +101,10 @@
 		init_belly()
 	verbs |= /mob/living/proc/animal_nom

+/mob/living/simple_animal/Destroy()
+	GLOB.simple_animals -= src
+	return ..()
+
 /mob/living/simple_animal/updatehealth()
 	..()
 	health = Clamp(health, 0, maxHealth)
@@ -94,6 +94,12 @@
 	set_colour(new_colour)
 	. = ..()

+/mob/living/simple_animal/slime/Destroy()
+	for (var/A in actions)
+		var/datum/action/AC = A
+		AC.Remove(src)
+	return ..()
+
 /mob/living/simple_animal/slime/proc/set_colour(new_colour)
 	colour = new_colour
 	update_name()