Merge pull request #8894 from MistakeNot4892/flavour

Simple animal flavour text will now show instead of desc, if set.

code/modules/mob/living/simple_mob/subtypes/animal/_animal_harness.dm

@@ -131,12 +131,10 @@
 
 /mob/living/simple_mob/animal/examine(mob/living/user)
 	. = ..()
-	if (!harness)
-		return
-	. += "\The [src] is wearing \a [harness]."
-	for (var/obj/item/item in harness.GetAttachedItems())
-		. += "There is \a [item] attached."
-
+	if (harness)
+		. += "\The [src] is wearing \a [harness]."
+		for (var/obj/item/item in harness.GetAttachedItems())
+			. += "There is \a [item] attached."
 
 /mob/living/simple_mob/animal/proc/RemoveAttachmentVerb()
 	set name = "Remove Harness Attachment"

code/modules/mob/living/simple_mob/subtypes/animal/animal.dm

@@ -32,10 +32,8 @@
 /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")
 
-/mob/living/simple_mob/animal/examine(var/mob/user)
-	. = ..()
-	if(flavor_text)
-		. += flavor_text
+/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"