From 48ba721b91028641e113242ba5040a382feb01ea Mon Sep 17 00:00:00 2001 From: VampyrBytes Date: Fri, 1 Apr 2016 08:05:57 +0100 Subject: [PATCH] Fixes forks producing trash/not leaving trash Fixes #4059 Forks now don't produce trash when eaten off Forks now do leave trash when taking the last bit of food from the original item --- code/modules/reagents/reagent_containers/food/snacks.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index df6edbaa03f..2d44b5aa96e 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -98,10 +98,18 @@ var/obj/item/weapon/reagent_containers/food/snacks/collected = new type collected.loc = U collected.reagents.remove_any(collected.reagents.total_volume) + collected.trash = null if(reagents.total_volume > bitesize) reagents.trans_to(collected, bitesize) else reagents.trans_to(collected, reagents.total_volume) + if(trash) + var/obj/item/TrashItem + if(ispath(trash,/obj/item)) + TrashItem = new trash(src) + else if(istype(trash,/obj/item)) + TrashItem = trash + TrashItem.forceMove(loc) qdel(src) return 1