From 3506e0861c640cbd1229e366d4b92ca7f8643635 Mon Sep 17 00:00:00 2001
From: Datraen <datraen@gmail.com>
Date: Sun, 29 Nov 2015 22:34:00 -0500
Subject: [PATCH] Fixes jumping, adds dev access to msay and ahelps.

---
 code/modules/admin/admin_verbs.dm     | 2 ++
 code/modules/admin/topic.dm           | 2 +-
 code/modules/admin/verbs/adminhelp.dm | 2 +-
 code/modules/admin/verbs/adminsay.dm  | 2 +-
 config/admin_ranks.txt                | 4 ++--
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 977e79bd28..77b2a35308 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -8,6 +8,7 @@ var/list/admin_verbs_default = list(
 	/client/proc/hide_most_verbs,		/*hides all our hideable adminverbs*/
 	/client/proc/debug_variables,		/*allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify*/
 //	/client/proc/check_antagonists,		/*shows all antags*/
+//	/client/proc/cmd_mod_say,
 	/client/proc/cmd_mentor_check_new_players
 //	/client/proc/deadchat				/*toggles deadchat on/off*/
 	)
@@ -142,6 +143,7 @@ var/list/admin_verbs_server = list(
 	/datum/admins/proc/restart,
 	/datum/admins/proc/delay,
 	/datum/admins/proc/toggleaban,
+	/client/proc/cmd_mod_say,
 	/client/proc/toggle_log_hrefs,
 	/datum/admins/proc/immreboot,
 	/client/proc/everyone_random,
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index a76565bf75..0a29603346 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1177,7 +1177,7 @@
 		show_player_panel(M)
 
 	else if(href_list["adminplayerobservejump"])
-		if(!check_rights(R_MENTOR|R_MOD|R_ADMIN))	return
+		if(!check_rights(R_MENTOR|R_MOD|R_ADMIN|R_SERVER))	return
 
 		var/mob/M = locate(href_list["adminplayerobservejump"])
 
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 9f29bc621a..5f4595e026 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -97,7 +97,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 	var/admin_number_afk = 0
 
 	for(var/client/X in admins)
-		if((R_ADMIN|R_MOD|R_MENTOR) & X.holder.rights)
+		if((R_ADMIN|R_MOD|R_MENTOR|R_SERVER) & X.holder.rights)
 			if(X.is_afk())
 				admin_number_afk++
 			if(X.prefs.toggles & SOUND_ADMINHELP)
diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index 70d14a4426..08fd95835a 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -21,7 +21,7 @@
 	set name = "Msay"
 	set hidden = 1
 
-	if(!check_rights(R_ADMIN|R_MOD|R_MENTOR))	return
+	if(!check_rights(R_ADMIN|R_MOD|R_MENTOR|R_SERVER))	return
 
 	msg = sanitize(msg)
 	log_admin("MOD: [key_name(src)] : [msg]")
diff --git a/config/admin_ranks.txt b/config/admin_ranks.txt
index 9aecb3c98b..24ccd10bf0 100644
--- a/config/admin_ranks.txt
+++ b/config/admin_ranks.txt
@@ -27,8 +27,8 @@
 # +SPAWN (or +CREATE) = mob transformations, spawning of most atoms including mobs (high-risk atoms, e.g. blackholes, will require the +FUN flag too)
 # +EVERYTHING (or +HOST or +ALL) = Simply gives you everything without having to type every flag
 
-Moderator		+ADMIN
-Admin Candidate	+ADMIN
+Moderator		+MOD
+Admin Candidate		+ADMIN
 Trial Admin		+@ +SPAWN +REJUV +VAREDIT +BAN  #left for readability
 Badmin			+@ +POSSESS +BUILDMODE +SERVER +FUN  #left for readability
 Game Admin		+@ +STEALTH +SOUNDS +DEBUG