shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12716 from LetterN/d-w-

Browse Source 
Adds more emojis
This commit is contained in:
silicons
2020-07-11 00:45:39 -07:00
committed by GitHub
parent 77b3f8356d eeedad21de
commit f33782aa38
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/asset_cache/asset_list_items.dm
+1
View File
@@ -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')
code/modules/emoji/emoji_parse.dm
+5 -3
View File
@@ -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 += "<i style='width:16px !important;height:16px !important;'>[tag]</i>" //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