admin verb permissions update

code/modules/admin/verbs/adminpm.dm

@@ -2,8 +2,7 @@
 /client/proc/cmd_admin_pm_context(mob/M as mob in GLOB.mob_list)
 	set category = null
 	set name = "Admin PM Mob"
-	if(!holder)
-		to_chat(src, "<span class='danger'>Error: Admin-PM-Context: Only administrators may use this command.</span>")
+	if(!check_rights(R_ADMIN))
 		return
 	if( !ismob(M) || !M.client )	return
 	cmd_admin_pm(M.client,null)
@@ -13,8 +12,7 @@
 /client/proc/cmd_admin_pm_panel()
 	set category = "Admin"
 	set name = "Admin PM Name"
-	if(!holder)
-		to_chat(src, "<span class='danger'>Error: Admin-PM-Panel: Only administrators may use this command.</span>")
+	if(!check_rights(R_ADMIN))
 		return
 	var/list/client/targets[0]
 	for(var/client/T)
@@ -36,8 +34,7 @@
 /client/proc/cmd_admin_pm_by_key_panel()
 	set category = "Admin"
 	set name = "Admin PM Key"
-	if(!holder)
-		to_chat(src, "<span class='danger'>Error: Admin-PM-Panel: Only administrators may use this command.</span>")
+	if(!check_rights(R_ADMIN))
 		return
 	var/list/client/targets[0]
 	for(var/client/T)

code/modules/admin/verbs/custom_event.dm

@@ -3,8 +3,7 @@
 	set category = "Event"
 	set name = "Change Custom Event"
 
-	if(!holder)
-		to_chat(src, "Only administrators may use this command.")
+	if(!check_rights(R_EVENT))
 		return
 
 	var/input = input(usr, "Enter the description of the custom event. Be descriptive. To cancel the event, make this blank or hit cancel.", "Custom Event", GLOB.custom_event_msg) as message|null

code/modules/admin/verbs/diagnostics.dm

@@ -108,7 +108,7 @@
 
 /client/proc/reload_admins()
 	set name = "Reload Admins"
-	set category = "Debug"
+	set category = "Server"
 
 	if(!check_rights(R_SERVER))
 		return

code/modules/admin/verbs/map_template_loadverb.dm

@@ -2,7 +2,7 @@
 	set category = "Debug"
 	set name = "Map template - Place"
 
-	if(!holder)
+	if(!check_rights(R_EVENT))
 		return
 	var/datum/map_template/template
 
@@ -36,6 +36,9 @@
 	set category = "Debug"
 	set name = "Map Template - Upload"
 
+	if(!check_rights(R_EVENT))
+		return
+
 	var/map = input(usr, "Choose a Map Template to upload to template storage","Upload Map Template") as null|file
 	if(!map)
 		return

code/modules/admin/verbs/possess.dm

@@ -2,6 +2,9 @@
 	set name = "Possess Obj"
 	set category = null
 
+	if(!check_rights(R_POSSESS))
+		return
+
 	if(istype(O,/obj/singularity))
 		if(config.forbid_singulo_possession)
 			to_chat(usr, "It is forbidden to possess singularities.")
@@ -35,6 +38,9 @@
 	set category = null
 	//usr.loc = get_turf(usr)
 
+	if(!check_rights(R_POSSESS))
+		return
+
 	if(usr.control_object && usr.name_archive) //if you have a name archived and if you are actually relassing an object
 		usr.real_name = usr.name_archive
 		usr.name = usr.real_name

code/modules/admin/verbs/randomverbs.dm

@@ -51,7 +51,7 @@
 	if(!ismob(M))
 		return
 
-	if(!check_rights(R_SERVER|R_EVENT))
+	if(!check_rights(R_EVENT))
 		return
 
 	var/msg = clean_input("Message:", text("Subtle PM to [M.key]"))
@@ -158,7 +158,7 @@
 /client/proc/admin_headset_message(mob/M in GLOB.mob_list, sender = null)
 	var/mob/living/carbon/human/H = M
 
-	if(!check_rights(R_ADMIN))
+	if(!check_rights(R_EVENT))
 		return
 
 	if(!istype(H))
@@ -1077,12 +1077,12 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		message_admins("Admin [key_name_admin(usr)] has disabled ERT calling.", 1)
 
 /client/proc/show_tip()
-	set category = "Admin"
+	set category = "Event"
 	set name = "Show Custom Tip"
 	set desc = "Sends a tip (that you specify) to all players. After all \
 		you're the experienced player here."
 
-	if(!check_rights(R_ADMIN))
+	if(!check_rights(R_EVENT))
 		return
 
 	var/input = input(usr, "Please specify your tip that you want to send to the players.", "Tip", "") as message|null