made set-observe not make the mob pass out

This commit is contained in:
Tastyfish
2011-12-03 16:55:26 -05:00
parent d1a7c95717
commit 772da9b506
3 changed files with 5 additions and 1 deletions

View File

@@ -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

View File

@@ -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"

View File

@@ -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