diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index f334ed4641d..90851e1819c 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -12,25 +12,29 @@ Keeping it in for adminabuse but the malf one is /obj/item/melee/baton/borg_stun
 /obj/item/borg/stun
 	name = "electrically-charged arm"
 	icon_state = "elecarm_active"
+	new_attack_chain = TRUE
 	var/charge_cost = 30
 
-/obj/item/borg/stun/attack__legacy__attackchain(mob/living/M, mob/living/silicon/robot/user)
-	if(ishuman(M))
-		var/mob/living/carbon/human/H = M
-		if(H.check_shields(src, 0, "[M]'s [name]", MELEE_ATTACK))
-			playsound(M, 'sound/weapons/genhit.ogg', 50, 1)
-			return 0
+/obj/item/borg/stun/attack(mob/living/target, mob/living/silicon/robot/user, params)
+	if(..())
+		return FINISH_ATTACK
+
+	if(ishuman(target))
+		var/mob/living/carbon/human/H = target
+		if(H.check_shields(src, 0, "[target]'s [name]", MELEE_ATTACK))
+			playsound(target, 'sound/weapons/genhit.ogg', 50, TRUE)
+			return FINISH_ATTACK
 
 	if(isrobot(user))
 		if(!user.cell.use(charge_cost))
-			return
+			return FINISH_ATTACK
 
-	user.do_attack_animation(M)
-	M.Weaken(10 SECONDS)
-	M.apply_effect(STUTTER, 10 SECONDS)
+	user.do_attack_animation(target)
+	target.Weaken(10 SECONDS)
+	target.apply_effect(STUTTER, 10 SECONDS)
 
-	M.visible_message("<span class='danger'>[user] has prodded [M] with [src]!</span>", \
+	target.visible_message("<span class='danger'>[user] has prodded [target] with [src]!</span>", \
 					"<span class='userdanger'>[user] has prodded you with [src]!</span>")
 
 	playsound(loc, 'sound/weapons/egloves.ogg', 50, TRUE, -1)
-	add_attack_logs(user, M, "Stunned with [src] ([uppertext(user.a_intent)])")
+	add_attack_logs(user, target, "Stunned with [src] ([uppertext(user.a_intent)])")