From d5756b46122a01d0a0c2b6daa591ec95d6b6f50b Mon Sep 17 00:00:00 2001 From: "kortgstation@gmail.com" Date: Wed, 21 Dec 2011 19:59:49 +0000 Subject: [PATCH] TG Updates: Staff of Change victims now have Universal Speak (the metroids/xenos/monkeys can all speak english). Reverted it back to cultists getting one random word each because I broke something apparently. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2763 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/cult/cult.dm | 8 ++++---- code/modules/projectiles/projectile/change.dm | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index c3bc296f684..a4900fb0670 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -147,7 +147,7 @@ /datum/game_mode/proc/grant_runeword(mob/living/carbon/human/cult_mob, var/word) - /*if(!wordtravel) + if(!wordtravel) runerandom() if (!word) word=pick(allwords) @@ -176,9 +176,9 @@ // if("free") // wordexp = "[wordfree] is free..." if("hide") - wordexp = "[wordhide] is hide..."*/ - cult_mob << "\red You remember the basics from the dark teachings of your master... [wordblood] is blood,[wordjoin] is join, and [wordself] is self..." - cult_mob.mind.store_memory("You remember that [wordblood] is blood,[wordjoin] is join, and [wordself] is self", 0, 0) + wordexp = "[wordhide] is hide..." + cult_mob << "\red You remember one thing from the dark teachings of your master... [wordexp]" + cult_mob.mind.store_memory("You remember that [wordexp]", 0, 0) /datum/game_mode/proc/add_cultist(datum/mind/cult_mind) //BASE diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm index a1237e3d282..02ff86c2ed2 100644 --- a/code/modules/projectiles/projectile/change.dm +++ b/code/modules/projectiles/projectile/change.dm @@ -41,6 +41,7 @@ if(M.mind) M.mind.transfer_to(O) O.a_intent = "hurt" + O.universal_speak = 1 O << "You are now a monkey." del(M) return O @@ -111,6 +112,7 @@ new_metroid.a_intent = "hurt" new_metroid << "You are now an adult Metroid." + new_metroid.universal_speak = 1 del(M) return new_metroid else @@ -120,6 +122,7 @@ if(M.mind) M.mind.transfer_to(new_metroid) new_metroid.a_intent = "hurt" + new_metroid.universal_speak = 1 new_metroid << "You are now a baby Metroid." del(M) return new_metroid @@ -145,6 +148,7 @@ if(M.mind) M.mind.transfer_to(new_xeno) new_xeno.a_intent = "hurt" + new_xeno.universal_speak = 1 new_xeno << "You are now an alien." del(M) return new_xeno