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

* fix: don't overlap popups for locked storages

* fix: tweak some lock i18n

diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index f7ebf21535d3a84e706245035d92cd94837f2752..397a3636bb0dbce67aae9ef4b2fb6fdcc859a171 100644 (file)
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -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);
         }
     }
 

diff --git a/Resources/Locale/en-US/lock/lock-component.ftl b/Resources/Locale/en-US/lock/lock-component.ftl
index 380605697baedb86f0ad9c492b2c542f44640d4b..f1455568b9356c692b9e8e9bb9849c865b83c7b6 100644 (file)
--- a/Resources/Locale/en-US/lock/lock-component.ftl
+++ b/Resources/Locale/en-US/lock/lock-component.ftl
@@ -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

diff --git a/Resources/Locale/en-US/storage/components/entity-storage-component.ftl b/Resources/Locale/en-US/storage/components/entity-storage-component.ftl
index 69646ebab07a047e1a286f913b34d54dad17989b..78a2d0f69bb423b408d5d3c39f6b54e565b6e45c 100644 (file)
--- a/Resources/Locale/en-US/storage/components/entity-storage-component.ftl
+++ b/Resources/Locale/en-US/storage/components/entity-storage-component.ftl
@@ -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)
\ No newline at end of file
+open-toggle-verb-welded-shut-message = {$verb} (welded shut)