lizard content

code/__DEFINES/screentips.dm

@@ -32,4 +32,4 @@
 #define SCREENTIP_PREFERENCE_CONTEXT_ONLY "Only with tips"
 
 /// Regardless of intent
-#define INTENT_ANY "intent_any"
+#define INTENT_ANY "any"

code/__HELPERS/screentips.dm

@@ -1,31 +1,30 @@
+#define HINT_ICON_FILE 'icons/UI_Icons/screentips/cursor_hints.dmi'
+
 // Generate intent icons
-/// Help intent icon for screentip context
+GLOBAL_LIST_INIT_TYPED(screentip_context_icons, /image, prepare_screentip_context_icons())
-GLOBAL_DATUM_INIT(icon_intent_help, /image, image('icons/emoji.dmi', icon_state = INTENT_HELP))
+
-/// Disarm intent icon for screentip context
+/proc/prepare_screentip_context_icons()
-GLOBAL_DATUM_INIT(icon_intent_disarm, /image, image('icons/emoji.dmi', icon_state = INTENT_DISARM))
+	. = list()
-/// Grab intent icon for screentip context
+	for(var/state in icon_states(HINT_ICON_FILE))
-GLOBAL_DATUM_INIT(icon_intent_grab, /image, image('icons/emoji.dmi', icon_state = INTENT_GRAB))
+		.[state] = image(HINT_ICON_FILE, icon_state = state)
-/// Harm intent icon for screentip context
-GLOBAL_DATUM_INIT(icon_intent_harm, /image, image('icons/emoji.dmi', icon_state = INTENT_HARM))
 
 /*
  * # Builds context with each intent for this key
  * Args:
  * - context = list (REQUIRED)
  * - key = string (REQUIRED)
+ * - allow_image = boolean (not required)
 */
-/proc/build_context(list/context, key)
+/proc/build_context(list/context, key, allow_image)
 	var/list/to_add
 	for(var/intent in context[key])
-		switch(intent)
+		var/key_help = "[length(key) > 3 ? copytext(key, 1, -3) : ""]"
-			if(INTENT_HELP)
+		var/icon = "[copytext(key, -3)]-[intent]"
-				LAZYADD(to_add, "\icon[GLOB.icon_intent_help] [key]: [context[key][INTENT_HELP]]")
+		if(allow_image)
-			if(INTENT_DISARM)
+			icon = "\icon[GLOB.screentip_context_icons[icon]]"
-				LAZYADD(to_add, "\icon[GLOB.icon_intent_disarm] [key]: [context[key][INTENT_DISARM]]")
+		LAZYADD(to_add, "[key_help][icon]: [context[key][intent]]")
-			if(INTENT_GRAB)
+
-				LAZYADD(to_add, "\icon[GLOB.icon_intent_grab] [key]: [context[key][INTENT_GRAB]]")
+	var/separator = "[allow_image ? " " : " | "]"
-			if(INTENT_HARM)
+	return english_list(to_add, "", separator, separator)
-				LAZYADD(to_add, "\icon[GLOB.icon_intent_harm] [key]: [context[key][INTENT_HARM]]")
+
-			else // If you're adding intent-less YOU BETTER ADD IT FIRST IN THE LIST
+#undef HINT_ICON_FILE
-				LAZYADD(to_add, "[key]: [context[key][intent]]")
-	return english_list(to_add, "", " ", " ")

code/game/atoms.dm

@@ -1470,6 +1470,7 @@
 
 			if (isliving(user) || isovermind(user) || isaicamera(user))
 				var/obj/item/held_item = user.get_active_held_item()
+				var/allow_images = user.client.prefs.screentip_allow_images
 
 				if (flags_1 & HAS_CONTEXTUAL_SCREENTIPS_1 || held_item?.item_flags & ITEM_HAS_CONTEXTUAL_SCREENTIPS)
 					var/list/context = list()
@@ -1482,10 +1483,10 @@
 						// LMB and RMB on one line...
 						var/lmb_text = ""
 						if((SCREENTIP_CONTEXT_LMB in context) && (length(context[SCREENTIP_CONTEXT_LMB]) > 0))
