From fe5c70fdc7f147163c68aa74fcac2162bd0222e2 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 11 Jan 2023 21:09:08 +0100 Subject: [PATCH] [MIRROR] RPED proximity Bug Fix [MDB IGNORE] (#18641) * RPED proximity Bug Fix (#72616) * RPED proximity Bug Fix Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com> --- code/game/machinery/constructable_frame.dm | 1 - code/modules/research/stock_parts.dm | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 9a7da3b0026..e685165c285 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -203,7 +203,6 @@ return //install board if(install_board(target_board, user, FALSE)) - user.Beam(src, icon_state = "rped_upgrade", time = 5) replacer.play_rped_sound() //attack this frame again with the rped so it can install stock parts since its now in state 3 attackby(replacer, user, params) diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index 3867675ee8a..83c492f9356 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -55,9 +55,6 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good if(!ismachinery(attacked_object) && !istype(attacked_object, /obj/structure/frame/machine)) return ..() - if(adjacent) - return ..() - if(ismachinery(attacked_object)) var/obj/machinery/attacked_machinery = attacked_object @@ -70,6 +67,8 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good return var/obj/structure/frame/machine/attacked_frame = attacked_object + if(!adjacent && !works_from_distance) + return // no point attacking the frame with the rped if the frame doesn't have wiring or it doesn't have components & rped has no circuitboard to offer as an component. if(attacked_frame.state == 1 || (!attacked_frame.components && !has_an_circuitboard())) return