From d9927eb62a285a953de26d866ba164f990960371 Mon Sep 17 00:00:00 2001 From: Aylong <69762909+AyIong@users.noreply.github.com> Date: Tue, 13 Aug 2024 18:10:16 +0300 Subject: [PATCH] Fix ore picking with bag (#26488) * No comments... * Update code/game/objects/items/stacks/stack.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Aylong <69762909+AyIong@users.noreply.github.com> --------- Signed-off-by: Aylong <69762909+AyIong@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- code/game/objects/items/stacks/stack.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index d7d42b57847..ccf5c97e674 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -139,9 +139,8 @@ ui_interact(user) /obj/item/stack/attackby(obj/item/thing, mob/user, params) - if((parent_stack && !istype(thing, merge_type)) || (parent_stack && thing.type != type)) - ..() - return + if((!parent_stack && !istype(thing, merge_type)) || (parent_stack && thing.type != type)) + return ..() var/obj/item/stack/material = thing merge(material)