From 52b9c3b246d88bdc5e0419a218da19ace64b2d5b Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Tue, 15 Oct 2024 01:15:09 -0400 Subject: [PATCH] Update grinder_chemical.dm --- .../plumbing/plumbers/grinder_chemical.dm | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/code/modules/plumbing/plumbers/grinder_chemical.dm b/code/modules/plumbing/plumbers/grinder_chemical.dm index 1907fb91fa..9c7c6babb7 100644 --- a/code/modules/plumbing/plumbers/grinder_chemical.dm +++ b/code/modules/plumbing/plumbers/grinder_chemical.dm @@ -17,29 +17,15 @@ if(anchored) to_chat(user, "It is fastened to the floor!") return FALSE - switch(eat_dir) - if(WEST) - eat_dir = NORTH - return TRUE - if(EAST) - eat_dir = SOUTH - return TRUE - if(NORTH) - eat_dir = EAST - return TRUE - if(SOUTH) - eat_dir = WEST - return TRUE /obj/machinery/plumbing/grinder_chemical/CanAllowThrough(atom/movable/AM) . = ..() if(!anchored) return - var/move_dir = get_dir(loc, AM.loc) - if(move_dir == eat_dir) - return TRUE -/obj/machinery/plumbing/grinder_chemical/Crossed(atom/movable/AM) + return TRUE + +rinder_chemical/Crossed(atom/movable/AM) . = ..() grind(AM) @@ -61,4 +47,8 @@ return I.on_grind() reagents.add_reagent_list(I.grind_results) + + if(I.reagents) //If the thing has any reagents inside of it, grind them up. + I.reagents.trans_to(reagents, I.reagents.total_volume) + qdel(I)