cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 07:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15122 from JJRcop/bugfixmoji

Browse Source 
Fixes emoji issues to do with adminPM and OOC formatting
This commit is contained in:
tkdrg
2016-02-01 19:44:16 -03:00
parent 5884b160ae ab99043d31
commit 0f47866cad
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/adminpm.dm
+5 -2
View File
@@ -98,7 +98,10 @@
if(!msg)
return
msg = emoji_parse(msg)
var/rawmsg = msg
if(holder)
msg = emoji_parse(msg)
var/keywordparsedmsg = keywords_lookup(msg)
if(C.holder)
@@ -141,7 +144,7 @@
src << "<font color='red'>Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.</font>"
return
log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]")
log_admin("PM: [key_name(src)]->[key_name(C)]: [rawmsg]")
//we don't use message_admins here because the sender/receiver might get it too
for(var/client/X in admins)