From c7774b3a41c5c5a87fe2d0dbd8cfdce234fae858 Mon Sep 17 00:00:00 2001
From: Rob Nelson <nexisentertainment@gmail.com>
Date: Wed, 19 Feb 2014 16:51:58 -0800
Subject: [PATCH] Fully fixed compressed-matter implanter.  Tested. (GitHub
 #526)

Conflicts:
	code/game/objects/items/weapons/implants/implanter.dm
---
 .../objects/items/weapons/implants/implanter.dm     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm
index adfd704487e..dfe2fc80acd 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -113,6 +113,9 @@
 	return
 
 /obj/item/weapon/implanter/compressed/attack(mob/M as mob, mob/user as mob)
+	// Attacking things in your hands tends to make this fuck up.
+	if(!istype(M))
+		return
 	var/obj/item/weapon/implant/compressed/c = imp
 	if (!c)	return
 	if (c.scanned == null)
@@ -126,9 +129,11 @@
 		if (c.scanned)
 			user << "\red Something is already scanned inside the implant!"
 			return
-		imp:scanned = A
-		A.loc.contents.Remove(A)
-		update()
+		if(user)
+			user.u_equip(I)
+			user.update_icons()	//update our overlays
+		c.scanned = I
+		c.scanned.loc = c
 
 
 /obj/item/weapon/implanter/deadman
@@ -149,4 +154,4 @@
 		src.imp = new /obj/item/weapon/implant/death_alarm(src)
 		..()
 		update()
-		return
\ No newline at end of file
+		return