Fixes an issue where areas were set with luminosity = 1. Not sure why the hell I done that and why the hell I never noticed it. Thanks Kor.

Once again, Only crates may be sold on the supply shuttle.
Changed adminverb updates to be called by Login if holder.state changes. This is so we don't have to mess around with it elsewhere and we don't have to call it as often.
Added some missing verbs to the clearadminverbs proc
Fixed a icon reference not using the fullpath (Goddamn stop doing that)
Going catatonic makes you fall down
All mobs with the resting variable can now unrest (god damn what were you doing).
"Lay down / Get up" was renamed to "Rest".
Rest now uses src rather than usr (again, wtf)
Added some ugly fatty fat hacky code to make admin-ghosted mobs appear braindead rather than catatonic
Admin-ghosting (set-observe and set-play) merged into one verb named "Aghost" (short for admin ghost, same convention as asay)



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4708 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/admin/admin.dm

@@ -1205,18 +1205,17 @@ var/global/floorIsLava = 0
 	if (href_list["adminplayerobservejump"])
 		var/mob/M = locate(href_list["adminplayerobservejump"])
 		if(src && src.owner)
+			var/client/C
 			if(istype(src.owner,/client))
-				var/client/cl = src.owner
-				cl.admin_observe()
-				sleep(2)
-				cl.jumptomob(M)
+				C = src.owner
 			else if(ismob(src.owner))
 				var/mob/MO = src.owner
-				if(MO.client)
-					var/client/cl = MO.client
-					cl.admin_observe()
-					sleep(2)
-					cl.jumptomob(M)
+				C = MO.client
+			if(C)
+				if(state == 1)
+					C.admin_ghost()
+				sleep(2)
+				C.jumptomob(M)
 
 	if (href_list["adminchecklaws"])
 		if(src && src.owner)

code/modules/admin/admin_verbs.dm

@@ -22,7 +22,7 @@
 		holder = new /obj/admins(src)
 
 	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")
@@ -35,7 +35,7 @@
 			return
 		else
 			del(holder)
-			return
+			return		*/
 
 	switch (rank)
 		if ("Game Master")
@@ -125,8 +125,7 @@
 			verbs += /client/proc/cmd_admin_subtle_message
 			//verbs += /client/proc/warn	- was never used
 			verbs += /client/proc/dsay
-			verbs += /client/proc/admin_play
-			verbs += /client/proc/admin_observe
+			verbs += /client/proc/admin_ghost
 			verbs += /client/proc/game_panel
 			verbs += /client/proc/player_panel
 			verbs += /client/proc/player_panel_new
@@ -370,8 +369,7 @@
 	verbs -= /client/proc/cmd_admin_subtle_message
 	//verbs -= /client/proc/warn
 	verbs -= /client/proc/dsay
-	verbs -= /client/proc/admin_play
-	verbs -= /client/proc/admin_observe
+	verbs -= /client/proc/admin_ghost
 	verbs -= /client/proc/game_panel
 	verbs -= /client/proc/player_panel
 	verbs -= /client/proc/unban_panel
@@ -424,51 +422,30 @@
 	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
 	return
 
-
-/client/proc/admin_observe()
+/client/proc/admin_ghost()
 	set category = "Admin"
-	set name = "Set Observe"
-	if(!holder)
-		alert("You are not an admin")
-		return
-
-	verbs -= /client/proc/admin_play
-	spawn( 1200 )
-		verbs += /client/proc/admin_play
-	var/rank = holder.rank
-	clear_admin_verbs()
-	holder.state = 2
-	update_admins(rank)
-	if(!istype(mob, /mob/dead/observer))
-		mob.ghostize(1)
-	src << "\blue You are now observing"
-	feedback_add_details("admin_verb","O") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/proc/admin_play()
-	set category = "Admin"
-	set name = "Set Play"
-	if(!holder)
-		alert("You are not an admin")
-		return
-	verbs -= /client/proc/admin_observe
-	spawn( 1200 )
-		verbs += /client/proc/admin_observe
-	var/rank = holder.rank
-	clear_admin_verbs()
-	holder.state = 1
-	update_admins(rank)
-	if(istype(mob, /mob/dead/observer))
+	set name = "Aghost"
+	if(!holder)	return
+	if(istype(mob,/mob/dead/observer))
+		//re-enter
 		var/mob/dead/observer/ghost = mob
-		ghost.can_reenter_corpse = 1	//just in-case.
+		ghost.can_reenter_corpse = 1			//just in-case.
 		ghost.reenter_corpse()
-	deadchat = 0
-	src << "\blue You are now playing"
-	feedback_add_details("admin_verb","P") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+		feedback_add_details("admin_verb","P") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	else
+		//ghostize
+		var/mob/body = mob
+		body.ghostize(1)
+		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!
+
 
 /client/proc/get_admin_state()
 	set name = "Get Admin State"
@@ -770,8 +747,7 @@
 		verbs += /client/proc/togglebuildmodeself
 
 	verbs += /client/proc/dsay
-	verbs += /client/proc/admin_play
-	verbs += /client/proc/admin_observe
+	verbs += /client/proc/admin_ghost
 	verbs += /client/proc/game_panel
 	verbs += /client/proc/player_panel
 	verbs += /client/proc/cmd_admin_subtle_message