From 6bf673dbb48ec879efe8783063996f132e44e597 Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Mon, 30 Dec 2024 09:43:18 -0500 Subject: [PATCH] fix borg gripper held item self-activation (#27740) --- code/game/objects/items/robot/cyborg_gripper.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/robot/cyborg_gripper.dm b/code/game/objects/items/robot/cyborg_gripper.dm index 4f81cdc5f97..cac644d7c83 100644 --- a/code/game/objects/items/robot/cyborg_gripper.dm +++ b/code/game/objects/items/robot/cyborg_gripper.dm @@ -62,7 +62,10 @@ if(!gripped_item) to_chat(user, "[src] is empty.") return - gripped_item.attack_self__legacy__attackchain(user) + if(gripped_item.new_attack_chain) + gripped_item.activate_self(user) + else + gripped_item.attack_self__legacy__attackchain(user) // This is required to ensure that the forceMove checks on some objects don't rip the gripper out of the borg's inventory and toss it on the floor. That would hurt, a lot! /obj/item/gripper/forceMove(atom/destination)