From ae2476818925e402dab4c9f46f6d12904a2d2122 Mon Sep 17 00:00:00 2001
From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com>
Date: Fri, 12 Jun 2020 03:10:03 +0800
Subject: [PATCH] Fixes Bones death description (#9085)

---
 .../mob/living/simple_animal/friendly/cat.dm  | 22 +++++-----
 html/changelogs/wezzy_bonesdeathdescfix.yml   | 41 +++++++++++++++++++
 2 files changed, 51 insertions(+), 12 deletions(-)
 create mode 100644 html/changelogs/wezzy_bonesdeathdescfix.yml

diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 1a8bdd22868..c8511d6f011 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -233,13 +233,14 @@
 	befriend_job = "Chief Medical Officer"
 	holder_type = /obj/item/holder/cat/black
 
-/mob/living/simple_animal/cat/fluff/Runtime/death()
-	.=..()
-	desc = "Oh no, Runtime is dead! What kind of monster would do this?"
+/mob/living/simple_animal/cat/fluff/examine(mob/user)
+	..()
+	if(stat == DEAD)
+		to_chat(user, "Oh no, [name] is dead! What kind of monster would do this?")
 
 /mob/living/simple_animal/cat/kitten
 	name = "kitten"
-	desc = "D'aaawwww"
+	desc = "D'aaawwww."
 	icon_state = "kitten"
 	item_state = "kitten"
 	icon_living = "kitten"
@@ -248,13 +249,14 @@
 	gender = NEUTER
 	holder_type = /obj/item/holder/cat/kitten
 
-/mob/living/simple_animal/cat/kitten/death()
-	.=..()
-	desc = "It's a dead kitten! What kind of monster would do this?"
+/mob/living/simple_animal/cat/kitten/examine(mob/user)
+	..()
+	if(stat == DEAD)
+		to_chat(user, "It's a dead kitten! What kind of monster would do this?")
 
 /mob/living/simple_animal/cat/fluff/bones
 	name = "Bones"
-	desc = "That's Bones the cat. He's a laid back, black cat. Meow."
+	desc = "He's a laid back, black cat. Meow."
 	gender = MALE
 	icon_state = "cat3"
 	item_state = "cat3"
@@ -265,10 +267,6 @@
 	var/friend_name = "Erstatz Vryroxes"
 	holder_type = /obj/item/holder/cat/black
 
-/mob/living/simple_animal/cat/fluff/bones/death()
-	.=..()
-	desc = "Bones is dead"
-
 /mob/living/simple_animal/cat/kitten/Initialize()
 	. = ..()
 	gender = pick(MALE, FEMALE)
diff --git a/html/changelogs/wezzy_bonesdeathdescfix.yml b/html/changelogs/wezzy_bonesdeathdescfix.yml
new file mode 100644
index 00000000000..c1d5f0ef37d
--- /dev/null
+++ b/html/changelogs/wezzy_bonesdeathdescfix.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "fixes Bones' death description."