Merge remote-tracking branch 'upstream/master' into cash

This commit is contained in:
Hubblenaut
2016-02-26 13:48:01 +01:00
15 changed files with 122 additions and 36 deletions
+1 -1
View File
@@ -1333,7 +1333,7 @@ proc/admin_notice(var/message, var/rights)
var/msg
if(check_rights(R_ADMIN))
if(check_rights(R_ADMIN|R_MOD))
if (H.paralysis == 0)
H.paralysis = 8000
msg = "has paralyzed [key_name(H)]."