From 49bd96781385b0aadb5803b4336a5d08734d64d0 Mon Sep 17 00:00:00 2001 From: Alan Date: Tue, 18 Aug 2026 22:32:02 +0000 Subject: [PATCH] [s] Fix a muggy problem. (#32451) --- code/modules/food_and_drinks/food/foods/desserts.dm | 3 +++ code/modules/food_and_drinks/food_base.dm | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/food/foods/desserts.dm b/code/modules/food_and_drinks/food/foods/desserts.dm index 721c0dfcbe7..3466792f384 100644 --- a/code/modules/food_and_drinks/food/foods/desserts.dm +++ b/code/modules/food_and_drinks/food/foods/desserts.dm @@ -95,6 +95,9 @@ /obj/item/food/mugcake/Initialize(mapload, obj/item/container) . = ..() + if(istype(loc, /obj/item/kitchen/utensil)) + return + if(istype(container, /obj/item/reagent_containers/drinks/mug)) trash = container container.forceMove(src) diff --git a/code/modules/food_and_drinks/food_base.dm b/code/modules/food_and_drinks/food_base.dm index fad9c3de11c..30748f2c04b 100644 --- a/code/modules/food_and_drinks/food_base.dm +++ b/code/modules/food_and_drinks/food_base.dm @@ -214,9 +214,8 @@ var/image/I = new(U.icon, "loadedfood") I.color = filling_color U.overlays += I - var/obj/item/food/collected = new type + var/obj/item/food/collected = new type(U) collected.name = name - collected.loc = U collected.reagents.remove_any(collected.reagents.total_volume) collected.trash = null if(reagents.total_volume > bitesize)