From 9d33b7662e44f83e6c9b9f2596f03bf04d9607e6 Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Thu, 20 Apr 2017 16:23:21 +0100
Subject: [PATCH] Fixes some character setup issues

---
 .../client/preference_setup/vore/01_ears.dm   | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/code/modules/client/preference_setup/vore/01_ears.dm b/code/modules/client/preference_setup/vore/01_ears.dm
index 1d8fb81c3d7..50d9b71be75 100644
--- a/code/modules/client/preference_setup/vore/01_ears.dm
+++ b/code/modules/client/preference_setup/vore/01_ears.dm
@@ -63,11 +63,24 @@
 	. += "<div class='statusDisplay'><center><img src=previewicon.png width=[pref.preview_icon.Width()] height=[pref.preview_icon.Height()]></center></div>"
 	. += "<br><a href='?src=\ref[src];toggle_clothing=1'>[pref.dress_mob ? "Hide equipment" : "Show equipment"]</a><br>"
 
+	var/ear_display = "Normal"
+	if(pref.ear_style && (pref.ear_style in ear_styles_list))
+		var/datum/sprite_accessory/ears/instance = ear_styles_list[pref.ear_style]
+		ear_display = instance.name
+	else if(pref.ear_style)
+		ear_display = "REQUIRES UPDATE"
 	. += "<b>Ears</b><br>"
-	. += " Style: <a href='?src=\ref[src];ear_style=1'>[pref.ear_style ? "Custom" : "Normal"]</a><br>"
+	. += " Style: <a href='?src=\ref[src];ear_style=1'>[ear_display]</a><br>"
 
+	var/tail_display = "Normal"
+	if(pref.tail_style && (pref.tail_style in tail_styles_list))
+		var/datum/sprite_accessory/ears/instance = tail_styles_list[pref.tail_style]
+		tail_display = instance.name
+	else if(pref.tail_style)
+		tail_display = "REQUIRES UPDATE"
 	. += "<b>Tail</b><br>"
-	. += " Style: <a href='?src=\ref[src];tail_style=1'>[pref.tail_style ? "Custom" : "Normal"]</a><br>"
+	. += " Style: <a href='?src=\ref[src];tail_style=1'>[tail_display]</a><br>"
+
 	if(tail_styles_list[pref.tail_style])
 		var/datum/sprite_accessory/tail/T = tail_styles_list[pref.tail_style]
 		if (T.do_colouration)
@@ -100,7 +113,10 @@
 		if(selection && selection != "Normal")
 			pref.ear_style = pretty_ear_styles[selection]
 		else
-			pref.ear_style = null
+			if(pref.ear_style)
+				return TOPIC_REFRESH_UPDATE_PREVIEW
+			else
+				pref.ear_style = null
 		return TOPIC_REFRESH_UPDATE_PREVIEW
 
 	else if(href_list["tail_style"])
@@ -116,7 +132,10 @@
 		if(selection && selection != "Normal")
 			pref.tail_style = pretty_tail_styles[selection]
 		else
-			pref.tail_style = null
+			if(pref.tail_style)
+				return TOPIC_REFRESH_UPDATE_PREVIEW
+			else
+				pref.tail_style = null
 		return TOPIC_REFRESH_UPDATE_PREVIEW
 
 	else if(href_list["tail_color"])