From 5226b39e3ec56c4815377e34ed50221dec7c0165 Mon Sep 17 00:00:00 2001 From: "n3ophyt3@gmail.com" Date: Wed, 30 Mar 2011 23:16:54 +0000 Subject: [PATCH] I'm not entirely sure how or why ghosting broke, but it should work again. My testing indicated that attempting to ghost via the verb wasn't even calling the proc. Shunted adminghosting to a seperate proc that lacks the deadedness check since the adminness check was seemingly the source of the fuckup. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1314 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/admin/admin_verbs.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index e8c289bf4ee..8412af29762 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -1172,7 +1172,7 @@ src.holder.state = 2 update_admins(rank) if(!istype(src.mob, /mob/dead/observer)) - src.mob.ghostize(1) + src.mob.adminghostize(1) src << "\blue You are now observing" /client/proc/admin_play() diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 335737b6d08..bd7351409d8 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -12,17 +12,22 @@ src.name = corpse.real_name src.verbs += /mob/dead/observer/proc/reenter_corpse -/mob/proc/ghostize(var/adminoverride = 0) +/mob/proc/ghostize() set category = "Special Verbs" set name = "Ghost" set desc = "You cannot be revived as a ghost" - if(src.stat != 2 && !adminoverride) + if(src.stat != 2) src << "Only dead people and admins get to ghost, and admins don't use this verb to ghost while alive." return if(src.client) src.client.mob = new/mob/dead/observer(src) return +/mob/proc/adminghostize() + if(src.client) + src.client.mob = new/mob/dead/observer(src) + return + /mob/dead/observer/Move(NewLoc, direct) if(NewLoc) src.loc = NewLoc