Merge branch 'master' into spellcheck

This commit is contained in:
ShizCalev
2018-06-26 16:43:41 -04:00
committed by GitHub
186 changed files with 2073 additions and 1570 deletions
+9 -2
View File
@@ -1056,14 +1056,21 @@
if(!check_rights(R_ADMIN))
return
var/mob/M = locate(href_list["boot2"])
if (ismob(M))
if(ismob(M))
if(!check_if_greater_rights_than(M.client))
to_chat(usr, "<span class='danger'>Error: They have more rights than you do.</span>")
return
if(alert(usr, "Kick [key_name(M)]?", "Confirm", "Yes", "No") != "Yes")
return
if(!M)
to_chat(usr, "<span class='danger'>Error: [M] no longer exists!</span>")
return
if(!M.client)
to_chat(usr, "<span class='danger'>Error: [M] no longer has a client!</span>")
return
to_chat(M, "<span class='danger'>You have been kicked from the server by [usr.client.holder.fakekey ? "an Administrator" : "[usr.client.ckey]"].</span>")
log_admin("[key_name(usr)] kicked [key_name(M)].")
message_admins("<span class='adminnotice'>[key_name_admin(usr)] kicked [key_name_admin(M)].</span>")
//M.client = null
qdel(M.client)
else if(href_list["addmessage"])