From 821ee11272244a6abc73df928cbb002fb568f15b Mon Sep 17 00:00:00 2001
From: Arokha Sieyes <arokha@arokha.com>
Date: Fri, 16 Mar 2018 00:11:38 -0400
Subject: [PATCH 1/2] POLARIS: Fix tooltip style sanitize

---
 code/modules/client/preference_setup/global/01_ui.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/client/preference_setup/global/01_ui.dm b/code/modules/client/preference_setup/global/01_ui.dm
index 6168aa36b07..29502ec9850 100644
--- a/code/modules/client/preference_setup/global/01_ui.dm
+++ b/code/modules/client/preference_setup/global/01_ui.dm
@@ -14,14 +14,14 @@
 	S["UI_style_color"]	<< pref.UI_style_color
 	S["UI_style_alpha"]	<< pref.UI_style_alpha
 	S["ooccolor"]		<< pref.ooccolor
-	S["tooltipstyle"]	>> pref.tooltipstyle
+	S["tooltipstyle"]	<< pref.tooltipstyle
 
 /datum/category_item/player_setup_item/player_global/ui/sanitize_preferences()
 	pref.UI_style		= sanitize_inlist(pref.UI_style, all_ui_styles, initial(pref.UI_style))
 	pref.UI_style_color	= sanitize_hexcolor(pref.UI_style_color, initial(pref.UI_style_color))
 	pref.UI_style_alpha	= sanitize_integer(pref.UI_style_alpha, 0, 255, initial(pref.UI_style_alpha))
 	pref.ooccolor		= sanitize_hexcolor(pref.ooccolor, initial(pref.ooccolor))
-	pref.tooltipstyle	= sanitize_inlist(pref.tooltipstyle, all_tooltip_styles, all_tooltip_styles[1])
+	pref.tooltipstyle	= sanitize_inlist(pref.tooltipstyle, all_tooltip_styles, initial(pref.tooltipstyle))
 
 /datum/category_item/player_setup_item/player_global/ui/content(var/mob/user)
 	. = "<b>UI Style:</b> <a href='?src=\ref[src];select_style=1'><b>[pref.UI_style]</b></a><br>"

From f1965f997cdf023ae59b135b74bddeef5bcd42dc Mon Sep 17 00:00:00 2001
From: Arokha Sieyes <arokha@arokha.com>
Date: Fri, 16 Mar 2018 00:12:41 -0400
Subject: [PATCH 2/2] POLARIS: Fix simple animal tooltip

---
 code/modules/mob/living/simple_animal/simple_animal.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index cde93f797d1..450580fbb45 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -1723,4 +1723,4 @@
 	destroy_surroundings = 1
 
 /mob/living/simple_animal/get_nametag_desc(mob/user)
-	return "<i>tt_desc</i>"
+	return "<i>[tt_desc]</i>"