cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-16 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

makes slapping easier (#41914)

Browse Source 
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
This commit is contained in:
anconfuzedrock
2018-12-15 19:05:28 -05:00
committed by oranges
parent 0e982cad32
commit 423982ed7b
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weaponry.dm
+6 -10
View File
@@ -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("<span class='danger'>[user] slaps [M]!</span>",
"<span class='notice'>You slap [M]!</span>",\
"You hear a slap.")
return
else
..()
user.do_attack_animation(M)
playsound(M, 'sound/weapons/slap.ogg', 50, 1, -1)
user.visible_message("<span class='danger'>[user] slaps [M]!</span>",
"<span class='notice'>You slap [M]!</span>",\
"You hear a slap.")
return
/obj/item/proc/can_trigger_gun(mob/living/user)
if(!user.can_use_guns(src))
return FALSE