From 67086070735173380cbb2480287c6696f66621d6 Mon Sep 17 00:00:00 2001 From: Kraseo Date: Sat, 18 Jan 2020 15:05:07 +0100 Subject: [PATCH 1/2] fixes jelly donuts not having sprinkle sprites, fixes jelly donuts not having berry jelly --- .../food_and_drinks/food/snacks_pastry.dm | 4 ++-- icons/obj/food/donut.dmi | Bin 2928 -> 2927 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index 516c8b2c31..d823961a0f 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -65,7 +65,7 @@ reagents.add_reagent(extra_reagent, 3) /obj/item/reagent_containers/food/snacks/donut/meat - name = "Meat Donut" + name = "meat donut" desc = "Tastes as gross as it looks." icon_state = "donut_meat" bonus_reagents = list(/datum/reagent/consumable/ketchup = 1) @@ -152,7 +152,7 @@ icon_state = "jelly" decorated_icon = "jelly_homer" bonus_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/nutriment/vitamin = 1) - extra_reagent = "berryjuice" + extra_reagent = /datum/reagent/consumable/berryjuice tastes = list("jelly" = 1, "donut" = 3) foodtype = JUNKFOOD | GRAIN | FRIED | FRUIT | SUGAR | BREAKFAST diff --git a/icons/obj/food/donut.dmi b/icons/obj/food/donut.dmi index fb13ab5dfa9836032deee936f757294f70728605..395739eccc02708165bfb1f5090a8b590e2ede44 100644 GIT binary patch delta 124 zcmV-?0E7SV7Vj3Yl>!0mla>ODX`mKkhqSG2G@*GhIGQh(s0PIt8@+SM(;_Q z6R3ToW`wqIjSZvL eF0>ZUpAk}?AF}=jdI67gTvw(_fXcIr1LX&)N;jGS delta 146 zcmV;D0B!&87Vs9Zl>!0nla>ODe~>nKF?fjE+C~!^7=xqvVu@-{jIq&s40A*SV{G)E zq&b1wH)=*`3)k2%YfWy<0V8$|ozX4a7zB;hN7!IG&ea$(S(RV4nu z|KUPw@%$Mf<@q7&zn~XbBwWMu?dOjG00+%UL_t(|ob8+WcN0|<$5U!Lv!4Ud2kXN| AoB#j- From 29c3e72335a570d995e7c77295665390186cb7b6 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sat, 18 Jan 2020 17:41:31 +0100 Subject: [PATCH 2/2] You jelly. --- code/modules/food_and_drinks/food/snacks_pastry.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index d823961a0f..1c8b70dc13 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -240,7 +240,7 @@ name = "jelly donut" desc = "You jelly?" icon_state = "jelly" - extra_reagent = "slimejelly" + extra_reagent = /datum/reagent/toxin/slimejelly foodtype = JUNKFOOD | GRAIN | FRIED | TOXIC | SUGAR | BREAKFAST /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain