cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Leshana
2018-03-16 14:23:12 -04:00
committed by GitHub
parent 5831a8705a 67044e6643
commit d3c350a4db
7 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/admin.dm
View File

@@ -6,7 +6,7 @@ var/global/floorIsLava = 0
////////////////////////////////
/proc/message_admins(var/msg)
msg = "<span class=\"log_message\"><span class=\"prefix\">ADMIN LOG:</span> <span class=\"message\">[msg]</span></span>"
log_adminwarn(msg)
//log_adminwarn(msg) //log_and_message_admins is for this
for(var/client/C in admins)
if((R_ADMIN|R_MOD) & C.holder.rights)
C << msg

2
code/modules/admin/verbs/adminpm.dm
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