cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 14:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

-Changed the Resurrection "verb" to a "proc" so that nobody starts with it.

Browse Source 
-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
This commit is contained in:
giacomand@gmail.com
2012-11-21 21:27:12 +00:00
parent 541ae72099
commit 5f4d0a2de9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/say.dm
View File

@@ -276,7 +276,7 @@ var/list/department_radio_keys = list(
continue //skip monkeys and leavers continue //skip monkeys and leavers
if (istype(M, /mob/new_player)) if (istype(M, /mob/new_player))
continue 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 listening|=M
var/turf/T = get_turf(src) var/turf/T = get_turf(src)

4
maps/RandomZLevels/wildwest.dm
View File

@@ -68,7 +68,7 @@
if("Immortality") if("Immortality")
user << "<B>Your wish is granted, but at a terrible cost...</B>" user << "<B>Your wish is granted, but at a terrible cost...</B>"
user << "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart." 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.dna.mutantrace = "shadow"
user.update_mutantrace() user.update_mutantrace()
if("To Kill") if("To Kill")
@@ -142,7 +142,7 @@
/////For the Wishgranter/////////// /////For the Wishgranter///////////
/mob/living/carbon/verb/immortality() /mob/living/carbon/proc/immortality()
set category = "Immortality" set category = "Immortality"
set name = "Resurrection" set name = "Resurrection"