cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replaces the projectile deflect from the titanium push broom with a good parry (#26061)

Browse Source 
* No more reflect, good parry instead

* Remove this too
This commit is contained in:
DGamerL
2024-07-03 03:50:03 +00:00
committed by GitHub
parent cc8aa14e9f
commit 1a3a77d42c
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/uplink_items/uplink_traitor.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/twohanded.dm
+1 -10
View File
@@ -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.</span>"
/obj/item/push_broom/traitor/wield(obj/item/source, mob/user)
ADD_TRAIT(user, TRAIT_DEFLECTS_PROJECTILES, "pushbroom")
to_chat(user, "<span class='warning'>Your sweeping stance allows you to deflect projectiles.</span>")
/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, "<span class='warning'>You stop reflecting projectiles.</span>")
/obj/item/push_broom/traitor/attack(mob/target, mob/living/user)
if(!HAS_TRAIT(src, TRAIT_WIELDED) || !ishuman(target))
return ..()