diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm
index 04177783e6..1ec65d3df3 100644
--- a/code/modules/food_and_drinks/food/snacks_pie.dm
+++ b/code/modules/food_and_drinks/food/snacks_pie.dm
@@ -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
diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm
index 5a94b19e7f..e4db45123b 100644
--- a/code/modules/spells/spell_types/godhand.dm
+++ b/code/modules/spells/spell_types/godhand.dm
@@ -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, "You smear \the [src] on your chest! ")
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, "You smear \the [src] on your chest!")
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("[user] is trying to stuff [M]\s body into \the [src]!")
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--