diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index d3207d02935..e2993681208 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -211,6 +211,9 @@
 			found += A.search_contents_for(path,filter_path)
 	return found
 
+/atom/proc/get_examine_desc()
+	return desc
+
 //All atoms
 /atom/proc/examine(mob/user, var/infix = "", var/suffix = "")
 	//This reformat names to get a/an properly working on item descriptions when they are bloody
@@ -225,14 +228,13 @@
 		else
 			f_name += "oil-stained [name][infix]."
 
-	var/list/output = list("\icon[src.examine_icon()][bicon(src)] That's [f_name] [suffix]", desc)
+	var/list/output = list("\icon[src.examine_icon()][bicon(src)] That's [f_name] [suffix]", get_examine_desc())
 
 	if(user.client?.prefs.examine_text_mode == EXAMINE_MODE_INCLUDE_USAGE)
 		output += description_info
 
 	if(user.client?.prefs.examine_text_mode == EXAMINE_MODE_SWITCH_TO_PANEL)
 		user.client.statpanel = "Examine" // Switch to stat panel
-
 	SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, output)
 	return output
 
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm b/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm
index 563b2925291..6ef2c176f57 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm
@@ -24,4 +24,17 @@
 		)
 
 /decl/mob_organ_names/quadruped //Most subtypes have this basic body layout.
-	hit_zones = list("head", "torso", "left foreleg", "right foreleg", "left hind leg", "right hind leg", "tail")
\ No newline at end of file
+	hit_zones = list("head", "torso", "left foreleg", "right foreleg", "left hind leg", "right hind leg", "tail")
+
+/mob/living/simple_mob/animal/get_examine_desc()
+	return flavor_text || desc
+
+/mob/living/simple_mob/animal/verb/set_flavour_text()
+	set name = "Set Flavour Text"
+	set category = "IC"
+	set desc = "Set your flavour text."
+	set src = usr
+	var/new_flavour_text = sanitize((input("Please describe yourself.", "Flavour Text", flavor_text) as message|null), MAX_MESSAGE_LEN)
+	if(length(new_flavour_text) && !QDELETED(src))
+		flavor_text = new_flavour_text
+		to_chat(src, SPAN_NOTICE("Your flavour text has been updated."))