diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 20aeb628df..e7d9ab1b5c 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -588,17 +588,14 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 	set category = "Object"
 	set name = "Pick up"
 
-	if(usr.incapacitated() || !Adjacent(usr) || usr.lying)
-		return
-
 	if(iscyborg(usr))
 		var/obj/item/gripper/gripper = usr.get_active_held_item(TRUE)
-		if(istype(gripper))
-			gripper.pre_attack(src, usr, get_dist(src, usr))
+		if(istype(gripper) && !gripper.wrapped)
+			usr.ClickOn(src)
 		return
 
 	if(usr.get_active_held_item() == null) // Let me know if this has any problems -Yota
-		usr.UnarmedAttack(src)
+		usr.ClickOn(src)
 
 //This proc is executed when someone clicks the on-screen UI button.
 //The default action is attack_self().