From 5f45d8c594aa1b709670434dd1f55197d9fb08b4 Mon Sep 17 00:00:00 2001 From: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Sun, 7 Apr 2024 00:40:47 +0100 Subject: [PATCH] Cigarettes and cigars can now be ground up in the All-In-One-Grinder (#24770) * Update reagentgrinder.dm * Reagent transfer functionality * Oops! Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com> * Helper proc wooo * smol * grind * Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update reagentgrinder.dm * Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- .../reagents/chemistry/machinery/reagentgrinder.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 89e6149bd0e..32cf4cde057 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -54,7 +54,8 @@ /obj/item/slime_extract = list(), /obj/item/food = list(), /obj/item/reagent_containers/pill = list(), - /obj/item/reagent_containers/patch = list() + /obj/item/reagent_containers/patch = list(), + /obj/item/clothing/mask/cigarette = list() ) var/list/juice_items = list ( @@ -520,10 +521,9 @@ if(beaker.reagents.holder_full()) return - // Everything else - Transfers reagents from it into beaker - for(var/obj/item/reagent_containers/O in holdingitems) + // Everything else - Transfers reagents from the items into the beaker + for(var/obj/item/O in holdingitems) O.reagents.trans_to(beaker, O.reagents.total_volume) - if(!O.reagents.total_volume) remove_object(O) if(beaker.reagents.holder_full())