From 2e6f5f6c0ccae4d126fc552db76cb237e26b0263 Mon Sep 17 00:00:00 2001
From: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com>
Date: Wed, 16 Jun 2021 17:53:40 -0400
Subject: [PATCH] Borg Gripper Fixes, The Sequel (The ride never ends) (#12057)

---
 code/modules/mob/living/silicon/robot/inventory.dm   | 9 ++++++---
 html/changelogs/Doxxmedearly - gripper_fix_part2.yml | 7 +++++++
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 html/changelogs/Doxxmedearly - gripper_fix_part2.yml

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."