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

Fix integration tests.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-07-16 17:07:12 +02:00
parent 8ec512c46f
commit 4d9344c733
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs
View File

@@ -9,6 +9,7 @@ using Content.Shared.Chemistry;
using Content.Shared.Physics; using Content.Shared.Physics;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Server.GameObjects.EntitySystems; using Robust.Server.GameObjects.EntitySystems;
using Robust.Server.Interfaces.GameObjects;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components; using Robust.Shared.GameObjects.Components;
using Robust.Shared.GameObjects.Components.Transform; using Robust.Shared.GameObjects.Components.Transform;
@@ -30,7 +31,7 @@ namespace Content.Server.GameObjects.Components.Fluids
/// Puddle on a floor /// Puddle on a floor
/// </summary> /// </summary>
[RegisterComponent] [RegisterComponent]
public class PuddleComponent : Component, IExamine public class PuddleComponent : Component, IExamine, IMapInit
{ {
// Current design: Something calls the SpillHelper.Spill, that will either // Current design: Something calls the SpillHelper.Spill, that will either
// A) Add to an existing puddle at the location (normalised to tile-center) or // A) Add to an existing puddle at the location (normalised to tile-center) or
@@ -137,12 +138,17 @@ namespace Content.Server.GameObjects.Components.Fluids
var baseName = new ResourcePath(_spriteComponent.BaseRSIPath).FilenameWithoutExtension; var baseName = new ResourcePath(_spriteComponent.BaseRSIPath).FilenameWithoutExtension;
_spriteComponent.LayerSetState(0, $"{baseName}-{randomVariant}"); // TODO: Remove hardcode _spriteComponent.LayerSetState(0, $"{baseName}-{randomVariant}"); // TODO: Remove hardcode
_spriteComponent.Rotation = Angle.FromDegrees(robustRandom.Next(0, 359));
// UpdateAppearance should get called soon after this so shouldn't need to call Dirty() here // UpdateAppearance should get called soon after this so shouldn't need to call Dirty() here
UpdateStatus(); UpdateStatus();
} }
void IMapInit.MapInit()
{
var robustRandom = IoCManager.Resolve<IRobustRandom>();
_spriteComponent.Rotation = Angle.FromDegrees(robustRandom.Next(0, 359));
}
void IExamine.Examine(FormattedMessage message, bool inDetailsRange) void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
{ {
if(_slippery) if(_slippery)