Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync
# Conflicts: # Content.Client/Parallax/ParallaxControl.cs # Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs # Content.Server/Labels/Label/LabelSystem.cs # Content.Shared/Actions/SharedActionsSystem.cs # Content.Shared/Fluids/Components/EvaporationComponent.cs # Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs # README.md # Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml # Resources/Prototypes/Maps/Pools/deathmatch.yml # Resources/Prototypes/Maps/arenas.yml
This commit is contained in:
@@ -18,10 +18,10 @@ public sealed partial class EvaporationComponent : Component
|
||||
public TimeSpan NextTick = TimeSpan.Zero;
|
||||
|
||||
/// <summary>
|
||||
/// How much evaporation per second.
|
||||
/// Evaporation factor. Multiplied by the evaporating speed of the reagent.
|
||||
/// </summary>
|
||||
[DataField("evaporationAmount")]
|
||||
public FixedPoint2 EvaporationAmount = FixedPoint2.New(0.3);
|
||||
public FixedPoint2 EvaporationAmount = FixedPoint2.New(1);
|
||||
|
||||
/// <summary>
|
||||
/// forcibly vaporizes ALL the chemicals
|
||||
|
||||
@@ -19,6 +19,12 @@ namespace Content.Shared.Fluids.Components
|
||||
|
||||
[DataField("solution")] public string SolutionName = "puddle";
|
||||
|
||||
/// <summary>
|
||||
/// Default minimum speed someone must be moving to slip for all reagents.
|
||||
/// </summary>
|
||||
[DataField]
|
||||
public float DefaultSlippery = 5.5f;
|
||||
|
||||
[ViewVariables]
|
||||
public Entity<SolutionComponent>? Solution;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user