From 948a47a5f866a9abbcec018973b4626245dfaee5 Mon Sep 17 00:00:00 2001
From: DerelictDrone <57756830+DerelictDrone@users.noreply.github.com>
Date: Fri, 15 Nov 2019 06:01:12 -0600
Subject: [PATCH 1/3] Update conveyor2.dm
---
code/modules/recycling/conveyor2.dm | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 8b02c160de13..8c82227fb852 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -316,6 +316,20 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
transfer_fingerprints_to(C)
to_chat(user, "You detach the conveyor switch.")
qdel(src)
+ else if(I.tool_behaviour == TOOL_WRENCH)
+ if(position == 0 && oneway == FALSE)
+ oneway = TRUE
+ I.play_tool_sound(src, 75)
+ user.visible_message("[user] sets \the [src] to one-way.", \
+ "You set \the [src] to one-way.", \
+ "You hear a ratchet.")
+ return
+ else if(position == 0 && oneway == TRUE)
+ oneway = FALSE
+ I.play_tool_sound(src, 75)
+ user.visible_message("[user] sets \the [src] to two-way.", \
+ "You set \the [src] to two-way.", \
+ "You hear a ratchet.")
/obj/machinery/conveyor_switch/oneway
icon_state = "conveyor_switch_oneway"
From 39cc4d07e043e75a0c652183314f1a922fbb761c Mon Sep 17 00:00:00 2001
From: DerelictDrone <57756830+DerelictDrone@users.noreply.github.com>
Date: Fri, 15 Nov 2019 06:55:30 -0600
Subject: [PATCH 2/3] Update conveyor2.dm
---
code/modules/recycling/conveyor2.dm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 8c82227fb852..f0760007bfda 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -330,6 +330,9 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
user.visible_message("[user] sets \the [src] to two-way.", \
"You set \the [src] to two-way.", \
"You hear a ratchet.")
+ return
+ else if(position != 0)
+ to_chat(user, "\The [src] must be off before attempting to change it's direction!")
/obj/machinery/conveyor_switch/oneway
icon_state = "conveyor_switch_oneway"
From 8ec5b02494817decc1e85a472615f73bf1cb8f57 Mon Sep 17 00:00:00 2001
From: DerelictDrone <57756830+DerelictDrone@users.noreply.github.com>
Date: Fri, 15 Nov 2019 17:32:32 -0600
Subject: [PATCH 3/3] Update conveyor2.dm
---
code/modules/recycling/conveyor2.dm | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index f0760007bfda..6e921fa4f572 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -316,23 +316,17 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
transfer_fingerprints_to(C)
to_chat(user, "You detach the conveyor switch.")
qdel(src)
- else if(I.tool_behaviour == TOOL_WRENCH)
- if(position == 0 && oneway == FALSE)
- oneway = TRUE
- I.play_tool_sound(src, 75)
- user.visible_message("[user] sets \the [src] to one-way.", \
- "You set \the [src] to one-way.", \
- "You hear a ratchet.")
- return
- else if(position == 0 && oneway == TRUE)
- oneway = FALSE
- I.play_tool_sound(src, 75)
- user.visible_message("[user] sets \the [src] to two-way.", \
- "You set \the [src] to two-way.", \
+
+/obj/machinery/conveyor_switch/wrench_act(mob/living/user, obj/item/I)
+ if(position)
+ to_chat(user, "\The [src] must be off before attempting to change it's direction!")
+ return FALSE
+ oneway = !oneway
+ I.play_tool_sound(src, 75)
+ user.visible_message("[user] sets \the [src] to [oneway ? "one-way" : "two-way"].", \
+ "You set \the [src] to [oneway ? "one-way" : "two-way"].", \
"You hear a ratchet.")
- return
- else if(position != 0)
- to_chat(user, "\The [src] must be off before attempting to change it's direction!")
+ return TRUE
/obj/machinery/conveyor_switch/oneway
icon_state = "conveyor_switch_oneway"