From: Tayrtahn <tayrtahn@gmail.com>
Date: Fri, 23 Feb 2024 01:04:23 +0000 (-0500)
Subject: Fix examine text bug for Openable Drinkables (#25478)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=146c7b272d9af2ff68e110211d88c9c3c38b5fd9;p=space-station-14.git

Fix examine text bug for Openable Drinkables (#25478)

Break up Opened/Closed and fill level onto separate lines
---

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<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)
             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<ExaminableSolutionComponent>(entity, out var comp))
+        if (HasComp<ExaminableSolutionComponent>(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));
         }
     }