From 9de6fbce36fcbc418b3d00bb495d19b4d2d84db5 Mon Sep 17 00:00:00 2001 From: Iajret Date: Thu, 28 Mar 2024 15:35:37 +0300 Subject: [PATCH] merge conflict --- .../reagents/chemistry/machinery/reagentgrinder.dm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 2271ea98464..708be786404 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -419,20 +419,10 @@ Shake(duration = duration) operating = TRUE -<<<<<<< HEAD - if(!silent) - if(!juicing) - playsound(src, 'sound/machines/blender.ogg', 50, TRUE) - else - playsound(src, 'sound/machines/juicer.ogg', 20, TRUE) - use_energy(active_power_usage * time / (1 SECONDS)) - addtimer(CALLBACK(src, PROC_REF(stop_operating)), time / speed) -======= if(!juicing) playsound(src, 'sound/machines/blender.ogg', 50, TRUE) else playsound(src, 'sound/machines/juicer.ogg', 20, TRUE) ->>>>>>> 7356d10bc6d ([MIRROR] General maintenance for reagent grinder (#1642)) var/total_weight for(var/obj/item/weapon in src)