From e09913ae39f3bcda887a166d3e9a0524a2c822ee Mon Sep 17 00:00:00 2001
From: Coul <coul422@gmail.com>
Date: Sat, 14 Sep 2019 21:51:06 -0400
Subject: [PATCH] move removal to human/death

---
 code/modules/mob/living/carbon/human/death.dm          | 2 +-
 code/modules/mob/living/carbon/human/species/monkey.dm | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 8478b30063d..4ceedc5b49c 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -101,7 +101,7 @@
 		return FALSE
 
 	set_heartattack(FALSE)
-
+	SSmobs.cubemonkeys -= src
 	if(dna.species)
 		dna.species.handle_hud_icons(src)
 		//Handle species-specific deaths.
diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm
index 79fed659f1c..7eedf2520a3 100644
--- a/code/modules/mob/living/carbon/human/species/monkey.dm
+++ b/code/modules/mob/living/carbon/human/species/monkey.dm
@@ -46,10 +46,6 @@
 /datum/species/monkey/get_random_name()
 	return "[lowertext(name)] ([rand(100,999)])"
 
-/datum/species/monkey/handle_death(gibbed, mob/living/carbon/human/H)
-	. = ..()
-	SSmobs.cubemonkeys -= H
-
 /datum/species/monkey/on_species_gain(mob/living/carbon/human/H)
 	..()
 	H.real_name = "[lowertext(name)] ([rand(100,999)])"