tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Omnitool fixes (#12476)

Browse Source 
Fix https://github.com/space-wizards/space-station-14/issues/11203
This commit is contained in:
Alex Evgrashin
2022-11-24 07:00:34 +01:00
committed by GitHub
parent 0f027bc2aa
commit 82db3a3979
4 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Server/MachineLinking/System/SignalLinkerSystem.cs
View File

@@ -3,6 +3,7 @@ using System.Diagnostics.CodeAnalysis;
using Content.Server.MachineLinking.Components;
using Content.Server.MachineLinking.Events;
using Content.Server.Power.Components;
using Content.Server.Tools;
using Content.Shared.Interaction;
using Content.Shared.MachineLinking;
using Content.Shared.Popups;
@@ -19,6 +20,7 @@ namespace Content.Server.MachineLinking.System
[Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
[Dependency] private readonly IPrototypeManager _protoMan = default!;
[Dependency] private readonly ToolSystem _tools = default!;
public override void Initialize()
{
@@ -69,7 +71,8 @@ namespace Content.Server.MachineLinking.System
if (!args.CanAccess || !args.CanInteract)
return;
if (!TryComp(args.Using, out SignalLinkerComponent? linker))
if (!TryComp(args.Using, out SignalLinkerComponent? linker) ||
!IsLinkerInteractable(args.Using.Value, linker))
return;
AlternativeVerb verb = new()
@@ -100,7 +103,8 @@ namespace Content.Server.MachineLinking.System
if (!args.CanAccess || !args.CanInteract)
return;
if (!TryComp(args.Using, out SignalLinkerComponent? linker))
if (!TryComp(args.Using, out SignalLinkerComponent? linker)
|| !IsLinkerInteractable(args.Using.Value, linker))
return;
AlternativeVerb verb = new()
@@ -200,7 +204,7 @@ namespace Content.Server.MachineLinking.System
{
if (args.Handled) return;
if (!TryComp(args.Used, out SignalLinkerComponent? linker) ||
if (!TryComp(args.Used, out SignalLinkerComponent? linker) || !IsLinkerInteractable(args.Used, linker) ||
!TryComp(args.User, out ActorComponent? actor))
return;
@@ -226,7 +230,7 @@ namespace Content.Server.MachineLinking.System
{
if (args.Handled) return;
if (!TryComp(args.Used, out SignalLinkerComponent? linker) ||
if (!TryComp(args.Used, out SignalLinkerComponent? linker) || !IsLinkerInteractable(args.Used, linker) ||
!TryComp(args.User, out ActorComponent? actor))
return;
@@ -473,5 +477,11 @@ namespace Content.Server.MachineLinking.System
return Comp<TransformComponent>(transmitterComponent.Owner).MapPosition.InRange(
Comp<TransformComponent>(receiverComponent.Owner).MapPosition, transmitterComponent.TransmissionRange);
}
private bool IsLinkerInteractable(EntityUid uid, SignalLinkerComponent linkerComponent)
{
var quality = linkerComponent.RequiredQuality;
return quality == null || _tools.HasQuality(uid, quality);
}
}
}