From 01882fec2680bd06e9b0a9d1851e4b1a538f3195 Mon Sep 17 00:00:00 2001 From: "elly1989@rocketmail.com" Date: Fri, 28 Sep 2012 03:56:51 +0000 Subject: [PATCH] Resolves issue 961 - invisibility is set in the define not in New for ghosts Replaces usr with mob. Using usr means invisimin can't be used as a proc git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4765 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/admin/admin_verbs.dm | 4 ++-- code/modules/mob/dead/observer/observer.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 46e803b2d9..31a98f5c63 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -476,10 +476,10 @@ if(holder && mob) if(mob.invisibility == INVISIBILITY_OBSERVER) mob.invisibility = initial(mob.invisibility) - usr << "\red You are now visible to other players." + mob << "\red Invisimin off. Invisibility reset." else mob.invisibility = INVISIBILITY_OBSERVER - usr << "\blue You are now invisible to other players." + mob << "\blue Invisimin on. You are now as invisible as a ghost." /client/proc/player_panel() diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 5db44dfcfd..239b1c9bf2 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -9,6 +9,7 @@ canmove = 0 blinded = 0 anchored = 1 // don't get pushed around + invisibility = INVISIBILITY_OBSERVER var/can_reenter_corpse var/datum/hud/living/carbon/hud = null // hud var/bootime = 0 @@ -17,7 +18,6 @@ //Note that this is not a reliable way to determine if admins started as observers, since they change mobs a lot. /mob/dead/observer/New(mob/body) - invisibility = INVISIBILITY_OBSERVER sight |= SEE_TURFS | SEE_MOBS | SEE_OBJS | SEE_SELF see_invisible = SEE_INVISIBLE_OBSERVER see_in_dark = 100