From a439e2379a69bd55048fc065545af96a89e2e6cc Mon Sep 17 00:00:00 2001 From: Jacquerel Date: Sun, 16 Feb 2025 23:56:30 +0000 Subject: [PATCH] Tweaks to chat hallucinations (#89486) ## About The Pull Request It was pointed out to me that the hallucinations json file still mentioned "viro" (as a job) and "gang leader" (as something to be scared of), two things our codebase doesn't have. So I removed them from the list. While I was there I couldn't resist adding a bunch of extra stuff also. ## Why It's Good For The Game More diversity of fake callouts you can hear over the radio is fun. ## Changelog :cl: add: Adjusted what things you can hallucinate people being accused of doing or being over the radio /:cl: --- code/modules/hallucination/fake_chat.dm | 2 + strings/hallucination.json | 75 +++++++++++++++++++++++-- 2 files changed, 73 insertions(+), 4 deletions(-) diff --git a/code/modules/hallucination/fake_chat.dm b/code/modules/hallucination/fake_chat.dm index 963e718eed8..10431724496 100644 --- a/code/modules/hallucination/fake_chat.dm +++ b/code/modules/hallucination/fake_chat.dm @@ -48,7 +48,9 @@ if(!chosen) if(is_radio) chosen = pick(list("Help!", + "Help [pick_list_replacements(HALLUCINATION_FILE, "location")][prob(50)?"!":"!!"]", "[pick_list_replacements(HALLUCINATION_FILE, "people")] is [pick_list_replacements(HALLUCINATION_FILE, "accusations")]!", + "[pick_list_replacements(HALLUCINATION_FILE, "people")] has [pick_list_replacements(HALLUCINATION_FILE, "contraband")]!", "[pick_list_replacements(HALLUCINATION_FILE, "threat")] in [pick_list_replacements(HALLUCINATION_FILE, "location")][prob(50)?"!":"!!"]", "[pick("Where's [first_name(hallucinator.name)]?", "Set [first_name(hallucinator.name)] to arrest!")]", "[pick("C","Ai, c","Someone c","Rec")]all the shuttle!", diff --git a/strings/hallucination.json b/strings/hallucination.json index 5cfdae87794..d6e13d570d9 100644 --- a/strings/hallucination.json +++ b/strings/hallucination.json @@ -72,9 +72,12 @@ ], "aggressive": [ + "@pick(add_name)fuck off!", "@pick(add_name)fuck you!", + "@pick(add_name)get out!", "@pick(add_name)give me that!", "@pick(add_name)i'm going to kill you!", + "@pick(add_name)stop!!", "@pick(add_name)stop it!" ], @@ -96,8 +99,11 @@ "escape": [ "@pick(add_name)follow me!", "@pick(add_name)follow me", + "@pick(add_name)look out!", "@pick(add_name)RUN!!", "It's here!", + "Oh shit!", + "They're coming!", "They're behind me!" ], @@ -115,55 +121,109 @@ "Borg", "Captain", "Ce", + "Chef", + "Clown", "Cmo", "Geneticist", "Hop", "Hos", "Janitor", + "Mime", "Qm", "Rd", - "Robo", - "Viro" + "Robo" ], "accusations": [ "a changeling", "a cultist", - "a gang leader", "a heretic", "a ling", + "a murderer", "a rev", "a revhead", + "a spy", "a tator", "a traitor", "a wizard", + "assaulting me", + "attacking me", "bad", "cult", "dead", + "drawing runes", + "flashing people", + "kidnapping me", + "killing people", "mindswapped", "rogue", + "shooting me", + "suicided", "the traitor", "the wizard" ], + "contraband" : [ + "a bomb", + "a syndibomb", + "a ttv", + "a death wand", + "a desword", + "an emag", + "an esword", + "a makarov", + "a mech", + "a powersink", + "a red suit", + "a revolver", + "a staff of change", + "a supermatter shard", + "armblade", + "cult halo", + "cult robes on", + "died", + "dual esword", + "heretic sword", + "hulk", + "my backpack", + "my heirloom", + "my id", + "my stuff", + "romerol", + "the fire axe", + "the spare id" + ], + "threat": [ "%TARGETNAME%", "Blob", "Blue APC", + "Bomb", + "Carps", "Changeling", "Cult", + "Cult rune", + "Dragon", + "Fire", "Harm", "Help", "Heretics", "Heretic", "I hear flashing", + "Kudzu", "Ling", + "Nightmare", "Ops", + "Plasma", "Revenant", + "Rune", + "Runes", "Spiders", + "Spy", "Traitor", "Wizard", - "Xenos" + "Xenos", + "Zombies" ], "location": [ @@ -221,9 +281,16 @@ "Hmm...not sure about that.", "Just do it.", "Kill that person. You know who.", + "Look out!", "No. Stop what you're doing.", + "Something is coming.", + "Something is wrong.", "That person wants to kill you.", + "They're coming for you.", + "They're out to get you.", + "This will end badly.", "Trust that person.", + "Trust no-one.", "Yes. You're doing the right thing.", "You have my permission. Do it.", "You should be wary of that person.",