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

[MIRROR] Remote materials don't block multitool on failure (#28761)

Browse Source 
* Remote materials don't block multitool on failure (#84797)

## About The Pull Request
- Fixes #84794

`/datum/component/remote_materials` blocks the tool act from continuing
when linking with ore silo fails. We don't want that for stacking
machines

## Changelog
🆑
fix: stacking machines can be linked with its console via multitool
/🆑

* Remote materials don't block multitool on failure

---------

Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-07-10 12:59:58 +05:30
committed by GitHub
co-authored by SyncIt21
parent 7c8ebf7d88
commit 66fa63cd7c
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/material/remote_materials.dm
+1 -1
View File
@@ -147,7 +147,7 @@ handles linking back and forth.
/datum/component/remote_materials/proc/OnMultitool(datum/source, mob/user, obj/item/multitool/M)
SIGNAL_HANDLER
. = ITEM_INTERACT_BLOCKING
. = NONE
if (!QDELETED(M.buffer) && istype(M.buffer, /obj/machinery/ore_silo))
if (silo == M.buffer)
to_chat(user, span_warning("[parent] is already connected to [silo]!"))
code/modules/mining/machine_stacking.dm
+10 -7
View File
@@ -127,13 +127,16 @@
if(istype(AM, /obj/item/stack/sheet) && AM.loc == get_step(src, input_dir))
process_sheet(AM)
/obj/machinery/mineral/stacking_machine/multitool_act(mob/living/user, obj/item/multitool/M)
if(istype(M))
if(istype(M.buffer, /obj/machinery/mineral/stacking_unit_console))
console = M.buffer
console.machine = src
to_chat(user, span_notice("You link [src] to the console in [M]'s buffer."))
return TRUE
/obj/machinery/mineral/stacking_machine/multitool_act(mob/living/user, obj/item/multitool/multi_tool)
if(user.combat_mode || multi_tool.item_flags & ABSTRACT || multi_tool.flags_1 & HOLOGRAM_1)
return ITEM_INTERACT_SKIP_TO_ATTACK
. = ITEM_INTERACT_BLOCKING
if(istype(multi_tool.buffer, /obj/machinery/mineral/stacking_unit_console))
console = multi_tool.buffer
console.machine = src
to_chat(user, span_notice("You link [src] to the console in [multi_tool]'s buffer."))
return ITEM_INTERACT_SUCCESS
/obj/machinery/mineral/stacking_machine/proc/rotate(input)
if (input)