diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs index f41ca44437..925e50b949 100644 --- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs @@ -130,21 +130,18 @@ public sealed class DrinkSystem : EntitySystem private void OnExamined(Entity entity, ref ExaminedEvent args) { - var hasOpenable = TryComp(entity, out var openable); + TryComp(entity, out var openable); if (_openable.IsClosed(entity.Owner, null, openable) || !args.IsInDetailsRange || !entity.Comp.Examinable) return; - // put Empty / Xu after Opened, or start a new line - args.AddMarkup(hasOpenable ? " - " : "\n"); - var empty = IsEmpty(entity, entity.Comp); if (empty) { - args.AddMarkup(Loc.GetString("drink-component-on-examine-is-empty")); + args.PushMarkup(Loc.GetString("drink-component-on-examine-is-empty")); return; } - if (TryComp(entity, out var comp)) + if (HasComp(entity)) { //provide exact measurement for beakers 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), _ => "drink-component-on-examine-is-mostly-empty", }; - args.AddMarkup(Loc.GetString(remainingString)); + args.PushMarkup(Loc.GetString(remainingString)); } }