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 1/5] 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)
From a28c282158d89e9b107f92d1cffbf98d390ef1f9 Mon Sep 17 00:00:00 2001
From: Metis <100518708+sheepishgoat@users.noreply.github.com>
Date: Tue, 15 Oct 2024 01:16:19 -0400
Subject: [PATCH 2/5] Update grinder_chemical.dm
---
code/modules/plumbing/plumbers/grinder_chemical.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/plumbing/plumbers/grinder_chemical.dm b/code/modules/plumbing/plumbers/grinder_chemical.dm
index 9c7c6babb7..bd341cde00 100644
--- a/code/modules/plumbing/plumbers/grinder_chemical.dm
+++ b/code/modules/plumbing/plumbers/grinder_chemical.dm
@@ -25,7 +25,7 @@
return TRUE
-rinder_chemical/Crossed(atom/movable/AM)
+/obj/machinery/plumbing/grinder_chemical/Crossed(atom/movable/AM)
. = ..()
grind(AM)
From 61b0b62f2d28c153de297d351fe36d8e003ed3c4 Mon Sep 17 00:00:00 2001
From: Metis <100518708+sheepishgoat@users.noreply.github.com>
Date: Tue, 15 Oct 2024 01:21:24 -0400
Subject: [PATCH 3/5] Update grinder_chemical.dm
---
code/modules/plumbing/plumbers/grinder_chemical.dm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/code/modules/plumbing/plumbers/grinder_chemical.dm b/code/modules/plumbing/plumbers/grinder_chemical.dm
index bd341cde00..94c55c2b62 100644
--- a/code/modules/plumbing/plumbers/grinder_chemical.dm
+++ b/code/modules/plumbing/plumbers/grinder_chemical.dm
@@ -18,6 +18,8 @@
to_chat(user, "It is fastened to the floor!")
return FALSE
+ return TRUE
+
/obj/machinery/plumbing/grinder_chemical/CanAllowThrough(atom/movable/AM)
. = ..()
if(!anchored)
From 01841576cba5b25c5138d31d15d6ed5b68596c2e Mon Sep 17 00:00:00 2001
From: Metis <100518708+sheepishgoat@users.noreply.github.com>
Date: Tue, 15 Oct 2024 01:21:42 -0400
Subject: [PATCH 4/5] Update grinder_chemical.dm
---
code/modules/plumbing/plumbers/grinder_chemical.dm | 1 -
1 file changed, 1 deletion(-)
diff --git a/code/modules/plumbing/plumbers/grinder_chemical.dm b/code/modules/plumbing/plumbers/grinder_chemical.dm
index 94c55c2b62..9782ac3d28 100644
--- a/code/modules/plumbing/plumbers/grinder_chemical.dm
+++ b/code/modules/plumbing/plumbers/grinder_chemical.dm
@@ -7,7 +7,6 @@
rcd_cost = 30
rcd_delay = 30
buffer = 400
- var/eat_dir = NORTH
/obj/machinery/plumbing/grinder_chemical/Initialize(mapload, bolt)
. = ..()
From c04d889e8b2a289fedc20d7d0839247f35ccbbcf Mon Sep 17 00:00:00 2001
From: Metis <100518708+sheepishgoat@users.noreply.github.com>
Date: Tue, 15 Oct 2024 11:36:26 -0400
Subject: [PATCH 5/5] Update grinder_chemical.dm
---
.../plumbing/plumbers/grinder_chemical.dm | 29 +++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/code/modules/plumbing/plumbers/grinder_chemical.dm b/code/modules/plumbing/plumbers/grinder_chemical.dm
index 9782ac3d28..5d01c973c1 100644
--- a/code/modules/plumbing/plumbers/grinder_chemical.dm
+++ b/code/modules/plumbing/plumbers/grinder_chemical.dm
@@ -7,16 +7,39 @@
rcd_cost = 30
rcd_delay = 30
buffer = 400
+ var/eat_dir = NORTH
/obj/machinery/plumbing/grinder_chemical/Initialize(mapload, bolt)
. = ..()
AddComponent(/datum/component/plumbing/simple_supply, bolt)
-/obj/machinery/plumbing/grinder_chemical/can_be_rotated(mob/user,rotation_type)
+/obj/machinery/plumbing/grinder_chemical/examine(mob/user)
+ . = ..()
+ . += span_notice("The input direction for this item can be rotated by using CTRL+SHIFT+CLICK")
+
+/obj/machinery/plumbing/grinder_chemical/CtrlShiftClick(mob/user)
if(anchored)
to_chat(user, "It is fastened to the floor!")
return FALSE
+ switch(eat_dir)
+ if(WEST)
+ balloon_alert(user, "set to north")
+ eat_dir = NORTH
+ return TRUE
+ if(EAST)
+ balloon_alert(user, "set to south")
+ eat_dir = SOUTH
+ return TRUE
+ if(NORTH)
+ balloon_alert(user, "set to east")
+ eat_dir = EAST
+ return TRUE
+ if(SOUTH)
+ balloon_alert(user, "set to west")
+ eat_dir = WEST
+ return TRUE
+
return TRUE
/obj/machinery/plumbing/grinder_chemical/CanAllowThrough(atom/movable/AM)
@@ -24,7 +47,9 @@
if(!anchored)
return
- return TRUE
+ var/move_dir = get_dir(loc, AM.loc)
+ if(move_dir == eat_dir)
+ return TRUE
/obj/machinery/plumbing/grinder_chemical/Crossed(atom/movable/AM)
. = ..()