diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index 95334e908e3..45f7c304dfc 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -350,14 +350,18 @@
 	set category = "Object"
 	set name = "Pick up"
 
-	if(!usr.canmove || usr.stat || usr.restrained())
+	if(!usr.canmove || usr.stat || usr.restrained() || !in_range(src, usr))
 		return
 
 	if(ishuman(usr))
+		if(usr.get_active_hand() == null)
+			src.Click() // Let me know if this has any problems -Giacom
+		/*
 		if(usr.get_active_hand() == null)
 			src.attack_hand(usr)
 		else
 			usr << "\red You already have something in your hand."
+		*/
 	else
 		usr << "\red This mob type can't use this verb."
 
diff --git a/code/defines/procs/gamehelpers.dm b/code/defines/procs/gamehelpers.dm
index 8106f179712..7f71dc3a4f3 100644
--- a/code/defines/procs/gamehelpers.dm
+++ b/code/defines/procs/gamehelpers.dm
@@ -133,6 +133,14 @@
 				if(M.client)
 					hear += M
 
+	// Search for Mulebots. A person might be riding in it's load.
+	for(var/obj/machinery/bot/mulebot/C in V)
+		if(C.load && ismob(C.load))
+			if(isInSight(source,C))
+				var/mob/M = C.load
+				if(M.client)
+					hear += M
+
 	// Cryos:
 	for(var/obj/machinery/atmospherics/unary/cryo_cell/C in V)
 		if(C.occupant)