Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Make "no access" popups appear again. (#19034)

Browse Source
This commit is contained in:
Nemanja
2023-08-12 21:21:06 -04:00
committed by GitHub
parent d55fae0732
commit 175660c800
2 changed files with 14 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Content.Shared/Lock/LockSystem.cs
View File

@@ -11,10 +11,6 @@ using Content.Shared.Storage.Components;
using Content.Shared.Verbs;
using JetBrains.Annotations;
using Robust.Shared.Audio;
using Robust.Shared.GameStates;
using Robust.Shared.Network;
using Robust.Shared.Player;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
namespace Content.Shared.Lock;
@@ -25,7 +21,6 @@ namespace Content.Shared.Lock;
[UsedImplicitly]
public sealed class LockSystem : EntitySystem
{
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly AccessReaderSystem _accessReader = default!;
[Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
@@ -36,8 +31,6 @@ public sealed class LockSystem : EntitySystem
{
base.Initialize();
SubscribeLocalEvent<LockComponent, ComponentGetState>(OnGetState);
SubscribeLocalEvent<LockComponent, ComponentHandleState>(OnHandleState);
SubscribeLocalEvent<LockComponent, ComponentStartup>(OnStartup);
SubscribeLocalEvent<LockComponent, ActivateInWorldEvent>(OnActivated);
SubscribeLocalEvent<LockComponent, StorageOpenAttemptEvent>(OnStorageOpenAttempt);
@@ -46,19 +39,6 @@ public sealed class LockSystem : EntitySystem
SubscribeLocalEvent<LockComponent, GotEmaggedEvent>(OnEmagged);
}
private void OnGetState(EntityUid uid, LockComponent component, ref ComponentGetState args)
{
args.State = new LockComponentState(component.Locked, component.LockOnClick);
}
private void OnHandleState(EntityUid uid, LockComponent component, ref ComponentHandleState args)
{
if (args.Current is not LockComponentState state)
return;
component.Locked = state.Locked;
component.LockOnClick = state.LockOnClick;
}
private void OnStartup(EntityUid uid, LockComponent lockComp, ComponentStartup args)
{
_appearanceSystem.SetData(uid, StorageVisuals.CanLock, true);
@@ -206,8 +186,8 @@ public sealed class LockSystem : EntitySystem
if (_accessReader.IsAllowed(user, reader))
return true;
if (!quiet && _timing.IsFirstTimePredicted)
_sharedPopupSystem.PopupEntity(Loc.GetString("lock-comp-has-user-access-fail"), uid, Filter.Local(), true);
if (!quiet)
_sharedPopupSystem.PopupClient(Loc.GetString("lock-comp-has-user-access-fail"), uid, user);
return false;
}