Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Maps/oasis.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/audio.yml

Content.Shared/Storage/Components/StoreOnCollideComponent.cs

@@ -0,0 +1,34 @@
+using Content.Shared.Storage.EntitySystems;
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Storage.Components;
+
+// Use where you want an entity to store other entities on collide
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(StoreOnCollideSystem))]
+public sealed partial class StoreOnCollideComponent : Component
+{
+    /// <summary>
+    ///     Entities that are allowed in the storage on collide
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    ///     Should this storage lock on collide, provided they have a lock component?
+    /// </summary>
+    [DataField]
+    public bool LockOnCollide;
+
+    /// <summary>
+    ///     Should the behavior be disabled when the storage is first opened?
+    /// </summary>
+    [DataField]
+    public bool DisableWhenFirstOpened;
+
+    /// <summary>
+    ///     If the behavior is disabled or not
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Disabled;
+}