Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removes half-implemented ConduitLayer from piping (#2957)

Browse Source 
Co-authored-by: py01 <pyronetics01@gmail.com>
This commit is contained in:
py01
2021-01-08 17:05:29 -06:00
committed by GitHub
parent e84e387972
commit b46b890618
12 changed files with 17 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Shared/GameObjects/Components/Atmos/SharedPipeComponent.cs
View File

@@ -14,12 +14,10 @@ namespace Content.Shared.GameObjects.Components.Atmos
public class PipeVisualState
{
public readonly PipeDirection PipeDirection;
public readonly ConduitLayer ConduitLayer;
public PipeVisualState(PipeDirection pipeDirection, ConduitLayer conduitLayer)
public PipeVisualState(PipeDirection pipeDirection)
{
PipeDirection = pipeDirection;
ConduitLayer = conduitLayer;
}
}
@@ -65,13 +63,6 @@ namespace Content.Shared.GameObjects.Components.Atmos
Fourway
}
public enum ConduitLayer
{
One = 1,
Two = 2,
Three = 3,
}
public static class PipeDirectionHelpers
{
public const int PipeDirections = 4;

8
Content.Shared/GameObjects/Components/Atmos/SharedPumpComponent.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using Robust.Shared.Serialization;
namespace Content.Shared.GameObjects.Components.Atmos
@@ -14,16 +14,12 @@ namespace Content.Shared.GameObjects.Components.Atmos
{
public readonly PipeDirection InletDirection;
public readonly PipeDirection OutletDirection;
public readonly ConduitLayer InletConduitLayer;
public readonly ConduitLayer OutletConduitLayer;
public readonly bool PumpEnabled;
public PumpVisualState(PipeDirection inletDirection, PipeDirection outletDirection, ConduitLayer inletConduitLayer, ConduitLayer outletConduitLayer, bool pumpEnabled)
public PumpVisualState(PipeDirection inletDirection, PipeDirection outletDirection, bool pumpEnabled)
{
InletDirection = inletDirection;
OutletDirection = outletDirection;
InletConduitLayer = inletConduitLayer;
OutletConduitLayer = outletConduitLayer;
PumpEnabled = pumpEnabled;
}
}