Merge branch 'master' into polaris-sync-2018-03-15

This commit is contained in:
Leshana
2018-03-16 14:23:12 -04:00
committed by GitHub
7 changed files with 13 additions and 10 deletions
+1 -1
View File
@@ -104,7 +104,7 @@
if(C.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping))
C << 'sound/effects/adminhelp.ogg'
log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]")
log_adminpm(msg,src,C)
send2adminirc("Reply: [key_name(src)]->[key_name(C)]: [html_decode(msg)]")
//we don't use message_admins here because the sender/receiver might get it too