Merge pull request #20 from Abi79/master

Some more stuff done for #8, preparing for the move

code/modules/admin/admin_verbs.dm

@@ -126,17 +126,11 @@
 		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
-			verbs += /client/proc/triple_ai
 			verbs += /client/proc/get_admin_state
 			verbs += /client/proc/reload_admins
 			verbs += /client/proc/kill_air
 			verbs += /client/proc/cmd_debug_make_powernets
-			verbs += /client/proc/object_talk
-			verbs += /client/proc/strike_team
 			verbs += /client/proc/enable_mapping_debug
 
 		if (holder.level >= 5)//Game Admin********************************************************************
@@ -166,6 +160,13 @@
 			verbs += /client/proc/restartcontroller //Can call via aproccall --I_hate_easy_things.jpg, Mport --Agouri
 			verbs += /client/proc/Blobize//I need to remember to move/remove this later
 			verbs += /client/proc/toggle_clickproc //TODO ERRORAGE (Temporary proc while the enw clickproc is being tested)
+			// Moved over from tg's Game Master:
+			verbs += /client/proc/colorooc
+			verbs += /obj/admins/proc/toggle_aliens			//toggle aliens
+			verbs += /obj/admins/proc/toggle_space_ninja	//toggle ninjas
+			verbs += /client/proc/triple_ai
+			verbs += /client/proc/object_talk
+			verbs += /client/proc/strike_team
 
 		if (holder.level >= 4)//Badmin********************************************************************
 			verbs += /obj/admins/proc/adrev					//toggle admin revives

config/admins.txt

@@ -1,29 +1,15 @@
-tle - Game Master
-xsi - Game Master
-sillazi - Game Master
-herpa - Game Master
-scaredofshadows - Game Master
-chicagoted - Game Master
-neofite - Game Master
-uristmcdorf - Game Master
-cinless - Game Master
-
-mport2004 - Game Admin
-lj82 - Game Admin
-fatmanfive - Game Admin
-thickwillynilly - Game Admin
-euronumbers - Game Admin
-deuryn - Game Admin
-rosenritter - Game Admin
-lastwish - Game Admin
-tashdurandel - Game Admin
-mario90900 - Game Admin
-atomictroop - Game Admin
-fateweaver - Game Admin
-agouri - Game Master
-errorage - Game Master
-
-uhangi - Game Master
-
-superxpdude - Game Master
-petethegoat - Game Master
+abi79 - Game Master
+arcalane - Game Admin
+cacophony - Game Admin
+cajoes - Game Admin
+cib - Game Master
+compactninja - Game Admin
+headswe - Game Master
+iaryni - Game Master
+masterofapples - Game Admin
+megacaesar - Game Admin
+miniature - Game Master
+misterfox - Game Admin
+mloc - Game Master
+spaceman96 - Game Admin
+uristqwerty - Game Master