Merge remote-tracking branch 'upstream/stable' into ed-15-10-2024-upstream

# Conflicts:
#	Content.Server/Station/Systems/StationSpawningSystem.cs

Content.Shared/Storage/Components/SecretStashComponent.cs

@@ -8,6 +8,7 @@ using Robust.Shared.GameStates;
 using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 using Robust.Shared.Audio;
+using Content.Shared.Whitelist;
 
 namespace Content.Shared.Storage.Components
 {
@@ -26,6 +27,12 @@ namespace Content.Shared.Storage.Components
         [DataField("maxItemSize")]
         public ProtoId<ItemSizePrototype> MaxItemSize = "Small";
 
+        /// <summary>
+        ///     Entity blacklist for secret stashes.
+        /// </summary>
+        [DataField]
+        public EntityWhitelist? Blacklist;
+
         /// <summary>
         ///     This sound will be played when you try to insert an item in the stash.
         ///     The sound will be played whether or not the item is actually inserted.