From eeedad21de937cf7265952ff90f5af8fa37b7a99 Mon Sep 17 00:00:00 2001
From: Letter N <24603524+LetterN@users.noreply.github.com>
Date: Thu, 9 Jul 2020 14:32:23 +0800
Subject: [PATCH] ^w^
---
code/modules/asset_cache/asset_list_items.dm | 1 +
code/modules/emoji/emoji_parse.dm | 8 +++++---
icons/emoji_32.dmi | Bin 0 -> 7493 bytes
3 files changed, 6 insertions(+), 3 deletions(-)
create mode 100644 icons/emoji_32.dmi
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index 13a1803188..ba58769d3e 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -192,6 +192,7 @@
/datum/asset/spritesheet/goonchat/register()
InsertAll("emoji", 'icons/emoji.dmi')
+ InsertAll("emoji", 'icons/emoji_32.dmi')
// pre-loading all lanugage icons also helps to avoid meta
InsertAll("language", 'icons/misc/language.dmi')
diff --git a/code/modules/emoji/emoji_parse.dm b/code/modules/emoji/emoji_parse.dm
index 65e8063ce0..33d32227e1 100644
--- a/code/modules/emoji/emoji_parse.dm
+++ b/code/modules/emoji/emoji_parse.dm
@@ -2,7 +2,8 @@
. = text
if(!CONFIG_GET(flag/emojis))
return
- var/static/list/emojis = icon_states(icon('icons/emoji.dmi'))
+ var/list/emojis = icon_states(icon('icons/emoji.dmi'))
+ emojis |= icon_states(icon('icons/emoji_32.dmi'))
var/parsed = ""
var/pos = 1
var/search = 0
@@ -18,7 +19,7 @@
var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/goonchat)
var/tag = sheet.icon_tag("emoji-[emoji]")
if(tag)
- parsed += tag
+ parsed += "[tag]" //evil way of enforcing 16x16
pos = search + length(text[pos])
else
parsed += copytext(text, pos, search)
@@ -34,7 +35,8 @@
. = text
if(!CONFIG_GET(flag/emojis))
return
- var/static/list/emojis = icon_states(icon('icons/emoji.dmi'))
+ var/list/emojis = icon_states(icon('icons/emoji.dmi'))
+ emojis |= icon_states(icon('icons/emoji_32.dmi'))
var/final = "" //only tags are added to this
var/pos = 1
var/search = 0
diff --git a/icons/emoji_32.dmi b/icons/emoji_32.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..44b36a35e419c6c64e7edb9409d085afc0340025
GIT binary patch
literal 7493
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
P00000NkvXXu0mjfD*J5k
literal 0
HcmV?d00001