Tweaks n' stuff.

This commit is contained in:
Useroth
2019-05-29 08:45:21 +02:00
parent 848f3910e6
commit 16826eba66
2 changed files with 13 additions and 8 deletions
@@ -57,6 +57,9 @@
H.add_overlay(creamoverlay)
H.creamed = TRUE
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "creampie", /datum/mood_event/creampie)
for(var/atom/movable/A in contents)
A.forceMove(T)
A.throw_at(hit_atom, 1, 1)
qdel(src)
/obj/item/reagent_containers/food/snacks/pie/cream/nostun
+10 -8
View File
@@ -104,10 +104,9 @@
icon = 'icons/mecha/mecha_equipment.dmi'
icon_state = "mecha_honker"
/obj/item/melee/touch_attack/megahonk/afterattack(atom/target, mob/user, proximity)
if(!iscarbon(target))
/obj/item/melee/touch_attack/megahonk/afterattack(atom/target, mob/living/carbon/user, proximity)
if(!proximity || !iscarbon(target) || !iscarbon(user) || user.handcuffed)
return
user.say(catchphrase, forced = "spell")
playsound(get_turf(target), on_use_sound,100,1)
for(var/mob/living/carbon/M in (hearers(1, target) - user)) //3x3 around the target, not affecting the user
@@ -149,15 +148,14 @@
to_chat(user, "<span class='notice'>You smear \the [src] on your chest! </span>")
qdel(src)
/obj/item/melee/touch_attack/bspie/afterattack(atom/target, mob/user, proximity)
/obj/item/melee/touch_attack/bspie/afterattack(atom/target, mob/living/carbon/user, proximity)
if(!proximity || !iscarbon(target) || !iscarbon(user) || user.handcuffed)
return
if(target == user)
to_chat(user, "<span class='notice'>You smear \the [src] on your chest!</span>")
qdel(src)
return
if(!iscarbon(target))
return
var/mob/living/carbon/M = target
var/obj/item/bodypart/head = M.get_bodypart("head")
user.visible_message("<span class='warning'>[user] is trying to stuff [M]\s body into \the [src]!</span>")
if(do_mob(user, M, 250))
@@ -167,10 +165,14 @@
playsound(get_turf(target), on_use_sound, 50, 1)
/*
var/obj/item/bodypart/head = M.get_bodypart("head")
if(head)
head.drop_limb()
head.throw_at(get_turf(head), 1, 1, user)
head.throw_at(get_turf(head), 1, 1)
qdel(M)
*/
M.forceMove(pie)
charges--