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/master' into dev-freeze

Browse Source 
Conflicts:
	code/modules/admin/verbs/deadsay.dm
This commit is contained in:
PsiOmega
2015-07-04 15:19:52 +02:00
parent 88b9787ac4 2b8adb2526
commit 6e93b7d604
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@
var/stafftype = uppertext(holder.rank) var/stafftype = uppertext(holder.rank)
msg = sanitize(msg) msg = sanitize(msg)
log_admin("[key_name(src)] : [msg]") log_admin("DSAY: [key_name(src)] : [msg]")
if (!msg) if (!msg)
return return