From f0e18860b0a655b1d4a59cc594e4c6852258cc02 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Fri, 22 Jul 2016 10:30:07 -0400 Subject: [PATCH] Fixes component messages --- code/game/gamemodes/clock_cult/clock_items.dm | 4 ++-- code/game/gamemodes/clock_cult/clock_scripture.dm | 2 +- code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_items.dm b/code/game/gamemodes/clock_cult/clock_items.dm index 51048539933..345c15bc23e 100644 --- a/code/game/gamemodes/clock_cult/clock_items.dm +++ b/code/game/gamemodes/clock_cult/clock_items.dm @@ -990,7 +990,7 @@ user << "[cultist_message]" if(is_servant_of_ratvar(user) && prob(20)) var/pickedmessage = pick(servant_of_ratvar_messages) - user << "[servant_of_ratvar_messages[pickedmessage] ? "[text2ratvar("pickedmessage")]" : "pickedmessage"]" + user << "[servant_of_ratvar_messages[pickedmessage] ? "[text2ratvar(pickedmessage)]" : pickedmessage]" /obj/item/clockwork/component/examine(mob/user) ..() @@ -1003,7 +1003,7 @@ icon_state = "belligerent_eye" component_id = "belligerent_eye" cultist_message = "The eye gives you an intensely hateful glare." - servant_of_ratvar_messages = list("\"...\"" = FALSE, "For a moment, your mind is flooded with extremely violent thoughts." = FALSE, "\"...Die.\"" = 1) + servant_of_ratvar_messages = list("\"...\"" = FALSE, "For a moment, your mind is flooded with extremely violent thoughts." = FALSE, "\"...Die.\"" = TRUE) message_span = "neovgre" /obj/item/clockwork/component/belligerent_eye/blind_eye diff --git a/code/game/gamemodes/clock_cult/clock_scripture.dm b/code/game/gamemodes/clock_cult/clock_scripture.dm index 264659b7dd9..57b30f6e379 100644 --- a/code/game/gamemodes/clock_cult/clock_scripture.dm +++ b/code/game/gamemodes/clock_cult/clock_scripture.dm @@ -1049,7 +1049,7 @@ Judgement: 10 servants, 100 CV, and any existing AIs are converted or destroyed name = "Invoke Sevtug, the Formless Pariah" desc = "Taps the limitless power of Sevtug, one of Ratvar's four generals. The mental manipulation ability of the Pariah allows its wielder to cause mass hallucinations and confusion \ for all non-servant humans on the same z-level as them. The power of this scripture falls off somewhat with distance, and certain things may reduce its effects." - invocations = list("I call upon you, Fright!!", "Let your power shatter the sanity of the weak minded!!", "Let your tendrils hold sway over all!!") + invocations = list("I call upon you, Fright!!", "Let your power shatter the sanity of the weak-minded!!", "Let your tendrils hold sway over all!!") channel_time = 150 required_components = list("belligerent_eye" = 3, "vanguard_cogwheel" = 3, "guvax_capacitor" = 6, "hierophant_ansible" = 3) consumed_components = list("belligerent_eye" = 3, "vanguard_cogwheel" = 3, "guvax_capacitor" = 6, "hierophant_ansible" = 3) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 7dd444daf7c..de7d764437b 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -178,7 +178,7 @@ M.Dizzy(5) if(iscultist(M) && prob(5)) M.say(pick("Av'te Nar'sie","Pa'lid Mors","INO INO ORA ANA","SAT ANA!","Daim'niodeis Arc'iai Le'eones","R'ge Na'sie","Diabo us Vo'iscum","Eld' Mon Nobis")) - else if(is_servant_of_ratvar(M) && prob(5)) + else if(is_servant_of_ratvar(M) && prob(8)) switch(pick("speech", "message", "emote")) if("speech") clockwork_say(M, "...[text2ratvar(pick("Engine... your light grows dark...", "Where are you, master?", "He lies rusting in Error...", "Purge all untruths and... and... something..."))]")