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

Fix firelocks

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-09-06 17:34:45 +02:00
parent d58b7f0ebe
commit bc972156bb
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Atmos/TileAtmosphere.cs
View File

@@ -1159,9 +1159,15 @@ namespace Content.Server.Atmos
public void UpdateAdjacent(AtmosDirection direction) public void UpdateAdjacent(AtmosDirection direction)
{ {
if (!_gridAtmosphereComponent.IsAirBlocked(GridIndices.Offset(direction.ToDirection()))) _adjacentTiles[direction.ToIndex()] = _gridAtmosphereComponent.GetTile(GridIndices.Offset(direction.ToDirection()));
if (!_gridAtmosphereComponent.IsAirBlocked(GridIndices.Offset(direction.ToDirection()), direction.GetOpposite()))
{ {
_adjacentTiles[direction.ToIndex()] = _gridAtmosphereComponent.GetTile(GridIndices.Offset(direction.ToDirection())); _adjacentBits |= direction;
}
else
{
_adjacentBits &= ~direction;
} }
} }

5
Content.Shared/Atmos/AtmosDirection.cs
View File

@@ -87,6 +87,11 @@ namespace Content.Shared.Atmos
{ {
return direction | other; return direction | other;
} }
public static AtmosDirection WithoutFlag(this AtmosDirection direction, AtmosDirection other)
{
return direction & ~other;
}
} }
public sealed class AtmosDirectionFlags { } public sealed class AtmosDirectionFlags { }

2
Resources/Prototypes/Entities/Constructible/Doors/firelock.yml
View File

@@ -15,6 +15,8 @@
- state: closed_unlit - state: closed_unlit
shader: unshaded shader: unshaded
map: ["enum.DoorVisualLayers.BaseUnlit"] map: ["enum.DoorVisualLayers.BaseUnlit"]
- state: welded
map: ["enum.DoorVisualLayers.BaseWelded"]
- state: bolted - state: bolted
shader: unshaded shader: unshaded
map: ["enum.DoorVisualLayers.BaseBolted"] map: ["enum.DoorVisualLayers.BaseBolted"]