From d8d9d6efebd1d907a6a796ba4f3f041460a2d355 Mon Sep 17 00:00:00 2001 From: Useroth Date: Wed, 29 May 2019 23:45:25 +0200 Subject: [PATCH] Tweaks. Also, eating human pies makes them chestburst you a'la monkey cubes. --- .../food_and_drinks/food/snacks_pie.dm | 25 ++++++++++++++++--- code/modules/spells/spell_types/godhand.dm | 2 +- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm index 1ec65d3df3..8264b4153e 100644 --- a/code/modules/food_and_drinks/food/snacks_pie.dm +++ b/code/modules/food_and_drinks/food/snacks_pie.dm @@ -57,14 +57,33 @@ 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 stunning = FALSE +/obj/item/reagent_containers/food/snacks/pie/cream/body + +/obj/item/reagent_containers/food/snacks/pie/cream/body/Destroy() + var/turf/T = get_turf(src) + for(var/atom/movable/A in contents) + A.forceMove(T) + A.throw_at(T, 1, 1) + . = ..() + +/obj/item/reagent_containers/food/snacks/pie/cream/body/On_Consume(mob/living/carbon/M) + if(!reagents.total_volume) //so that it happens on the last bite + if(iscarbon(M) && contents.len) + var/turf/T = get_turf(src) + for(var/atom/movable/A in contents) + A.forceMove(T) + A.throw_at(T, 1, 1) + M.visible_message("[src] bursts out of [M]!") + M.emote("scream") + M.Knockdown(40) + M.adjustBruteLoss(60) + return ..() + /obj/item/reagent_containers/food/snacks/pie/berryclafoutis name = "berry clafoutis" desc = "No black birds, this is a good sign." diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm index e4db45123b..a08b5baa13 100644 --- a/code/modules/spells/spell_types/godhand.dm +++ b/code/modules/spells/spell_types/godhand.dm @@ -160,7 +160,7 @@ user.visible_message("[user] is trying to stuff [M]\s body into \the [src]!") if(do_mob(user, M, 250)) var/name = M.real_name - var/obj/item/reagent_containers/food/snacks/pie/cream/pie = new(get_turf(M)) + var/obj/item/reagent_containers/food/snacks/pie/cream/body/pie = new(get_turf(M)) pie.name = "\improper [name] [pie.name]" playsound(get_turf(target), on_use_sound, 50, 1)