From 68ee5a9f00737bafc551b6a7e3102d43012cf014 Mon Sep 17 00:00:00 2001
From: asciodev <81930475+asciodev@users.noreply.github.com>
Date: Tue, 6 Feb 2024 15:06:55 -0500
Subject: [PATCH] Remove names from monkey brains and heads (#23942) (#24004)

Previously, butchering or gibbing a monkey would yield a head and brain
with a random human name, determined from its DNA. This change makes all
monkeys drop heads and brains with their displayed name instead - that
is, "monkey (488)" will, upon gibbing, yield "monkey (488)'s head".
---
 code/modules/surgery/organs/brain.dm                    | 3 +++
 code/modules/surgery/organs/subtypes/standard_organs.dm | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/code/modules/surgery/organs/brain.dm b/code/modules/surgery/organs/brain.dm
index a7e8b1c9e85..28b8c04dccd 100644
--- a/code/modules/surgery/organs/brain.dm
+++ b/code/modules/surgery/organs/brain.dm
@@ -73,6 +73,9 @@
 		name = "[dna.real_name]'s [initial(name)]"
 
 	if(!owner) return ..() // Probably a redundant removal; just bail
+	
+	if(is_species(owner, /datum/species/monkey))
+		name = "[owner.name]'s [initial(name)]"
 
 	var/obj/item/organ/internal/brain/B = src
 	if(!special)
diff --git a/code/modules/surgery/organs/subtypes/standard_organs.dm b/code/modules/surgery/organs/subtypes/standard_organs.dm
index f2e3a5ff7c9..7e7d8d2bfe9 100644
--- a/code/modules/surgery/organs/subtypes/standard_organs.dm
+++ b/code/modules/surgery/organs/subtypes/standard_organs.dm
@@ -264,6 +264,8 @@
 		if(!istype(dna))
 			dna = owner.dna.Clone()
 		name = "[dna.real_name]'s head"
+		if(is_species(owner, /datum/species/monkey))
+			name = "[owner.name]'s head"
 		if(owner.glasses)
 			owner.unEquip(owner.glasses, force = TRUE)
 		if(owner.head)