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/mob/dead/observer/login.dm

@@ -1,2 +1,7 @@
 /mob/dead/observer/Login()
-	return ..()
+	..()
+	if(client.holder && client.holder.state != 2)
+		client.holder.state = 2
+		var/rank = client.holder.rank
+		client.clear_admin_verbs()
+		client.update_admins(rank)

code/modules/mob/dead/observer/observer.dm

@@ -81,6 +81,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	else
 		var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost whilst still alive you may not play again this round! You can't change your mind so choose wisely!!)","Are you sure you want to ghost?","Ghost","Stay in body")
 		if(response != "Ghost")	return	//didn't want to ghost after-all
+		resting = 1
 		ghostize(0)						//0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3
 	return
 
@@ -137,7 +138,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(!(mind && mind.current && can_reenter_corpse))
 		src << "<span class='warning'>You have no body.</span>"
 		return
-	if(mind.current.key)	//makes sure we don't accidentally kick any clients
+	if(mind.current.key && copytext(mind.current.key,1,2)!="@")	//makes sure we don't accidentally kick any clients
 		usr << "<span class='warning'>Another consciousness is in your body...It is resisting you.</span>"
 		return
 	if(mind.current.ajourn && mind.current.stat != DEAD) 	//check if the corpse is astral-journeying (it's client ghosted using a cultist rune).
@@ -146,13 +147,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 			usr << "<span class='warning'>The astral cord that ties your body and your spirit has been severed. You are likely to wander the realm beyond until your body is finally dead and thus reunited with you.</span>"
 			return
 	mind.current.ajourn=0
-	if(client.holder && client.holder.state == 2)	//TODO: should be handled by Login/Logout ~Carn
-		var/rank = client.holder.rank
-		client.clear_admin_verbs()
-		client.holder.state = 1
-		client.update_admins(rank)
-
 	mind.current.key = key
+	return 1
 
 /mob/dead/observer/proc/dead_tele()
 	set category = "Ghost"

code/modules/mob/living/login.dm

@@ -19,6 +19,14 @@
 				if(mind in ticker.mode:syndicates)
 					ticker.mode.update_all_synd_icons()
 
+
+	if(client.holder && client.holder.state != 1)
+		client.holder.state = 1
+		var/rank = client.holder.rank
+		client.clear_admin_verbs()
+		client.update_admins(rank)
+	return .
+
 //This stuff needs to be merged from cloning.dm but I'm not in the mood to be shouted at for breaking all the things :< ~Carn
 	/* clones
 	switch(ticker.mode.name)

code/modules/mob/mob.dm

@@ -365,14 +365,8 @@ var/list/slot_equipment_priority = list( \
 		del(M)
 		return
 
-
-
-	if(client && client.holder && (client.holder.state == 2))
-		client.admin_play()
-		return
-
-	M.key = client.key
-	M.Login()
+	M.key = key
+//	M.Login()	//wat
 	return
 
 /mob/verb/changes()

code/modules/mob/screen.dm

@@ -371,12 +371,6 @@
 					if("hurt")
 						usr.a_intent = "help"
 						usr.hud_used.action_intent.icon_state = "intent_help"
-				/*if (usr.hud_used.show_intent_icons)
-					usr.hud_used.show_intent_icons = 0
-					usr.client.screen -= usr.hud_used.intent_small_hud_objects
-				else
-					usr.hud_used.show_intent_icons = 1
-					usr.client.screen += usr.hud_used.intent_small_hud_objects*/ //Small intent icons
 			if(issilicon(usr))
 				if(usr.a_intent == "help")
 					usr.a_intent = "hurt"
@@ -503,12 +497,12 @@
 		if(alert(src,"You sure you want to sleep for a while?","Sleep","Yes","No") == "Yes")
 			usr.sleeping = 20 //Short nap
 
-/mob/living/carbon/verb/lay_down()
-	set name = "Lay down / Get up"
+/mob/living/verb/lay_down()
+	set name = "Rest"
 	set category = "IC"
 
-	usr.resting = !( usr.resting )
-	usr << "\blue You are now [(usr.resting) ? "resting" : "getting up"]"
+	resting = !resting
+	src << "\blue You are now [resting ? "resting" : "getting up"]"
 
 /mob/verb/quick_equip()
 	set name = "quick-equip"