-							lmb_text = build_context(context, SCREENTIP_CONTEXT_LMB)
+							lmb_text = build_context(context, SCREENTIP_CONTEXT_LMB, allow_images)
 						var/rmb_text = ""
 						if((SCREENTIP_CONTEXT_RMB in context) && (length(context[SCREENTIP_CONTEXT_RMB]) > 0))
-							rmb_text = build_context(context, SCREENTIP_CONTEXT_RMB)
+							rmb_text = build_context(context, SCREENTIP_CONTEXT_RMB, allow_images)
 
 						if (lmb_text)
 							lmb_rmb_line = lmb_text
@@ -1499,37 +1500,37 @@
 							lmb_rmb_line += "<br>"
 							extra_lines++
 						if((SCREENTIP_CONTEXT_CTRL_LMB in context) && (length(context[SCREENTIP_CONTEXT_CTRL_LMB]) > 0))
-							ctrl_lmb_ctrl_rmb_line = build_context(context, SCREENTIP_CONTEXT_CTRL_LMB)
+							ctrl_lmb_ctrl_rmb_line = build_context(context, SCREENTIP_CONTEXT_CTRL_LMB, allow_images)
 
 						if((SCREENTIP_CONTEXT_CTRL_RMB in context) && (length(context[SCREENTIP_CONTEXT_CTRL_RMB]) > 0))
 							if (ctrl_lmb_ctrl_rmb_line != "")
 								ctrl_lmb_ctrl_rmb_line += " | "
 							ctrl_lmb_ctrl_rmb_line += "[SCREENTIP_CONTEXT_CTRL_RMB]: [context[SCREENTIP_CONTEXT_CTRL_RMB]]"
-							ctrl_lmb_ctrl_rmb_line = build_context(context, SCREENTIP_CONTEXT_CTRL_RMB)
+							ctrl_lmb_ctrl_rmb_line = build_context(context, SCREENTIP_CONTEXT_CTRL_RMB, allow_images)
 
 						// Alt-LMB, Alt-RMB on one line...
 						if (ctrl_lmb_ctrl_rmb_line != "")
 							ctrl_lmb_ctrl_rmb_line += "<br>"
 							extra_lines++
 						if((SCREENTIP_CONTEXT_ALT_LMB in context) && (length(context[SCREENTIP_CONTEXT_ALT_LMB]) > 0))
-							alt_lmb_alt_rmb_line = build_context(context, SCREENTIP_CONTEXT_ALT_LMB)
+							alt_lmb_alt_rmb_line = build_context(context, SCREENTIP_CONTEXT_ALT_LMB, allow_images)
 						if((SCREENTIP_CONTEXT_ALT_RMB in context) && (length(context[SCREENTIP_CONTEXT_ALT_RMB]) > 0))
 							if (alt_lmb_alt_rmb_line != "")
 								alt_lmb_alt_rmb_line += " | "
-							alt_lmb_alt_rmb_line = build_context(context, SCREENTIP_CONTEXT_ALT_RMB)
+							alt_lmb_alt_rmb_line = build_context(context, SCREENTIP_CONTEXT_ALT_RMB, allow_images)
 
 						// Shift-LMB, Ctrl-Shift-LMB on one line...
 						if (alt_lmb_alt_rmb_line != "")
 							alt_lmb_alt_rmb_line += "<br>"
 							extra_lines++
 						if((SCREENTIP_CONTEXT_SHIFT_LMB in context) && (length(context[SCREENTIP_CONTEXT_SHIFT_LMB]) > 0))
-							shift_lmb_ctrl_shift_lmb_line = build_context(context, SCREENTIP_CONTEXT_SHIFT_LMB)
+							shift_lmb_ctrl_shift_lmb_line = build_context(context, SCREENTIP_CONTEXT_SHIFT_LMB, allow_images)
 
 						if((SCREENTIP_CONTEXT_CTRL_SHIFT_LMB in context) && (length(context[SCREENTIP_CONTEXT_CTRL_SHIFT_LMB]) > 0))
 							if (shift_lmb_ctrl_shift_lmb_line != "")
 								shift_lmb_ctrl_shift_lmb_line += " | "
 							shift_lmb_ctrl_shift_lmb_line += "[SCREENTIP_CONTEXT_CTRL_SHIFT_LMB]: [context[SCREENTIP_CONTEXT_CTRL_SHIFT_LMB]]"
