diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index 9abc5be2e80..8cad6f772e0 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -79,12 +79,18 @@
 		if(!isturf(loc))
 			return
 
-		// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc && isturf(A.loc.loc))
+		// cyborg rightclick code, allowing borgos to use weapons at range
 		if(CanReach(A,W))
 			W.melee_attack_chain(src, A, params)
 			return
-		if(isturf(A) || isturf(A.loc))
-			W.afterattack(A, src, 0, params)
+		else if(isturf(A) || isturf(A.loc))
+			if(LAZYACCESS(modifiers, RIGHT_CLICK))
+				var/after_attack_secondary_result = W.afterattack_secondary(A, src, FALSE, params)
+
+				if(after_attack_secondary_result == SECONDARY_ATTACK_CALL_NORMAL)
+					W.afterattack(A, src, FALSE, params)
+			else 
+				W.afterattack(A, src, FALSE, params)
 
 //Give cyborgs hotkey clicks without breaking existing uses of hotkey clicks
 // for non-doors/apcs