tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Entity storage air capacity changes (#14734)

Browse Source
This commit is contained in:
Kara
2023-03-18 17:56:38 -07:00
committed by GitHub
parent fff00dd25f
commit 7995817c80
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Storage/Components/EntityStorageComponent.cs
View File

@@ -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. /// None while open. Grabs gas from the atmosphere when closed, and exposes any entities inside to it.
/// </summary> /// </summary>
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public GasMixture Air { get; set; } = new (GasMixVolume); [DataField("air")]
public GasMixture Air { get; set; } = new (200);
} }

2
Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
View File

@@ -77,7 +77,7 @@ public sealed class EntityStorageSystem : SharedEntityStorageSystem
if (tile != null && _atmos.GetTileMixture(tile.Value.GridUid, null, tile.Value.GridIndices, true) is {} environment) 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));
} }
} }

1
Content.Shared/Storage/Components/SharedEntityStorageComponent.cs
View File

@@ -11,7 +11,6 @@ namespace Content.Shared.Storage.Components;
public abstract class SharedEntityStorageComponent : Component public abstract class SharedEntityStorageComponent : Component
{ {
public readonly float MaxSize = 1.0f; // maximum width or height of an entity allowed inside the storage. 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 static readonly TimeSpan InternalOpenAttemptDelay = TimeSpan.FromSeconds(0.5);
public TimeSpan LastInternalOpenAttempt; public TimeSpan LastInternalOpenAttempt;

3
Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
View File

@@ -240,6 +240,9 @@
id: CrateLivestock id: CrateLivestock
name: livestock crate name: livestock crate
components: components:
- type: EntityStorage
air:
volume: 800
- type: Sprite - type: Sprite
sprite: Structures/Storage/Crates/livestock.rsi sprite: Structures/Storage/Crates/livestock.rsi
layers: layers: