From 49653babab4eb68b6ecb4fb2be79b7e61a5effd5 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 8 Feb 2019 04:28:07 -0800 Subject: [PATCH 1/3] Update snacks_meat.dm --- code/modules/food_and_drinks/food/snacks_meat.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index c77242e69d..33a5ca56dc 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -184,6 +184,14 @@ tastes = list("the jungle" = 1, "bananas" = 1) foodtype = MEAT | SUGAR +/obj/item/reagent_containers/food/snacks/monkeycube/On_Consume(mob/M) + if(iscarbon(M)) + M.visible_message("[src] bursts out of [M]!") + M.say("*scream") + M.Knockdown(40) + M.adjustBruteLoss(60) + Expand() + /obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand() var/mob/spammer = get_mob_by_key(fingerprintslast) var/mob/living/carbon/monkey/bananas = new(drop_location(), TRUE, spammer) From a56793d6c0f466e11c6d382e72cf2b413a2f08a5 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 8 Feb 2019 05:27:51 -0800 Subject: [PATCH 2/3] Update snacks_meat.dm --- code/modules/food_and_drinks/food/snacks_meat.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index 33a5ca56dc..b7add0ee0e 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -184,13 +184,14 @@ tastes = list("the jungle" = 1, "bananas" = 1) foodtype = MEAT | SUGAR -/obj/item/reagent_containers/food/snacks/monkeycube/On_Consume(mob/M) +/obj/item/reagent_containers/food/snacks/monkeycube/On_Consume(mob/living/carbon/M) if(iscarbon(M)) M.visible_message("[src] bursts out of [M]!") M.say("*scream") M.Knockdown(40) M.adjustBruteLoss(60) Expand() + return ..() /obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand() var/mob/spammer = get_mob_by_key(fingerprintslast) From e80b17e5723c1228d63d41598eebd354e486277f Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Fri, 8 Mar 2019 20:55:41 -0500 Subject: [PATCH 3/3] Update code/modules/food_and_drinks/food/snacks_meat.dm Co-Authored-By: deathride58 --- code/modules/food_and_drinks/food/snacks_meat.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index b7add0ee0e..d3466caa5e 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -187,7 +187,7 @@ /obj/item/reagent_containers/food/snacks/monkeycube/On_Consume(mob/living/carbon/M) if(iscarbon(M)) M.visible_message("[src] bursts out of [M]!") - M.say("*scream") + M.emote("scream") M.Knockdown(40) M.adjustBruteLoss(60) Expand()