Skip to content

Commit

Permalink
tweak: emoji update (ss220-space#4051)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ROdenFL @Etrnlmelancholy
ROdenFL authored and Etrnlmelancholy committed Jan 3, 2024
1 parent 7e6f427 commit d420924
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 25 deletions.
1 change: 1 addition & 0 deletions code/modules/admin/admin.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
if(message)
if(!check_rights(R_SERVER,0))
message = adminscrub(message,500)
message = handleDiscordEmojis(message)
message = replacetext(message, "\n", "<br>") // required since we're putting it in a <p> tag
to_chat(world, "<span class='notice'><b>[usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:</b><p style='text-indent: 50px'>[message]</p></span>")
log_admin("Announce: [key_name(usr)] : [message]")
Expand Down
3 changes: 1 addition & 2 deletions code/modules/admin/verbs/adminpm.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
if(!msg)
set_typing(C, TRUE)
msg = clean_input("Message:", "Private message to [holder ? key_name(C, FALSE) : key_name_hidden(C, FALSE)]", , src)
msg = handleDiscordEmojis(msg)
set_typing(C, FALSE)

if(!msg)
Expand Down Expand Up @@ -131,7 +132,6 @@
return

var/recieve_message = ""

pm_tracker.add_message(C, src, msg, mob)
C.pm_tracker.add_message(src, src, msg, C.mob)

Expand All @@ -155,7 +155,6 @@
adminhelp(reply) //sender has left, adminhelp instead
return


var/emoji_msg = "<span class='emoji_enabled'>[msg]</span>"
recieve_message = "<span class='[recieve_span]'>[type] from-<b>[recieve_pm_type][C.holder ? key_name(src, TRUE, type) : key_name_hidden(src, TRUE, type)]</b>: [emoji_msg]</span>"
to_chat(C, recieve_message)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/emoji/emoji_parse.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
newMsg += DISCORD_EMOJI_IMAGE(emoji, 32, 32)
else
newMsg += word
return jointext(newMsg, " ")
return copytext_char(jointext(newMsg, " "), 2)

/proc/generateDiscordEmojiTable()
var/const/itemsInRow = 7
Expand Down
55 changes: 33 additions & 22 deletions config/example/emojis.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,54 +4,62 @@
###################

EMOJI clueless 1121108217888505977.png
EMOJI 1head 852660559093694474.png
EMOJI 2head 852660568389451808.png
EMOJI 3head 619086835116802051.png
EMOJI 4head 852660577246773249.png
EMOJI 5head 619086849264189460.png
EMOJI ache 829695261386211350.png
EMOJI afacepalm 947574263886524456.png
EMOJI alo 618440264771567626.png
EMOJI arolf 910196928657113128.png
EMOJI bigkek 751426772599439386.png
EMOJI keks 656620301320192010.png
EMOJI blessrng 618449016841306123.png
EMOJI catgigi 619108484834918417.png
EMOJI catkerz 619108485421858816.png
EMOJI catping 951390117879246878.png
EMOJI catpong 951390056222978078.png
EMOJI cats 619108484515889173.png
EMOJI 4cb 852699344888397834.png
EMOJI cemkaauf 772551376311418890.png
EMOJI cemkae 852699282342674493.png
EMOJI chad 988503823733620756.png
EMOJI 1head 852660559093694474.png
EMOJI 2head 852660568389451808.png
EMOJI 3head 619086835116802051.png
EMOJI 4head 852660577246773249.png
EMOJI 5head 619086849264189460.png
EMOJI ache 829695261386211350.png
EMOJI afacepalm 947574263886524456.png
EMOJI alo 618440264771567626.png
EMOJI arolf 910196928657113128.png
EMOJI bigkek 751426772599439386.png
EMOJI keks 656620301320192010.png
EMOJI blessrng 618449016841306123.png
EMOJI catgigi 619108484834918417.png
EMOJI catkerz 619108485421858816.png
EMOJI catping 951390117879246878.png
EMOJI catpong 951390056222978078.png
EMOJI cats 619108484515889173.png
EMOJI 4cb 852699344888397834.png
EMOJI cemkaauf 772551376311418890.png
EMOJI cemkae 852699282342674493.png
EMOJI chad 988503823733620756.png
EMOJI coolstorybob 618449045853306893.png
EMOJI dogesmile 954327666239078420.png
EMOJI shocked 772549579572510780.png
EMOJI fearlul 852691120772743219.png
EMOJI fuel 852687467537760307.png
EMOJI gagaga 1176622673124655144.png
EMOJI hampter 1154473667842023555.png
EMOJI hss 751418350512635914.png
EMOJI jokerge 1069958367952519168.png
EMOJI kekwat 751418444460720138.png
EMOJI kotvshlyapi 896343514185617418.png
EMOJI madge 904386321949278238.png
EMOJI neodobryaem 945992517374066698.png
EMOJI odobryaem 945992519802581043.png
EMOJI peepo 949203926027227199.png
EMOJI pepeangry 854807413496348723.png
EMOJI pepepoint 852661162335404102.png
EMOJI pepechill 751418747817951323.png
EMOJI angryclown 623234197989097492.png
EMOJI pepecoffe 852661162248241213.png
EMOJI pepecoffe2 1116233228865515610.png
EMOJI pepecool 751435240152760360.png
EMOJI pepecry 627932762170720266.png
EMOJI pepedeal 975485613937684551.png
EMOJI pepekotya 1043131822961344572.png
EMOJI pepeok 852661162243784734.png
EMOJI pepepizdec 975485750411931759.png
EMOJI pepelist 772558440803336192.png
EMOJI peperot 788527487654559744.png
EMOJI pepesleep 620042375519272961.png
EMOJI pepetoxic 852699333114855475.png
EMOJI pepewut 618440230243926027.png
EMOJI prayge 829690142930632736.png
EMOJI ratge 852661162222026843.png
EMOJI ratgesus 1000385583346106438.png
EMOJI sadge 772549607837794334.png
EMOJI yepp 829692964577476628.png
EMOJI pog 852664480500547584.png
Expand All @@ -60,5 +68,8 @@ EMOJI seemsgood 618596234260906004.png
EMOJI shlepa 941689112073744405.png
EMOJI smilew 938010167671422976.png
EMOJI smorch 618596250849378317.png
EMOJI suki 975491730642198548.png
EMOJI catahui 751426851171467276.png
EMOJI goblin 689541504070582287.png
EMOJI goblin 689541504070582287.png
EMOJI welder 759773098937155615.png
EMOJI verymadge 1152328689154002974.png

0 comments on commit d420924

Please sign in to comment.