diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index 0fe73bad6ef..b6f612bcda8 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -56,8 +56,7 @@
 
 	var/obj/item/W = get_active_held_item()
 
-	// Cyborgs have no range-checking unless there is item use
-	if(!W)
+	if(!W && get_dist(src,A) <= remote_range)
 		A.attack_robot(src)
 		return
 
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 7a9269d647e..2874a087422 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -93,6 +93,8 @@
 	/obj/item/clothing/head/sombrero,
 	/obj/item/clothing/head/witchunter_hat)
 
+	var/remote_range = 7 //How far can you interact with machines.
+
 	can_buckle = TRUE
 	buckle_lying = FALSE
 	can_ride_typecache = list(/mob/living/carbon/human)