From 6906356b1a24d36769fa8d0eaa7296ade572f802 Mon Sep 17 00:00:00 2001
From: Heroman <alesha3000@list.ru>
Date: Mon, 4 Jul 2022 16:39:37 +1000
Subject: [PATCH] Fixes implanter implant teleportation

---
 .../objects/items/weapons/implants/implanter.dm  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm
index 606b707fce..952e5fa976 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -15,18 +15,22 @@
 	to_chat(user, "<span class='notice'>You [active ? "" : "de"]activate \the [src].</span>")
 	update()
 
-/obj/item/weapon/implanter/verb/remove_implant(var/mob/user)
+/obj/item/weapon/implanter/verb/remove_implant()
 	set category = "Object"
 	set name = "Remove Implant"
 	set src in usr
 
 	if(!imp)
 		return
-	imp.loc = get_turf(src)
-	user.put_in_hands(imp)
-	to_chat(user, "<span class='notice'>You remove \the [imp] from \the [src].</span>")
-	name = "implanter"
-	imp = null
+	if(istype(usr, /mob))
+		var/mob/M = usr
+		imp.loc = get_turf(src)
+		if(M.get_active_hand() == null)
+			M.put_in_hands(imp)
+		to_chat(M, "<span class='notice'>You remove \the [imp] from \the [src].</span>")
+		name = "implanter"
+		imp = null
+
 	update()
 
 	return