Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

Conflicts:
	code/controllers/configuration.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/factions.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/verbs/ooc.dm
	code/game/verbs/who.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/login.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/paperwork/paper.dm
	config/config.txt
	html/changelog.html
	icons/mob/human.dmi
	icons/mob/human_face.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/admin/DB ban/functions.dm

@@ -1,5 +1,5 @@
 
-obj/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0)
+datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0)
 	var/user = sqlfdbklogin
 	var/pass = sqlfdbkpass
 	var/db = sqlfdbkdb
@@ -79,7 +79,7 @@ obj/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1
 
 
 
-obj/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "")
+datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "")
 	var/user = sqlfdbklogin
 	var/pass = sqlfdbkpass
 	var/db = sqlfdbkdb
@@ -149,7 +149,7 @@ obj/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "")
 	DB_ban_unban_by_id(ban_id)
 
 
-obj/admins/proc/DB_ban_unban_by_id(var/id)
+datum/admins/proc/DB_ban_unban_by_id(var/id)
 	var/user = sqlfdbklogin
 	var/pass = sqlfdbkpass
 	var/db = sqlfdbkdb

code/modules/admin/NewBan.dm

@@ -163,7 +163,7 @@ var/savefile/Banlist
 			timeleftstring = "[exp] Minutes"
 		return timeleftstring
 
-/obj/admins/proc/unbanpanel()
+/datum/admins/proc/unbanpanel()
 	var/count = 0
 	var/dat
 	//var/dat = "<HR><B>Unban Player:</B> \blue(U) = Unban , (E) = Edit Ban\green (Total<HR><table border=1 rules=all frame=void cellspacing=0 cellpadding=3 >"

code/modules/admin/admin_verbs.dm

@@ -17,28 +17,32 @@
 //			verbs += /client/proc/Cell //More air things
 
 /client/proc/update_admins(var/rank)
-
 	if(!holder)
-		holder = new /obj/admins(src)
+		holder = new /datum/admins(rank)
+		admin_list |= src
+		admins[ckey] = holder
 
-	holder.rank = rank
-/*	Unused
-	if(!holder.state)
-		var/state = alert("Which state do you want the admin to begin in?", "Admin-state", "Play", "Observe", "Neither")
-		if(state == "Play")
+	var/need_update = 0
+	//check if our rank has changed
+	if(holder.rank != rank)
+		holder.rank = rank
+		need_update = 1
+	//check if our state has changed
+	if(istype(mob,/mob/living))
+		if(holder.state != 1)
 			holder.state = 1
-			admin_play()
-			return
-		else if(state == "Observe")
+			need_update = 1
+	else
+		if(holder.state != 2)
 			holder.state = 2
-			admin_observe()
-			return
-		else
-			del(holder)
-			return		*/
+			need_update = 1
 
-	switch (rank)
-		if ("Game Master")
+	if(!need_update)	return
+
+	clear_admin_verbs()
+
+	switch(rank)
+		if("Game Master")
 			holder.level = 6
 
 		if ("Game Admin")
@@ -71,7 +75,7 @@
 			holder.level = 2
 			if(holder.state == 2) // if observing
 				deadchat = 1
-				verbs += /obj/admins/proc/toggleaban					//abandon mob
+				verbs += /datum/admins/proc/toggleaban					//abandon mob
 				verbs += /client/proc/deadchat							//toggles deadchat
 				verbs += /client/proc/cmd_admin_check_contents
 				verbs += /client/proc/Jump
@@ -88,10 +92,10 @@
 		if ("Admin Observer")
 			holder.level = -1
 
-		if ("Banned")
-			holder.level = -2
-			del(src)
-			return
+//		if ("Banned")
+//			holder.level = -2
+//			del(src)
+//			return
 
 		if ("Retired Admin")
 			holder.level = -3
@@ -119,6 +123,7 @@
 
 		//Moderator
 		if (holder.level >= 0)
+
 			verbs += /client/proc/cmd_admin_pm_context
 			verbs += /client/proc/cmd_admin_pm_panel
 			verbs += /client/proc/hide_verbs
@@ -135,18 +140,6 @@
 			verbs -= /client/proc/cmd_admin_gib_self
 			verbs += /client/proc/mod_panel
 
-		//Temporary Admin
-		if (holder.level >= 1)
-			verbs += /obj/admins/proc/delay								//game start delay
-			verbs += /obj/admins/proc/immreboot							//immediate reboot
-			verbs += /obj/admins/proc/restart							//restart
-			verbs += /client/proc/cmd_admin_check_contents
-			verbs += /client/proc/cmd_admin_create_centcom_report
-			verbs += /client/proc/toggle_hear_deadcast
-			verbs += /client/proc/toggle_hear_radio
-			verbs += /client/proc/deadmin_self
-			//verbs += /client/proc/cmd_admin_attack_log				--Merged with view variables
-
 			//
 			//MOVED FROM MODERATOR
 			//
@@ -172,9 +165,23 @@
 			verbs += /client/proc/unjobban_panel
 			verbs += /client/proc/check_ai_laws
 			//verbs += /client/proc/cmd_admin_prison 					--Merged with player panel
-			//verbs += /obj/admins/proc/unprison  						--Merged with player panel
+			//verbs += /datum/admins/proc/unprison  						--Merged with player panel
 		else	return
 
+
+		else	return
+		//Temporary Admin
+		if (holder.level >= 1)
+			verbs += /obj/admins/proc/delay								//game start delay
+			verbs += /obj/admins/proc/immreboot							//immediate reboot
+			verbs += /obj/admins/proc/restart							//restart
+			verbs += /client/proc/cmd_admin_check_contents
+			verbs += /client/proc/cmd_admin_create_centcom_report
+			verbs += /client/proc/toggle_hear_deadcast
+			verbs += /client/proc/toggle_hear_radio
+			verbs += /client/proc/deadmin_self
+			//verbs += /client/proc/cmd_admin_attack_log				--Merged with view variables
+
 		//Admin Candidate
 		if (holder.level >= 2)
 			verbs += /client/proc/cmd_admin_add_random_ai_law
@@ -191,10 +198,10 @@
 			seeprayers = 1
 
 			verbs += /client/proc/invisimin
-			verbs += /obj/admins/proc/view_txt_log
-			verbs += /obj/admins/proc/view_atk_log
-			verbs += /obj/admins/proc/toggleaban						//abandon mob
-			verbs += /obj/admins/proc/show_traitor_panel
+			verbs += /datum/admins/proc/view_txt_log
+			verbs += /datum/admins/proc/view_atk_log
+			verbs += /datum/admins/proc/toggleaban						//abandon mob
+			verbs += /datum/admins/proc/show_traitor_panel
 			verbs += /client/proc/getserverlog							//fetch an old serverlog to look at
 			//verbs += /client/proc/cmd_admin_remove_plasma 			--This proc is outdated, does not do anything
 			verbs += /client/proc/admin_call_shuttle
@@ -215,10 +222,10 @@
 
 		//Badmin
 		if (holder.level >= 4)
-			verbs += /obj/admins/proc/adrev								//toggle admin revives
-			verbs += /obj/admins/proc/adspawn							//toggle admin item spawning
+			verbs += /datum/admins/proc/adrev								//toggle admin revives
+			verbs += /datum/admins/proc/adspawn							//toggle admin item spawning
 			verbs += /client/proc/debug_variables
-			verbs += /obj/admins/proc/access_news_network               //Admin access to the newscaster network
+			verbs += /datum/admins/proc/access_news_network               //Admin access to the newscaster network
 			verbs += /client/proc/cmd_modify_ticker_variables
 			verbs += /client/proc/Debug2								//debug toggle switch
 			verbs += /client/proc/toggle_view_range
@@ -246,7 +253,7 @@
 
 		//Game Admin
 		if (holder.level >= 5)
-			verbs += /obj/admins/proc/spawn_atom
+			verbs += /datum/admins/proc/spawn_atom
 			verbs += /client/proc/cmd_admin_list_open_jobs
 			verbs += /client/proc/cmd_admin_direct_narrate
 			verbs += /client/proc/colorooc
@@ -284,9 +291,9 @@
 
 		//Game Master
 		if (holder.level >= 6)
-			verbs += /obj/admins/proc/toggle_aliens						//toggle aliens
-			verbs += /obj/admins/proc/toggle_space_ninja				//toggle ninjas
-			verbs += /obj/admins/proc/adjump
+			verbs += /datum/admins/proc/toggle_aliens						//toggle aliens
+			verbs += /datum/admins/proc/toggle_space_ninja				//toggle ninjas
+			verbs += /datum/admins/proc/adjump
 			verbs += /client/proc/callproc
 			verbs += /client/proc/triple_ai
 			verbs += /client/proc/get_admin_state
@@ -308,127 +315,132 @@
 
 /client/proc/clear_admin_verbs()
 	deadchat = 0
