juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix overlapping popups for entity storages you can't access (#39039)

Browse Source 
* fix: don't overlap popups for locked storages

* fix: tweak some lock i18n
This commit is contained in:
Perry Fraser
2025-07-17 19:44:45 -04:00
committed by GitHub
parent ada0e4cb6f
commit a093a2dd28
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,11 +73,13 @@ public sealed class LockSystem : EntitySystem
// Only attempt an unlock by default on Activate
if (lockComp.Locked && lockComp.UnlockOnClick)
{
args.Handled = TryUnlock(uid, args.User, lockComp);
args.Handled = true;
TryUnlock(uid, args.User, lockComp);
}
else if (!lockComp.Locked && lockComp.LockOnClick)
{
args.Handled = TryLock(uid, args.User, lockComp);
args.Handled = true;
TryLock(uid, args.User, lockComp);
}
}

2
Resources/Locale/en-US/lock/lock-component.ftl
View File

@@ -2,7 +2,7 @@ lock-comp-on-examined-is-locked = The {$entityName} seems to be locked.
lock-comp-on-examined-is-unlocked = The {$entityName} seems to be unlocked.
lock-comp-do-lock-success = You lock the {$entityName}.
lock-comp-do-unlock-success = You unlock the {$entityName}.
lock-comp-has-user-access-fail = Access denied
lock-comp-has-user-access-fail = Access denied.
lock-comp-generic-fail = {CAPITALIZE(SUBJECT($target))} {CONJUGATE-BE($target)} locked.
## ToggleLockVerb

6
Resources/Locale/en-US/storage/components/entity-storage-component.ftl
View File

@@ -1,8 +1,8 @@
entity-storage-component-welded-shut-message = It's welded completely shut!
entity-storage-component-locked-message = It's Locked!
entity-storage-component-already-contains-user-message = It's too Cramped!
entity-storage-component-locked-message = It's locked!
entity-storage-component-already-contains-user-message = It's too cramped!
entity-storage-component-cannot-open-no-space = There's no room to open it!
## OpenToggleVerb
open-toggle-verb-welded-shut-message = {$verb} (welded shut)
open-toggle-verb-welded-shut-message = {$verb} (welded shut)