From b40c9a0b6398b36efc903ca12530b93de923fec6 Mon Sep 17 00:00:00 2001 From: ToasterBan <54711687+ToasterBan@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:23:16 +0200 Subject: [PATCH] Baton shove now requires disarm intent (#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 ac7814c15fd82aa92ebb5264f8184dc7a12e8335. --- code/game/objects/items/stunbaton.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index c4a190de8e587..c9f8c581e1732 100644 --- 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()