From 6520b32e56d6a5707a422b3be16a118154a3a107 Mon Sep 17 00:00:00 2001 From: moxian Date: Thu, 31 Oct 2019 03:42:04 +0000 Subject: [PATCH] Fix a potential minor logic error. If the stack has no items left, we drop it, it gets merged with another stack on the ground, then we should still report the stack as having zero items. Otherwise there's a potential to accidentally use items on the ground once you run out of items in hand, which is slightly surprising. --- 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 0d864492266..1db390a2c91 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -312,7 +312,7 @@ // the two get merged, so the amount of items in the stack can increase from the 0 that it had before. // Check the amount again, to be sure we're not qdeling healthy stacks. qdel(src) - return TRUE + return TRUE return FALSE /obj/item/stack/proc/merge(obj/item/stack/S) //Merge src into S, as much as possible