From 149aacf18713a2b4330995937e0428923da02d03 Mon Sep 17 00:00:00 2001 From: rolfero <45628623+rolfero@users.noreply.github.com> Date: Fri, 16 Sep 2022 23:27:53 +0200 Subject: [PATCH] Multitool examine wires on click (#11352) * cable examine update * Revert "cable examine update" This reverts commit 0c6df040b3b014a35fb9abe1cdc6e1078c5b1ca1. * Multitool checks wire when clicked Co-authored-by: CommieFlowers --- .../Power/EntitySystems/CableMultitoolSystem.cs | 12 ++++++++++++ Content.Server/Power/EntitySystems/CableSystem.cs | 3 +-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs b/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs index 75d624c944..18f0586584 100644 --- a/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs +++ b/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs @@ -3,6 +3,7 @@ using Content.Server.Power.Components; using Content.Server.Power.NodeGroups; using Content.Server.Tools; using Content.Shared.Examine; +using Content.Shared.Interaction; using Content.Shared.Verbs; using JetBrains.Annotations; using Robust.Shared.Utility; @@ -21,6 +22,17 @@ namespace Content.Server.Power.EntitySystems base.Initialize(); SubscribeLocalEvent>(OnGetExamineVerbs); + SubscribeLocalEvent(OnAfterInteractUsing); + } + + private void OnAfterInteractUsing(EntityUid uid, CableComponent component, AfterInteractUsingEvent args) + { + if (args.Handled || args.Target == null || !args.CanReach || !_toolSystem.HasQuality(args.Used, "Pulsing")) + return; + + var markup = FormattedMessage.FromMarkup(GenerateCableMarkup(uid)); + _examineSystem.SendExamineTooltip(args.User, uid, markup, false, false); + args.Handled = true; } private void OnGetExamineVerbs(EntityUid uid, CableComponent component, GetVerbsEvent args) diff --git a/Content.Server/Power/EntitySystems/CableSystem.cs b/Content.Server/Power/EntitySystems/CableSystem.cs index 24fc7c93ad..4d795edc8a 100644 --- a/Content.Server/Power/EntitySystems/CableSystem.cs +++ b/Content.Server/Power/EntitySystems/CableSystem.cs @@ -36,8 +36,7 @@ public sealed partial class CableSystem : EntitySystem return; var ev = new CuttingFinishedEvent(args.User); - _toolSystem.UseTool(args.Used, args.User, uid, 0, cable.CuttingDelay, new[] { cable.CuttingQuality }, doAfterCompleteEvent: ev, doAfterEventTarget: uid); - args.Handled = true; + args.Handled = _toolSystem.UseTool(args.Used, args.User, uid, 0, cable.CuttingDelay, new[] { cable.CuttingQuality }, doAfterCompleteEvent: ev, doAfterEventTarget: uid); } private void OnCableCut(EntityUid uid, CableComponent cable, CuttingFinishedEvent args)