From 9759decbc99df37f165a7eb942e78a87a7f56496 Mon Sep 17 00:00:00 2001
From: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com>
Date: Tue, 15 Jun 2021 00:07:51 -0400
Subject: [PATCH] Fixes borg gripper issue (#12043)

---
 code/modules/mob/living/silicon/robot/inventory.dm | 2 ++
 html/changelogs/doxxmedearly - borg_item_drop.yml  | 6 ++++++
 2 files changed, 8 insertions(+)
 create mode 100644 html/changelogs/doxxmedearly - borg_item_drop.yml

diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm
index 7faf3151971..abda564522c 100644
--- a/code/modules/mob/living/silicon/robot/inventory.dm
+++ b/code/modules/mob/living/silicon/robot/inventory.dm
@@ -254,6 +254,8 @@
 	W.forceMove(get_turf(src))
 	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()
 
 /mob/living/silicon/robot/drop_item()
 	if (istype(module_active, /obj/item/gripper))
diff --git a/html/changelogs/doxxmedearly - borg_item_drop.yml b/html/changelogs/doxxmedearly - borg_item_drop.yml
new file mode 100644
index 00000000000..bbaaf8325c8
--- /dev/null
+++ b/html/changelogs/doxxmedearly - borg_item_drop.yml	
@@ -0,0 +1,6 @@
+author: Doxxmedearly
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed a bug where phantom items would remain in a borg's gripper after attempting to place them in things like vendors and grinders."