From 48b34c23322b8fe35195afd964764e672020c558 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 22 May 2022 19:42:55 -0400 Subject: [PATCH 1/2] fixes the ability to attach multiple tracking beacons to a single mech --- code/modules/vehicles/mecha/mecha_control_console.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/vehicles/mecha/mecha_control_console.dm b/code/modules/vehicles/mecha/mecha_control_console.dm index 38224fbbdd..3f40e4d765 100644 --- a/code/modules/vehicles/mecha/mecha_control_console.dm +++ b/code/modules/vehicles/mecha/mecha_control_console.dm @@ -118,7 +118,12 @@ return ..() /obj/item/mecha_parts/mecha_tracking/try_attach_part(mob/user, obj/vehicle/sealed/mecha/M) - if(!..()) + for(var/obj/item/I in M.equipment) + if(istype(I, src)) + to_chat(user, "[M] already has a tracking beacon!") + return + . = ..() + if(!.) return M.trackers += src M.diag_hud_set_mechtracking() From f751e10cc4106ec13fe862106ff1c58f92f7c501 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 22 May 2022 19:50:45 -0400 Subject: [PATCH 2/2] actually wait tracking beacons arent equipment --- code/modules/vehicles/mecha/mecha_control_console.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/mecha/mecha_control_console.dm b/code/modules/vehicles/mecha/mecha_control_console.dm index 3f40e4d765..ff5ea13059 100644 --- a/code/modules/vehicles/mecha/mecha_control_console.dm +++ b/code/modules/vehicles/mecha/mecha_control_console.dm @@ -118,7 +118,7 @@ return ..() /obj/item/mecha_parts/mecha_tracking/try_attach_part(mob/user, obj/vehicle/sealed/mecha/M) - for(var/obj/item/I in M.equipment) + for(var/obj/item/I in M.contents) if(istype(I, src)) to_chat(user, "[M] already has a tracking beacon!") return