From cefb9c8217dddfc731455be55145f9bea972a565 Mon Sep 17 00:00:00 2001
From: "quartz235@gmail.com"
 <quartz235@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Mon, 9 Jan 2012 01:48:59 +0000
Subject: [PATCH] - Updated .dme from polymorph's area defines thingy - Per
 XSI's request (and Muskets' consent,) toggle OOC color is now a Game Admin
 level command (as opposed to Game Master.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2933 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/verbs/ooc.dm                     | 2 +-
 code/modules/admin/admin_verbs.dm          | 4 ++--
 code/modules/mob/new_player/preferences.dm | 2 +-
 tgstation.dme                              | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index 699d019625b..661bbfcd70b 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -41,7 +41,7 @@
 //			C << "<span class=\"adminooc\"><span class=\"prefix\">OOC:</span> <span class=\"name\">[src.key]:</span> <span class=\"message\">[msg]</span></span>"
 			if (src.client.holder.rank == "Admin Observer")
 				C << "<span class=\"gfartooc\"><span class=\"prefix\">OOC:</span> <span class=\"name\">[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</span> <span class=\"message\">[msg]</span></span>"
-			else if (src.client.holder.rank == "Game Master")
+			else if (src.client.holder.level >= 5)
 				C << "<font color=[src.client.ooccolor]><b><span class=\"prefix\">OOC:</span> <span class=\"name\">[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</span> <span class=\"message\">[msg]</span></b></font>"
 			else
 				C << "<span class=\"adminooc\"><span class=\"prefix\">OOC:</span> <span class=\"name\">[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</span> <span class=\"message\">[msg]</span></span>"
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 72d270a441f..d8cb9ec7d7d 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -127,7 +127,6 @@
 		holder.owner = src
 		if (holder.level >= 6)//Game Master********************************************************************
 			verbs += /client/proc/callproc
-			verbs += /client/proc/colorooc
 			verbs += /obj/admins/proc/toggle_aliens			//toggle aliens
 			verbs += /obj/admins/proc/toggle_space_ninja	//toggle ninjas
 			verbs += /obj/admins/proc/adjump
@@ -148,6 +147,7 @@
 			//verbs += /client/proc/cmd_mass_modify_object_variables --Merged with view variables
 			verbs += /client/proc/cmd_admin_list_open_jobs
 			verbs += /client/proc/cmd_admin_direct_narrate
+			verbs += /client/proc/colorooc
 			verbs += /client/proc/cmd_admin_world_narrate
 			verbs += /client/proc/cmd_debug_del_all
 			verbs += /client/proc/cmd_debug_tog_aliens
@@ -680,7 +680,7 @@
 	verbs -= /client/proc/hide_most_verbs
 	verbs += /client/proc/show_verbs
 
-	if(holder.level >= 6)//Game Master********************************************************************
+	if(holder.level >= 5)//Game Admin********************************************************************
 		verbs += /client/proc/colorooc
 
 	if(holder.level >= 4)//Badmin********************************************************************
diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm
index d5af524c314..7cef4ab032c 100644
--- a/code/modules/mob/new_player/preferences.dm
+++ b/code/modules/mob/new_player/preferences.dm
@@ -128,7 +128,7 @@ datum/preferences
 		dat += "<b>UI Style:</b> <a href=\"byond://?src=\ref[user];preferences=1;UI=input\"><b>[UI == UI_NEW ? "New" : "Old"]</b></a><br>"
 		dat += "<b>Play admin midis:</b> <a href=\"byond://?src=\ref[user];preferences=1;midis=input\"><b>[midis == 1 ? "Yes" : "No"]</b></a><br>"
 
-		if((user.client) && (user.client.holder) && (user.client.holder.rank) && (user.client.holder.rank == "Game Master"))
+		if((user.client) && (user.client.holder) && (user.client.holder.rank) && (user.client.holder.level >= 5))
 			dat += "<hr><b>OOC</b><br>"
 			dat += "<a href='byond://?src=\ref[user];preferences=1;ooccolor=input'>Change colour</a> <font face=\"fixedsys\" size=\"3\" color=\"[ooccolor]\"><table style='display:inline;'  bgcolor=\"[ooccolor]\"><tr><td>__</td></tr></table></font>"
 
diff --git a/tgstation.dme b/tgstation.dme
index 4c6001ef579..31f88755cd7 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -162,7 +162,6 @@
 #define FILE_DIR "icons/vending_icons"
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
-#define FILE_DIR "maps/backup"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/ambience"
 #define FILE_DIR "sound/announcer"