Merge remote-tracking branch 'upstream/master' into Bloodsuckers

code/game/objects/items/implants/implant.dm

@@ -107,7 +107,7 @@
 	return ..()
 
 /obj/item/implant/proc/get_data()
-	return "No information available"
+	return "No information available about this implant."
 
 /obj/item/implant/dropped(mob/user)
 	. = 1

code/game/objects/items/implants/implantpad.dm

@@ -13,34 +13,31 @@
 	var/broadcasting = null
 	var/listening = 1
 
+/obj/item/implantpad/examine(mob/user)
+	. = ..()
+	if(case)
+		. += "<span class='notice'>Alt-click [src] to remove the inserted implant case.</span>"
 
 /obj/item/implantpad/update_icon()
-	if(case)
-		icon_state = "implantpad-1"
-	else
-		icon_state = "implantpad-0"
+	icon_state = "implantpad-[case ? TRUE : FALSE]"
 
-
-/obj/item/implantpad/attack_hand(mob/user)
+/obj/item/implantpad/AltClick(mob/user)
 	. = ..()
-	if(.)
-		return
-	if(case && user.is_holding(src))
-		user.put_in_active_hand(case)
+	if(case && user.can_hold_items() && user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+		user.put_in_hands(case)
 
 		case.add_fingerprint(user)
 		case = null
 
 		add_fingerprint(user)
 		update_icon()
+		return TRUE
 
 /obj/item/implantpad/attackby(obj/item/implantcase/C, mob/user, params)
-	if(istype(C, /obj/item/implantcase))
-		if(!case)
-			if(!user.transferItemToLoc(C, src))
-				return
+	if(istype(C))
+		if(!case && user.transferItemToLoc(C, src))
 			case = C
-		update_icon()
+			update_icon()
 	else
 		return ..()