Merge branch 'master' into findnreplace

This commit is contained in:
Mark van Alphen
2017-03-15 16:02:14 +01:00
committed by GitHub
270 changed files with 9902 additions and 1687 deletions
+2 -2
View File
@@ -162,8 +162,8 @@
C.ckey_last_pm = ckey*/
//play the recieving admin the adminhelp sound (if they have them enabled)
//non-admins shouldn't be able to disable this
if(C.prefs.sound & SOUND_ADMINHELP)
//non-admins always hear the sound, as they cannot toggle it
if((!C.holder) || (C.prefs.sound & SOUND_ADMINHELP))
C << 'sound/effects/adminhelp.ogg'
log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]")