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

Fix opening wire panels without WiresPanelSecurityComponent (#20798)

Browse Source
This commit is contained in:
chromiumboy
2023-10-06 16:26:02 -05:00
committed by GitHub
parent 186e395b23
commit 7d20aefc0a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Doors/Systems/AirlockSystem.cs
View File

@@ -152,10 +152,12 @@ public sealed class AirlockSystem : SharedAirlockSystem
{ {
if (TryComp<WiresPanelComponent>(uid, out var panel) && if (TryComp<WiresPanelComponent>(uid, out var panel) &&
panel.Open && panel.Open &&
TryComp<WiresPanelSecurityComponent>(uid, out var wiresPanelSecurity) &&
wiresPanelSecurity.WiresAccessible &&
TryComp<ActorComponent>(args.User, out var actor)) TryComp<ActorComponent>(args.User, out var actor))
{ {
if (TryComp<WiresPanelSecurityComponent>(uid, out var wiresPanelSecurity) &&
!wiresPanelSecurity.WiresAccessible)
return;
_wiresSystem.OpenUserInterface(uid, actor.PlayerSession); _wiresSystem.OpenUserInterface(uid, actor.PlayerSession);
args.Handled = true; args.Handled = true;
return; return;

6
Content.Server/Wires/WiresSystem.cs
View File

@@ -463,11 +463,13 @@ public sealed class WiresSystem : SharedWiresSystem
return; return;
if (panel.Open && if (panel.Open &&
TryComp<WiresPanelSecurityComponent>(uid, out var wiresPanelSecurity) &&
wiresPanelSecurity.WiresAccessible &&
(_toolSystem.HasQuality(args.Used, "Cutting", tool) || (_toolSystem.HasQuality(args.Used, "Cutting", tool) ||
_toolSystem.HasQuality(args.Used, "Pulsing", tool))) _toolSystem.HasQuality(args.Used, "Pulsing", tool)))
{ {
if (TryComp<WiresPanelSecurityComponent>(uid, out var wiresPanelSecurity) &&
!wiresPanelSecurity.WiresAccessible)
return;
if (TryComp(args.User, out ActorComponent? actor)) if (TryComp(args.User, out ActorComponent? actor))
{ {
_uiSystem.TryOpen(uid, WiresUiKey.Key, actor.PlayerSession); _uiSystem.TryOpen(uid, WiresUiKey.Key, actor.PlayerSession);