Merge pull request #728 from TheDZD/minor-fixes

Mute Changes
This commit is contained in:
ZomgPonies
2015-04-05 19:02:34 -04:00
4 changed files with 8 additions and 10 deletions
+2 -1
View File
@@ -1015,7 +1015,8 @@
return
else if(href_list["mute"])
if(!check_rights(R_ADMIN)) return
if(!check_rights(R_MOD))
return
var/mob/M = locate(href_list["mute"])
if(!ismob(M)) return
+3 -3
View File
@@ -20,12 +20,12 @@
var/stafftype = null
if (src.holder.rights & R_MOD)
stafftype = "MOD"
if (src.holder.rights & R_MENTOR)
stafftype = "MENTOR"
if (src.holder.rights & R_MOD)
stafftype = "MOD"
if (src.holder.rights & R_ADMIN)
stafftype = "ADMIN"
+1 -4
View File
@@ -152,15 +152,12 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
else
if(!usr || !usr.client)
return
if(!usr.client.holder)
if(!(usr.client.holder && usr.client.holder.rights && (usr.client.holder.rights & R_MOD)))
usr << "<font color='red'>Error: cmd_admin_mute: You don't have permission to do this.</font>"
return
if(!M.client)
usr << "<font color='red'>Error: cmd_admin_mute: This mob doesn't have a client tied to it.</font>"
if(M.client.holder)
usr << "<font color='red'>Error: cmd_admin_mute: You cannot mute an admin.</font>"
if(!M.client) return
if(M.client.holder) return
var/muteunmute
var/mute_string