Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream

# Conflicts: # Content.Shared/Inventory/InventorySystem.Equip.cs # Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
2024-08-12 14:40:15 +03:00
parent ff8d294af5 691e37c0db
commit d9336781f1
830 changed files with 27583 additions and 19536 deletions
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -148,8 +148,10 @@ public sealed class LockSystem : EntitySystem
            return _doAfter.TryStartDoAfter(
                new DoAfterArgs(EntityManager, user, lockComp.LockTime, new LockDoAfter(), uid, uid)
                {
-                    BreakOnDamage = true, BreakOnMove = true, RequireCanInteract = true,
-                    NeedHand = true
+                    BreakOnDamage = true,
+                    BreakOnMove = true,
+                    NeedHand = true,
+                    BreakOnDropItem = false,
                });
        }

@@ -224,8 +226,10 @@ public sealed class LockSystem : EntitySystem
            return _doAfter.TryStartDoAfter(
                new DoAfterArgs(EntityManager, user, lockComp.LockTime, new UnlockDoAfter(), uid, uid)
                {
-                    BreakOnDamage = true, BreakOnMove = true, RequireCanInteract = true,
-                    NeedHand = true
+                    BreakOnDamage = true,
+                    BreakOnMove = true,
+                    NeedHand = true,
+                    BreakOnDropItem = false,
                });
        }