-
-	verbs -= /obj/admins/proc/announce
-	verbs -= /obj/admins/proc/startnow
-	verbs -= /obj/admins/proc/toggleAI									//Toggle the AI
-	verbs -= /obj/admins/proc/toggleenter								//Toggle enterting
-	verbs -= /obj/admins/proc/toggleguests								//Toggle guests entering
-	verbs -= /obj/admins/proc/toggleooc									//toggle ooc
-	verbs -= /obj/admins/proc/toggleoocdead         					//toggle ooc for dead/unc
-	verbs -= /obj/admins/proc/delay										//game start delay
-	verbs -= /obj/admins/proc/immreboot									//immediate reboot
-	verbs -= /obj/admins/proc/restart									//restart
-	verbs -= /obj/admins/proc/show_traitor_panel
-	verbs -= /obj/admins/proc/show_player_panel
-	verbs -= /obj/admins/proc/toggle_aliens								//toggle aliens
-	verbs -= /obj/admins/proc/toggle_space_ninja						//toggle ninjas
-	verbs -= /obj/admins/proc/adjump
-	verbs -= /obj/admins/proc/view_txt_log
-	verbs -= /obj/admins/proc/view_atk_log
-	verbs -= /obj/admins/proc/spawn_atom
-	verbs -= /obj/admins/proc/adrev										//toggle admin revives
-	verbs -= /obj/admins/proc/adspawn									//toggle admin item spawning
-	verbs -= /obj/admins/proc/toggleaban								//abandon mob
-	verbs -= /client/proc/hide_verbs
-	verbs -= /client/proc/hide_most_verbs
-	verbs -= /client/proc/show_verbs
-	verbs -= /client/proc/colorooc
-	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/cmd_admin_list_open_jobs
-	verbs -= /client/proc/cmd_admin_direct_narrate
-	verbs -= /client/proc/cmd_admin_world_narrate
-	verbs -= /client/proc/callproc
-	verbs -= /client/proc/Cell
-	verbs -= /client/proc/cmd_debug_del_all
-	verbs -= /client/proc/cmd_debug_tog_aliens
-//	verbs -= /client/proc/mapload
-	verbs -= /client/proc/check_words
-	verbs -= /client/proc/drop_bomb
+	verbs.Remove(
+		/datum/admins/proc/announce,
+		/datum/admins/proc/startnow,
+		/datum/admins/proc/toggleAI, 			/*Toggle the AI*/
+		/datum/admins/proc/toggleenter,		/*Toggle enterting*/
+		/datum/admins/proc/toggleguests,		/*Toggle guests entering*/
+		/datum/admins/proc/toggleooc,			/*toggle ooc*/
+		/datum/admins/proc/toggleoocdead,		/*toggle ooc for dead/unc*/
+		/datum/admins/proc/delay,				/*game start delay*/
+		/datum/admins/proc/immreboot,			/*immediate reboot*/
+		/datum/admins/proc/restart,			/*restart*/
+		/datum/admins/proc/show_traitor_panel,
+		/datum/admins/proc/show_player_panel,
+		/datum/admins/proc/toggle_aliens,		/*toggle aliens*/
+		/datum/admins/proc/toggle_space_ninja,/*toggle ninjas*/
+		/datum/admins/proc/adjump,
+		/datum/admins/proc/view_txt_log,
+		/datum/admins/proc/view_atk_log,
+		/datum/admins/proc/spawn_atom,
+		/datum/admins/proc/adrev,				/*toggle admin revives*/
+		/datum/admins/proc/adspawn,			/*toggle admin item spawning*/
+		/datum/admins/proc/toggleaban,		/*abandon mob*/
+		/client/proc/hide_verbs,
+		/client/proc/hide_most_verbs,
+		/client/proc/show_verbs,
+		/client/proc/colorooc,
+		/client/proc/triple_ai,
+		/client/proc/get_admin_state,
+		/client/proc/reload_admins,
+		/client/proc/kill_air,
+		/client/proc/cmd_debug_make_powernets,
+		/client/proc/object_talk,
+		/client/proc/strike_team,
+		/client/proc/cmd_admin_list_open_jobs,
+		/client/proc/cmd_admin_direct_narrate,
+		/client/proc/cmd_admin_world_narrate,
+		/client/proc/callproc,
+		/client/proc/Cell,
+		/client/proc/cmd_debug_del_all,
+		/client/proc/cmd_debug_tog_aliens,
+		/client/proc/check_words,
+		/client/proc/drop_bomb,
+		/client/proc/make_sound,
+		/client/proc/only_one,
+		/client/proc/send_space_ninja,
+		/client/proc/debug_variables,
+		/client/proc/cmd_modify_ticker_variables,
+		/client/proc/Debug2,				/*debug toggle switch*/
+		/client/proc/toggle_view_range,
+		/client/proc/Getmob,
+		/client/proc/Getkey,
+		/client/proc/sendmob,
+		/client/proc/Jump,
+		/client/proc/jumptokey,
+		/client/proc/jumptomob,
+		/client/proc/jumptoturf,
+		/client/proc/cmd_admin_add_freeform_ai_law,
+		/client/proc/cmd_admin_add_random_ai_law,
+		/client/proc/cmd_admin_rejuvenate,
+		/client/proc/cmd_admin_delete,
+		/client/proc/toggleadminhelpsound,
+		/client/proc/admin_call_shuttle,
+		/client/proc/admin_cancel_shuttle,
+		/client/proc/cmd_admin_dress,
+		/client/proc/respawn_character,
+		/client/proc/spawn_xeno,
+		/client/proc/cmd_admin_add_random_ai_law,
+		/client/proc/secrets,
+		/client/proc/check_antagonists,
+		/client/proc/play_sound,
+		/client/proc/stealth,
+		/client/proc/cmd_admin_check_contents,
+		/client/proc/cmd_admin_create_centcom_report,
+		/client/proc/deadchat,				/*toggles deadchat*/
+		/client/proc/cmd_admin_pm_context,
+		/client/proc/cmd_admin_pm_panel,
+		/client/proc/cmd_admin_say,
+		/client/proc/cmd_admin_subtle_message,
+		/client/proc/dsay,
+		/client/proc/admin_ghost,
+		/client/proc/game_panel,
+		/client/proc/player_panel,
+		/client/proc/unban_panel,
+		/client/proc/jobbans,
+		/client/proc/unjobban_panel,
+		/client/proc/hide_verbs,
+		/client/proc/general_report,
+		/client/proc/air_report,
+		/client/proc/cmd_admin_say,
+		/client/proc/cmd_admin_gib_self,
+		/client/proc/restart_controller,
+		/client/proc/play_local_sound,
+		/client/proc/enable_debug_verbs,
+		/client/proc/toggleprayers,
+		/client/proc/toggle_clickproc,		/*TODO ERRORAGE (Temporary proc while the enw clickproc is being tested)*/
+		/client/proc/toggle_hear_deadcast,
+		/client/proc/toggle_hear_radio,
+		/client/proc/player_panel_new,
+		/client/proc/toggle_gravity_on,
+		/client/proc/toggle_gravity_off,
+		/client/proc/toggle_random_events,
+		/client/proc/deadmin_self,
+		/client/proc/jumptocoord,
+		/client/proc/everyone_random,
+		/client/proc/Set_Holiday,
+		/client/proc/giveruntimelog,		/*used by coders to retrieve runtime logs*/
+		/client/proc/getserverlog,
+		/client/proc/cinematic,				/*show a cinematic sequence*/
+		/client/proc/admin_memo,
+		/client/proc/investigate_show,		/*investigate in-game mishaps using various logs.*/
+		/client/proc/toggle_log_hrefs,
+		/client/proc/ToRban,
+		/proc/possess,
+		/proc/release,
+		/client/proc/togglebuildmodeself,
+		/client/proc/kill_airgroup,
+		/client/proc/debug_controller,
+		/client/proc/startSinglo,
+		/client/proc/check_ai_laws,
+		/client/proc/cmd_debug_mob_lists,
+		/datum/admins/proc/access_news_network,
+		/client/proc/one_click_antag,
+		/client/proc/invisimin
+	)
+	//verbs -= /client/proc/mapload
 	//verbs -= /client/proc/cmd_admin_drop_everything					--merged with view variables
-	verbs -= /client/proc/make_sound
-	verbs -= /client/proc/only_one
-	verbs -= /client/proc/send_space_ninja
-	verbs -= /client/proc/debug_variables
-	verbs -= /client/proc/cmd_modify_ticker_variables
-	verbs -= /client/proc/Debug2										//debug toggle switch
-	verbs -= /client/proc/toggle_view_range
-	verbs -= /client/proc/Getmob
-	verbs -= /client/proc/Getkey
-	verbs -= /client/proc/sendmob
-	verbs -= /client/proc/Jump
-	verbs -= /client/proc/jumptokey
-	verbs -= /client/proc/jumptomob
-	verbs -= /client/proc/jumptoturf
-	verbs -= /client/proc/cmd_admin_add_freeform_ai_law
-	verbs -= /client/proc/cmd_admin_add_random_ai_law
-	verbs -= /client/proc/cmd_admin_rejuvenate
-	verbs -= /client/proc/cmd_admin_delete
-	verbs -= /client/proc/toggleadminhelpsound
-	//verbs -= /client/proc/cmd_admin_remove_plasma						--This proc is outdated, does not do anything
-	verbs -= /client/proc/admin_call_shuttle
-	verbs -= /client/proc/admin_cancel_shuttle
-	verbs -= /client/proc/cmd_admin_dress
-	verbs -= /client/proc/respawn_character
-	verbs -= /client/proc/spawn_xeno
-	verbs -= /client/proc/cmd_admin_add_random_ai_law
-	verbs -= /client/proc/secrets
-	verbs -= /client/proc/check_antagonists
-	verbs -= /client/proc/play_sound
-	verbs -= /client/proc/stealth
-	verbs -= /client/proc/cmd_admin_check_contents
-	verbs -= /client/proc/cmd_admin_create_centcom_report
-	verbs -= /client/proc/deadchat										//toggles deadchat
-	//verbs -= /client/proc/cmd_admin_mute	--was never used (according to stats trackind) - use show player panel --erro
-	verbs -= /client/proc/cmd_admin_pm_context
-	verbs -= /client/proc/cmd_admin_pm_panel
-	verbs -= /client/proc/cmd_admin_say
-	verbs -= /client/proc/cmd_admin_subtle_message
-	//verbs -= /client/proc/warn
-	verbs -= /client/proc/dsay
-	verbs -= /client/proc/admin_ghost
-	verbs -= /client/proc/game_panel
-	verbs -= /client/proc/player_panel
-	verbs -= /client/proc/unban_panel
-	verbs -= /client/proc/jobbans
-	verbs -= /client/proc/unjobban_panel
-	verbs -= /client/proc/hide_verbs
-	verbs -= /client/proc/general_report
-	verbs -= /client/proc/air_report
-	verbs -= /client/proc/cmd_admin_say
-	verbs -= /client/proc/cmd_admin_gib_self
-	verbs -= /client/proc/restart_controller
-	verbs -= /client/proc/play_local_sound
-	verbs -= /client/proc/enable_debug_verbs
-	verbs -= /client/proc/toggleprayers
-//	verbs -= /client/proc/Blobize
-//	verbs -= /client/proc/Blobcount
-	verbs -= /client/proc/toggle_clickproc 								//TODO ERRORAGE (Temporary proc while the enw clickproc is being tested)
-	verbs -= /client/proc/toggle_hear_deadcast
-	verbs -= /client/proc/toggle_hear_radio
-	verbs -= /client/proc/player_panel_new
-	verbs -= /client/proc/toggle_gravity_on
-	verbs -= /client/proc/toggle_gravity_off
-	verbs -= /client/proc/toggle_random_events
-	verbs -= /client/proc/deadmin_self
-	verbs -= /client/proc/jumptocoord
-	verbs -= /client/proc/everyone_random
-	verbs -= /client/proc/Set_Holiday
-	verbs -= /client/proc/giveruntimelog								//used by coders to retrieve runtime logs
-	verbs -= /client/proc/getserverlog
-	verbs -= /client/proc/cinematic										//show a cinematic sequence
-	verbs -= /client/proc/admin_memo
-	verbs -= /client/proc/investigate_show								//investigate in-game mishaps using various logs.
-	verbs -= /client/proc/toggle_log_hrefs
-	verbs -= /client/proc/ToRban
-	verbs -= /proc/possess
-	verbs -= /proc/release
 	//verbs -= /client/proc/give_spell 									--Merged with view variables
 	//verbs -= /client/proc/cmd_admin_ninjafy 							--Merged with view variables
 	//verbs -= /client/proc/cmd_modify_object_variables 				--Merged with view variables