-							shift_lmb_ctrl_shift_lmb_line = build_context(context, SCREENTIP_CONTEXT_CTRL_SHIFT_LMB)
+							shift_lmb_ctrl_shift_lmb_line = build_context(context, SCREENTIP_CONTEXT_CTRL_SHIFT_LMB, allow_images)
 
 						if (shift_lmb_ctrl_shift_lmb_line != "")
 							extra_lines++

code/modules/client/preferences.dm

@@ -64,6 +64,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/outline_color = COLOR_THEME_MIDNIGHT
 	var/screentip_pref = SCREENTIP_PREFERENCE_ENABLED
 	var/screentip_color = "#ffd391"
+	var/screentip_allow_images = FALSE
 	var/buttons_locked = FALSE
 	var/hotkeys = FALSE
 
@@ -829,6 +830,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<b>Outline Color:</b> [outline_color ? "<span style='border:1px solid #161616; background-color: [outline_color];'>" : "Theme-based (null)"]&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=outline_color'>Change</a><BR>"
 			dat += "<b>Screentip:</b> <a href='?_src_=prefs;preference=screentip_pref'>[screentip_pref]</a><br>"
 			dat += "<b>Screentip Color:</b> <span style='border:1px solid #161616; background-color: [screentip_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=screentip_color'>Change</a><BR>"
+			dat += "<font style='border-bottom:2px dotted white; cursor:help;'\
+				title=\"This is an accessibility preference, if disabled, fallbacks to only text which colorblind people can understand better\">\
+				<b>Screentip context with images:</b></font> <a href='?_src_=prefs;preference=screentip_allow_images'>[screentip_allow_images ? "Allowed" : "Disallowed"]</a><br>"
 			dat += "<b>tgui Monitors:</b> <a href='?_src_=prefs;preference=tgui_lock'>[(tgui_lock) ? "Primary" : "All"]</a><br>"
 			dat += "<b>tgui Style:</b> <a href='?_src_=prefs;preference=tgui_fancy'>[(tgui_fancy) ? "Fancy" : "No Frills"]</a><br>"
 			dat += "<b>Show Runechat Chat Bubbles:</b> <a href='?_src_=prefs;preference=chat_on_map'>[chat_on_map ? "Enabled" : "Disabled"]</a><br>"
@@ -2925,6 +2929,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					var/pickedScreentipColor = input(user, "Choose your screentip color.", "General Preference", screentip_color) as color|null
 					if(pickedScreentipColor)
 						screentip_color = pickedScreentipColor
+				if("screentip_allow_images")
+					screentip_allow_images = !screentip_allow_images
 				if("tgui_lock")
 					tgui_lock = !tgui_lock
 				if("winflash")

code/modules/client/preferences_savefile.dm

@@ -423,6 +423,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["outline_enabled"] >> outline_enabled
 	S["screentip_pref"] >> screentip_pref
 	S["screentip_color"] >> screentip_color
+	S["screentip_allow_images"] >> screentip_allow_images
 	S["hotkeys"] >> hotkeys
 	S["chat_on_map"] >> chat_on_map
 	S["max_chat_length"] >> max_chat_length
@@ -611,6 +612,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["outline_color"], outline_color)
 	WRITE_FILE(S["screentip_pref"], screentip_pref)
 	WRITE_FILE(S["screentip_color"], screentip_color)
+	WRITE_FILE(S["screentip_allow_images"], screentip_allow_images)
 	WRITE_FILE(S["hotkeys"], hotkeys)
 	WRITE_FILE(S["chat_on_map"], chat_on_map)
 	WRITE_FILE(S["max_chat_length"], max_chat_length)