diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index abda564522c..c95300c31a1 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -255,12 +255,15 @@ return FALSE /mob/living/silicon/robot/remove_from_mob(var/obj/O) //Necessary to clear gripper when trying to place items in things (grinders, smartfridges, vendors, etc) - drop_item() + if(istype(module_active, /obj/item/gripper)) + var/obj/item/gripper/G = module_active + if(G.wrapped == O) + G.drop(get_turf(src), FALSE) //We don't need to see the "released X item" message if we're putting stuff in fridges and the like. /mob/living/silicon/robot/drop_item() - if (istype(module_active, /obj/item/gripper)) + if(istype(module_active, /obj/item/gripper)) var/obj/item/gripper/G = module_active - if (G.wrapped) + if(G.wrapped) G.drop_item() return uneq_active() diff --git a/html/changelogs/Doxxmedearly - gripper_fix_part2.yml b/html/changelogs/Doxxmedearly - gripper_fix_part2.yml new file mode 100644 index 00000000000..1029f54a91d --- /dev/null +++ b/html/changelogs/Doxxmedearly - gripper_fix_part2.yml @@ -0,0 +1,7 @@ +author: Doxxmedearly + +delete-after: True + +changes: + - bugfix: "Borg grippers should pick up stacks of items correctly again, instead of dropping them each time a stack is merged." + - tweak: "Removed the message telling you that you released an item from your gripper when you're putting said item into something like a fridge or grinder."