Merge remote-tracking branch 'upstream/master' into dev-freeze

Conflicts:
	code/modules/admin/verbs/deadsay.dm
This commit is contained in:
PsiOmega
2015-07-04 15:19:52 +02:00

View File

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