From 35476ab2c2594f3ad816809a062a6253a41c6a93 Mon Sep 17 00:00:00 2001
From: matttheficus <57759731+matttheficus@users.noreply.github.com>
Date: Tue, 31 Jan 2023 23:07:12 -0500
Subject: [PATCH] Allows the Kinetic Crusher to Parry Melee Attacks + BDM
Trophy Tweaks (#20170)
* Parry this you filthy casual
* BDM offset
---
code/datums/status_effects/buffs.dm | 12 ++++++------
code/modules/mining/equipment/kinetic_crusher.dm | 6 +++++-
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index 1eabaeac840..1c31e6d2cc4 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -116,12 +116,12 @@
ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, "blooddrunk")
if(ishuman(owner))
var/mob/living/carbon/human/H = owner
- H.physiology.brute_mod *= 0.1
- H.physiology.burn_mod *= 0.1
- H.physiology.tox_mod *= 0.1
- H.physiology.oxy_mod *= 0.1
- H.physiology.clone_mod *= 0.1
- H.physiology.stamina_mod *= 0.1
+ H.physiology.brute_mod *= 0.25
+ H.physiology.burn_mod *= 0.25
+ H.physiology.tox_mod *= 0.25
+ H.physiology.oxy_mod *= 0.25
+ H.physiology.clone_mod *= 0.25
+ H.physiology.stamina_mod *= 0.25
add_attack_logs(owner, owner, "gained blood-drunk stun immunity", ATKLOG_ALL)
owner.add_stun_absorption("blooddrunk", INFINITY, 4)
owner.playsound_local(get_turf(owner), 'sound/effects/singlebeat.ogg', 40, TRUE, use_reverb = FALSE)
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index 76931bab552..c588c690855 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -28,6 +28,10 @@
var/brightness_on = 5
var/adaptive_damage_bonus = 0
+/obj/item/twohanded/kinetic_crusher/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.7, _parryable_attack_types = MELEE_ATTACK, _parry_cooldown = (7 / 3) SECONDS ) // 2.3333 seconds of cooldown for 30% uptime
+
/obj/item/twohanded/kinetic_crusher/Destroy()
QDEL_LIST_CONTENTS(trophies)
return ..()
@@ -361,7 +365,7 @@
denied_type = /obj/item/crusher_trophy/miner_eye
/obj/item/crusher_trophy/miner_eye/effect_desc()
- return "mark detonation to grant stun immunity and 90% damage reduction for 1 second"
+ return "mark detonation to grant stun immunity and 75% damage reduction for 1 second"
/obj/item/crusher_trophy/miner_eye/on_mark_detonation(mob/living/target, mob/living/user)
user.apply_status_effect(STATUS_EFFECT_BLOODDRUNK)