Baton shove now requires disarm intent (BeeStation#11187)

* tonfa now paralyses rather than sleeps, stunbaton only shoves on disarm * Revert "tonfa now paralyses rather than sleeps, stunbaton only shoves on disarm" This reverts commit ac7814c.
EvilDragonfiend · Jul 30, 2024 · b40c9a0 · b40c9a0
1 parent aabea95
commit b40c9a0
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
@@ -187,13 +187,14 @@
 	target.stuttering = 20
 
 	// Shoving
-	var/shove_dir = get_dir(user.loc, target.loc)
-	var/turf/target_shove_turf = get_step(target.loc, shove_dir)
-	var/mob/living/carbon/human/target_collateral_human = locate(/mob/living/carbon) in target_shove_turf.contents
-	if (target_collateral_human && target_shove_turf != get_turf(user))
-		target.Knockdown(0.5 SECONDS)
-		target_collateral_human.Knockdown(0.5 SECONDS)
-	target.Move(target_shove_turf, shove_dir)
+	if(user.a_intent == INTENT_DISARM)
+		var/shove_dir = get_dir(user.loc, target.loc)
+		var/turf/target_shove_turf = get_step(target.loc, shove_dir)
+		var/mob/living/carbon/human/target_collateral_human = locate(/mob/living/carbon) in target_shove_turf.contents
+		if (target_collateral_human && target_shove_turf != get_turf(user))
+			target.Knockdown(0.5 SECONDS)
+			target_collateral_human.Knockdown(0.5 SECONDS)
+		target.Move(target_shove_turf, shove_dir)
 
 	target.do_stun_animation()