From 5f4d0a2de917b2b629a1fc572010d92b8c26ac4e Mon Sep 17 00:00:00 2001 From: "giacomand@gmail.com" Date: Wed, 21 Nov 2012 21:27:12 +0000 Subject: [PATCH] -Changed the Resurrection "verb" to a "proc" so that nobody starts with it. -Fixed a small error with the say() code trying to do a bitflag operation with the preference datum and not the toggle variable in the datum. Added a check for the mob speaking having a client so that ghosts with ears toggled on won't keep hearing mice and other animals talk. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5156 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/living/say.dm | 2 +- maps/RandomZLevels/wildwest.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 93d2303d086..69ba08bf690 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -276,7 +276,7 @@ var/list/department_radio_keys = list( continue //skip monkeys and leavers if (istype(M, /mob/new_player)) continue - if(M.stat == DEAD && (M.client.prefs & CHAT_GHOSTEARS)) + if(M.stat == DEAD && (M.client.prefs.toggles & CHAT_GHOSTEARS) && src.client) // src.client is so that ghosts don't have to listen to mice listening|=M var/turf/T = get_turf(src) diff --git a/maps/RandomZLevels/wildwest.dm b/maps/RandomZLevels/wildwest.dm index d040086f8c3..aa1bca66f86 100644 --- a/maps/RandomZLevels/wildwest.dm +++ b/maps/RandomZLevels/wildwest.dm @@ -68,7 +68,7 @@ if("Immortality") user << "Your wish is granted, but at a terrible cost..." user << "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart." - user.verbs += /mob/living/carbon/verb/immortality + user.verbs += /mob/living/carbon/proc/immortality user.dna.mutantrace = "shadow" user.update_mutantrace() if("To Kill") @@ -142,7 +142,7 @@ /////For the Wishgranter/////////// -/mob/living/carbon/verb/immortality() +/mob/living/carbon/proc/immortality() set category = "Immortality" set name = "Resurrection"