From 1930e5cf84ee5061a44d7ec587dd5e2b14f05234 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Mon, 23 Oct 2017 16:21:57 +0300 Subject: [PATCH] Fixes grinders (#31885) * But you're still hungry * Update reagentgrinder.dm --- code/modules/reagents/chemistry/machinery/reagentgrinder.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 8c84954ad6..a7bdab2d4b 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -285,7 +285,9 @@ updateUsrDialog() /obj/machinery/reagentgrinder/proc/get_allowed_by_obj(obj/item/O) - return blend_items[O.type] + for (var/i in blend_items) + if (istype(O, i)) + return blend_items[i] /obj/machinery/reagentgrinder/proc/get_allowed_juice_by_obj(obj/item/reagent_containers/food/snacks/O) for(var/i in juice_items) @@ -433,7 +435,7 @@ if (O.Uses > 0) beaker.reagents.add_reagent("slimejelly",min(20, space)) remove_object(O) - else if(istype(I, /obj/item/reagent_containers)) + if(istype(I, /obj/item/reagent_containers)) var/obj/item/reagent_containers/O = I var/amount = O.reagents.total_volume O.reagents.trans_to(beaker, amount)