@@ -440,17 +452,13 @@
 	//verbs -= /client/proc/cmd_admin_attack_log						--Merged with view variables
 	//verbs -= /proc/togglebuildmode									--Merged with view variables
 	//verbs -= /client/proc/cmd_admin_prison 							--Merged with player panel
-	//verbs -= /obj/admins/proc/unprison 								--Merged with player panel
+	//verbs -= /datum/admins/proc/unprison 								--Merged with player panel
 	//verbs -= /client/proc/cmd_switch_radio							--removed because tcommsat is staying
-	verbs -= /client/proc/togglebuildmodeself
-	verbs -= /client/proc/kill_airgroup
-	verbs -= /client/proc/debug_controller
-	verbs -= /client/proc/startSinglo
-	verbs -= /client/proc/check_ai_laws
-	verbs -= /client/proc/cmd_debug_mob_lists
-	verbs -= /obj/admins/proc/access_news_network
-	verbs -= /client/proc/one_click_antag
-	verbs -= /client/proc/invisimin
+	//	verbs -= /client/proc/Blobize
+	//	verbs -= /client/proc/Blobcount
+	//verbs -= /client/proc/warn
+	//verbs -= /client/proc/cmd_admin_mute	--was never used (according to stats trackind) - use show player panel --erro
+	//verbs -= /client/proc/cmd_admin_remove_plasma						--This proc is outdated, does not do anything
 //BS12 Admin Verbs
 	verbs -= /client/proc/update_mob_sprite
 	verbs -= /client/proc/mod_panel
@@ -472,11 +480,14 @@
 		ghost.can_reenter_corpse = 1			//just in-case.
 		ghost.reenter_corpse()
 		feedback_add_details("admin_verb","P") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	else if(istype(mob,/mob/new_player))
+		src << "<font color='red'>Error: Aghost: Can't admin-ghost whilst in the lobby. Join or Observe first.</font>"
 	else
 		//ghostize
 		var/mob/body = mob
 		body.ghostize(1)
-		if(body)	body.key = "@[key]"			//Haaaaaaaack. But the people have spoken. If it breaks; blame adminbus
+		if(body && !body.key)
+			body.key = "@[key]"	//Haaaaaaaack. But the people have spoken. If it breaks; blame adminbus
 		feedback_add_details("admin_verb","O") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 
@@ -573,30 +584,26 @@
 /client/proc/colorooc()
 	set category = "Fun"
 	set name = "OOC Text Color"
