From 06fcf9d4ec2ef0607282c698234082fbe82ecd01 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 14 Apr 2023 15:17:16 +0200 Subject: [PATCH] [MIRROR] Monkeys no longer drop items taken from storage onto the ground. [MDB IGNORE] (#20541) * Monkeys no longer drop items taken from storage onto the ground. (#74689) Fixes #74313. ## About The Pull Request During a refactor to storage in #73761 , they forgot to add a check to loc.atom_storage in attack_paw to mirror the check made in attack_hand. This meant that monkeys and other mobs that used attack_paw always dropped items taken from storage onto the ground. Now, the code to check if they should go into your hand instead is properly checked. ## Why It's Good For The Game Bugs are bad mkay ## Changelog :cl: fix: Monkeys and some other mobs no longer drop items they've grabbed from storage onto the ground. /:cl: * Monkeys no longer drop items taken from storage onto the ground. --------- Co-authored-by: Sneeker134 <53362182+Sneeker134@users.noreply.github.com> --- code/game/objects/items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 803cc2643a4..f0a1e4eba2c 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -610,7 +610,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e return //If the item is in a storage item, take it out - if(loc.atom_storage?.remove_single(user, src, user.loc, silent = TRUE)) + if(loc.atom_storage && !loc.atom_storage.remove_single(user, src, user.loc, silent = TRUE)) return if(QDELETED(src)) //moving it out of the storage to the floor destroyed it. return