From 6de4ff99f5c3e6b9b62160d45af231c0404bc6cf Mon Sep 17 00:00:00 2001 From: skull132 Date: Sat, 15 Jul 2017 21:54:53 +0300 Subject: [PATCH] Fixes #1616 (#3041) Inventory code: 0. Skull: 1. --- code/game/objects/items.dm | 10 ++++++---- html/changelogs/skull132-droppping-the-soap.yml | 5 +++++ 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/skull132-droppping-the-soap.yml diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index c7a024dcaba..0d52d4e38cc 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -167,10 +167,12 @@ if (src.loc == user) if(!user.prepare_for_slotmove(src)) return - else - if(isliving(src.loc)) - return - user.put_in_active_hand(src) + else if(isliving(src.loc)) + return + + // If equipping onto active hand fails, drop it on the floor. + if (!user.put_in_active_hand(src)) + forceMove(user.loc) return /obj/item/attack_ai(mob/user as mob) diff --git a/html/changelogs/skull132-droppping-the-soap.yml b/html/changelogs/skull132-droppping-the-soap.yml new file mode 100644 index 00000000000..e984a0dfc4d --- /dev/null +++ b/html/changelogs/skull132-droppping-the-soap.yml @@ -0,0 +1,5 @@ +author: Skull132 +delete-after: true + +changes: + - bugfix: "Fixed the bug where your items would vanish if you were to unequip them from personal storage when lying down."