Entity storage air capacity changes (#14734)

diff --git a/Content.Server/Storage/Components/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs
index 568c67bc06f9342a8718c2c829822b98d553c969..0824dc8909790c2ba33911e45ee3ad89fab9545b 100644 (file)
--- a/Content.Server/Storage/Components/EntityStorageComponent.cs
+++ b/Content.Server/Storage/Components/EntityStorageComponent.cs
@@ -12,5 +12,6 @@ public sealed class EntityStorageComponent : SharedEntityStorageComponent, IGasM
     ///     None while open. Grabs gas from the atmosphere when closed, and exposes any entities inside to it.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
-    public GasMixture Air { get; set; } = new (GasMixVolume);
+    [DataField("air")]
+    public GasMixture Air { get; set; } = new (200);
 }

diff --git a/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs b/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
index ebefd304f7947a9b6ecc36d5b8291a2dc464aa25..46459105bf98934f5a322f3f5571ea5d1979192c 100644 (file)
--- a/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
+++ b/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
@@ -77,7 +77,7 @@ public sealed class EntityStorageSystem : SharedEntityStorageSystem
 
         if (tile != null && _atmos.GetTileMixture(tile.Value.GridUid, null, tile.Value.GridIndices, true) is {} environment)
         {
-            _atmos.Merge(serverComp.Air, environment.RemoveVolume(SharedEntityStorageComponent.GasMixVolume));
+            _atmos.Merge(serverComp.Air, environment.RemoveVolume(serverComp.Air.Volume));
         }
     }
 

diff --git a/Content.Shared/Storage/Components/SharedEntityStorageComponent.cs b/Content.Shared/Storage/Components/SharedEntityStorageComponent.cs
index bbabde8e7d26030daefaaa746e646d35f21d67a0..9f6b9413a02a8628d8fee2c1a26451a61db85c63 100644 (file)
--- a/Content.Shared/Storage/Components/SharedEntityStorageComponent.cs
+++ b/Content.Shared/Storage/Components/SharedEntityStorageComponent.cs
@@ -11,7 +11,6 @@ namespace Content.Shared.Storage.Components;
 public abstract class SharedEntityStorageComponent : Component
 {
     public readonly float MaxSize = 1.0f; // maximum width or height of an entity allowed inside the storage.
-    public const float GasMixVolume = 70f;
 
     public static readonly TimeSpan InternalOpenAttemptDelay = TimeSpan.FromSeconds(0.5);
     public TimeSpan LastInternalOpenAttempt;

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index 0f3bfb795dc05c2df80f4a7157e70b293410939e..381dbe962b93561e7d4478db2e6fcc42809c8f32 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -240,6 +240,9 @@
   id: CrateLivestock
   name: livestock crate
   components:
+  - type: EntityStorage
+    air:
+      volume: 800
   - type: Sprite
     sprite: Structures/Storage/Crates/livestock.rsi
     layers: