cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into emergency-shuttle

Browse Source 
Conflicts:
	code/setup.dm
This commit is contained in:
mwerezak
2014-06-24 00:09:17 -04:00
parent d892099ea3 b63708577b
commit 25bcdfa39e
157 changed files with 3337 additions and 1664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,7 +114,7 @@
//play the recieving admin the adminhelp sound (if they have them enabled)
//non-admins shouldn't be able to disable this
if(C.prefs.toggles & SOUND_ADMINHELP)
if(C.prefs && C.prefs.toggles & SOUND_ADMINHELP)
C << 'sound/effects/adminhelp.ogg'
log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]")