diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index 95661c5cfe9..439c7571687 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -96,7 +96,7 @@
 		// No adjacency checks
 
 		var/resolved = W.resolve_attackby(A, src, click_parameters = params)
-		if(!resolved && A && W)
+		if((resolved != ITEM_INTERACT_SUCCESS)  && A && W)
 			W.afterattack(A,src,1,params)
 		return
 
@@ -108,7 +108,7 @@
 		if(A.Adjacent(src) || (W && W.attack_can_reach(src, A, W.reach))) // see adjacent.dm, allows robots to use ranged melee weapons
 			SEND_SIGNAL(src, COMSIG_ROBOT_ITEM_ATTACK, W, src, params) //This is we ATTEMPTED to attack someone.
 			var/resolved = W.resolve_attackby(A, src, click_parameters = params)
-			if(!resolved && A && W)
+			if((resolved != ITEM_INTERACT_SUCCESS)  && A && W)
 				W.afterattack(A, src, 1, params)
 			return
 		else