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

Fix examine text bug for Openable Drinkables (#25478)

Browse Source 
Break up Opened/Closed and fill level onto separate lines
This commit is contained in:
Tayrtahn
2024-02-22 20:04:23 -05:00
committed by GitHub
parent ce0a51fc29
commit 146c7b272d
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
View File

@@ -130,21 +130,18 @@ public sealed class DrinkSystem : EntitySystem
private void OnExamined(Entity<DrinkComponent> entity, ref ExaminedEvent args) private void OnExamined(Entity<DrinkComponent> entity, ref ExaminedEvent args)
{ {
var hasOpenable = TryComp<OpenableComponent>(entity, out var openable); TryComp<OpenableComponent>(entity, out var openable);
if (_openable.IsClosed(entity.Owner, null, openable) || !args.IsInDetailsRange || !entity.Comp.Examinable) if (_openable.IsClosed(entity.Owner, null, openable) || !args.IsInDetailsRange || !entity.Comp.Examinable)
return; return;
// put Empty / Xu after Opened, or start a new line
args.AddMarkup(hasOpenable ? " - " : "\n");
var empty = IsEmpty(entity, entity.Comp); var empty = IsEmpty(entity, entity.Comp);
if (empty) if (empty)
{ {
args.AddMarkup(Loc.GetString("drink-component-on-examine-is-empty")); args.PushMarkup(Loc.GetString("drink-component-on-examine-is-empty"));
return; return;
} }
if (TryComp<ExaminableSolutionComponent>(entity, out var comp)) if (HasComp<ExaminableSolutionComponent>(entity))
{ {
//provide exact measurement for beakers //provide exact measurement for beakers
args.PushText(Loc.GetString("drink-component-on-examine-exact-volume", ("amount", DrinkVolume(entity, entity.Comp)))); args.PushText(Loc.GetString("drink-component-on-examine-exact-volume", ("amount", DrinkVolume(entity, entity.Comp))));
@@ -159,7 +156,7 @@ public sealed class DrinkSystem : EntitySystem
> 33 => HalfEmptyOrHalfFull(args), > 33 => HalfEmptyOrHalfFull(args),
_ => "drink-component-on-examine-is-mostly-empty", _ => "drink-component-on-examine-is-mostly-empty",
}; };
args.AddMarkup(Loc.GetString(remainingString)); args.PushMarkup(Loc.GetString(remainingString));
} }
} }