NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Allow t-ray to penetrate carpets and puddles (#25276)

Browse source 
* Allow t-ray to penetrate carpets and puddles

* handle edge cases
This commit is contained in:
themias 2024-02-16 18:37:56 -05:00 • committed by GitHub
parent 1a438e644f
commit d7eb3b1c5c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Content.Client/SubFloor/SubFloorHideSystem.cs
View file

@ -1,3 +1,4 @@
using Content.Shared.DrawDepth;
using Content.Shared.SubFloor;
using Robust.Client.GameObjects;
@ -62,6 +63,18 @@ public sealed class SubFloorHideSystem : SharedSubFloorHideSystem
}
args.Sprite.Visible = hasVisibleLayer || revealed;
// allows a t-ray to show wires/pipes above carpets/puddles
if (scannerRevealed)
{
component.OriginalDrawDepth ??= args.Sprite.DrawDepth;
args.Sprite.DrawDepth = (int) Shared.DrawDepth.DrawDepth.FloorObjects + 1;
}
else if (component.OriginalDrawDepth.HasValue)
{
args.Sprite.DrawDepth = component.OriginalDrawDepth.Value;
component.OriginalDrawDepth = null;
}
}
private void UpdateAll()

7
Content.Shared/SubFloor/SubFloorHideComponent.cs
View file

@ -45,5 +45,12 @@ namespace Content.Shared.SubFloor
/// </summary>
[DataField("visibleLayers")]
public HashSet<Enum> VisibleLayers = new() { SubfloorLayers.FirstLayer };
/// <summary>
/// This is used for storing the original draw depth of a t-ray revealed entity.
/// e.g. when a t-ray revealed cable is drawn above a carpet.
/// </summary>
[DataField]
public int? OriginalDrawDepth;
}
}