From 423982ed7b236a0d2fdbc40efbb840f67fbed73c Mon Sep 17 00:00:00 2001 From: anconfuzedrock Date: Sat, 15 Dec 2018 19:05:28 -0500 Subject: [PATCH] makes slapping easier (#41914) cl tweak: slapping now doesn't require a specific intent or limb to be targetted. /cl Slapping was originally designed to function as a thing that happened if you aimed for the mouth and disarmed. since a slapper is its own emote, all the extra conditions do nothing but make slapping sometimes sound better than others. All this will do is make all slaps make the slap noise and not show the hand, as god intended. * makes slapping easier * fixes not being able to slap nonhumans --- code/game/objects/items/weaponry.dm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index ba2a0d34664..ffeaeac1ea6 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -618,16 +618,12 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 var/mob/living/carbon/human/L = M if(L && L.dna && L.dna.species) L.dna.species.stop_wagging_tail(M) - if(user.a_intent != INTENT_HARM && ((user.zone_selected == BODY_ZONE_PRECISE_MOUTH) || (user.zone_selected == BODY_ZONE_PRECISE_EYES) || (user.zone_selected == BODY_ZONE_HEAD))) - user.do_attack_animation(M) - playsound(M, 'sound/weapons/slap.ogg', 50, 1, -1) - user.visible_message("[user] slaps [M]!", - "You slap [M]!",\ - "You hear a slap.") - return - else - ..() - + user.do_attack_animation(M) + playsound(M, 'sound/weapons/slap.ogg', 50, 1, -1) + user.visible_message("[user] slaps [M]!", + "You slap [M]!",\ + "You hear a slap.") + return /obj/item/proc/can_trigger_gun(mob/living/user) if(!user.can_use_guns(src)) return FALSE