From 070513044844c2c0611b27dbb8a47d36d168f6d4 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Sun, 12 Jul 2020 17:31:37 +0100 Subject: [PATCH] small edgecase --- code/modules/events/travelling_trader.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/events/travelling_trader.dm b/code/modules/events/travelling_trader.dm index 9de8f75fd3..b3cd8cecaa 100644 --- a/code/modules/events/travelling_trader.dm +++ b/code/modules/events/travelling_trader.dm @@ -130,7 +130,10 @@ //pick a random crafted food item as the requested item var/recipe = pick(subtypesof(/datum/crafting_recipe/food)) var/datum/crafting_recipe/food/new_recipe = new recipe - requested_item = new_recipe.result + if(istype(new_recipe.result, /obj/item/reagent_containers/food)) //not all food recipes make food objects (like cak/butterbear) + requested_item = new_recipe.result + else + requested_item = /obj/item/reagent_containers/food/snacks/copypasta qdel(new_recipe) //we don't need it anymore ..()