cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 12:37:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3249 from VOREStation/aro-tooltipfix

Browse Source 
Fix tooltip style sanitize
This commit is contained in:
Leshana
2018-03-16 19:04:58 -04:00
committed by GitHub
parent afea2b1bd7 f1965f997c
commit 718f89e848
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/global/01_ui.dm
+2 -2
View File
@@ -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>"
code/modules/mob/living/simple_animal/simple_animal.dm
+1 -1
View File
@@ -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>"