From 667b2a869e8ea7e465b83ed51f1d38d46a6312a2 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 20 Feb 2023 03:10:21 +0100 Subject: [PATCH] [MIRROR] Fake messages now check the item [MDB IGNORE] (#19452) * Fake messages now check the item (#73515) ## About The Pull Request Fake messages about putting items away caused by hallucinations now checks the name of the item instead of being just a list of names. This fixes the names of the following items: .357 Revolver Energy Bow Spell book Hand tele Station blueprints ![image](https://user-images.githubusercontent.com/53777086/219892805-8c660fad-da83-44dc-9e8c-3e491324a4bb.png) ## Why It's Good For The Game Fixes grammar errors for hallucinations and futureproofs it a little. ## Changelog :cl: spellcheck: Hallucinations where you see people put things away now tell you they put the right thing away. /:cl: * Fake messages now check the item --------- Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> --- code/modules/hallucination/fake_message.dm | 43 +++++++++++----------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/code/modules/hallucination/fake_message.dm b/code/modules/hallucination/fake_message.dm index 43041ef667f..a1040496f5e 100644 --- a/code/modules/hallucination/fake_message.dm +++ b/code/modules/hallucination/fake_message.dm @@ -24,28 +24,29 @@ if(istype(equipped_backpack)) // in the future, this could / should be de-harcoded and // just draw from a pool uplink, theft, and antag item typepaths - var/static/list/stash_items = list( - ".357 revovler", - "energy sword", - "cryptographic sequencer", - "power sink", - "C-4 charge", - "energy bow", - "stun baton", - "flash", - "dart pistol", - "circular saw", - "ritual dagger", - "spellbook", - "Codex Cicatrix", - "captain's spare ID", - "hand teleporter", - "hypospray", - "antique laser gun", - "X-01 MultiPhase Energy Gun", - "station's blueprints", + var/static/list/stash_item_paths = list( + /obj/item/areaeditor/blueprints, + /obj/item/assembly/flash, + /obj/item/card/id/advanced/gold/captains_spare, + /obj/item/card/emag, + /obj/item/circular_saw, + /obj/item/codex_cicatrix, + /obj/item/grenade/c4, + /obj/item/gun/ballistic/revolver, + /obj/item/gun/energy/e_gun/hos, + /obj/item/gun/energy/laser/captain, + /obj/item/gun/energy/recharge/ebow, + /obj/item/gun/syringe/syndicate, + /obj/item/hand_tele, + /obj/item/melee/baton/security, + /obj/item/melee/cultblade/dagger, + /obj/item/melee/energy, + /obj/item/powersink, //this is a bulky item what + /obj/item/reagent_containers/hypospray/cmo, + /obj/item/spellbook, ) - message_pool[span_notice("[suspicious_personnel] puts the [pick(stash_items)] into [equipped_backpack].")] = 5 + var/obj/item/stashed_item = pick(stash_item_paths) + message_pool[span_notice("[suspicious_personnel] puts the [initial(stashed_item.name)] into [equipped_backpack].")] = 5 message_pool["[span_bold("[suspicious_personnel]")] [pick("sneezes", "coughs")]."] = 1