From 550c131d4afa097c93805b61149f9ce2da39eb3c Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Sun, 6 Mar 2022 10:18:26 -0500 Subject: [PATCH] Updates Slapping to Allow for Damage (#17463) --- code/game/objects/items/hand_item.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/hand_item.dm b/code/game/objects/items/hand_item.dm index fe0d198e266..3d61ebacbb2 100644 --- a/code/game/objects/items/hand_item.dm +++ b/code/game/objects/items/hand_item.dm @@ -6,7 +6,7 @@ force = 0 throwforce = 0 flags = DROPDEL | ABSTRACT - attack_verb = list("slaps") + attack_verb = list("slapped") hitsound = 'sound/weapons/slap.ogg' /// How many smaller table smacks we can do before we're out var/table_smacks_left = 3 @@ -15,6 +15,8 @@ user.do_attack_animation(M) playsound(M, hitsound, 50, TRUE, -1) user.visible_message("[user] slaps [M]!", "You slap [M]!", "You hear a slap.") + if(force) + return ..() /obj/item/slapper/attack_obj(obj/O, mob/living/user, params) if(!istype(O, /obj/structure/table))