-	ooccolor = input(src, "Please select your OOC colour.", "OOC colour") as color
+	if(holder)
+		var/new_ooccolor = input(src, "Please select your OOC colour.", "OOC colour") as color|null
+		if(new_ooccolor)	holder.ooccolor = new_ooccolor
 	feedback_add_details("admin_verb","OC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return
 
 /client/proc/stealth()
 	set category = "Admin"
 	set name = "Stealth Mode"
-	if(!holder)
-		src << "Only administrators may use this command."
-		return
-	stealth = !stealth
-	if(stealth)
-		var/new_key = trim(input("Enter your desired display name.", "Fake Key", key))
-		if(!new_key)
-			stealth = 0
-			return
-		new_key = strip_html(new_key)
-		if(length(new_key) >= 26)
-			new_key = copytext(new_key, 1, 26)
-		fakekey = new_key
-	else
-		fakekey = null
-	log_admin("[key_name(usr)] has turned stealth mode [stealth ? "ON" : "OFF"]")
-	message_admins("[key_name_admin(usr)] has turned stealth mode [stealth ? "ON" : "OFF"]", 1)
+	if(holder)
+		if(holder.fakekey)
+			holder.fakekey = null
+		else
+			var/new_key = ckeyEx(input("Enter your desired display name.", "Fake Key", key) as text|null)
+			if(!new_key)	return
+			if(length(new_key) >= 26)
+				new_key = copytext(new_key, 1, 26)
+			holder.fakekey = new_key
+		log_admin("[key_name(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]")
+		message_admins("[key_name_admin(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]", 1)
 	feedback_add_details("admin_verb","SM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/playernotes()
@@ -697,8 +704,9 @@
 /client/proc/toggleadminhelpsound()
 	set name = "Toggle Adminhelp Sound"
 	set category = "Admin"
-	sound_adminhelp = !sound_adminhelp
-	if(sound_adminhelp)
+	if(!holder)	return
+	holder.sound_adminhelp = !holder.sound_adminhelp
+	if(holder.sound_adminhelp)
 		usr << "You will now hear a sound when adminhelps arrive"
 	else
 		usr << "You will no longer hear a sound when adminhelps arrive"
@@ -735,7 +743,7 @@
 	src << "Restoring admin verbs back"
 
 	var/temp = deadchat
-	clear_admin_verbs()
+	holder.state = null		//forces a full verbs update
 	update_admins(holder.rank)
 	deadchat = temp
 	feedback_add_details("admin_verb","TAVVS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -773,13 +781,9 @@
 
 	if(src.holder)
 		if(alert("Confirm self-deadmin for the round? You can't re-admin yourself without someont promoting you.",,"Yes","No") == "Yes")
-			del(holder)
 			log_admin("[src] deadmined themself.")
 			message_admins("[src] deadmined themself.", 1)
-			src.clear_admin_verbs()
-			src.update_admins(null)
-			admins.Remove(src.ckey)
-			admin_list -= src
+			deadmin()
 			usr << "You are now a normal player."
 	feedback_add_details("admin_verb","DAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
@@ -816,7 +820,7 @@
 	verbs += /client/proc/cmd_admin_gib_self
 
 	verbs += /client/proc/deadchat					//toggles deadchat
-	verbs += /obj/admins/proc/toggleooc				//toggle ooc
+	verbs += /datum/admins/proc/toggleooc				//toggle ooc
 	verbs += /client/proc/cmd_admin_say//asay
 	verbs += /client/proc/toggleadminhelpsound
 	feedback_add_details("admin_verb","HMV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -836,7 +840,7 @@
 	verbs += /client/proc/show_verbs
 
 	verbs += /client/proc/deadchat					//toggles deadchat
-	verbs += /obj/admins/proc/toggleooc				//toggle ooc
+	verbs += /datum/admins/proc/toggleooc				//toggle ooc
 	verbs += /client/proc/cmd_admin_say//asay
 	feedback_add_details("admin_verb","TAVVH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return

code/modules/admin/create_mob.dm

@@ -1,5 +1,5 @@
 /var/create_mob_html = null
-/obj/admins/proc/create_mob(var/mob/user)
+/datum/admins/proc/create_mob(var/mob/user)
 	if (!create_mob_html)
 		var/mobjs = null
 		mobjs = dd_list2text(typesof(/mob), ";")

code/modules/admin/create_object.dm

@@ -1,6 +1,6 @@
 /var/create_object_html = null
 
-/obj/admins/proc/create_object(var/mob/user)
+/datum/admins/proc/create_object(var/mob/user)
 	if (!create_object_html)
 		var/objectjs = null
 		objectjs = dd_list2text(typesof(/obj), ";")
@@ -10,7 +10,7 @@
 	user << browse(dd_replacetext(create_object_html, "/* ref src */", "\ref[src]"), "window=create_object;size=425x475")
 
 
-/obj/admins/proc/quick_create_object(var/mob/user)
+/datum/admins/proc/quick_create_object(var/mob/user)
 
 	var/quick_create_object_html = null
 	var/pathtext = null

code/modules/admin/create_turf.dm

@@ -1,5 +1,5 @@
 /var/create_turf_html = null
-/obj/admins/proc/create_turf(var/mob/user)
+/datum/admins/proc/create_turf(var/mob/user)
 	if (!create_turf_html)
 		var/turfjs = null
 		turfjs = dd_list2text(typesof(/turf), ";")

code/modules/admin/newbanjob.dm

@@ -203,7 +203,7 @@ var/savefile/Banlistjob
 			timeleftstring = "[exp] Minutes"
 		return timeleftstring
 
-/obj/admins/proc/unjobbanpanel()
+/datum/admins/proc/unjobbanpanel()
 	var/count = 0
 	var/dat
 	//var/dat = "<HR><B>Unban Player:</B> \blue(U) = Unban , (E) = Edit Ban\green (Total<HR><table border=1 rules=all frame=void cellspacing=0 cellpadding=3 >"
@@ -217,7 +217,7 @@ var/savefile/Banlistjob
 	dat = "<HR><B>Bans:</B> <FONT COLOR=blue>(U) = Unban , </FONT> - <FONT COLOR=green>([count] Bans)</FONT><HR><table border=1 rules=all frame=void cellspacing=0 cellpadding=3 >[dat]"
 	usr << browse(dat, "window=unbanp;size=875x400")
 
-/*/obj/admins/proc/permjobban(ckey, computerid, reason, bannedby, temp, minutes, rank)
+/*/datum/admins/proc/permjobban(ckey, computerid, reason, bannedby, temp, minutes, rank)
 	if(AddBanjob(ckey, computerid, reason, usr.ckey, 0, 0, job))
 		M << "\red<BIG><B>You have been banned from [job] by [usr.client.ckey].\nReason: [reason].</B></BIG>"
 		M << "\red This is a permanent ban."
@@ -227,7 +227,7 @@ var/savefile/Banlistjob
 			M << "\red No ban appeals URL has been set."
 		log_admin("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.")
 		message_admins("\blue[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.")
-/obj/admins/proc/timejobban(ckey, computerid, reason, bannedby, temp, minutes, rank)
+/datum/admins/proc/timejobban(ckey, computerid, reason, bannedby, temp, minutes, rank)
 	if(AddBanjob(ckey, computerid, reason, usr.ckey, 1, mins, job))
 		M << "\red<BIG><B>You have been jobbanned from [job] by [usr.client.ckey].\nReason: [reason].</B></BIG>"
 		M << "\red This is a temporary ban, it will be removed in [mins] minutes."

code/modules/admin/player_notes.dm

@@ -4,11 +4,11 @@
 
 #define NOTESFILE "data/player_notes.sav"	//where the player notes are saved
 
-obj/admins/proc/notes_show(var/ckey)
+datum/admins/proc/notes_show(var/ckey)
 	usr << browse("<head><title>Player Notes</title></head><body>[notes_gethtml(ckey)]</body>","window=player_notes;size=700x400")
 
 
-obj/admins/proc/notes_gethtml(var/ckey)
+datum/admins/proc/notes_gethtml(var/ckey)
 	var/savefile/notesfile = new(NOTESFILE)
 	if(!notesfile)	return "<font color='red'>Error: Cannot access [NOTESFILE]</font>"
 	if(ckey)

code/modules/admin/player_panel.dm

@@ -1,231 +1,8 @@
-/obj/admins/proc/player_panel_new()//The new one
+
+/datum/admins/proc/player_panel_new()//The new one
 	if (!usr.client.holder)
 		return
-	var/dat = "<html><head><title>Player Menu</title></head>"
-	dat += "<body><table border=1 cellspacing=5><B><tr><th>Name/Real Name</th><th>Type</th><th>Assigned Job</th><th>Info</th><th>Options</th><th>Traitor?</th></tr></B>"
-	//add <th>IP:</th> to this if wanting to add back in IP checking
-	//add <td>(IP: [M.lastKnownIP])</td> if you want to know their ip to the lists below
-	var/list/mobs = get_sorted_mobs()
-	var/i = 1
-
-	for(var/mob/M in mobs)
-		if(M.ckey)
-			var/color = "#e6e6e6"
-			i++
-			if(i%2 == 0)
-				color = "#f2f2f2"
-			var/real = (M.name == M.real_name ? "<b>[M.name]/[M.real_name]</b>" : "<b>[M.real_name] (as [M.name]/[M.real_name])</b>")
-			var/turf/T = get_turf(M)
-			var/client_key = (M.key? M.key : "No key")
-			dat += "<tr align='center' bgcolor='[color]'><td>[real] <br>[M.client ? M.client : "No client ([client_key])"] at ([T.x], [T.y], [T.z])</td>" // Adds current name
-			if(isobserver(M))
-				dat += "<td>Ghost</td>"
-			else if(isalien(M))
-				dat += "<td>Alien</td>"
-			else if(islarva(M))
-				dat += "<td>Alien larva</td>"
-			else if(istajaran(M))
-				dat += "<td>Tajaran</td>"
-			else if(ishuman(M))
-				dat += "<td>[M.job]</td>"
-			else if(ismetroid(M))
-				dat += "<td>Metroid</td>"
-			else if(ismonkey(M))
-				dat += "<td>Monkey</td>"
-			else if(isAI(M))
-				dat += "<td>AI</td>"
-			else if(ispAI(M))
-				dat += "<td>pAI</td>"
-			else if(isrobot(M))
-				dat += "<td>Cyborg</td>"
-			else if(isanimal(M))
-				dat += "<td>Animal</td>"
-			else if(iscorgi(M))
-				dat += "<td>Corgi</td>"
-			else if(istype(M,/mob/new_player))
-				dat += "<td>New Player</td>"
-			else
-				dat += "<td>\red ERROR</td>\black"
-
-			if(M.mind && M.mind.assigned_role && istype(M, /mob/living/carbon/human))	// Adds a column to Player Panel that shows their current job.
-				var/mob/living/carbon/human/H = M
-
-				if (H.wear_id)
-					var/obj/item/weapon/card/id/id
-
-					if(istype(H.wear_id, /obj/item/device/pda))
-						var/obj/item/device/pda/PDA = H.wear_id
-						if(!isnull(PDA.id))				// The PDA may contain no ID
-							id = PDA.id					// The ID is contained inside the PDA
-
-					else
-						id = H.wear_id					// The ID was on the ID slot
-
-					if(!id) 							// Happens when there's no ID in the PDA located on the wear_id slot
-						dat += "<td>[M.mind.assigned_role] (No ID)</td>"
-
-					else if(isnull(id.assignment))		// Preventing runtime errors blocking the player panel
-						if(istype(id, /obj/item/weapon/card/id/syndicate))
-							dat += "<td><font color=purple>Antagonist</font></td>"
-						else
-							usr << "<font color=red>ERROR:</font> Inform the coders that an [id.name] was checked for its assignment variable, and it was null."
-							dat += "<td><font color=red>ERROR</font></td>"
-
-					else
-						if(M.mind.assigned_role == id.assignment)			// Polymorph
-							dat += "<td>[M.mind.assigned_role]</td>"
-
-						else
-							dat += "<td>[M.mind.assigned_role] ([id.assignment])"
-
-				else
-					dat += "<td>[M.mind.assigned_role] (No ID)</td>"
-
-			else
-				dat += "<td>No Assigned Role</td>"
-
-			var/muting = "Not Currently Working"
-//			if(M.client)
-//				muting = {"<A href='?src=\ref[src];mute2=\ref[M]'>Mute: [(M.client.muted ? "Muted" : "Voiced")]</A> |
-//				<A href='?src=\ref[src];mute_complete=\ref[M]'>Complete mute: [(M.client.muted ? "Completely Muted" : "Voiced")]</A>
-//				"}
-
-			dat += {"<td><A HREF='?src=\ref[src];player_info=[M.ckey]'>[player_has_info(M.ckey) ? "Info" : "N/A"] </A></td>
-			<td><A href='?src=\ref[usr];priv_msg=\ref[M]'><b>PM</b></A> |
-			<A HREF='?src=\ref[src];adminplayeropts=\ref[M]'>PP</A> |
-			<A HREF='?src=\ref[src];adminplayervars=\ref[M]'>VV</A> |
-			<A HREF='?src=\ref[src];traitor_panel_pp=\ref[M]'>TP</A> |
-			<A HREF='?src=\ref[src];adminplayersubtlemessage=\ref[M]'>SM</A> |
-			<A HREF='?src=\ref[src];adminplayerobservejump=\ref[M]'>JMP</A></font>
-			<br><font size="2">[muting]</font><br>
-			<font size="2"><A href='?src=\ref[src];warn=\ref[M]'>Warn</A> | <A href='?src=\ref[src];boot2=\ref[M]'>Boot</A> | <A href='?src=\ref[src];newban=\ref[M]'>Ban</A> | <A href='?src=\ref[src];jobban2=\ref[M]'>Jobban</A></td>
-			"}
-
-			switch(is_special_character(M))
-				if(0)
-					dat += {"<td align=center><A HREF='?src=\ref[src];traitor=\ref[M]'>Traitor?</A></td>"}
-				if(1)
-					dat += {"<td align=center><A HREF='?src=\ref[src];traitor=\ref[M]'><font color=red>Traitor?</font></A></td>"}
-				if(2)
-					dat += {"<td align=center><A HREF='?src=\ref[src];traitor=\ref[M]'><font color=red><b>Traitor?</b></font></A></td>"}
-
-	dat += "</table></body></html>"
-
-	usr << browse(dat, "window=players;size=905x600")
-
-
-/obj/admins/proc/mod_panel()//The new one
-	if (!usr.client.holder)
-		return
-	var/dat = "<html><head><title>Player Menu</title></head>"
-	dat += "<body><table border=1 cellspacing=5><B><tr><th>Name/Real Name</th><th>IP/CID</th><th>Info</th><th>Options</th><th>Traitor?</th></tr></B>"
-	//add <th>IP:</th> to this if wanting to add back in IP checking <th>Type</th> <th>Assigned Job</th> <th>Traitor?</th>
-	//add <td>(IP: [M.lastKnownIP])</td> if you want to know their ip to the lists below
-	var/list/mobs = get_sorted_mobs()
-	var/i = 1
-
-	for(var/mob/M in mobs)
-		if(M.ckey)
-			var/color = "#e6e6e6"
-			i++
-			if(i%2 == 0)
-				color = "#f2f2f2"
-			var/real = (M.name == M.real_name ? "<b>[M.name]/[M.real_name]</b>" : "<b>[M.real_name] (as [M.name]/[M.real_name])</b>")
-			var/turf/T = get_turf(M)
-			var/client_key = (M.key? M.key : "No key")
-			dat += "<tr align='center' bgcolor='[color]'><td>[real] <br>[M.client ? M.client : "No client ([client_key])"] at ([T.x], [T.y], [T.z])</td>" // Adds current name
-/*			if(isobserver(M))
-				dat += "<td>Ghost</td>"
-			else if(isalien(M))
-				dat += "<td>Alien</td>"
-			else if(islarva(M))
-				dat += "<td>Alien larva</td>"
-			else if(istajaran(M))
-				dat += "<td>Tajaran</td>"
-			else if(ishuman(M))
-				dat += "<td>[M.job]</td>"
-			else if(ismetroid(M))
-				dat += "<td>Metroid</td>"
-			else if(ismonkey(M))
-				dat += "<td>Monkey</td>"
-			else if(isAI(M))
-				dat += "<td>AI</td>"
-			else if(ispAI(M))
-				dat += "<td>pAI</td>"
-			else if(isrobot(M))
-				dat += "<td>Cyborg</td>"
-			else if(isanimal(M))
-				dat += "<td>Animal</td>"
-			else if(iscorgi(M))
-				dat += "<td>Corgi</td>"
-			else if(istype(M,/mob/new_player))
-				dat += "<td>New Player</td>"
-			else
-				dat += "<td>\red ERROR</td>\black"
-
-			if(M.mind && M.mind.assigned_role && istype(M, /mob/living/carbon/human))	// Adds a column to Player Panel that shows their current job.
-				var/mob/living/carbon/human/H = M
-
-				if (H.wear_id)
-					var/obj/item/weapon/card/id/id
-
-					if(istype(H.wear_id, /obj/item/device/pda))
-						var/obj/item/device/pda/PDA = H.wear_id
-						if(!isnull(PDA.id))				// The PDA may contain no ID
-							id = PDA.id					// The ID is contained inside the PDA
-
-					else
-						id = H.wear_id					// The ID was on the ID slot
-
-					if(!id) 							// Happens when there's no ID in the PDA located on the wear_id slot
-						dat += "<td>[M.mind.assigned_role] (No ID)</td>"
-
-					else if(isnull(id.assignment))		// Preventing runtime errors blocking the player panel
-						if(istype(id, /obj/item/weapon/card/id/syndicate))
-							dat += "<td><font color=purple>Antagonist</font></td>"
-						else
-							usr << "<font color=red>ERROR:</font> Inform the coders that an [id.name] was checked for its assignment variable, and it was null."
-							dat += "<td><font color=red>ERROR</font></td>"
-
-					else
-						if(M.mind.assigned_role == id.assignment)			// Polymorph
-							dat += "<td>[M.mind.assigned_role]</td>"
-
-						else
-							dat += "<td>[M.mind.assigned_role] ([id.assignment])"
-
-				else
-					dat += "<td>[M.mind.assigned_role] (No ID)</td>"
-
-			else
-				dat += "<td>No Assigned Role</td>"
-*/
-			dat += {"<td>IP: [M.client ? M.client.address : "Disconnected"]<br>
-			CID: [M.client ? M.client.computer_id : "Disconnected"]</td>
-			"}
-
-			dat += {"<td><A HREF='?src=\ref[src];player_info=[M.ckey]'>[player_has_info(M.ckey) ? "Info" : "N/A"] </A></td>
-			<td><A href='?src=\ref[usr];priv_msg=\ref[M]'><b>PM</b></A></td>
-			"}
-
-			switch(is_special_character(M))
-				if(0)
-					dat += {"<td align=center>Loyal</td>"}
-				if(1)
-					dat += {"<td align=center><font color=red>Antag</font></td>"}
-				if(2)
-					dat += {"<td align=center><font color=red><b>Mode-Antag</b></font></td>"}
-
-	dat += "</table></body></html>"
-
-	usr << browse(dat, "window=players;size=600x600")
-
-
-/* //TG Player Panel
-/obj/admins/proc/player_panel_new()//The new one
-	if (!usr.client.holder)
-		return
-	var/dat = "<html><head><title>Player Panel</title></head>"
+	var/dat = "<html><head><title>Admin Player Panel</title></head>"
 
 	//javascript, the part that does most of the work~
 	dat += {"
@@ -540,9 +317,329 @@
 	"}
 
 	usr << browse(dat, "window=players;size=600x480")
-*/
+
+//this is a direct copy paste
+/datum/admins/proc/mod_panel()
+	if (!usr.client.holder)
+		return
+	var/dat = "<html><head><title>Mod Player Panel</title></head>"
+
+	//javascript, the part that does most of the work~
+	dat += {"
+
+		<head>
+			<script type='text/javascript'>
+
+				var locked_tabs = new Array();
+
+				function updateSearch(){
+
+
+					var filter_text = document.getElementById('filter');
+					var filter = filter_text.value.toLowerCase();
+
+					if(complete_list != null && complete_list != ""){
+						var mtbl = document.getElementById("maintable_data_archive");
+						mtbl.innerHTML = complete_list;
+					}
+
+					if(filter.value == ""){
+						return;
+					}else{
+
+						var maintable_data = document.getElementById('maintable_data');
+						var ltr = maintable_data.getElementsByTagName("tr");
+						for ( var i = 0; i < ltr.length; ++i )
+						{
+							try{
+								var tr = ltr\[i\];
+								if(tr.getAttribute("id").indexOf("data") != 0){
+									continue;
+								}
+								var ltd = tr.getElementsByTagName("td");
+								var td = ltd\[0\];
+								var lsearch = td.getElementsByTagName("b");
+								var search = lsearch\[0\];
+								//var inner_span = li.getElementsByTagName("span")\[1\] //Should only ever contain one element.
+								//document.write("<p>"+search.innerText+"<br>"+filter+"<br>"+search.innerText.indexOf(filter))
+								if ( search.innerText.toLowerCase().indexOf(filter) == -1 )
+								{
+									//document.write("a");
+									//ltr.removeChild(tr);
+									td.innerHTML = "";
+									i--;
+								}
+							}catch(err) {   }
+						}
+					}
+
+					var count = 0;
+					var index = -1;
+					var debug = document.getElementById("debug");
+
+					locked_tabs = new Array();
+
+				}
+
+				function expand(id,job,name,real_name,image,key,ip,antagonist,ref){
+
+					clearAll();
+
+					var span = document.getElementById(id);
+
+					body = "<table><tr><td>";
+
+					body += "</td><td align='center'>";
+
+					body += "<font size='2'><b>"+job+" "+name+"</b><br><b>Real name "+real_name+"</b><br><b>Played by "+key+" ("+ip+")</b></font>"
+
+					body += "</td><td align='center'>";
+
+					body += "<a href='?src=\ref[src];adminplayeropts="+ref+"'>PP</a> - "
+					body += "<a href='?src=\ref[src];notes=show;mob="+ref+"'>N</a> - "
+					body += "<a href='?src=\ref[src];adminplayervars="+ref+"'>VV</a> - "
+					body += "<a href='?src=\ref[src];traitor_panel_pp="+ref+"'>TP</a> - "
+					body += "<a href='?src=\ref[usr];priv_msg=\ref"+ref+"'>PM</a> - "
+					body += "<a href='?src=\ref[src];adminplayersubtlemessage="+ref+"'>SM</a> - "
+					body += "<a href='?src=\ref[src];adminplayerobservejump="+ref+"'>JMP</a><br>"
+					if(antagonist > 0)
+						body += "<font size='2'><a href='?src=\ref[src];secretsadmin=check_antagonist'><font color='red'><b>Antagonist</b></font></a></font>";
+
+					body += "</td></tr></table>";
+
+
+					span.innerHTML = body
+				}
+
+				function clearAll(){
+					var spans = document.getElementsByTagName('span');
+					for(var i = 0; i < spans.length; i++){
+						var span = spans\[i\];
+
+						var id = span.getAttribute("id");
+
+						if(!(id.indexOf("item")==0))
+							continue;
+
+						var pass = 1;
+
+						for(var j = 0; j < locked_tabs.length; j++){
+							if(locked_tabs\[j\]==id){
+								pass = 0;
+								break;
+							}
+						}
+
+						if(pass != 1)
+							continue;
+
+
+
+
+						span.innerHTML = "";
+					}
+				}
+
+				function addToLocked(id,link_id,notice_span_id){
+					var link = document.getElementById(link_id);
+					var decision = link.getAttribute("name");
+					if(decision == "1"){
+						link.setAttribute("name","2");
+					}else{
+						link.setAttribute("name","1");
+						removeFromLocked(id,link_id,notice_span_id);
+						return;
+					}
+
+					var pass = 1;
+					for(var j = 0; j < locked_tabs.length; j++){
+						if(locked_tabs\[j\]==id){
+							pass = 0;
+							break;
+						}
+					}
+					if(!pass)
+						return;
+					locked_tabs.push(id);
+					var notice_span = document.getElementById(notice_span_id);
+					notice_span.innerHTML = "<font color='red'>Locked</font> ";
+					//link.setAttribute("onClick","attempt('"+id+"','"+link_id+"','"+notice_span_id+"');");
+					//document.write("removeFromLocked('"+id+"','"+link_id+"','"+notice_span_id+"')");
+					//document.write("aa - "+link.getAttribute("onClick"));
+				}
+
+				function attempt(ab){
+					return ab;
+				}
+
+				function removeFromLocked(id,link_id,notice_span_id){
+					//document.write("a");
+					var index = 0;
+					var pass = 0;
+					for(var j = 0; j < locked_tabs.length; j++){
+						if(locked_tabs\[j\]==id){
+							pass = 1;
+							index = j;
+							break;
+						}
+					}
+					if(!pass)
+						return;
+					locked_tabs\[index\] = "";
+					var notice_span = document.getElementById(notice_span_id);
+					notice_span.innerHTML = "";
+					//var link = document.getElementById(link_id);
+					//link.setAttribute("onClick","addToLocked('"+id+"','"+link_id+"','"+notice_span_id+"')");
+				}
+
+				function selectTextField(){
+					var filter_text = document.getElementById('filter');
+					filter_text.focus();
+					filter_text.select();
+				}
+
+			</script>
+		</head>
+
+
+	"}
+
+	//body tag start + onload and onkeypress (onkeyup) javascript event calls
+	dat += "<body onload='selectTextField(); updateSearch();' onkeyup='updateSearch();'>"
+
+	//title + search bar
+	dat += {"
+
+		<table width='560' align='center' cellspacing='0' cellpadding='5' id='maintable'>
+			<tr id='title_tr'>
+				<td align='center'>
+					<font size='5'><b>Player panel</b></font><br>
+					Hover over a line to see more information - <a href='?src=\ref[src];secretsadmin=check_antagonist'>Check antagonists</a>
+					<p>
+				</td>
+			</tr>
+			<tr id='search_tr'>
+				<td align='center'>
+					<b>Search:</b> <input type='text' id='filter' value='' style='width:300px;'>
+				</td>
+			</tr>
+	</table>
+
+	"}
+
+	//player table header
+	dat += {"
+		<span id='maintable_data_archive'>
+		<table width='560' align='center' cellspacing='0' cellpadding='5' id='maintable_data'>"}
+
+	var/list/mobs = sortmobs()
+	var/i = 1
+	for(var/mob/M in mobs)
+		if(M.ckey)
+
+			var/color = "#e6e6e6"
+			if(i%2 == 0)
+				color = "#f2f2f2"
+			var/is_antagonist = is_special_character(M)
+
+			var/M_job = ""
+
+			if(isliving(M))
+
+				if(iscarbon(M)) //Carbon stuff
+					if(ishuman(M))
+						M_job = M.job
+					else if(ismetroid(M))
+						M_job = "Metroid"
+					else if(ismonkey(M))
+						M_job = "Monkey"
+					else if(isalien(M)) //aliens
+						if(islarva(M))
+							M_job = "Alien larva"
+						else
+							M_job = "Alien"
+					else
+						M_job = "Carbon-based"
+
+				else if(issilicon(M)) //silicon
+					if(isAI(M))
+						M_job = "AI"
+					else if(ispAI(M))
+						M_job = "pAI"
+					else if(isrobot(M))
+						M_job = "Cyborg"
+					else
+						M_job = "Silicon-based"
+
+				else if(isanimal(M)) //simple animals
+					if(iscorgi(M))
+						M_job = "Corgi"
+					else
+						M_job = "Animal"
+
+				else
+					M_job = "Living"
+
+			else if(istype(M,/mob/new_player))
+				M_job = "New player"
+
+			else if(isobserver(M))
+				M_job = "Ghost"
+
+			M_job = dd_replacetext(M_job, "'", "")
+			M_job = dd_replacetext(M_job, "\"", "")
+			M_job = dd_replacetext(M_job, "\\", "")
+
+			var/M_name = M.name
+			M_name = dd_replacetext(M_name, "'", "")
+			M_name = dd_replacetext(M_name, "\"", "")
+			M_name = dd_replacetext(M_name, "\\", "")
+			var/M_rname = M.real_name
+			M_rname = dd_replacetext(M_rname, "'", "")
+			M_rname = dd_replacetext(M_rname, "\"", "")
+			M_rname = dd_replacetext(M_rname, "\\", "")
+
+			var/M_key = M.key
+			M_key = dd_replacetext(M_key, "'", "")
+			M_key = dd_replacetext(M_key, "\"", "")
+			M_key = dd_replacetext(M_key, "\\", "")
+
+			//output for each mob
+			dat += {"
+
+				<tr id='data[i]' name='[i]' onClick="addToLocked('item[i]','data[i]','notice_span[i]')">
+					<td align='center' bgcolor='[color]'>
+						<span id='notice_span[i]'></span>
+						<a id='link[i]'
+						onmouseover='expand("item[i]","[M_job]","[M_name]","[M_rname]","--unused--","[M_key]","[M.lastKnownIP]",[is_antagonist],"\ref[M]")'
+						>
+						<b id='search[i]'>[M_name] - [M_rname] - [M_key] ([M_job])</b>
+						</a>
+						<br><span id='item[i]'></span>
+					</td>
+				</tr>
+
+			"}
+
+			i++
+
+
+	//player table ending
+	dat += {"
+		</table>
+		</span>
+
+		<script type='text/javascript'>
+			var maintable = document.getElementById("maintable_data_archive");
+			var complete_list = maintable.innerHTML;
+		</script>
+	</body></html>
+	"}
+
+	usr << browse(dat, "window=players;size=600x480")
+
 //The old one
-/obj/admins/proc/player_panel_old()
+/datum/admins/proc/player_panel_old()
 	if (!usr.client.holder)
 		return
 	var/dat = "<html><head><title>Player Menu</title></head>"
@@ -601,7 +698,7 @@
 
 
 
-/obj/admins/proc/check_antagonists()
+/datum/admins/proc/check_antagonists()
 	if (ticker && ticker.current_state >= GAME_STATE_PLAYING)
 		var/dat = "<html><head><title>Round Status</title></head><body><h1><B>Round Status</B></h1>"
 		dat += "Current Game Mode: <B>[ticker.mode.name]</B><BR>"
@@ -716,4 +813,4 @@
 		dat += "</body></html>"
 		usr << browse(dat, "window=roundstatus;size=400x500")
 	else
-		alert("The game hasn't started yet!")
+		alert("The game hasn't started yet!")

code/modules/admin/verbs/MC.dm

@@ -1,21 +0,0 @@
-/client/proc/restartcontroller()
-	set category = "Debug"
-	set name = "Restart Master Controller"
-	if(!holder)	return
-	switch(alert("Are you sure?  If the control is still running it will now be running twice.",,"Yes","No"))
-		if("Yes")
-			src = null
-			usr = null	//weird things were happening after restarting MC.
-			spawn(0)
-				master_controller.process()
-		if("No")
-			return 0
-	feedback_add_details("admin_verb","RMC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-	return
-
-/client/proc/debug_master_controller()
-	set category = "Debug"
-	set name = "Debug Master Controller"
-	debug_variables(master_controller)
-	feedback_add_details("admin_verb","DMC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-	return

code/modules/admin/verbs/adminhelp.dm

@@ -7,8 +7,8 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an", "monkey", "ali
 	set category = "Admin"
 	set name = "Adminhelp"
 
-	if (muted_adminhelp)
-		src << "<font color='red'>Error: Admin-PM: You cannot send adminhelps (Muted by admins).</font>"
+	if(muted & MUTE_ADMINHELP)
+		src << "<font color='red'>Error: Admin-PM: You cannot send adminhelps (Muted).</font>"
 		return
 
 	if (src.handle_spam_prevention(msg,MUTE_ADMINHELP))
@@ -97,7 +97,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an", "monkey", "ali
 				admin_number++
 				if( X.inactivity > AFK_THRESHOLD ) //When I made this, the AFK_THRESHOLD was 3000ds = 300s = 5m, see setup.dm for the new one.
 					admin_number_afk++
-				if(X.sound_adminhelp)
+				if(X.holder.sound_adminhelp)
 					X << 'sound/effects/adminhelp.ogg'
 				var/check_laws_text = ""
 				if(ai_found)
@@ -114,7 +114,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an", "monkey", "ali
 				admin_number++
 				if( X.inactivity > AFK_THRESHOLD ) //When I made this, the AFK_THRESHOLD was 3000ds = 300s = 5m, see setup.dm for the new one.
 					admin_number_afk++
-				if(X.sound_adminhelp)
+				if(X.holder.sound_adminhelp)
 					X << 'sound/effects/adminhelp.ogg'
 				var/msg_to_send = "\blue <b><font color=red>HELP: </font>[key_name(src, X)] (<A HREF='?src=\ref[X.holder];adminplayervars=[ref_client]'>VV</A>) (<A HREF='?src=\ref[X.holder];secretsadmin=check_antagonist'>CA</A>):</b> [msg]"
 				msg_to_send = dd_replacetext(msg_to_send, "HOLDERREF", "\ref[X.holder]")

code/modules/admin/verbs/adminpm.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 //allows right clicking mobs to send an admin PM to their client, forwards the selected mob's client to cmd_admin_pm
 /client/proc/cmd_admin_pm_context(mob/M as mob in mob_list)
 	set category = null
@@ -118,3 +119,116 @@
 	for(var/client/X)									//there are fewer clients than mobs
 		if(X.holder && X.key!=key && X.key!=C.key)	//check client/X is an admin and isn't the sender or recipient
 			X << "<B><font color='blue'>PM: [key_name(src, X, 0)]-&gt;[key_name(C, X, 0)]:</B> \blue [msg]</font>" //inform X
+=======
+//allows right clicking mobs to send an admin PM to their client, forwards the selected mob's client to cmd_admin_pm
+/client/proc/cmd_admin_pm_context(mob/M as mob in mob_list)
+	set category = null
+	set name = "Admin PM Mob"
+	if(!holder)
+		src << "<font color='red'>Error: Admin-PM-Context: Only administrators may use this command.</font>"
+		return
+	if( !ismob(M) || !M.client )	return
+	cmd_admin_pm(M.client,null)
+	feedback_add_details("admin_verb","APMM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+//shows a list of clients we could send PMs to, then forwards our choice to cmd_admin_pm
+/client/proc/cmd_admin_pm_panel()
+	set category = "Admin"
+	set name = "Admin PM"
+	if(!holder)
+		src << "<font color='red'>Error: Admin-PM-Panel: Only administrators may use this command.</font>"
+		return
+	var/list/client/targets[0]
+	for(var/client/T)
+		if(T.mob)
+			if(istype(T.mob, /mob/new_player))
+				targets["(New Player) - [T]"] = T
+			else if(istype(T.mob, /mob/dead/observer))
+				targets["[T.mob.name](Ghost) - [T]"] = T
+			else
+				targets["[T.mob.real_name](as [T.mob.name]) - [T]"] = T
+		else
+			targets["(No Mob) - [T]"] = T
+	var/list/sorted = sortList(targets)
+	var/target = input(src,"To whom shall we send a message?","Admin PM",null) in sorted|null
+	cmd_admin_pm(targets[target],null)
+	feedback_add_details("admin_verb","APM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+
+//takes input from cmd_admin_pm_context, cmd_admin_pm_panel or /client/Topic and sends them a PM.
+//Fetching a message if needed. src is the sender and C is the target client
+/client/proc/cmd_admin_pm(var/client/C, var/msg)
+	if(src.muted & MUTE_ADMINHELP)
+		src << "<font color='red'>Error: Admin-PM: You are unable to use admin PM-s (muted).</font>"
+		return
+
+	if( !C || !istype(C,/client) )
+		if(holder)		src << "<font color='red'>Error: Admin-PM: Client not found.</font>"
+		else			adminhelp(msg)	//admin we are replying to left. adminhelp instead
+		return
+
+	//get message text, limit it's length.and clean/escape html
+	if(!msg)
+		msg = input(src,"Message:", "Private message to [C.key]") as text|null
+
+		if(!msg)	return
+		if(!C)
+			if(holder)	src << "<font color='red'>Error: Admin-PM: Client not found.</font>"
+			else		adminhelp(msg)	//admin we are replying to has vanished, adminhelp instead
+			return
+
+	if (src.handle_spam_prevention(msg,MUTE_ADMINHELP))
+		return
+
+	//clean the message if it's not sent by a GA or GM
+	if( !holder || !(holder.rank in list("Game Admin", "Game Master")) )
+		msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))
+		if(!msg)	return
+
+	if(C.holder)
+		if(holder)	//both are admins
+			C << "<font color='red'>Admin PM from-<b>[key_name(src, C, 1)]</b>: [msg]</font>"
+			src << "<font color='blue'>Admin PM to-<b>[key_name(C, src, 1)]</b>: [msg]</font>"
+
+		else		//recipient is an admin but sender is not
+			C << "<font color='red'>Reply PM from-<b>[key_name(src, C, 1)]</b>: [msg]</font>"
+			src << "<font color='blue'>PM to-<b>Admins</b>: [msg]</font>"
+
+		//play the recieving admin the adminhelp sound (if they have them enabled)
+		if(C.holder.sound_adminhelp)
+			C << 'sound/effects/adminhelp.ogg'
+
+	else
+		if(holder)	//sender is an admin but recipient is not. Do BIG RED TEXT
+			C << "<font color='red' size='4'><b>-- Administrator private message --</b></font>"
+			C << "<font color='red'>Admin PM from-<b>[key_name(src, C, 0)]</b>: [msg]</font>"
+			C << "<font color='red'><i>Click on the administrator's name to reply.</i></font>"
+			src << "<font color='blue'>Admin PM to-<b>[key_name(C, src, 1)]</b>: [msg]</font>"
+
+			//always play non-admin recipients the adminhelp sound
+			C << 'sound/effects/adminhelp.ogg'
+
+			//AdminPM popup for ApocStation and anybody else who wants to use it. Set it with POPUP_ADMIN_PM in config.txt ~Carn
+			if(config.popup_admin_pm)
+				spawn()	//so we don't hold the caller proc up
+					var/sender = src
+					var/sendername = key
+					var/reply = input(C, msg,"Admin PM from-[sendername]", "") as text|null		//show message and await a reply
+					if(C && reply)
+						if(sender)
+							C.cmd_admin_pm(sender,reply)										//sender is still about, let's reply to them
+						else
+							adminhelp(reply)													//sender has left, adminhelp instead
+					return
+
+		else		//neither are admins
+			src << "<font color='red'>Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.</font>"
+			return
+
+	log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]")
+
+	//we don't use message_admins here because the sender/receiver might get it too
+	for(var/client/X)									//there are fewer clients than mobs
+		if(X.holder && X.key!=key && X.key!=C.key)	//check client/X is an admin and isn't the sender or recipient
+			X << "<B><font color='blue'>PM: [key_name(src, X, 0)]-&gt;[key_name(C, X, 0)]:</B> \blue [msg]</font>" //inform X
+>>>>>>> remotes/git-svn

code/modules/admin/verbs/adminsay.dm

@@ -7,8 +7,8 @@
 		src << "Only administrators may use this command."
 		return
 
-	if (src.muted_adminhelp)
-		src << "You cannot send ASAY messages (muted by admins)."
+	if (src.muted & MUTE_ADMINHELP)
+		src << "You cannot send ASAY messages (muted)."
 		return
 
 	if (src.handle_spam_prevention(msg,MUTE_ADMINHELP))

code/modules/admin/verbs/deadsay.dm

@@ -7,8 +7,8 @@
 		return
 	if(!src.mob)
 		return
-	if(src.muted_deadchat)
-		src << "\red You cannot send DSAY messages (muted by admins)."
+	if(src.muted & MUTE_DEADCHAT)
+		src << "\red You cannot send DSAY messages (muted)."
 		return
 
 	if (src.handle_spam_prevention(msg,MUTE_DEADCHAT))
@@ -20,7 +20,7 @@
 	if (!msg)
 		return
 
-	var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>ADMIN([src.stealth ? pick("BADMIN", "hornigranny", "TLF", "scaredforshadows", "KSI", "Silnazi", "HerpEs", "BJ69", "SpoofedEdd", "Uhangay", "Wario90900", "Regarity", "MissPhareon", "LastFish", "unMportant", "Deurpyn", "Fatbeaver") : src.key])</span> says, <span class='message'>\"[msg]\"</span></span>"
+	var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>ADMIN([src.holder.fakekey ? pick("BADMIN", "hornigranny", "TLF", "scaredforshadows", "KSI", "Silnazi", "HerpEs", "BJ69", "SpoofedEdd", "Uhangay", "Wario90900", "Regarity", "MissPhareon", "LastFish", "unMportant", "Deurpyn", "Fatbeaver") : src.key])</span> says, <span class='message'>\"[msg]\"</span></span>"
 
 	for (var/mob/M in player_list)
 		if (istype(M, /mob/new_player))

code/modules/admin/verbs/diagnostics.dm

@@ -170,24 +170,7 @@
 
 		message_admins("[usr] manually reloaded admins.txt")
 		usr << "You reload admins.txt"
-		var/text = file2text("config/admins.txt")
-		if (!text)
-			diary << "Failed to reload config/admins.txt\n"
-		else
-			var/list/lines = dd_text2list(text, "\n")
-			for(var/line in lines)
-				if (!line)
-					continue
-
-				if (copytext(line, 1, 2) == ";")
-					continue
-
-				var/pos = findtext(line, " - ", 1, null)
-				if (pos)
-					var/m_key = copytext(line, 1, pos)
-					var/a_lev = copytext(line, pos + 3, length(line) + 1)
-					admins[m_key] = a_lev
-					diary << ("ADMIN: [m_key] = [a_lev]")
+		world.load_admins()
 		feedback_add_details("admin_verb","RLDA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 //todo:

code/modules/admin/verbs/getlogs.dm

@@ -112,7 +112,7 @@
 //Other log stuff put here for the sake of organisation
 
 //Shows today's server log
-/obj/admins/proc/view_txt_log()
+/datum/admins/proc/view_txt_log()
 	set category = "Admin"
 	set name = "Show Server Log"
 	set desc = "Shows today's server log."
@@ -127,7 +127,7 @@
 	return
 
 //Shows today's attack log
-/obj/admins/proc/view_atk_log()
+/datum/admins/proc/view_atk_log()
 	set category = "Admin"
 	set name = "Show Server Attack Log"
 	set desc = "Shows today's server attack log."

code/modules/admin/verbs/modifyvariables.dm

@@ -1,5 +1,5 @@
 var/list/forbidden_varedit_object_types = list(
-										/obj/admins,						//Admins editing their own admin-power object? Yup, sounds like a good idea.
+										/datum/admins,						//Admins editing their own admin-power object? Yup, sounds like a good idea.
 										/obj/machinery/blackbox_recorder,	//Prevents people messing with feedback gathering
 										/datum/feedback_variable			//Prevents people messing with feedback gathering
 									)

code/modules/admin/verbs/one_click_antag.dm

@@ -8,7 +8,7 @@ client/proc/one_click_antag()
 	return
 
 
-/obj/admins/proc/one_click_antag()
+/datum/admins/proc/one_click_antag()
 
 	var/dat = {"<B>One-click Antagonist</B><br>
 		<a href='?src=\ref[src];makeAntag=1'>Make Tratiors</a><br>
@@ -32,7 +32,7 @@ client/proc/one_click_antag()
 	return
 
 
-/obj/admins/proc/makeMalfAImode()
+/datum/admins/proc/makeMalfAImode()
 
 	var/list/mob/living/silicon/AIs = list()
 	var/mob/living/silicon/malfAI = null
@@ -53,7 +53,7 @@ client/proc/one_click_antag()
 	return 0
 
 
-/obj/admins/proc/makeTratiors()
+/datum/admins/proc/makeTratiors()
 	var/datum/game_mode/traitor/temp = new
 
 	if(config.protect_roles_from_antagonist)
@@ -89,7 +89,7 @@ client/proc/one_click_antag()
 	return 0
 
 
-/obj/admins/proc/makeChanglings()
+/datum/admins/proc/makeChanglings()
 
 	var/datum/game_mode/changeling/temp = new
 	if(config.protect_roles_from_antagonist)
@@ -124,7 +124,7 @@ client/proc/one_click_antag()
 
 	return 0
 
-/obj/admins/proc/makeRevs()
+/datum/admins/proc/makeRevs()
 
 	var/datum/game_mode/revolution/temp = new
 	if(config.protect_roles_from_antagonist)
@@ -158,7 +158,7 @@ client/proc/one_click_antag()
 
 	return 0
 
-/obj/admins/proc/makeWizard()
+/datum/admins/proc/makeWizard()
 	var/list/mob/dead/observer/candidates = list()
 	var/mob/dead/observer/theghost = null
 	var/time_passed = world.time
@@ -194,7 +194,7 @@ client/proc/one_click_antag()
 	return 0
 
 
-/obj/admins/proc/makeCult()
+/datum/admins/proc/makeCult()
 
 	var/datum/game_mode/cult/temp = new
 	if(config.protect_roles_from_antagonist)
@@ -232,7 +232,7 @@ client/proc/one_click_antag()
 
 
 
-/obj/admins/proc/makeNukeTeam()
+/datum/admins/proc/makeNukeTeam()
 
 	var/list/mob/dead/observer/candidates = list()
 	var/mob/dead/observer/theghost = null
@@ -325,15 +325,15 @@ client/proc/one_click_antag()
 
 
 
-/obj/admins/proc/makeAliens()
+/datum/admins/proc/makeAliens()
 	alien_infestation(3)
 	return 1
 
-/obj/admins/proc/makeSpaceNinja()
+/datum/admins/proc/makeSpaceNinja()
 	space_ninja_arrival()
 	return 1
 
-/obj/admins/proc/makeDeathsquad()
+/datum/admins/proc/makeDeathsquad()
 	var/list/mob/dead/observer/candidates = list()
 	var/mob/dead/observer/theghost = null
 	var/time_passed = world.time
@@ -401,7 +401,7 @@ client/proc/one_click_antag()
 	return 1
 
 
-/obj/admins/proc/makeBody(var/mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character
+/datum/admins/proc/makeBody(var/mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character
 	if(!G_found || !G_found.key)	return
 
 	//First we spawn a dude.
@@ -423,7 +423,7 @@ client/proc/one_click_antag()
 
 	return new_character
 
-/obj/admins/proc/create_syndicate_death_commando(obj/spawn_location, syndicate_leader_selected = 0)
+/datum/admins/proc/create_syndicate_death_commando(obj/spawn_location, syndicate_leader_selected = 0)
 	var/mob/living/carbon/human/new_syndicate_commando = new(spawn_location.loc)
 	var/syndicate_commando_leader_rank = pick("Lieutenant", "Captain", "Major")
 	var/syndicate_commando_rank = pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant 1st Class", "Master Sergeant", "Sergeant Major")

code/modules/admin/verbs/playsound.dm

@@ -6,10 +6,8 @@
 		src << "Only administrators may use this command."
 		return
 
-	var/sound/uploaded_sound = sound(S,0,1,0)
-	uploaded_sound.channel = 777
-	uploaded_sound.priority = 255
-	uploaded_sound.wait = 1
+	var/sound/uploaded_sound = sound(S, repeat = 0, wait = 1, channel = 777)
+	uploaded_sound.priority = 250
 
 	if(src.holder.rank == "Game Master" || src.holder.rank == "Game Admin" || src.holder.rank == "Badmin")
 		log_admin("[key_name(src)] played sound [S]")

code/modules/admin/verbs/pray.dm

@@ -8,7 +8,8 @@
 		return
 
 	if (usr.client)
-		if(usr.client.muted_pray)
+		if(usr.client.muted & MUTE_PRAY)
+			usr << "\red You cannot pray (muted)."
 			return
 
 		if (src.client.handle_spam_prevention(msg,MUTE_PRAY))

code/modules/admin/verbs/randomverbs.dm

@@ -123,73 +123,55 @@
 	message_admins("[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.nodamage ? "On" : "Off")]", 1)
 	feedback_add_details("admin_verb","GOD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+
 proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
-	if(!automute)
-		if(usr && usr.client)
-			if(!usr.client.holder)
-				src << "Only administrators may use this command."
-				return
-			if (M.client && M.client.holder && (M.client.holder.level >= usr.client.holder.level))
-				alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
-				return
-	if(!M.client)
-		src << "This mob doesn't have a client tied to it."
+	if(automute)
+		if(!config.automute_on)	return
+	else
+		if(!usr || !usr.client)
+			return
+		if(!usr.client.holder)
+			usr << "<font color='red'>Error: cmd_admin_mute: You don't have permission to do this.</font>"
+			return
+		if(!M.client)
+			usr << "<font color='red'>Error: cmd_admin_mute: This mob doesn't have a client tied to it.</font>"
+		if(M.client.holder)
+			usr << "<font color='red'>Error: cmd_admin_mute: You cannot mute an admin.</font>"
+	if(!M.client)		return
+	if(M.client.holder)	return
+
+	var/muteunmute
+	var/mute_string
+
+	switch(mute_type)
+		if(MUTE_IC)			mute_string = "IC (say and emote)"
+		if(MUTE_OOC)		mute_string = "OOC"
+		if(MUTE_PRAY)		mute_string = "pray"
+		if(MUTE_ADMINHELP)	mute_string = "adminhelp, admin PM and ASAY"
+		if(MUTE_DEADCHAT)	mute_string = "deadchat and DSAY"
+		if(MUTE_ALL)		mute_string = "everything"
+		else				return
+
+	if(automute)
+		muteunmute = "auto-muted"
+		M.client.muted |= mute_type
+		log_admin("SPAM AUTOMUTE: [muteunmute] [key_name(M)] from [mute_string]")
+		message_admins("SPAM AUTOMUTE: [muteunmute] [key_name_admin(M)] from [mute_string].", 1)
+		M << "You have been [muteunmute] from [mute_string] by the SPAM AUTOMUTE system. Contact an admin."
+		feedback_add_details("admin_verb","AUTOMUTE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 		return
 
-	var/muteunmute = 0	//0 = unmuted; 1 = muted
-	var/mute_string = "unknown"
-
-	//The '| automute' thing ensures that if an automute is being applied by code, it always mutes to prevent any potential for automute to unmute someone who was muted.
-	switch(mute_type)
-		if(MUTE_IC)
-			M.client.muted_ic = !M.client.muted_ic | automute
-			muteunmute = M.client.muted_ic
-			mute_string = "IC (say and emote)"
-		if(MUTE_OOC)
-			M.client.muted_ooc = !M.client.muted_ooc | automute
-			muteunmute = M.client.muted_ooc
-			mute_string = "OOC"
-		if(MUTE_PRAY)
-			M.client.muted_pray = !M.client.muted_pray | automute
-			muteunmute = M.client.muted_pray
-			mute_string = "pray"
-		if(MUTE_ADMINHELP)
-			M.client.muted_adminhelp = !M.client.muted_adminhelp | automute
-			muteunmute = M.client.muted_adminhelp
-			mute_string = "adminhelp, admin PM and ASAY"
-		if(MUTE_DEADCHAT)
-			M.client.muted_deadchat = !M.client.muted_deadchat | automute
-			muteunmute = M.client.muted_deadchat
-			mute_string = "deadchat and DSAY"
-		if(MUTE_ALL)
-			mute_string = "everything"
-			if( M.client.muted_ic )
-				M.client.muted_ic = 1
-				M.client.muted_ooc = 1
-				M.client.muted_pray = 1
-				M.client.muted_adminhelp = 1
-				M.client.muted_deadchat = 1
-				muteunmute = 1
-			else
-				M.client.muted_ic = 0
-				M.client.muted_ooc = 0
-				M.client.muted_pray = 0
-				M.client.muted_adminhelp = 0
-				M.client.muted_deadchat = 0
-				muteunmute = 0
-
-	if(!automute)
-		log_admin("[key_name(usr)] has [(muteunmute ? "muted" : "voiced")] [key_name(M)] from [mute_string]")
-		message_admins("[key_name_admin(usr)] has [(muteunmute ? "muted" : "voiced")] [key_name_admin(M)] from [mute_string].", 1)
-
-		M << "You have been [(muteunmute ? "muted" : "voiced")] from [mute_string] by [(usr.client.stealth)?"an admin":"[usr.client]"]."
-		feedback_add_details("admin_verb","MUTE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	if(M.client.muted & mute_type)
+		muteunmute = "unmuted"
+		M.client.muted &= ~mute_type
 	else
-		log_admin("SPAM AUTOMUTE: [(muteunmute ? "muted" : "voiced")] [key_name(M)] from [mute_string]")
-		message_admins("SPAM AUTOMUTE: [(muteunmute ? "muted" : "voiced")] [key_name_admin(M)] from [mute_string].", 1)
+		muteunmute = "muted"
+		M.client.muted |= mute_type
 
-		M << "You have been [(muteunmute ? "muted" : "voiced")] from [mute_string] by the SPAM AUTOMUTE system. Contact an admin."
-		feedback_add_details("admin_verb","AUTOMUTE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	log_admin("[key_name(usr)] has [muteunmute] [key_name(M)] from [mute_string]")
+	message_admins("[key_name_admin(usr)] has [muteunmute] [key_name_admin(M)] from [mute_string].", 1)
+	M << "You have been [muteunmute] from [mute_string]."
+	feedback_add_details("admin_verb","MUTE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 
 /client/proc/cmd_admin_add_random_ai_law()