From 1a3a77d42c21bb22ae4830bdee4037c3c16ccf88 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Wed, 3 Jul 2024 05:50:03 +0200 Subject: [PATCH] Replaces the projectile deflect from the titanium push broom with a good parry (#26061) * No more reflect, good parry instead * Remove this too --- code/datums/uplink_items/uplink_traitor.dm | 2 +- code/game/objects/items/weapons/twohanded.dm | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm index 8fd1bbd7101..a6e17d7a689 100644 --- a/code/datums/uplink_items/uplink_traitor.dm +++ b/code/datums/uplink_items/uplink_traitor.dm @@ -159,7 +159,7 @@ /datum/uplink_item/jobspecific/titaniumbroom name = "Titanium Push Broom" desc = "A push broom with a reinforced handle and a metal wire brush, perfect for giving yourself more work by beating up assistants. \ - When wielded, you will reflect projectiles, and hitting people will have different effects based on your intent." + When wielded hitting people will have different effects based on your intent. " reference = "TPBR" item = /obj/item/push_broom/traitor cost = 60 diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 249eabc2f6b..8eb10832c58 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -959,7 +959,7 @@ /obj/item/push_broom/traitor/Initialize(mapload) . = ..() - AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = NON_PROJECTILE_ATTACKS) + AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.25, _parryable_attack_types = ALL_ATTACK_TYPES, _parry_cooldown = (4 / 3) SECONDS) // 0.3333 seconds of cooldown for 75% uptime // parent component handles this AddComponent(/datum/component/two_handed, force_wielded = 25, force_unwielded = force) @@ -970,15 +970,6 @@ Help intent will sweep foes away from you, disarm intent sweeps their legs from under them, grab intent confuses \ and minorly fatigues them, and harm intent hits them normally." -/obj/item/push_broom/traitor/wield(obj/item/source, mob/user) - ADD_TRAIT(user, TRAIT_DEFLECTS_PROJECTILES, "pushbroom") - to_chat(user, "Your sweeping stance allows you to deflect projectiles.") - -/obj/item/push_broom/traitor/unwield(obj/item/source, mob/user) - if(HAS_TRAIT_FROM(user, TRAIT_DEFLECTS_PROJECTILES, "pushbroom")) //this check is needed because obj/item/twohanded calls unwield() on drop and you'd get the message even if you weren't wielding it before - REMOVE_TRAIT(user, TRAIT_DEFLECTS_PROJECTILES, "pushbroom") - to_chat(user, "You stop reflecting projectiles.") - /obj/item/push_broom/traitor/attack(mob/target, mob/living/user) if(!HAS_TRAIT(src, TRAIT_WIELDED) || !ishuman(target)) return ..()