From b09aa9d082d5e8d085752fe48e24808a8cb622eb Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 17 Sep 2017 12:03:31 -0500 Subject: [PATCH] [MIRROR] Fixes stacking when crafting items (#2814) * Merge pull request #30746 from YPOQ/stackfix Fixes stacking when crafting items * Fixes stacking when crafting items --- code/game/objects/items/stacks/stack.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index d4e9d596d7..cc718be2bd 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -149,7 +149,7 @@ if(!building_checks(R, multiplier)) return - var/atom/O = new R.result_type( usr.loc ) + var/obj/O = new R.result_type() O.setDir(usr.dir) use(R.req_amount * multiplier) @@ -168,11 +168,10 @@ new_item.amount = R.res_amount*multiplier new_item.update_icon() - if(new_item.amount <= 0)//if the stack is empty, i.e it has been merged with an existing stack and has been garbage collected - return - if (isitem(O)) usr.put_in_hands(O) + else + O.forceMove(usr.drop_location()) O.add_fingerprint(usr) //BubbleWrap - so newly formed boxes are empty