diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index b0c110cddc5..da3f8fcd2e5 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -69,9 +69,10 @@
 	// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents)
 	if(A == loc || (A in loc) || (A in contents))
 		// No adjacency checks
-		var/resolved = A.attackby(W,src, params)
-		if(!resolved && A && W)
-			W.afterattack(A,src,1,params)
+		if(W.pre_attackby(A,src,params))
+			var/resolved = A.attackby(W,src, params)
+			if(!resolved && A && W)
+				W.afterattack(A,src,1,params)
 		return
 
 	if(!isturf(loc))
@@ -80,9 +81,10 @@
 	// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc && isturf(A.loc.loc))
 	if(isturf(A) || isturf(A.loc))
 		if(A.Adjacent(src)) // see adjacent.dm
-			var/resolved = A.attackby(W, src, params)
-			if(!resolved && A && W)
-				W.afterattack(A, src, 1, params)
+			if(W.pre_attackby(A,src,params))
+				var/resolved = A.attackby(W, src, params)
+				if(!resolved && A && W)
+					W.afterattack(A, src, 1, params)
 			return
 		else
 			W.afterattack(A, src, 0, params)