From 2c2dfdc82065db234134d79a67689e22d721b0c1 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Wed, 13 Nov 2013 18:33:57 +0100 Subject: [PATCH 1/2] Allow for creation of stacks with amount = 0 --- code/game/objects/items/stacks/stack.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 551213c7fb4..0b03feca28b 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -17,7 +17,7 @@ /obj/item/stack/New(var/loc, var/amount=null) ..() - if (amount) + if (amount!=null) //Allow for stacks with the amount=0 src.amount=amount return From 9bdf8f06b77a7eb86f8494574b8c0aa519902585 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Wed, 13 Nov 2013 18:47:55 +0100 Subject: [PATCH 2/2] Non-sheet items no longer get stuck at the sheet stacker --- code/modules/mining/machine_stacking.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 19cce3caeab..07ca13d8b48 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -102,9 +102,11 @@ /obj/machinery/mineral/stacking_machine/process() - var/obj/item/stack/sheet/O - while (locate(/obj/item/stack/sheet, input.loc)) - O = locate(/obj/item/stack/sheet, input.loc) + var/obj/item/O + while (locate(/obj/item, input.loc)) + O = locate(/obj/item, input.loc) if(istype(O,/obj/item/stack/sheet)) process_sheet(O) + else + O.loc = src.output.loc return