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

Canister fixes and rework (#4266)

Browse Source 
* Kills PipeNode ConnectToContainedEntities and EnvironmentalAir with fire.

* Reaction IGasMixtureHolder is nullable.

* Reworks canisters

* Adds PortablePipeNode and PortPipeNode, which connect to each other.
This commit is contained in:
Vera Aguilera Puerto
2021-07-12 10:00:50 +02:00
committed by GitHub
parent 077f158dda
commit d8e353742c
10 changed files with 96 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Shared/Atmos/PipeDirection.cs
View File

@@ -36,8 +36,6 @@ namespace Content.Shared.Atmos
South = 1 << 1,
West = 1 << 2,
East = 1 << 3,
Port = 1 << 4,
Connector = 1 << 5,
//Straight pipes
Longitudinal = North | South,
@@ -49,12 +47,6 @@ namespace Content.Shared.Atmos
SWBend = South | West,
SEBend = South | East,
//Vertical Bends (Port only)
NPBend = North | Port,
SPBend = South | Port,
WPBend = West | Port,
EPBend = East | Port,
//T-Junctions
TNorth = North | Lateral,
TSouth = South | Lateral,
@@ -72,7 +64,6 @@ namespace Content.Shared.Atmos
Half,
Straight,
Bend,
VerticalBend,
TJunction,
Fourway
}
@@ -89,7 +80,6 @@ namespace Content.Shared.Atmos
PipeShape.Half => PipeDirection.South,
PipeShape.Straight => PipeDirection.Longitudinal,
PipeShape.Bend => PipeDirection.SWBend,
PipeShape.VerticalBend => PipeDirection.SPBend,
PipeShape.TJunction => PipeDirection.TSouth,
PipeShape.Fourway => PipeDirection.Fourway,
_ => throw new ArgumentOutOfRangeException(nameof(shape), $"{shape} does not have an associated {nameof(PipeDirection)}."),
@@ -148,8 +138,6 @@ namespace Content.Shared.Atmos
PipeDirection.South => PipeDirection.North,
PipeDirection.East => PipeDirection.West,
PipeDirection.West => PipeDirection.East,
PipeDirection.Port => PipeDirection.Connector,
PipeDirection.Connector => PipeDirection.Port,
_ => throw new ArgumentOutOfRangeException(nameof(pipeDirection)),
};
}
@@ -171,11 +159,6 @@ namespace Content.Shared.Atmos
PipeDirection.SEBend => PipeShape.Bend,
PipeDirection.SWBend => PipeShape.Bend,
PipeDirection.NPBend => PipeShape.VerticalBend,
PipeDirection.SPBend => PipeShape.VerticalBend,
PipeDirection.WPBend => PipeShape.VerticalBend,
PipeDirection.EPBend => PipeShape.VerticalBend,
PipeDirection.TNorth => PipeShape.TJunction,
PipeDirection.TSouth => PipeShape.TJunction,
PipeDirection.TEast => PipeShape.TJunction,