From e6c6888a4f077aec2d1e75e7c0355a7fce21fb4c Mon Sep 17 00:00:00 2001 From: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com> Date: Thu, 13 Feb 2025 02:49:53 +0500 Subject: [PATCH] Fix CQC slapper (#28342) * fix slapper drop * Apply code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com> --------- Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- code/game/objects/items/hand_item.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/hand_item.dm b/code/game/objects/items/hand_item.dm index 8bfcc9c0ebc2..576c703f6d33 100644 --- a/code/game/objects/items/hand_item.dm +++ b/code/game/objects/items/hand_item.dm @@ -70,10 +70,14 @@ AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = NON_PROJECTILE_ATTACKS, _parry_cooldown = (4 / 3) SECONDS) //75% uptime if(isliving(loc)) var/mob/owner = loc - RegisterSignal(owner, COMSIG_MOB_WILLINGLY_DROP, TYPE_PROC_REF(/datum, signal_qdel), override = TRUE) - RegisterSignal(owner, COMSIG_MOB_WEAPON_APPEARS, TYPE_PROC_REF(/datum, signal_qdel), override = TRUE) + RegisterSignal(owner, COMSIG_MOB_WILLINGLY_DROP, PROC_REF(dropkey), override = TRUE) + RegisterSignal(owner, COMSIG_MOB_WEAPON_APPEARS, PROC_REF(dropkey), override = TRUE) return ..() +/obj/item/slapper/parry/proc/dropkey(mob/user) + if(user?.get_active_hand() == src) + qdel(src) + /obj/item/slapper/parry/Destroy() if(isliving(loc)) var/mob/owner = loc