From 2b55391ed752b66960efdcb0572390a7bef04b75 Mon Sep 17 00:00:00 2001 From: "Kortgstation@gmail.com" Date: Thu, 2 Aug 2012 03:22:37 +0000 Subject: [PATCH] Shades name will now be based on the victims real name (so them wearing a gas mask or fake ID won't effect the shades name, and they won't have names like Shade of Unknown (As X). Also, Shades will be assigned a real name and original name upon creation, to prevent them from getting a random name when ghosted. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4278 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/wizard/soulstone.dm | 10 ++++++---- code/modules/mob/living/simple_animal/shade.dm | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index f1a00be628f..1188bc3b6ce 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -126,15 +126,17 @@ S.loc = C //put shade in stone S.nodamage = 1 //So they won't die inside the stone somehow S.canmove = 0//Can't move out of the soul stone - S.name = "Shade of [T.name]" + S.name = "Shade of [T.real_name]" + S.real_name = "Shade of [T.real_name]" + S.original_name = "Shade of [T.real_name]" if (T.client) T.client.mob = S S.cancel_camera() C.icon_state = "soulstone2" - C.name = "Soul Stone: [S.name]" + C.name = "Soul Stone: [S.real_name]" S << "Your soul has been captured! You are now bound to [U.name]'s will, help them suceed in their goals at all costs." - U << "\blue Capture successful!: \black [T.name]'s soul has been ripped from their body and stored within the soul stone." - U << "The soulstone has been imprinted with [S.name]'s mind, it will no longer react to other souls." + U << "\blue Capture successful!: \black [T.real_name]'s soul has been ripped from their body and stored within the soul stone." + U << "The soulstone has been imprinted with [S.real_name]'s mind, it will no longer react to other souls." C.imprinted = "[S.name]" del T if("SHADE") diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index 0c47f6f8976..873df68e9fd 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -1,5 +1,7 @@ /mob/living/simple_animal/shade name = "Shade" + real_name = "Shade" + original_name = "Shade" desc = "A bound spirit" icon = 'icons/mob/mob.dmi' icon_state = "shade"