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

Fix metamorphic glass name mispredict (#16550)

Browse Source
This commit is contained in:
themias
2023-06-30 18:57:28 -04:00
committed by GitHub
parent 69e1c7e7a5
commit 53e9bc8236
4 changed files with 131 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Shared.Chemistry;
using Content.Shared.Chemistry;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.Rounding;
using Robust.Client.GameObjects;
@@ -64,17 +64,12 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionCo
{
_prototype.TryIndex<ReagentPrototype>(baseOverride, out var reagentProto);
var metadata = MetaData(uid);
if (reagentProto?.MetamorphicSprite is { } sprite)
{
args.Sprite.LayerSetSprite(baseLayer, sprite);
args.Sprite.LayerSetVisible(fillLayer, false);
if (hasOverlay)
args.Sprite.LayerSetVisible(overlayLayer, false);
metadata.EntityName = Loc.GetString(component.MetamorphicNameFull,
("name", reagentProto.LocalizedName));
metadata.EntityDescription = reagentProto.LocalizedDescription;
return;
}
else
@@ -82,8 +77,6 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionCo
if (hasOverlay)
args.Sprite.LayerSetVisible(overlayLayer, true);
args.Sprite.LayerSetSprite(baseLayer, component.MetamorphicDefaultSprite);
metadata.EntityName = component.InitialName;
metadata.EntityDescription = component.InitialDescription;
}
}
}