From 4b94912a613bde1354ecd7aa45332ab96bee2aae Mon Sep 17 00:00:00 2001
From: FenodyreeAv <fenodyree.av@gmail.com>
Date: Mon, 20 Apr 2026 12:32:01 +0100
Subject: [PATCH] Fixes combat actuators leap grab (#22274)

Fixes #22161

Combat actuators actually give you a grab now, instead of just stopping
you moving forever.

---------

Signed-off-by: FenodyreeAv <fenodyree.av@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
---
 .../mob/living/carbon/human/human_powers.dm   | 20 ++++++++++---------
 .../CombatActuatorFix-Fenodyree.yml           |  6 ++++++
 2 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 html/changelogs/CombatActuatorFix-Fenodyree.yml

diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm
index c3149934b71..056a073c425 100644
--- a/code/modules/mob/living/carbon/human/human_powers.dm
+++ b/code/modules/mob/living/carbon/human/human_powers.dm
@@ -180,25 +180,27 @@
 
 	T.Weaken(3)
 
-	var/use_hand = "left"
 	if(l_hand)
 		if(r_hand)
 			to_chat(src, SPAN_DANGER("You need to have one hand free to grab someone."))
 			return TRUE
-		else
-			use_hand = "right"
 
 	visible_message(SPAN_WARNING("<b>[src]</b> seizes [T] aggressively!"),
 					SPAN_WARNING("You aggressively seize [T]!"))
 
-	var/obj/item/grab/G = new(src,T)
-	if(use_hand == "left")
-		l_hand = G
-	else
-		r_hand = G
+	var/obj/item/grab/G = new /obj/item/grab(src, src, T)
 
-	G.state = GRAB_PASSIVE
+	if(buckled_to)
+		to_chat(src, SPAN_WARNING("You cannot grab [T], [T.get_pronoun("he")] [get_pronoun("is")] buckled in!"))
+	if(!G)	//the grab will delete itself in New if affecting is anchored
+		return
+	src.put_in_active_hand(G)
+	LAssailant = WEAKREF(src)
+	playsound(loc, SFX_GRAB, 50, FALSE, -1)
+	G.state = GRAB_AGGRESSIVE
 	G.icon_state = "grabbed1"
+	G.hud.icon_state = "reinforce1"
+	G.last_action = world.time
 	G.synch()
 
 	return TRUE
diff --git a/html/changelogs/CombatActuatorFix-Fenodyree.yml b/html/changelogs/CombatActuatorFix-Fenodyree.yml
new file mode 100644
index 00000000000..c2a68877125
--- /dev/null
+++ b/html/changelogs/CombatActuatorFix-Fenodyree.yml
@@ -0,0 +1,6 @@
+author: Fenodyree
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixes combat actuators leap and grab failing and breaking your movement forever."