Adds Slappers (#31406)

* ADDS SLAPPERS

* fixes everything, just need sprites

* nerfs criticism
This commit is contained in:
deathride58
2017-10-11 00:53:32 +00:00
committed by CitadelStationBot
parent f8d0646b09
commit c163176e5d
2 changed files with 38 additions and 0 deletions
+25
View File
@@ -586,6 +586,31 @@
flags_1 = DROPDEL_1 | ABSTRACT_1
attack_verb = list("bopped")
/obj/item/slapper
name = "slapper"
desc = "This is how real men fight."
icon_state = "latexballon"
force = 1
throwforce = 0
flags_1 = DROPDEL_1 | ABSTRACT_1
attack_verb = list("slapped")
hitsound = 'sound/effects/snap.ogg'
/obj/item/slapper/attack(mob/M, mob/living/carbon/human/user)
if(ishuman(M))
var/mob/living/carbon/human/L = M
L.endTailWag()
if(user.a_intent != INTENT_HARM)
var/aim_for_face = ((user.zone_selected == "mouth") || (user.zone_selected == "eyes") || (user.zone_selected == "head"))
user.do_attack_animation(M)
playsound(M, 'sound/weapons/slap.ogg', 50, 1, -1)
user.visible_message("<span class='danger'>[user] slaps [M] in the [(aim_for_face)?"face":user.zone_selected]!</span>",
"<span class='notice'>You slap [M] in the [(aim_for_face)?"face":user.zone_selected]! </span>",\
"You hear a slap.")
return
else
..()
/obj/item/proc/can_trigger_gun(mob/living/user)
if(!user.can_use_guns(src))
return FALSE
+13
View File
@@ -513,3 +513,16 @@
else
qdel(N)
to_chat(user, "<span class='warning'>You don't have any free hands to make a circle with.</span>")
/datum/emote/living/slap
key = "slap"
key_third_person = "slaps"
restraint_check = TRUE
/datum/emote/living/slap/run_emote(mob/user, params)
. = ..()
var/obj/item/slapper/N = new(user)
if(user.put_in_hands(N))
to_chat(user, "<span class='notice'>You ready your slapping hand.</span>")
else
to_chat(user, "<span class='warning'>You're incapable of slapping in your current state.</span>")