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

Fix item cabinet locking while open and locker favoritism (#12508)

Browse Source 
Co-authored-by: Moony <moony@hellomouse.net>
Fixes https://github.com/space-wizards/space-station-14/issues/12426
This commit is contained in:
Bright0
2022-12-06 16:59:59 -06:00
committed by GitHub
parent 14599c0a90
commit f55d85a975
4 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Lock/LockComponent.cs
View File

@@ -14,3 +14,17 @@ namespace Content.Server.Storage.Components
[ViewVariables(VVAccess.ReadWrite)] [DataField("lockingSound")] public SoundSpecifier LockSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/door_lock_on.ogg");
}
}
[ByRefEvent]
public struct LockToggleAttemptEvent
{
public bool Silent = false;
public bool Cancelled = false;
public EntityUid User;
public LockToggleAttemptEvent(EntityUid user, bool silent = false)
{
User = user;
Silent = silent;
}
}
public sealed class LockToggleAttemptArgs : EventArgs { }

17
Content.Server/Lock/LockSystem.cs
View File

@@ -148,23 +148,14 @@ namespace Content.Server.Lock
/// <summary>
/// Before locking the entity, check whether it's a locker. If is, prevent it from being locked from the inside or while it is open.
/// </summary>
public bool CanToggleLock(EntityUid uid, EntityUid user, EntityStorageComponent? storage = null, bool quiet = true)
public bool CanToggleLock(EntityUid uid, EntityUid user, bool quiet = true)
{
if (!Resolve(uid, ref storage, logMissing: false))
return true;
if (!HasComp<SharedHandsComponent>(user))
return false;
// Cannot lock if the entity is currently opened.
if (storage.Open)
return false;
// Cannot (un)lock from the inside. Maybe a bad idea? Security jocks could trap nerds in lockers?
if (storage.Contents.Contains(user))
return false;
return true;
var ev = new LockToggleAttemptEvent(user, quiet);
RaiseLocalEvent(uid, ref ev, true);
return !ev.Cancelled;
}
private bool HasUserAccess(EntityUid uid, EntityUid user, AccessReaderComponent? reader = null, bool quiet = true)