From b66fbfd4cda51eb47f51cab6399d90fd446198ec Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Sun, 16 May 2021 03:32:13 +0200
Subject: [PATCH] [MIRROR] Transfers icon path to the emojis to define (#5730)

* Transfers icon path to the emojis to define (#58948)

* Transfers icon path to the emojis to define

Co-authored-by: NopemanMcHalt <36963049+NopemanMcHalt@users.noreply.github.com>
---
 code/__DEFINES/misc.dm                       | 3 +++
 code/game/objects/items/devices/PDA/cart.dm  | 2 +-
 code/modules/asset_cache/asset_list_items.dm | 2 +-
 code/modules/emoji/emoji_parse.dm            | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index 56e1f7f24a9..5fb8295a236 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -553,3 +553,6 @@ GLOBAL_LIST_INIT(pda_styles, sortList(list(MONO, VT, ORBITRON, SHARE)))
 //while using the SKILLCHIP_RESTRICTED_CATEGORIES flag
 #define SKILLCHIP_CATEGORY_GENERAL "general"
 #define SKILLCHIP_CATEGORY_JOB "job"
+
+/// Emoji icon set
+#define EMOJI_SET 'icons/emoji.dmi'
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index f633b11b5d1..4e1ff2256cd 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -530,7 +530,7 @@ Code:
 			if(!emoji_table)
 				var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat)
 				var/list/collate = list("<br><table>")
-				for(var/emoji in sortList(icon_states(icon('icons/emoji.dmi'))))
+				for(var/emoji in sortList(icon_states(icon(EMOJI_SET))))
 					var/tag = sheet.icon_tag("emoji-[emoji]")
 					collate += "<tr><td>[emoji]</td><td>[tag]</td></tr>"
 				collate += "</table><br>"
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index ca8da7e8cd3..1484d49b671 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -153,7 +153,7 @@
 	name = "chat"
 
 /datum/asset/spritesheet/chat/register()
-	InsertAll("emoji", 'icons/emoji.dmi')
+	InsertAll("emoji", EMOJI_SET)
 	// pre-loading all lanugage icons also helps to avoid meta
 	InsertAll("language", 'icons/misc/language.dmi')
 	// catch languages which are pulling icons from another file
diff --git a/code/modules/emoji/emoji_parse.dm b/code/modules/emoji/emoji_parse.dm
index 185341d294c..16e1eeef6c9 100644
--- a/code/modules/emoji/emoji_parse.dm
+++ b/code/modules/emoji/emoji_parse.dm
@@ -2,7 +2,7 @@
 	. = text
 	if(!CONFIG_GET(flag/emojis))
 		return
-	var/static/list/emojis = icon_states(icon('icons/emoji.dmi'))
+	var/static/list/emojis = icon_states(icon(EMOJI_SET))
 	var/parsed = ""
 	var/pos = 1
 	var/search = 0
@@ -34,7 +34,7 @@
 	. = text
 	if(!CONFIG_GET(flag/emojis))
 		return
-	var/static/list/emojis = icon_states(icon('icons/emoji.dmi'))
+	var/static/list/emojis = icon_states(icon(EMOJI_SET))
 	var/final = "" //only tags are added to this
 	var/pos = 1
 	var/search = 0