From 772da9b506313a5c5d797d451e136adfb489eb72 Mon Sep 17 00:00:00 2001
From: Tastyfish <crazychris32@gmail.com>
Date: Sat, 3 Dec 2011 16:55:26 -0500
Subject: [PATCH] made set-observe not make the mob pass out

---
 code/defines/mob/mob.dm                  | 1 +
 code/modules/admin/admin_verbs.dm        | 1 +
 code/modules/mob/living/carbon/carbon.dm | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/defines/mob/mob.dm b/code/defines/mob/mob.dm
index db1bd81df09..2c6ebe66470 100644
--- a/code/defines/mob/mob.dm
+++ b/code/defines/mob/mob.dm
@@ -88,6 +88,7 @@
 	var/plasma = null
 	var/sleeping = 0.0//Carbon
 	var/sleeping_willingly = 0.0 //Carbon, allows people to sleep forever if desired
+	var/admin_observing = 0.0
 	var/resting = 0.0//Carbon
 	var/lying = 0.0
 	var/canmove = 1.0
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 0b8952d95f2..7c7cfb76fe1 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -410,6 +410,7 @@
 	holder.state = 2
 	update_admins(rank)
 	if(!istype(mob, /mob/dead/observer))
+		mob.admin_observing = 1
 		mob.adminghostize(1)
 	src << "\blue You are now observing"
 
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index b0e8b08af8b..a3758c05280 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -183,13 +183,15 @@
 /mob/living/carbon/Logout()
 	..()
 
-	if(!src.sleeping) // would be exploited by stoxin'd people otherwise ;)
+	if(!src.sleeping && !src.admin_observing) // would be exploited by stoxin'd people otherwise ;)
+					   // (also make admins set-observing not sleep)
 		src.sleeping = 1
 		src.sleeping_willingly = 1
 
 /mob/living/carbon/Login()
 	..()
 
+	src.admin_observing = 0
 	if(src.sleeping_willingly)
 		src.sleeping = 0
 		src.sleeping_willingly = 0
\ No newline at end of file