cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 20:20:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conveyors switches now use left and right click (#83001)

Browse Source 
## About The Pull Request

Replaces current switch behavior from having to spam to get between
forward, off, and reversing states to just use left and right click. It
also removes the previous toggle behavior from the circuit trigger in
favor or the forward, backwards, and stop buttons. Follow up to
suggested changes from #82857

## Why It's Good For The Game

No more spamming left click to get to the state you want, nor worrying
about what the previous direction was and not knowing which way it's
gonna go.

## Changelog
🆑
qol: conveyors now use left and right click controls
qol: add screentips for conveyor switches
del: removes circuit conveyor circuit default trigger behavior in favor
in favor of the three state triggers
/🆑
This commit is contained in:
Echriser
2024-05-02 09:08:59 -07:00
committed by GitHub
parent a99b36893c
commit 2f660b328a
1 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/conveyor.dm
+30 -23
View File
@@ -350,8 +350,6 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
/// The current state of the switch.
var/position = CONVEYOR_OFF
/// Last direction setting.
var/last_pos = CONVEYOR_BACKWARDS
/// If the switch only operates the conveyor belts in a single direction.
var/oneway = FALSE
/// If the level points the opposite direction when it's turned on.
@@ -372,6 +370,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
AddComponent(/datum/component/usb_port, list(
/obj/item/circuit_component/conveyor_switch,
))
register_context()
/obj/machinery/conveyor_switch/Destroy()
LAZYREMOVE(GLOB.conveyors_by_id[id], src)
@@ -397,6 +396,27 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
icon_state = "[base_icon_state]-[invert_icon ? "rev" : "fwd"]"
return ..()
/obj/machinery/conveyor_switch/add_context(atom/source, list/context, obj/item/held_item, mob/user)
. = ..()
if(!held_item)
context[SCREENTIP_CONTEXT_LMB] = "Toggle forwards"
if(!oneway)
context[SCREENTIP_CONTEXT_RMB] = "Toggle backwards"
return CONTEXTUAL_SCREENTIP_SET
if(held_item.tool_behaviour == TOOL_MULTITOOL)
context[SCREENTIP_CONTEXT_LMB] = "Set speed"
context[SCREENTIP_CONTEXT_RMB] = "View wires"
return CONTEXTUAL_SCREENTIP_SET
if(held_item.tool_behaviour == TOOL_SCREWDRIVER)
context[SCREENTIP_CONTEXT_LMB] = "Toggle oneway"
return CONTEXTUAL_SCREENTIP_SET
if(held_item.tool_behaviour == TOOL_CROWBAR)
context[SCREENTIP_CONTEXT_LMB] = "Detach"
return CONTEXTUAL_SCREENTIP_SET
if(held_item.tool_behaviour == TOOL_WRENCH)
context[SCREENTIP_CONTEXT_LMB] = "Invert"
return CONTEXTUAL_SCREENTIP_SET
/// Updates all conveyor belts that are linked to this switch, and tells them to start processing.
/obj/machinery/conveyor_switch/proc/update_linked_conveyors()
for(var/obj/machinery/conveyor/belt in GLOB.conveyors_by_id[id])
@@ -414,28 +434,29 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
CHECK_TICK
/// Updates the switch's `position` and `last_pos` variable. Useful so that the switch can properly cycle between the forwards, backwards and neutral positions.
/obj/machinery/conveyor_switch/proc/update_position()
/obj/machinery/conveyor_switch/proc/update_position(direction)
if(position == CONVEYOR_OFF)
if(oneway) //is it a oneway switch
position = oneway
else
if(last_pos < CONVEYOR_OFF)
if(direction == CONVEYOR_FORWARD)
position = CONVEYOR_FORWARD
last_pos = CONVEYOR_OFF
else
position = CONVEYOR_BACKWARDS
last_pos = CONVEYOR_OFF
else
last_pos = position
position = CONVEYOR_OFF
/// Called when a user clicks on this switch with an open hand.
/obj/machinery/conveyor_switch/interact(mob/user)
/obj/machinery/conveyor_switch/attack_hand(mob/living/user, list/modifiers)
add_fingerprint(user)
update_position()
if(LAZYACCESS(modifiers, RIGHT_CLICK))
update_position(CONVEYOR_BACKWARDS)
else
update_position(CONVEYOR_FORWARD)
update_appearance()
update_linked_conveyors()
update_linked_switches()
return TRUE
/obj/machinery/conveyor_switch/attackby(obj/item/attacking_item, mob/user, params)
if(is_wire_tool(attacking_item))
@@ -588,7 +609,6 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
/obj/item/circuit_component/conveyor_switch
display_name = "Conveyor Switch"
desc = "Allows to control connected conveyor belts."
circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL
/// Direction input ports.
var/datum/port/input/stop
@@ -619,12 +639,6 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
attached_switch = null
return ..()
/obj/item/circuit_component/conveyor_switch/input_received(datum/port/input/port)
if(!attached_switch)
return
INVOKE_ASYNC(src, PROC_REF(update_conveyors), port)
/obj/item/circuit_component/conveyor_switch/proc/on_switch_changed()
attached_switch.update_appearance()
attached_switch.update_linked_conveyors()
@@ -646,13 +660,6 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
attached_switch.position = CONVEYOR_BACKWARDS
INVOKE_ASYNC(src, PROC_REF(on_switch_changed))
/obj/item/circuit_component/conveyor_switch/proc/update_conveyors(datum/port/input/port)
if(!attached_switch)
return
attached_switch.update_position()
INVOKE_ASYNC(src, PROC_REF(on_switch_changed))
#undef CONVEYOR_BACKWARDS
#undef CONVEYOR_OFF
#undef CONVEYOR_FORWARD