From dd22e70a453f8ca9ff97274cc986faad46bdacdd Mon Sep 17 00:00:00 2001
From: JohnWildkins <john.wildkins@gmail.com>
Date: Thu, 12 Nov 2020 13:44:21 -0500
Subject: [PATCH] Fixes borg grippers not being able to use drop hotkey (Q) to
 drop items (#10520)

---
 code/modules/mob/mob_movement.dm         | 2 +-
 html/changelogs/johnwildkins-gripper.yml | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/johnwildkins-gripper.yml

diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 95c14fd3c17..e139ea06ce2 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -63,7 +63,7 @@
 					to_chat(usr, SPAN_WARNING("You have nothing to drop in your hand."))
 					return
 				drop_item()
-			else if(isrobot(src))
+			else if(isrobot(usr))
 				var/mob/living/silicon/robot/R = usr
 				var/I = R.get_active_hand()
 				if(istype(I, /obj/item/gripper))
diff --git a/html/changelogs/johnwildkins-gripper.yml b/html/changelogs/johnwildkins-gripper.yml
new file mode 100644
index 00000000000..3a9faa7ba4b
--- /dev/null
+++ b/html/changelogs/johnwildkins-gripper.yml
@@ -0,0 +1,6 @@
+author: JohnWildkins
+
+delete-after: True
+
+changes:
+  - bugfix: "Drop hotkey (Q) should now properly work to drop things held by robotic grippers."