tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

9
Content.Server/Cabinet/ItemCabinetSystem.cs
View File

@@ -27,6 +27,8 @@ namespace Content.Server.Cabinet
SubscribeLocalEvent<ItemCabinetComponent, EntInsertedIntoContainerMessage>(OnContainerModified);
SubscribeLocalEvent<ItemCabinetComponent, EntRemovedFromContainerMessage>(OnContainerModified);
SubscribeLocalEvent<ItemCabinetComponent, LockToggleAttemptEvent>(OnLockToggleAttempt);
}
private void OnComponentInit(EntityUid uid, ItemCabinetComponent cabinet, ComponentInit args)
@@ -63,6 +65,13 @@ namespace Content.Server.Cabinet
UpdateAppearance(uid, cabinet);
}
private void OnLockToggleAttempt(EntityUid uid, ItemCabinetComponent cabinet, ref LockToggleAttemptEvent args)
{
// Cannot lock or unlock while open.
if (cabinet.Opened)
args.Cancelled = true;
}
private void AddToggleOpenVerb(EntityUid uid, ItemCabinetComponent cabinet, GetVerbsEvent<ActivationVerb> args)
{
if (args.Hands == null || !args.CanAccess || !args.CanInteract)

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)

13
Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
View File

@@ -45,11 +45,13 @@ public sealed class EntityStorageSystem : EntitySystem
SubscribeLocalEvent<EntityStorageComponent, ActivateInWorldEvent>(OnInteract);
SubscribeLocalEvent<EntityStorageComponent, WeldableAttemptEvent>(OnWeldableAttempt);
SubscribeLocalEvent<EntityStorageComponent, WeldableChangedEvent>(OnWelded);
SubscribeLocalEvent<EntityStorageComponent, LockToggleAttemptEvent>(OnLockToggleAttempt);
SubscribeLocalEvent<EntityStorageComponent, DestructionEventArgs>(OnDestroy);
SubscribeLocalEvent<InsideEntityStorageComponent, InhaleLocationEvent>(OnInsideInhale);
SubscribeLocalEvent<InsideEntityStorageComponent, ExhaleLocationEvent>(OnInsideExhale);
SubscribeLocalEvent<InsideEntityStorageComponent, AtmosExposedGetAirEvent>(OnInsideExposed);
}
private void OnInit(EntityUid uid, EntityStorageComponent component, ComponentInit args)
@@ -102,6 +104,17 @@ public sealed class EntityStorageSystem : EntitySystem
component.IsWeldedShut = args.IsWelded;
}
private void OnLockToggleAttempt(EntityUid uid, EntityStorageComponent target, ref LockToggleAttemptEvent args)
{
// Cannot (un)lock open lockers.
if (target.Open)
args.Cancelled = true;
// Cannot (un)lock from the inside. Maybe a bad idea? Security jocks could trap nerds in lockers?
if (target.Contents.Contains(args.User))
args.Cancelled = true;
}
private void OnDestroy(EntityUid uid, EntityStorageComponent component, DestructionEventArgs args)
{
component.Open = true;