From 72d7980e60fb3d90b1c255c8f270b1607e85f707 Mon Sep 17 00:00:00 2001 From: Raeschen Date: Thu, 14 Mar 2024 19:35:57 +0100 Subject: [PATCH] Chat tags use assets (#7962) --- code/_helpers/text.dm | 11 ++++++----- code/modules/asset_cache/assets/chat.dm | 3 +-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/_helpers/text.dm b/code/_helpers/text.dm index 825c67e82e..cc0e610234 100644 --- a/code/_helpers/text.dm +++ b/code/_helpers/text.dm @@ -349,16 +349,17 @@ //The icon var could be local in the proc, but it's a waste of resources // to always create it and then throw it out. /var/icon/text_tag_icons = 'icons/chattags.dmi' -/var/list/text_tag_cache = list() +GLOBAL_LIST_EMPTY(text_tag_cache) + /proc/create_text_tag(var/tagname, var/tagdesc = tagname, var/client/C = null) if(!(C && C.is_preference_enabled(/datum/client_preference/chat_tags))) return tagdesc - if(!text_tag_cache[tagname]) - var/icon/tag = icon(text_tag_icons, tagname) - text_tag_cache[tagname] = tag + if(!GLOB.text_tag_cache[tagname]) + var/datum/asset/spritesheet/chatassets = get_asset_datum(/datum/asset/spritesheet/chat) + GLOB.text_tag_cache[tagname] = {""} if(!C.tgui_panel.is_ready() || C.tgui_panel.oldchat) return "[tagdesc]" - return icon2html(text_tag_cache[tagname], C, extra_classes = "text_tag") + return GLOB.text_tag_cache[tagname] /proc/create_text_tag_old(var/tagname, var/tagdesc = tagname, var/client/C = null) if(!(C && C.is_preference_enabled(/datum/client_preference/chat_tags))) diff --git a/code/modules/asset_cache/assets/chat.dm b/code/modules/asset_cache/assets/chat.dm index 0853ea542c..82d33e381b 100644 --- a/code/modules/asset_cache/assets/chat.dm +++ b/code/modules/asset_cache/assets/chat.dm @@ -2,5 +2,4 @@ name = "chat" /datum/asset/spritesheet/chat/create_spritesheets() - //honk - //This function has to be overridden otherwise it will generate runtimes + InsertAll("", text_tag_icons) //Chomp - OOC, LOOC ect icons