From 6885bc8997517d4f2ecb733a086f7a588a0aa876 Mon Sep 17 00:00:00 2001 From: Alan Date: Thu, 13 Aug 2026 17:43:47 +0000 Subject: [PATCH] Restore attack animation to slapper/parry. (#32419) --- code/game/objects/items/hand_item.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/hand_item.dm b/code/game/objects/items/hand_item.dm index efa79633ac4..e976a0a919b 100644 --- a/code/game/objects/items/hand_item.dm +++ b/code/game/objects/items/hand_item.dm @@ -65,7 +65,7 @@ force = 5 flags = DROPDEL | ABSTRACT | NODROP attack_verb = list("slapped", "backhanded", "smacked", "discombobulated") - table_smacks_left = 10 //Much more smackitude + table_smacks_left = 10 // Much more smackitude. /obj/item/slapper/parry/Initialize(mapload) AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = NON_PROJECTILE_ATTACKS, _parry_cooldown = (4 / 3) SECONDS) //75% uptime @@ -86,14 +86,15 @@ UnregisterSignal(owner, COMSIG_MOB_WEAPON_APPEARS) return ..() -/obj/item/slapper/parry/attack(mob/M, mob/living/carbon/human/user) - if(!isliving(M)) +/obj/item/slapper/parry/after_attack(atom/target, mob/user, proximity_flag, click_parameters) + if(!isliving(target)) return ..() - var/mob/living/creature = M + var/mob/living/creature = target SEND_SOUND(creature, sound('sound/weapons/flash_ring.ogg')) creature.Confused(10 SECONDS) // SMACK CAM! creature.EyeBlind(2 SECONDS) // OH GOD MY EARS ARE RINGING! creature.Deaf(4 SECONDS) // OH MY HEAD! + return FINISH_ATTACK /obj/item/slapper/run_pointed_on_item(mob/pointer_mob, atom/target_atom) if(target_atom == src)