From b2da9368485530a62a918af6f3b347bc993b69ab Mon Sep 17 00:00:00 2001
From: E F R <602406+Efruit@users.noreply.github.com>
Date: Mon, 13 Dec 2021 02:25:42 +0000
Subject: [PATCH] Everything: Rich text redux (#5625)

* lord save me

* UI/ChatBox: Use the new `defStyle` param for `RenderMarkup`

The previous iteration didn't work because `AddMessage` can't inherit
its color from the PushColor (since we're not doing actual tag stacks
anymore).

* rebase touchup
---
 .../Actions/UI/ActionAlertTooltip.cs          |   5 +-
 Content.Client/Actions/UI/ActionSlot.cs       |   5 +-
 .../Administration/UI/BwoinkWindow.xaml.cs    |   5 +-
 .../Changelog/ChangelogWindow.xaml.cs         |   5 +-
 Content.Client/Chat/Managers/ChatManager.cs   |   3 +-
 Content.Client/Chat/UI/ChatBox.xaml.cs        |   9 +-
 .../ContextMenu/UI/ContextMenuElement.xaml.cs |  10 +-
 Content.Client/Credits/CreditsWindow.xaml.cs  |   3 +-
 Content.Client/Examine/ExamineSystem.cs       |   4 +-
 .../Roles/UI/GhostRoleRulesWindow.xaml.cs     |   5 +-
 Content.Client/HUD/GameHud.cs                 |   3 +-
 Content.Client/Info/RulesAndInfoWindow.cs     |   5 +-
 Content.Client/Info/ServerInfo.cs             |   3 +-
 Content.Client/Message/RichTextLabelExt.cs    |   3 +-
 Content.Client/Paper/UI/PaperWindow.xaml.cs   |   5 +-
 Content.Client/Stylesheets/StyleBase.cs       |  73 +++++++---
 Content.Client/Stylesheets/StyleNano.cs       | 126 ++++++++++++------
 Content.Client/Stylesheets/StyleSpace.cs      |  26 +---
 Content.Server/Administration/BwoinkSystem.cs |   3 +-
 .../Atmos/Components/GasTankComponent.cs      |   3 +-
 .../Botany/Components/PlantHolderComponent.cs |   3 +-
 .../Botany/Components/SeedComponent.cs        |   3 +-
 Content.Server/Chat/Managers/ChatManager.cs   |  17 +--
 .../Components/MachineBoardComponent.cs       |   3 +-
 .../Components/MachinePartComponent.cs        |   3 +-
 .../Conditions/MachineFrameComplete.cs        |   1 +
 Content.Server/Examine/ExamineSystem.cs       |   7 +-
 Content.Server/Headset/HeadsetComponent.cs    |   2 +-
 Content.Server/Labels/Label/LabelSystem.cs    |   5 +-
 .../Components/EmergencyLightComponent.cs     |   5 +-
 .../Components/HandheldLightComponent.cs      |   3 +-
 .../Mind/Components/MindComponent.cs          |   3 +-
 .../CrematoriumEntityStorageComponent.cs      |   3 +-
 .../MorgueEntityStorageComponent.cs           |   3 +-
 .../NodeContainer/NodeContainerComponent.cs   |  23 ++--
 .../Nutrition/EntitySystems/DrinkSystem.cs    |   1 +
 Content.Server/Paper/PaperComponent.cs        |   3 +-
 .../Components/ApcPowerReceiverComponent.cs   |   3 +-
 .../Components/ExaminableBatteryComponent.cs  |   3 +-
 .../Components/PowerCellComponent.cs          |   3 +-
 .../Components/PowerCellSlotComponent.cs      |   3 +-
 .../Components/HandheldRadioComponent.cs      |   3 +-
 .../Suspicion/SuspicionRoleComponent.cs       |   3 +-
 Content.Server/Toilet/ToiletComponent.cs      |   3 +-
 Content.Server/Warps/WarpPointComponent.cs    |   3 +-
 .../Ammunition/Components/AmmoBoxComponent.cs |   3 +-
 .../Ammunition/Components/AmmoComponent.cs    |   3 +-
 .../Components/RangedMagazineComponent.cs     |   3 +-
 .../Components/BoltActionBarrelComponent.cs   |   3 +-
 .../Barrels/Components/PumpBarrelComponent.cs |   3 +-
 .../ServerMagazineBarrelComponent.cs          |   3 +-
 .../Components/ServerRangedBarrelComponent.cs |   3 +-
 Content.Server/Window/WindowComponent.cs      |   3 +-
 Content.Server/WireHacking/WiresComponent.cs  |   3 +-
 .../Actions/Prototypes/BaseActionPrototype.cs |  10 +-
 Content.Shared/Alert/AlertPrototype.cs        |   4 +-
 .../ArbitraryInsertConstructionGraphStep.cs   |   3 +-
 .../Steps/ComponentConstructionGraphStep.cs   |  17 ++-
 .../Steps/MaterialConstructionGraphStep.cs    |   3 +-
 .../Steps/PrototypeConstructionGraphStep.cs   |   6 +-
 Content.Shared/Examine/ExamineSystemShared.cs |  33 ++---
 61 files changed, 305 insertions(+), 214 deletions(-)

diff --git a/Content.Client/Actions/UI/ActionAlertTooltip.cs b/Content.Client/Actions/UI/ActionAlertTooltip.cs
index b64faa56b1..6a6dd268fe 100644
--- a/Content.Client/Actions/UI/ActionAlertTooltip.cs
+++ b/Content.Client/Actions/UI/ActionAlertTooltip.cs
@@ -4,6 +4,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.IoC;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Actions.UI
@@ -68,7 +69,7 @@ namespace Content.Client.Actions.UI
                     MaxWidth = TooltipTextMaxWidth,
                     StyleClasses = {StyleNano.StyleClassTooltipActionRequirements}
                 };
-                requiresLabel.SetMessage(FormattedMessage.FromMarkup("[color=#635c5c]" +
+                requiresLabel.SetMessage(Basic.RenderMarkup("[color=#635c5c]" +
                                                                      requires +
                                                                      "[/color]"));
                 vbox.AddChild(requiresLabel);
@@ -88,7 +89,7 @@ namespace Content.Client.Actions.UI
             if (timeLeft > TimeSpan.Zero)
             {
                 var duration = Cooldown.Value.End - Cooldown.Value.Start;
-                _cooldownLabel.SetMessage(FormattedMessage.FromMarkup(
+                _cooldownLabel.SetMessage(Basic.RenderMarkup(
                     $"[color=#a10505]{duration.Seconds} sec cooldown ({timeLeft.Seconds + 1} sec remaining)[/color]"));
                 _cooldownLabel.Visible = true;
             }
diff --git a/Content.Client/Actions/UI/ActionSlot.cs b/Content.Client/Actions/UI/ActionSlot.cs
index b6fc2bb2c4..c8fba1f50f 100644
--- a/Content.Client/Actions/UI/ActionSlot.cs
+++ b/Content.Client/Actions/UI/ActionSlot.cs
@@ -16,6 +16,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Actions.UI
@@ -478,10 +479,10 @@ namespace Content.Client.Actions.UI
 
         private FormattedMessage SlotNumberLabel()
         {
-            if (SlotNumber > 10) return FormattedMessage.FromMarkup("");
+            if (SlotNumber > 10) return FormattedMessage.Empty;
             var number = Loc.GetString(SlotNumber == 10 ? "0" : SlotNumber.ToString());
             var color = (ActionEnabled || !HasAssignment) ? EnabledColor : DisabledColor;
-            return FormattedMessage.FromMarkup("[color=" + color + "]" + number + "[/color]");
+            return Basic.RenderMarkup("[color=" + color + "]" + number + "[/color]");
         }
 
         private void UpdateIcons()
diff --git a/Content.Client/Administration/UI/BwoinkWindow.xaml.cs b/Content.Client/Administration/UI/BwoinkWindow.xaml.cs
index c3f000f6ca..7586a10649 100644
--- a/Content.Client/Administration/UI/BwoinkWindow.xaml.cs
+++ b/Content.Client/Administration/UI/BwoinkWindow.xaml.cs
@@ -18,6 +18,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using Robust.Shared.Network;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Utility.Markup;
 using YamlDotNet.RepresentationModel;
 
 namespace Content.Client.Administration.UI
@@ -58,9 +59,7 @@ namespace Content.Client.Administration.UI
 
         public void ReceiveLine(string text)
         {
-            var formatted = new FormattedMessage(1);
-            formatted.AddMarkup(text);
-            TextOutput.AddMessage(formatted);
+            TextOutput.AddMessage(Basic.RenderMarkup(text));
         }
     }
 }
diff --git a/Content.Client/Changelog/ChangelogWindow.xaml.cs b/Content.Client/Changelog/ChangelogWindow.xaml.cs
index a1b2d65eac..c66546a082 100644
--- a/Content.Client/Changelog/ChangelogWindow.xaml.cs
+++ b/Content.Client/Changelog/ChangelogWindow.xaml.cs
@@ -14,6 +14,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using static Content.Client.Changelog.ChangelogManager;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 
@@ -146,13 +147,13 @@ namespace Content.Client.Changelog
                         Margin = new Thickness(6, 0, 0, 0),
                     };
                     authorLabel.SetMessage(
-                        FormattedMessage.FromMarkup(Loc.GetString("changelog-author-changed", ("author", author))));
+                        Basic.RenderMarkup(Loc.GetString("changelog-author-changed", ("author", author))));
                     ChangelogBody.AddChild(authorLabel);
 
                     foreach (var change in groupedEntry.SelectMany(c => c.Changes))
                     {
                         var text = new RichTextLabel();
-                        text.SetMessage(FormattedMessage.FromMarkup(change.Message));
+                        text.SetMessage(Basic.RenderMarkup(change.Message));
                         ChangelogBody.AddChild(new BoxContainer
                         {
                             Orientation = LayoutOrientation.Horizontal,
diff --git a/Content.Client/Chat/Managers/ChatManager.cs b/Content.Client/Chat/Managers/ChatManager.cs
index 60ea578aa1..34625be899 100644
--- a/Content.Client/Chat/Managers/ChatManager.cs
+++ b/Content.Client/Chat/Managers/ChatManager.cs
@@ -21,6 +21,7 @@ using Robust.Shared.Log;
 using Robust.Shared.Network;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Client.Chat.Managers
 {
@@ -420,7 +421,7 @@ namespace Content.Client.Chat.Managers
                 return;
             }
 
-            var messages = SplitMessage(FormattedMessage.RemoveMarkup(msg.Message));
+            var messages = SplitMessage(Basic.RenderMarkup(msg.Message).ToString());
 
             foreach (var message in messages)
             {
diff --git a/Content.Client/Chat/UI/ChatBox.xaml.cs b/Content.Client/Chat/UI/ChatBox.xaml.cs
index 0199d0666a..d961cb3987 100644
--- a/Content.Client/Chat/UI/ChatBox.xaml.cs
+++ b/Content.Client/Chat/UI/ChatBox.xaml.cs
@@ -18,6 +18,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Client.Chat.UI
 {
@@ -395,7 +396,7 @@ namespace Content.Client.Chat.UI
 
         private void WriteChatMessage(StoredChatMessage message)
         {
-            var messageText = FormattedMessage.EscapeText(message.Message);
+            var messageText = Basic.EscapeText(message.Message);
             if (!string.IsNullOrEmpty(message.MessageWrap))
             {
                 messageText = string.Format(message.MessageWrap, messageText);
@@ -502,11 +503,7 @@ namespace Content.Client.Chat.UI
         {
             DebugTools.Assert(!Disposed);
 
-            var formatted = new FormattedMessage(3);
-            formatted.PushColor(color);
-            formatted.AddMarkup(message);
-            formatted.Pop();
-            Contents.AddMessage(formatted);
+            Contents.AddMessage(Basic.RenderMarkup(message, new Section{Color=color.ToArgb()}));
         }
 
         private void Input_OnTextEntered(LineEdit.LineEditEventArgs args)
diff --git a/Content.Client/ContextMenu/UI/ContextMenuElement.xaml.cs b/Content.Client/ContextMenu/UI/ContextMenuElement.xaml.cs
index c186e27fd5..2caba4ec71 100644
--- a/Content.Client/ContextMenu/UI/ContextMenuElement.xaml.cs
+++ b/Content.Client/ContextMenu/UI/ContextMenuElement.xaml.cs
@@ -7,6 +7,7 @@ using Robust.Client.UserInterface.XAML;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Client.ContextMenu.UI
 {
@@ -45,7 +46,14 @@ namespace Content.Client.ContextMenu.UI
         /// <summary>
         ///     Convenience property to set label text.
         /// </summary>
-        public string Text { set => Label.SetMessage(FormattedMessage.FromMarkupPermissive(value.Trim())); }
+        public string Text {
+            set
+            {
+                var b = new Basic();
+                b.AddMarkupPermissive(value.Trim());
+                Label.SetMessage(b.Render());
+            }
+        }
 
         public ContextMenuElement(string? text = null)
         {
diff --git a/Content.Client/Credits/CreditsWindow.xaml.cs b/Content.Client/Credits/CreditsWindow.xaml.cs
index 2cd65733e9..cbf9ebe93c 100644
--- a/Content.Client/Credits/CreditsWindow.xaml.cs
+++ b/Content.Client/Credits/CreditsWindow.xaml.cs
@@ -15,6 +15,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using YamlDotNet.RepresentationModel;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 
@@ -143,7 +144,7 @@ namespace Content.Client.Credits
                 var text = _resourceManager.ContentFileReadAllText($"/Credits/{path}");
                 if (markup)
                 {
-                    label.SetMessage(FormattedMessage.FromMarkup(text.Trim()));
+                    label.SetMessage(Basic.RenderMarkup(text.Trim()));
                 }
                 else
                 {
diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs
index d3c3c90eaa..58fc9fc05f 100644
--- a/Content.Client/Examine/ExamineSystem.cs
+++ b/Content.Client/Examine/ExamineSystem.cs
@@ -181,9 +181,9 @@ namespace Content.Client.Examine
                 message = response.Message;
             }
 
-            foreach (var msg in message.Tags.OfType<FormattedMessage.TagText>())
+            foreach (var msg in message.Sections)
             {
-                if (string.IsNullOrWhiteSpace(msg.Text)) continue;
+                if (string.IsNullOrWhiteSpace(msg.Content)) continue;
 
                 var richLabel = new RichTextLabel();
                 richLabel.SetMessage(message);
diff --git a/Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml.cs b/Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml.cs
index 307c47dded..8aec632f6b 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml.cs
+++ b/Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml.cs
@@ -7,6 +7,7 @@ using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Localization;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Client.Ghost.Roles.UI
 {
@@ -17,7 +18,9 @@ namespace Content.Client.Ghost.Roles.UI
         public GhostRoleRulesWindow(string rules, Action<BaseButton.ButtonEventArgs> requestAction)
         {
             RobustXamlLoader.Load(this);
-            Title.SetMessage(FormattedMessage.FromMarkupPermissive(rules + "\n" + Loc.GetString("ghost-roles-window-rules-footer")));
+            var b = new Basic();
+            b.AddMarkupPermissive(rules + "\n" + Loc.GetString("ghost-roles-window-rules-footer"));
+            Title.SetMessage(b.Render());
             RequestButton.OnPressed += requestAction;
         }
 
diff --git a/Content.Client/HUD/GameHud.cs b/Content.Client/HUD/GameHud.cs
index 6da65b2f20..4fd89226c2 100644
--- a/Content.Client/HUD/GameHud.cs
+++ b/Content.Client/HUD/GameHud.cs
@@ -24,6 +24,7 @@ using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using static Robust.Client.Input.Keyboard.Key;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 using Control = Robust.Client.UserInterface.Control;
@@ -727,7 +728,7 @@ namespace Content.Client.HUD
 
             private string? DefaultShortKeyName(BoundKeyFunction keyFunction)
             {
-                var name = FormattedMessage.EscapeText(_inputManager.GetKeyFunctionButtonString(keyFunction));
+                var name = Basic.EscapeText(_inputManager.GetKeyFunctionButtonString(keyFunction));
                 return name.Length > 3 ? null : name;
             }
 
diff --git a/Content.Client/Info/RulesAndInfoWindow.cs b/Content.Client/Info/RulesAndInfoWindow.cs
index 25f5a8f5d7..5132d674a0 100644
--- a/Content.Client/Info/RulesAndInfoWindow.cs
+++ b/Content.Client/Info/RulesAndInfoWindow.cs
@@ -11,6 +11,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Info
@@ -80,7 +81,7 @@ namespace Content.Client.Info
                 var text = _resourceManager.ContentFileReadAllText($"/Server Info/{path}");
                 if (markup)
                 {
-                    label.SetMessage(FormattedMessage.FromMarkup(text.Trim()));
+                    label.SetMessage(Basic.RenderMarkup(text.Trim()));
                 }
                 else
                 {
@@ -122,7 +123,7 @@ namespace Content.Client.Info
                 var text = _resourceManager.ContentFileReadAllText($"/Server Info/{path}");
                 if (markup)
                 {
-                    label.SetMessage(FormattedMessage.FromMarkup(text.Trim()));
+                    label.SetMessage(Basic.RenderMarkup(text.Trim()));
                 }
                 else
                 {
diff --git a/Content.Client/Info/ServerInfo.cs b/Content.Client/Info/ServerInfo.cs
index d670a43458..16de98b95e 100644
--- a/Content.Client/Info/ServerInfo.cs
+++ b/Content.Client/Info/ServerInfo.cs
@@ -6,6 +6,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Client.Info
 {
@@ -62,7 +63,7 @@ namespace Content.Client.Info
 
         public void SetInfoBlob(string markup)
         {
-            _richTextLabel.SetMessage(FormattedMessage.FromMarkup(markup));
+            _richTextLabel.SetMessage(Basic.RenderMarkup(markup));
         }
     }
 }
diff --git a/Content.Client/Message/RichTextLabelExt.cs b/Content.Client/Message/RichTextLabelExt.cs
index df2c61e306..3f3b8008a8 100644
--- a/Content.Client/Message/RichTextLabelExt.cs
+++ b/Content.Client/Message/RichTextLabelExt.cs
@@ -1,5 +1,6 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Client.Message
 {
@@ -7,7 +8,7 @@ namespace Content.Client.Message
     {
         public static void SetMarkup(this RichTextLabel label, string markup)
         {
-            label.SetMessage(FormattedMessage.FromMarkup(markup));
+            label.SetMessage(Basic.RenderMarkup(markup));
         }
     }
 }
diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs
index a35af8fd10..6dfc11d85b 100644
--- a/Content.Client/Paper/UI/PaperWindow.xaml.cs
+++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs
@@ -4,6 +4,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Client.Paper.UI
 {
@@ -21,9 +22,9 @@ namespace Content.Client.Paper.UI
             {
                 Input.Visible = true;
             }
-            var msg = new FormattedMessage();
+            var msg = new Basic();
             msg.AddMarkupPermissive(state.Text);
-            Label.SetMessage(msg);
+            Label.SetMessage(msg.Render());
         }
     }
 }
diff --git a/Content.Client/Stylesheets/StyleBase.cs b/Content.Client/Stylesheets/StyleBase.cs
index 5804d39134..d5735addbe 100644
--- a/Content.Client/Stylesheets/StyleBase.cs
+++ b/Content.Client/Stylesheets/StyleBase.cs
@@ -4,6 +4,7 @@ using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.Utility;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Stylesheets
@@ -39,28 +40,57 @@ namespace Content.Client.Stylesheets
 
         protected StyleBoxTexture BaseAngleRect { get; }
 
+        protected IFontLibrary FontLib { get; }
+
         protected StyleBase(IResourceCache resCache)
         {
-            var notoSans12 = resCache.GetFont
-            (
-                new []
-                {
-                    "/Fonts/NotoSans/NotoSans-Regular.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols-Regular.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf"
-                },
-                12
-            );
-            var notoSans12Italic = resCache.GetFont
-            (
-                new []
-                {
-                    "/Fonts/NotoSans/NotoSans-Italic.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols-Regular.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf"
-                },
-                12
+            FontLib = new FontLibrary(
+                new FontClass(Id: "notosans", Style: (FontStyle) default, Size: (FontSize) 12)
+            ) as IFontLibrary;
+
+            FontLib.AddFont("notosans",
+                new FontVariant
+                (
+                    FontStyle.Normal,
+                    new []
+                    {
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"),
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSansSymbols-Regular.ttf"),
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf")
+                    }
+                ),
+                new FontVariant
+                (
+                    FontStyle.Italic,
+                    new []
+                    {
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Italic.ttf"),
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSansSymbols-Regular.ttf"),
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf")
+                    }
+                ),
+                new FontVariant
+                (
+                    FontStyle.Bold,
+                    new []
+                    {
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Bold.ttf"),
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSansSymbols-Bold.ttf"),
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf")
+                    }
+                ),
+                new FontVariant
+                (
+                    FontStyle.Bold | FontStyle.Italic,
+                    new []
+                    {
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-BoldItalic.ttf"),
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSansSymbols-Bold.ttf"),
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf")
+                    }
+                )
             );
+
             var textureCloseButton = resCache.GetTexture("/Textures/Interface/Nano/cross.svg.png");
 
             // Button styles.
@@ -151,7 +181,8 @@ namespace Content.Client.Stylesheets
                     new SelectorElement(null, null, null, null),
                     new[]
                     {
-                        new StyleProperty("font", notoSans12),
+                        new StyleProperty("font-library", FontLib),
+                        new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 12)),
                     }),
 
                 // Default font.
@@ -159,7 +190,7 @@ namespace Content.Client.Stylesheets
                     new SelectorElement(null, new[] {StyleClassItalic}, null, null),
                     new[]
                     {
-                        new StyleProperty("font", notoSans12Italic),
+                        new StyleProperty("font", new FontClass("notosans", FontStyle.Italic, (FontSize) 12)),
                     }),
 
                 // Window close button base texture.
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index 5f92cc88c5..56138d2c1d 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -14,6 +14,7 @@ using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Maths;
+using Robust.Shared.Utility;
 using static Robust.Client.UserInterface.StylesheetHelpers;
 
 namespace Content.Client.Stylesheets
@@ -109,19 +110,49 @@ namespace Content.Client.Stylesheets
 
         public StyleNano(IResourceCache resCache) : base(resCache)
         {
-            var notoSans10 = resCache.notoStack(size: 10);
-            var notoSansItalic10 = resCache.notoStack(variation: "Italic", size: 10);
-            var notoSans12 = resCache.notoStack(size: 12);
-            var notoSansItalic12 = resCache.notoStack(variation: "Italic", size: 12);
-            var notoSansBold12 = resCache.notoStack(variation: "Bold", size: 12);
-            var notoSansBoldItalic12 = resCache.notoStack(variation: "BoldItalic", size: 12);
-            var notoSansDisplayBold14 = resCache.notoStack(variation: "Bold", display: true, size: 14);
-            var notoSansDisplayBold16 = resCache.notoStack(variation: "Bold", display: true, size: 16);
-            var notoSans15 = resCache.notoStack(variation: "Regular", size: 15);
-            var notoSans16 = resCache.notoStack(variation: "Regular", size: 16);
-            var notoSansBold16 = resCache.notoStack(variation: "Bold", size: 16);
-            var notoSansBold18 = resCache.notoStack(variation: "Bold", size: 18);
-            var notoSansBold20 = resCache.notoStack(variation: "Bold", size: 20);
+            FontLib.AddFont("notosansdisplay",
+                new FontVariant
+                (
+                    FontStyle.Normal,
+                    new []
+                    {
+                        resCache.GetResource<FontResource>("/Fonts/NotoSansDisplay/NotoSansDisplay-Regular.ttf"),
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSansSymbols-Regular.ttf"),
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf")
+                    }
+                ),
+                new FontVariant
+                (
+                    FontStyle.Bold,
+                    new []
+                    {
+                        resCache.GetResource<FontResource>("/Fonts/NotoSansDisplay/NotoSansDisplay-Bold.ttf"),
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSansSymbols-Regular.ttf"),
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf")
+                    }
+                ),
+                new FontVariant
+                (
+                    FontStyle.Italic,
+                    new []
+                    {
+                        resCache.GetResource<FontResource>("/Fonts/NotoSansDisplay/NotoSansDisplay-Italic.ttf"),
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSansSymbols-Regular.ttf"),
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf")
+                    }
+                ),
+                new FontVariant
+                (
+                    FontStyle.Bold | FontStyle.Italic,
+                    new []
+                    {
+                        resCache.GetResource<FontResource>("/Fonts/NotoSansDisplay/NotoSansDisplay-BoldItalic.ttf"),
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSansSymbols-Bold.ttf"),
+                        resCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf")
+                    }
+                )
+            );
+
             var windowHeaderTex = resCache.GetTexture("/Textures/Interface/Nano/window_header.png");
             var windowHeader = new StyleBoxTexture
             {
@@ -428,7 +459,16 @@ namespace Content.Client.Stylesheets
             var sliderFillRed = new StyleBoxTexture(sliderFillBox) {Modulate = Color.Red};
             var sliderFillBlue = new StyleBoxTexture(sliderFillBox) {Modulate = Color.Blue};
 
-            var boxFont13 = resCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13);
+            FontLib.AddFont("box",
+                    new FontVariant
+                    (
+                        (FontStyle) default,
+                        new []
+                        {
+                            resCache.GetResource<FontResource>("/Fonts/Boxfont-round/Boxfont Round.ttf")
+                        }
+                    )
+            );
 
             var insetBack = new StyleBoxTexture
             {
@@ -445,7 +485,7 @@ namespace Content.Client.Stylesheets
                     new[]
                     {
                         new StyleProperty(Label.StylePropertyFontColor, NanoGold),
-                        new StyleProperty(Label.StylePropertyFont, notoSansDisplayBold14),
+                        new StyleProperty(Label.StylePropertyFont, new FontClass("notosansdisplay", FontStyle.Bold, (FontSize) 14)),
                     }),
                 // Alert (white) window title.
                 new StyleRule(
@@ -453,7 +493,7 @@ namespace Content.Client.Stylesheets
                     new[]
                     {
                         new StyleProperty(Label.StylePropertyFontColor, Color.White),
-                        new StyleProperty(Label.StylePropertyFont, notoSansDisplayBold14),
+                        new StyleProperty(Label.StylePropertyFont, new FontClass("notosansdisplay", FontStyle.Bold, (FontSize) 14)),
                     }),
                 // Window background.
                 new StyleRule(
@@ -603,16 +643,16 @@ namespace Content.Client.Stylesheets
 
                 // Context Menu Labels
                 Element<RichTextLabel>().Class(VerbMenuElement.StyleClassVerbInteractionText)
-                    .Prop(Label.StylePropertyFont, notoSansBoldItalic12),
+                    .Prop(Label.StylePropertyFont, new FontClass("notosans", FontStyle.Bold | FontStyle.Italic, (FontSize) 12)),
 
                 Element<RichTextLabel>().Class(VerbMenuElement.StyleClassVerbActivationText)
-                    .Prop(Label.StylePropertyFont, notoSansBold12),
+                    .Prop(Label.StylePropertyFont, new FontClass("notosans", FontStyle.Bold, (FontSize) 12)),
 
                 Element<RichTextLabel>().Class(VerbMenuElement.StyleClassVerbAlternativeText)
-                    .Prop(Label.StylePropertyFont, notoSansItalic12),
+                    .Prop(Label.StylePropertyFont, new FontClass("notosans", FontStyle.Italic, (FontSize) 12)),
 
                 Element<RichTextLabel>().Class(VerbMenuElement.StyleClassVerbOtherText)
-                    .Prop(Label.StylePropertyFont, notoSans12),
+                    .Prop(Label.StylePropertyFont, new FontClass("notosans", (FontStyle) default, (FontSize) 12)),
 
                 // Thin buttons (No padding nor vertical margin)
                 Element<EntityContainerButton>().Class(StyleClassStorageButton)
@@ -677,7 +717,7 @@ namespace Content.Client.Stylesheets
                     new SelectorElement(typeof(Label), null, null, null)),
                     new[]
                     {
-                        new StyleProperty("font", notoSansBold16),
+                        new StyleProperty("font", new FontClass("notosans", FontStyle.Bold, (FontSize) 16)),
                     }),
 
                 // Main menu: also make those buttons slightly more separated.
@@ -783,52 +823,52 @@ namespace Content.Client.Stylesheets
                     new SelectorElement(typeof(RichTextLabel), null, null, null)),
                     new[]
                 {
-                    new StyleProperty("font", notoSansItalic12),
+                    new StyleProperty("font", new FontClass("notosans", FontStyle.Italic, (FontSize) 12)),
                 }),
 
                 // alert tooltip
                 new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipAlertTitle}, null, null), new[]
                 {
-                    new StyleProperty("font", notoSansBold18)
+                    new StyleProperty("font", new FontClass("notosans", FontStyle.Bold, (FontSize) 18))
                 }),
                 new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipAlertDescription}, null, null), new[]
                 {
-                    new StyleProperty("font", notoSans16)
+                    new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 16))
                 }),
                 new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipAlertCooldown}, null, null), new[]
                 {
-                    new StyleProperty("font", notoSans16)
+                    new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 16))
                 }),
 
                 // action tooltip
                 new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipActionTitle}, null, null), new[]
                 {
-                    new StyleProperty("font", notoSansBold16)
+                    new StyleProperty("font", new FontClass("notosans", FontStyle.Bold, (FontSize) 16))
                 }),
                 new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipActionDescription}, null, null), new[]
                 {
-                    new StyleProperty("font", notoSans15)
+                    new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 15))
                 }),
                 new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipActionCooldown}, null, null), new[]
                 {
-                    new StyleProperty("font", notoSans15)
+                    new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 15))
                 }),
                 new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipActionRequirements}, null, null), new[]
                 {
-                    new StyleProperty("font", notoSans15)
+                    new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 15))
                 }),
 
                 // small number for the entity counter in the entity menu
                 new StyleRule(new SelectorElement(typeof(Label), new[] {EntityMenuElement.StyleClassEntityMenuCountText}, null, null), new[]
                 {
-                    new StyleProperty("font", notoSans10),
+                    new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 10)),
                     new StyleProperty(Label.StylePropertyAlignMode, Label.AlignMode.Right),
                 }),
 
                 // hotbar slot
                 new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassHotbarSlotNumber}, null, null), new[]
                 {
-                    new StyleProperty("font", notoSansDisplayBold16)
+                    new StyleProperty("font", new FontClass("notosansdisplay", FontStyle.Bold, (FontSize) 16))
                 }),
 
                 // Entity tooltip
@@ -885,14 +925,14 @@ namespace Content.Client.Stylesheets
                 new StyleRule(
                     new SelectorElement(typeof(Label), new[] {Placeholder.StyleClassPlaceholderText}, null, null), new[]
                     {
-                        new StyleProperty(Label.StylePropertyFont, notoSans16),
+                        new StyleProperty(Label.StylePropertyFont, new FontClass("notosans", (FontStyle) default, (FontSize) 16)),
                         new StyleProperty(Label.StylePropertyFontColor, new Color(103, 103, 103, 128)),
                     }),
 
                 // Big Label
                 new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassLabelHeading}, null, null), new[]
                 {
-                    new StyleProperty(Label.StylePropertyFont, notoSansBold16),
+                    new StyleProperty(Label.StylePropertyFont, new FontClass("notosans", FontStyle.Bold, (FontSize) 16)),
                     new StyleProperty(Label.StylePropertyFontColor, NanoGold),
                 }),
 
@@ -900,28 +940,28 @@ namespace Content.Client.Stylesheets
                 new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassLabelHeadingBigger}, null, null),
                     new[]
                     {
-                        new StyleProperty(Label.StylePropertyFont, notoSansBold20),
+                        new StyleProperty(Label.StylePropertyFont, new FontClass("notosans", FontStyle.Bold, (FontSize) 20)),
                         new StyleProperty(Label.StylePropertyFontColor, NanoGold),
                     }),
 
                 // Small Label
                 new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassLabelSubText}, null, null), new[]
                 {
-                    new StyleProperty(Label.StylePropertyFont, notoSans10),
+                    new StyleProperty(Label.StylePropertyFont, new FontClass("notosans", (FontStyle) default, (FontSize) 10)),
                     new StyleProperty(Label.StylePropertyFontColor, Color.DarkGray),
                 }),
 
                 // Label Key
                 new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassLabelKeyText}, null, null), new[]
                 {
-                    new StyleProperty(Label.StylePropertyFont, notoSansBold12),
+                    new StyleProperty(Label.StylePropertyFont, new FontClass("notosans", FontStyle.Bold, (FontSize) 12)),
                     new StyleProperty(Label.StylePropertyFontColor, NanoGold)
                 }),
 
                 new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassLabelSecondaryColor}, null, null),
                     new[]
                     {
-                        new StyleProperty(Label.StylePropertyFont, notoSans12),
+                        new StyleProperty(Label.StylePropertyFont, new FontClass("notosans", (FontStyle) default, (FontSize) 12)),
                         new StyleProperty(Label.StylePropertyFontColor, Color.DarkGray),
                     }),
 
@@ -931,14 +971,14 @@ namespace Content.Client.Stylesheets
                     new SelectorElement(typeof(Label), null, null, null)),
                     new[]
                     {
-                        new StyleProperty("font", notoSans16)
+                        new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 16))
                     }),
 
                 // Popup messages
                 new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassPopupMessage}, null, null),
                     new[]
                     {
-                        new StyleProperty("font", notoSansItalic10),
+                        new StyleProperty("font", new FontClass("notosans", FontStyle.Italic, (FontSize) 10)),
                         new StyleProperty("font-color", Color.LightGray),
                     }),
 
@@ -1029,7 +1069,7 @@ namespace Content.Client.Stylesheets
                     new SelectorElement(typeof(Label), new[] {GameHud.TopButton.StyleClassLabelTopButton}, null, null),
                     new[]
                     {
-                        new StyleProperty(Label.StylePropertyFont, notoSansDisplayBold14),
+                        new StyleProperty(Label.StylePropertyFont, new FontClass("notosansdisplay", FontStyle.Bold, (FontSize) 14)),
                     }),
 
                 // Targeting doll
@@ -1079,13 +1119,13 @@ namespace Content.Client.Stylesheets
                     SelectorElement.Class(StyleClassLabelBig),
                     new[]
                     {
-                        new StyleProperty("font", notoSans16),
+                        new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 16)),
                     }),
 
                 // StyleClassItemStatus
                 new StyleRule(SelectorElement.Class(StyleClassItemStatus), new[]
                 {
-                    new StyleProperty("font", notoSans10),
+                    new StyleProperty("font", new FontClass("notosans", (FontStyle) default, (FontSize) 10)),
                 }),
 
                 // Slider
@@ -1190,7 +1230,7 @@ namespace Content.Client.Stylesheets
                     }),
 
                 Element<Label>().Class("FancyWindowTitle")
-                    .Prop("font", boxFont13)
+                    .Prop("font", new FontClass("boxfont", (FontStyle) default, (FontSize) 13))
                     .Prop("font-color", NanoGold),
 
                 Element<PanelContainer>().Class("WindowHeadingBackground")
diff --git a/Content.Client/Stylesheets/StyleSpace.cs b/Content.Client/Stylesheets/StyleSpace.cs
index ef3713fb34..4496dd2646 100644
--- a/Content.Client/Stylesheets/StyleSpace.cs
+++ b/Content.Client/Stylesheets/StyleSpace.cs
@@ -5,6 +5,7 @@ using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Maths;
+using Robust.Shared.Utility;
 using static Robust.Client.UserInterface.StylesheetHelpers;
 
 namespace Content.Client.Stylesheets
@@ -27,27 +28,6 @@ namespace Content.Client.Stylesheets
 
         public StyleSpace(IResourceCache resCache) : base(resCache)
         {
-            var notoSans10 = resCache.GetFont
-            (
-                new []
-                {
-                    "/Fonts/NotoSans/NotoSans-Regular.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols-Regular.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf"
-                },
-                10
-            );
-            var notoSansBold16 = resCache.GetFont
-            (
-                new []
-                {
-                    "/Fonts/NotoSans/NotoSans-Bold.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols-Regular.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf"
-                },
-                16
-            );
-
             var progressBarBackground = new StyleBoxFlat
             {
                 BackgroundColor = new Color(0.25f, 0.25f, 0.25f)
@@ -65,11 +45,11 @@ namespace Content.Client.Stylesheets
             Stylesheet = new Stylesheet(BaseRules.Concat(new StyleRule[]
             {
                 Element<Label>().Class(StyleClassLabelHeading)
-                    .Prop(Label.StylePropertyFont, notoSansBold16)
+                    .Prop(Label.StylePropertyFont, new FontClass("notosans", FontStyle.Bold, (FontSize) 16))
                     .Prop(Label.StylePropertyFontColor, SpaceRed),
 
                 Element<Label>().Class(StyleClassLabelSubText)
-                    .Prop(Label.StylePropertyFont, notoSans10)
+                    .Prop(Label.StylePropertyFont, new FontClass("notosans", FontStyle.Normal, (FontSize) 10))
                     .Prop(Label.StylePropertyFontColor, Color.DarkGray),
 
                 Element<PanelContainer>().Class(ClassHighDivider)
diff --git a/Content.Server/Administration/BwoinkSystem.cs b/Content.Server/Administration/BwoinkSystem.cs
index 6f1ab75f18..b2eac4020c 100644
--- a/Content.Server/Administration/BwoinkSystem.cs
+++ b/Content.Server/Administration/BwoinkSystem.cs
@@ -14,6 +14,7 @@ using Robust.Shared.Localization;
 using Robust.Server.Player;
 using Robust.Shared.IoC;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Server.Administration
 {
@@ -39,7 +40,7 @@ namespace Content.Server.Administration
                 return;
             }
 
-            var escapedText = FormattedMessage.EscapeText(message.Text);
+            var escapedText = Basic.EscapeText(message.Text);
 
             var bwoinkText = senderAdmin
                 ? $"[color=red]{senderSession.Name}[/color]: {escapedText}"
diff --git a/Content.Server/Atmos/Components/GasTankComponent.cs b/Content.Server/Atmos/Components/GasTankComponent.cs
index b9d5d1a6b6..c74e1e3f8a 100644
--- a/Content.Server/Atmos/Components/GasTankComponent.cs
+++ b/Content.Server/Atmos/Components/GasTankComponent.cs
@@ -24,6 +24,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Atmos.Components
@@ -108,7 +109,7 @@ namespace Content.Server.Atmos.Components
             UpdateUserInterface(true);
         }
 
-        public void Examine(FormattedMessage message, bool inDetailsRange)
+        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             message.AddMarkup(Loc.GetString("comp-gas-tank-examine", ("pressure", Math.Round(Air?.Pressure ?? 0))));
             if (IsConnected)
diff --git a/Content.Server/Botany/Components/PlantHolderComponent.cs b/Content.Server/Botany/Components/PlantHolderComponent.cs
index 9c15a5e5ab..eb85a822bc 100644
--- a/Content.Server/Botany/Components/PlantHolderComponent.cs
+++ b/Content.Server/Botany/Components/PlantHolderComponent.cs
@@ -29,6 +29,7 @@ using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Botany.Components
@@ -843,7 +844,7 @@ namespace Content.Server.Botany.Components
             DoHarvest(eventArgs.User);
         }
 
-        public void Examine(FormattedMessage message, bool inDetailsRange)
+        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             if (!inDetailsRange)
                 return;
diff --git a/Content.Server/Botany/Components/SeedComponent.cs b/Content.Server/Botany/Components/SeedComponent.cs
index 5131e76117..9401580ed1 100644
--- a/Content.Server/Botany/Components/SeedComponent.cs
+++ b/Content.Server/Botany/Components/SeedComponent.cs
@@ -5,6 +5,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Botany.Components
@@ -26,7 +27,7 @@ namespace Content.Server.Botany.Components
             set => _seedName = value?.ID;
         }
 
-        public void Examine(FormattedMessage message, bool inDetailsRange)
+        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             if (!inDetailsRange)
                 return;
diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs
index 02cb35f2f4..5ca48f412a 100644
--- a/Content.Server/Chat/Managers/ChatManager.cs
+++ b/Content.Server/Chat/Managers/ChatManager.cs
@@ -25,6 +25,7 @@ using Robust.Shared.Log;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using static Content.Server.Chat.Managers.IChatManager;
 
 namespace Content.Server.Chat.Managers
@@ -192,7 +193,7 @@ namespace Content.Server.Chat.Managers
             var listeners = EntitySystem.Get<ListeningSystem>();
             listeners.PingListeners(source, message);
 
-            message = FormattedMessage.EscapeText(message);
+            message = Basic.EscapeText(message);
 
             var msg = _netManager.CreateNetMessage<MsgChatMessage>();
             msg.Channel = ChatChannel.Local;
@@ -223,7 +224,7 @@ namespace Content.Server.Chat.Managers
                 return;
             }
 
-            action = FormattedMessage.EscapeText(action);
+            action = Basic.EscapeText(action);
 
             var clients = Filter.Empty()
                 .AddInRange(_entManager.GetComponent<TransformComponent>(source).MapPosition, VoiceRange)
@@ -260,7 +261,7 @@ namespace Content.Server.Chat.Managers
                 return;
             }
 
-            message = FormattedMessage.EscapeText(message);
+            message = Basic.EscapeText(message);
 
             var msg = _netManager.CreateNetMessage<MsgChatMessage>();
             msg.Channel = ChatChannel.OOC;
@@ -292,7 +293,7 @@ namespace Content.Server.Chat.Managers
                 return;
             }
 
-            message = FormattedMessage.EscapeText(message);
+            message = Basic.EscapeText(message);
 
             var clients = GetDeadChatClients();
 
@@ -319,7 +320,7 @@ namespace Content.Server.Chat.Managers
                 return;
             }
 
-            message = FormattedMessage.EscapeText(message);
+            message = Basic.EscapeText(message);
 
             var clients = GetDeadChatClients();
 
@@ -350,7 +351,7 @@ namespace Content.Server.Chat.Managers
                 return;
             }
 
-            message = FormattedMessage.EscapeText(message);
+            message = Basic.EscapeText(message);
 
             var clients = _adminManager.ActiveAdmins.Select(p => p.ConnectedClient);
 
@@ -368,7 +369,7 @@ namespace Content.Server.Chat.Managers
         {
             var clients = _adminManager.ActiveAdmins.Select(p => p.ConnectedClient);
 
-            message = FormattedMessage.EscapeText(message);
+            message = Basic.EscapeText(message);
 
             var msg = _netManager.CreateNetMessage<MsgChatMessage>();
 
@@ -382,7 +383,7 @@ namespace Content.Server.Chat.Managers
 
         public void SendHookOOC(string sender, string message)
         {
-            message = FormattedMessage.EscapeText(message);
+            message = Basic.EscapeText(message);
 
             var msg = _netManager.CreateNetMessage<MsgChatMessage>();
             msg.Channel = ChatChannel.OOC;
diff --git a/Content.Server/Construction/Components/MachineBoardComponent.cs b/Content.Server/Construction/Components/MachineBoardComponent.cs
index 9a9cfda649..ec35a75928 100644
--- a/Content.Server/Construction/Components/MachineBoardComponent.cs
+++ b/Content.Server/Construction/Components/MachineBoardComponent.cs
@@ -8,6 +8,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Construction.Components
@@ -53,7 +54,7 @@ namespace Content.Server.Construction.Components
             }
         }
 
-        public void Examine(FormattedMessage message, bool inDetailsRange)
+        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             message.AddMarkup(Loc.GetString("machine-board-component-on-examine-label") + "\n");
             foreach (var (part, amount) in Requirements)
diff --git a/Content.Server/Construction/Components/MachinePartComponent.cs b/Content.Server/Construction/Components/MachinePartComponent.cs
index d5f129df3f..afe2c722b8 100644
--- a/Content.Server/Construction/Components/MachinePartComponent.cs
+++ b/Content.Server/Construction/Components/MachinePartComponent.cs
@@ -4,6 +4,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Construction.Components
@@ -38,7 +39,7 @@ namespace Content.Server.Construction.Components
         [DataField("rating")]
         public int Rating { get; private set; } = 1;
 
-        public void Examine(FormattedMessage message, bool inDetailsRange)
+        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             message.AddMarkup(Loc.GetString("machine-part-component-on-examine-rating-text", ("rating", Rating)) + "\n");
             message.AddMarkup(Loc.GetString("machine-part-component-on-examine-type-text", ("type", PartType)) + "\n");
diff --git a/Content.Server/Construction/Conditions/MachineFrameComplete.cs b/Content.Server/Construction/Conditions/MachineFrameComplete.cs
index 7e4fec885a..b23763cdff 100644
--- a/Content.Server/Construction/Conditions/MachineFrameComplete.cs
+++ b/Content.Server/Construction/Conditions/MachineFrameComplete.cs
@@ -9,6 +9,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Server.Construction.Conditions
 {
diff --git a/Content.Server/Examine/ExamineSystem.cs b/Content.Server/Examine/ExamineSystem.cs
index eb91139539..006f2c8e67 100644
--- a/Content.Server/Examine/ExamineSystem.cs
+++ b/Content.Server/Examine/ExamineSystem.cs
@@ -5,17 +5,18 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Server.Examine
 {
     [UsedImplicitly]
     public class ExamineSystem : ExamineSystemShared
     {
-        private static readonly FormattedMessage _entityNotFoundMessage;
+        private static readonly FormattedMessage.Builder _entityNotFoundMessage;
 
         static ExamineSystem()
         {
-            _entityNotFoundMessage = new FormattedMessage();
+            _entityNotFoundMessage = new FormattedMessage.Builder();
             _entityNotFoundMessage.AddText(Loc.GetString("examine-system-entity-does-not-exist"));
         }
 
@@ -39,7 +40,7 @@ namespace Content.Server.Examine
                 || !CanExamine(playerEnt, request.EntityUid))
             {
                 RaiseNetworkEvent(new ExamineSystemMessages.ExamineInfoResponseMessage(
-                    request.EntityUid, _entityNotFoundMessage), channel);
+                    request.EntityUid, _entityNotFoundMessage.Build()), channel);
                 return;
             }
 
diff --git a/Content.Server/Headset/HeadsetComponent.cs b/Content.Server/Headset/HeadsetComponent.cs
index 7ebed04056..3e825abc54 100644
--- a/Content.Server/Headset/HeadsetComponent.cs
+++ b/Content.Server/Headset/HeadsetComponent.cs
@@ -86,7 +86,7 @@ namespace Content.Server.Headset
             RadioRequested = false;
         }
 
-        public void Examine(FormattedMessage message, bool inDetailsRange)
+        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             message.AddText(Loc.GetString("examine-radio-frequency", ("frequency", BroadcastFrequency)));
             message.AddText("\n");
diff --git a/Content.Server/Labels/Label/LabelSystem.cs b/Content.Server/Labels/Label/LabelSystem.cs
index d5eb619def..3fc98966ab 100644
--- a/Content.Server/Labels/Label/LabelSystem.cs
+++ b/Content.Server/Labels/Label/LabelSystem.cs
@@ -9,6 +9,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Server.Labels
 {
@@ -55,9 +56,7 @@ namespace Content.Server.Labels
             if (label.CurrentLabel == null)
                 return;
 
-            var message = new FormattedMessage();
-            message.AddText(Loc.GetString("hand-labeler-has-label", ("label", label.CurrentLabel)));
-            args.PushMessage(message);
+            args.Message.AddText(Loc.GetString("hand-labeler-has-label", ("label", label.CurrentLabel)));
         }
 
         private void OnExamined(EntityUid uid, PaperLabelComponent comp, ExaminedEvent args)
diff --git a/Content.Server/Light/Components/EmergencyLightComponent.cs b/Content.Server/Light/Components/EmergencyLightComponent.cs
index 23fd78c9eb..7a7d409625 100644
--- a/Content.Server/Light/Components/EmergencyLightComponent.cs
+++ b/Content.Server/Light/Components/EmergencyLightComponent.cs
@@ -9,6 +9,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Light.Components
@@ -148,9 +149,9 @@ namespace Content.Server.Light.Components
             }
         }
 
-        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
-            message.AddMarkup(Loc.GetString("emergency-light-component-on-examine",("batteryStateText", Loc.GetString(BatteryStateText[State]))));
+            message.AddMessage(Basic.BuildMarkup(Loc.GetString("emergency-light-component-on-examine",("batteryStateText", Loc.GetString(BatteryStateText[State])))));
         }
 
         public enum EmergencyLightState
diff --git a/Content.Server/Light/Components/HandheldLightComponent.cs b/Content.Server/Light/Components/HandheldLightComponent.cs
index dc8b6d7560..4603f82c28 100644
--- a/Content.Server/Light/Components/HandheldLightComponent.cs
+++ b/Content.Server/Light/Components/HandheldLightComponent.cs
@@ -22,6 +22,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Light.Components
@@ -83,7 +84,7 @@ namespace Content.Server.Light.Components
             return true;
         }
 
-        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             if (Activated)
             {
diff --git a/Content.Server/Mind/Components/MindComponent.cs b/Content.Server/Mind/Components/MindComponent.cs
index 386ee396a9..76ada93768 100644
--- a/Content.Server/Mind/Components/MindComponent.cs
+++ b/Content.Server/Mind/Components/MindComponent.cs
@@ -10,6 +10,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Mind.Components
@@ -125,7 +126,7 @@ namespace Content.Server.Mind.Components
             }
         }
 
-        public void Examine(FormattedMessage message, bool inDetailsRange)
+        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             if (!ShowExamineInfo || !inDetailsRange)
             {
diff --git a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs
index 807d6e54e8..479c2f2a3d 100644
--- a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs
+++ b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs
@@ -19,6 +19,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Morgue.Components
@@ -48,7 +49,7 @@ namespace Content.Server.Morgue.Components
 
         private CancellationTokenSource? _cremateCancelToken;
 
-        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             if (Appearance == null) return;
 
diff --git a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs
index e4faa794ba..27cb7aaa1e 100644
--- a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs
+++ b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs
@@ -21,6 +21,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Morgue.Components
@@ -172,7 +173,7 @@ namespace Content.Server.Morgue.Components
             }
         }
 
-        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             if (Appearance == null) return;
 
diff --git a/Content.Server/NodeContainer/NodeContainerComponent.cs b/Content.Server/NodeContainer/NodeContainerComponent.cs
index b7ac0122b3..6a2ebc78a5 100644
--- a/Content.Server/NodeContainer/NodeContainerComponent.cs
+++ b/Content.Server/NodeContainer/NodeContainerComponent.cs
@@ -7,6 +7,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.NodeContainer
@@ -43,28 +44,20 @@ namespace Content.Server.NodeContainer
             return false;
         }
 
-        public void Examine(FormattedMessage message, bool inDetailsRange)
+        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             if (!_examinable || !inDetailsRange) return;
 
             foreach (var node in Nodes.Values)
             {
                 if (node == null) continue;
-                switch (node.NodeGroupID)
+                message.AddMarkup(node.NodeGroupID switch
                 {
-                    case NodeGroupID.HVPower:
-                        message.AddMarkup(
-                            Loc.GetString("node-container-component-on-examine-details-hvpower") + "\n");
-                        break;
-                    case NodeGroupID.MVPower:
-                        message.AddMarkup(
-                            Loc.GetString("node-container-component-on-examine-details-mvpower") + "\n");
-                        break;
-                    case NodeGroupID.Apc:
-                        message.AddMarkup(
-                            Loc.GetString("node-container-component-on-examine-details-apc") + "\n");
-                        break;
-                }
+                    NodeGroupID.HVPower => Loc.GetString("node-container-component-on-examine-details-hvpower") + "\n",
+                    NodeGroupID.MVPower => Loc.GetString("node-container-component-on-examine-details-mvpower") + "\n",
+                    NodeGroupID.Apc => Loc.GetString("node-container-component-on-examine-details-apc") + "\n",
+                    _ => ""
+                });
             }
         }
     }
diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index 4c0a4c29e6..6e75adef28 100644
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -29,6 +29,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Server.Nutrition.EntitySystems
 {
diff --git a/Content.Server/Paper/PaperComponent.cs b/Content.Server/Paper/PaperComponent.cs
index e99520c72e..e3086f989d 100644
--- a/Content.Server/Paper/PaperComponent.cs
+++ b/Content.Server/Paper/PaperComponent.cs
@@ -10,6 +10,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Paper
@@ -60,7 +61,7 @@ namespace Content.Server.Paper
             UserInterface?.SetState(new PaperBoundUserInterfaceState(Content, _mode));
         }
 
-        public void Examine(FormattedMessage message, bool inDetailsRange)
+        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             if (!inDetailsRange)
                 return;
diff --git a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs
index 4a0ae9a80a..2b3b63c58d 100644
--- a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs
+++ b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs
@@ -11,6 +11,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Power.Components
@@ -98,7 +99,7 @@ namespace Content.Server.Power.Components
         ///<summary>
         ///Adds some markup to the examine text of whatever object is using this component to tell you if it's powered or not, even if it doesn't have an icon state to do this for you.
         ///</summary>
-        public void Examine(FormattedMessage message, bool inDetailsRange)
+        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             message.AddMarkup(Loc.GetString("power-receiver-component-on-examine-main",
                                             ("stateText", Loc.GetString( Powered ? "power-receiver-component-on-examine-powered" :
diff --git a/Content.Server/Power/Components/ExaminableBatteryComponent.cs b/Content.Server/Power/Components/ExaminableBatteryComponent.cs
index 4f62721128..31e288b581 100644
--- a/Content.Server/Power/Components/ExaminableBatteryComponent.cs
+++ b/Content.Server/Power/Components/ExaminableBatteryComponent.cs
@@ -3,6 +3,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Server.Power.Components
 {
@@ -16,7 +17,7 @@ namespace Content.Server.Power.Components
         [ViewVariables]
         [ComponentDependency] private BatteryComponent? _battery = default!;
 
-        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             if (_battery == null)
                 return;
diff --git a/Content.Server/PowerCell/Components/PowerCellComponent.cs b/Content.Server/PowerCell/Components/PowerCellComponent.cs
index c0cda8d0ff..220e136b80 100644
--- a/Content.Server/PowerCell/Components/PowerCellComponent.cs
+++ b/Content.Server/PowerCell/Components/PowerCellComponent.cs
@@ -9,6 +9,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.PowerCell.Components
@@ -90,7 +91,7 @@ namespace Content.Server.PowerCell.Components
             return (byte) ContentHelpers.RoundToNearestLevels(fraction, 1, SharedPowerCell.PowerCellVisualsLevels);
         }
 
-        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             if (inDetailsRange)
             {
diff --git a/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs b/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs
index d5138ef1bc..54ed068143 100644
--- a/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs
+++ b/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs
@@ -12,6 +12,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.PowerCell.Components
@@ -107,7 +108,7 @@ namespace Content.Server.PowerCell.Components
             _cellContainer = ContainerHelpers.EnsureContainer<ContainerSlot>(Owner, "cellslot_cell_container", out _);
         }
 
-        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             if (!inDetailsRange) return;
             string sizeLetter = SlotSize switch
diff --git a/Content.Server/Radio/Components/HandheldRadioComponent.cs b/Content.Server/Radio/Components/HandheldRadioComponent.cs
index f05181d5b4..7e14e0db0b 100644
--- a/Content.Server/Radio/Components/HandheldRadioComponent.cs
+++ b/Content.Server/Radio/Components/HandheldRadioComponent.cs
@@ -10,6 +10,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Radio.Components
@@ -108,7 +109,7 @@ namespace Content.Server.Radio.Components
             Use(eventArgs.User);
         }
 
-        public void Examine(FormattedMessage message, bool inDetailsRange)
+        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             message.AddText(Loc.GetString("handheld-radio-component-on-examine",("frequency", BroadcastFrequency)));
         }
diff --git a/Content.Server/Suspicion/SuspicionRoleComponent.cs b/Content.Server/Suspicion/SuspicionRoleComponent.cs
index df51ff8537..64b0563eeb 100644
--- a/Content.Server/Suspicion/SuspicionRoleComponent.cs
+++ b/Content.Server/Suspicion/SuspicionRoleComponent.cs
@@ -13,6 +13,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Players;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Suspicion
@@ -125,7 +126,7 @@ namespace Content.Server.Suspicion
             Dirty();
         }
 
-        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             if (!IsDead())
             {
diff --git a/Content.Server/Toilet/ToiletComponent.cs b/Content.Server/Toilet/ToiletComponent.cs
index b44f600799..00987679bd 100644
--- a/Content.Server/Toilet/ToiletComponent.cs
+++ b/Content.Server/Toilet/ToiletComponent.cs
@@ -24,6 +24,7 @@ using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Toilet
@@ -123,7 +124,7 @@ namespace Content.Server.Toilet
             return true;
         }
 
-        public void Examine(FormattedMessage message, bool inDetailsRange)
+        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             if (inDetailsRange && LidOpen)
             {
diff --git a/Content.Server/Warps/WarpPointComponent.cs b/Content.Server/Warps/WarpPointComponent.cs
index e0b87f1ea2..08d3e040c3 100644
--- a/Content.Server/Warps/WarpPointComponent.cs
+++ b/Content.Server/Warps/WarpPointComponent.cs
@@ -3,6 +3,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Warps
@@ -16,7 +17,7 @@ namespace Content.Server.Warps
 
         [ViewVariables(VVAccess.ReadWrite)] [DataField("location")] public string? Location { get; set; }
 
-        public void Examine(FormattedMessage message, bool inDetailsRange)
+        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             var loc = Location == null ? "<null>" : $"'{Location}'";
             message.AddText(Loc.GetString("warp-point-component-on-examine-success", ("location", loc)));
diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs
index 5e47ac28db..85944d15e3 100644
--- a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs
+++ b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs
@@ -14,6 +14,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Server.Weapon.Ranged.Ammunition.Components
 {
@@ -214,7 +215,7 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
             return TryUse(eventArgs.User);
         }
 
-        public void Examine(FormattedMessage message, bool inDetailsRange)
+        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             message.AddMarkup("\n" + Loc.GetString("ammo-box-component-on-examine-caliber-description", ("caliber", _caliber)));
             message.AddMarkup("\n" + Loc.GetString("ammo-box-component-on-examine-remaining-ammo-description", ("ammoLeft",AmmoLeft),("capacity", _capacity)));
diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs
index a12ca95d19..8feb51675f 100644
--- a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs
+++ b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs
@@ -13,6 +13,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Server.Weapon.Ranged.Ammunition.Components
 {
@@ -156,7 +157,7 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
             EntitySystem.Get<EffectSystem>().CreateParticle(message);
         }
 
-        public void Examine(FormattedMessage message, bool inDetailsRange)
+        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             var text = Loc.GetString("ammo-component-on-examine",("caliber", Caliber));
             message.AddMarkup(text);
diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs
index fca41f78d0..5a03824f73 100644
--- a/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs
+++ b/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs
@@ -14,6 +14,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Server.Weapon.Ranged.Ammunition.Components
 {
@@ -168,7 +169,7 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
             return true;
         }
 
-        public void Examine(FormattedMessage message, bool inDetailsRange)
+        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             var text = Loc.GetString("ranged-magazine-component-on-examine", ("magazineType", MagazineType),("caliber", Caliber));
             message.AddMarkup(text);
diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs
index dc6012d76b..97275399d8 100644
--- a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs
@@ -16,6 +16,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Weapon.Ranged.Barrels.Components
@@ -328,7 +329,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
             return false;
         }
 
-        public override void Examine(FormattedMessage message, bool inDetailsRange)
+        public override void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             base.Examine(message, inDetailsRange);
 
diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs
index 6b90cf9917..9641a115df 100644
--- a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs
@@ -16,6 +16,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Weapon.Ranged.Barrels.Components
@@ -237,7 +238,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
             return TryInsertBullet(eventArgs);
         }
 
-        public override void Examine(FormattedMessage message, bool inDetailsRange)
+        public override void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             base.Examine(message, inDetailsRange);
 
diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs
index 7e0a30b51f..f45eb87c91 100644
--- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs
@@ -20,6 +20,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Weapon.Ranged.Barrels.Components
@@ -430,7 +431,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
             return false;
         }
 
-        public override void Examine(FormattedMessage message, bool inDetailsRange)
+        public override void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             base.Examine(message, inDetailsRange);
 
diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs
index dd83b75198..e43d71058d 100644
--- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs
@@ -27,6 +27,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Server.Weapon.Ranged.Barrels.Components
 {
@@ -407,7 +408,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
         }
         #endregion
 
-        public virtual void Examine(FormattedMessage message, bool inDetailsRange)
+        public virtual void Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             var fireRateMessage = Loc.GetString(FireRateSelector switch
             {
diff --git a/Content.Server/Window/WindowComponent.cs b/Content.Server/Window/WindowComponent.cs
index 150e00a0a8..31ff5abb77 100644
--- a/Content.Server/Window/WindowComponent.cs
+++ b/Content.Server/Window/WindowComponent.cs
@@ -17,6 +17,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Window
@@ -42,7 +43,7 @@ namespace Content.Server.Window
         [DataField("knockSound")]
         private SoundSpecifier _knockSound = new SoundPathSpecifier("/Audio/Effects/glass_knock.ogg");
 
-        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             if (!_entMan.TryGetComponent(Owner, out DamageableComponent? damageable) ||
                 !_entMan.TryGetComponent(Owner, out DestructibleComponent? destructible))
diff --git a/Content.Server/WireHacking/WiresComponent.cs b/Content.Server/WireHacking/WiresComponent.cs
index d9acca8305..f7170f2911 100644
--- a/Content.Server/WireHacking/WiresComponent.cs
+++ b/Content.Server/WireHacking/WiresComponent.cs
@@ -25,6 +25,7 @@ using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.WireHacking
@@ -534,7 +535,7 @@ namespace Content.Server.WireHacking
             return false;
         }
 
-        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
         {
             message.AddMarkup(Loc.GetString(IsPanelOpen
                 ? "wires-component-on-examine-panel-open"
diff --git a/Content.Shared/Actions/Prototypes/BaseActionPrototype.cs b/Content.Shared/Actions/Prototypes/BaseActionPrototype.cs
index 671e40c3ac..71b16254c5 100644
--- a/Content.Shared/Actions/Prototypes/BaseActionPrototype.cs
+++ b/Content.Shared/Actions/Prototypes/BaseActionPrototype.cs
@@ -36,13 +36,13 @@ namespace Content.Shared.Actions.Prototypes
         /// Name to show in UI. Accepts formatting.
         /// </summary>
         [DataField("name")]
-        public FormattedMessage Name { get; private set; } = new();
+        public FormattedMessage Name { get; private set; } = FormattedMessage.Empty;
 
         /// <summary>
         /// Description to show in UI. Accepts formatting.
         /// </summary>
         [DataField("description")]
-        public FormattedMessage Description { get; } = new();
+        public FormattedMessage Description { get; } = FormattedMessage.Empty;
 
         /// <summary>
         /// Requirements message to show in UI. Accepts formatting, but generally should be avoided
@@ -101,8 +101,10 @@ namespace Content.Shared.Actions.Prototypes
 
         public virtual void AfterDeserialization()
         {
-            Name = new FormattedMessage();
-            Name.AddText(ID);
+            Name = new FormattedMessage(new []
+            {
+                new Section {Content=ID}
+            });
 
             if (BehaviorType == BehaviorType.None)
             {
diff --git a/Content.Shared/Alert/AlertPrototype.cs b/Content.Shared/Alert/AlertPrototype.cs
index 79eafd637d..30a4289e81 100644
--- a/Content.Shared/Alert/AlertPrototype.cs
+++ b/Content.Shared/Alert/AlertPrototype.cs
@@ -39,13 +39,13 @@ namespace Content.Shared.Alert
         /// Name to show in tooltip window. Accepts formatting.
         /// </summary>
         [DataField("name")]
-        public FormattedMessage Name { get; private set; } = new();
+        public FormattedMessage Name { get; private set; } = FormattedMessage.Empty;
 
         /// <summary>
         /// Description to show in tooltip window. Accepts formatting.
         /// </summary>
         [DataField("description")]
-        public FormattedMessage Description { get; private set; } = new();
+        public FormattedMessage Description { get; private set; } = FormattedMessage.Empty;
 
         /// <summary>
         /// Category the alert belongs to. Only one alert of a given category
diff --git a/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
index c7962c5eb9..edf3733e29 100644
--- a/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
@@ -2,6 +2,7 @@
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Shared.Construction.Steps
 {
@@ -16,7 +17,7 @@ namespace Content.Shared.Construction.Steps
             if (string.IsNullOrEmpty(Name))
                 return;
 
-            examinedEvent.Message.AddMarkup(Loc.GetString("construction-insert-arbitrary-entity", ("stepName", Name)));
+            examinedEvent.Message.AddMessage(Basic.RenderMarkup(Loc.GetString("construction-insert-arbitrary-entity", ("stepName", Name))));
         }
 
         public override ConstructionGuideEntry GenerateGuideEntry()
diff --git a/Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs
index 179f8b1fb2..747a2fdcf8 100644
--- a/Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs
@@ -2,6 +2,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Shared.Construction.Steps
 {
@@ -23,13 +24,15 @@ namespace Content.Shared.Construction.Steps
 
         public override void DoExamine(ExaminedEvent examinedEvent)
         {
-            examinedEvent.Message.AddMarkup(string.IsNullOrEmpty(Name)
-                ? Loc.GetString(
-                    "construction-insert-entity-with-component",
-                    ("componentName", Component))// Terrible.
-                : Loc.GetString(
-                    "construction-insert-exact-entity",
-                    ("entityName", Name)));
+            examinedEvent.Message.AddMessage(
+                    Basic.RenderMarkup(string.IsNullOrEmpty(Name)
+                        ? Loc.GetString(
+                            "construction-insert-entity-with-component",
+                            ("componentName", Component))// Terrible.
+                        : Loc.GetString(
+                            "construction-insert-exact-entity",
+                            ("entityName", Name))
+                    ));
         }
     }
 }
diff --git a/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs b/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
index 8ab0ead8bb..f7ce07e88b 100644
--- a/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
@@ -7,6 +7,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Shared.Construction.Steps
 {
@@ -24,7 +25,7 @@ namespace Content.Shared.Construction.Steps
         {
             var material = IoCManager.Resolve<IPrototypeManager>().Index<StackPrototype>(MaterialPrototypeId);
 
-            examinedEvent.Message.AddMarkup(Loc.GetString("construction-insert-material-entity", ("amount", Amount), ("materialName", material.Name)));
+            examinedEvent.Message.AddMessage(Basic.RenderMarkup(Loc.GetString("construction-insert-material-entity", ("amount", Amount), ("materialName", material.Name))));
         }
 
         public override bool EntityValid(EntityUid uid, IEntityManager entityManager)
diff --git a/Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs b/Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs
index 317ac8ab6f..c58da8a48d 100644
--- a/Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs
@@ -2,6 +2,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.Utility.Markup;
 
 namespace Content.Shared.Construction.Steps
 {
@@ -17,7 +18,8 @@ namespace Content.Shared.Construction.Steps
 
         public override void DoExamine(ExaminedEvent examinedEvent)
         {
-            examinedEvent.Message.AddMarkup(string.IsNullOrEmpty(Name)
+            var nb = new Basic();
+            nb.AddMarkup(string.IsNullOrEmpty(Name)
                 ? Loc.GetString(
                     "construction-insert-prototype-no-name",
                     ("prototypeName", Prototype) // Terrible.
@@ -26,6 +28,8 @@ namespace Content.Shared.Construction.Steps
                     "construction-insert-prototype",
                     ("entityName", Name)
                 ));
+
+            examinedEvent.Message.AddMessage(nb.Render());
         }
     }
 }
diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs
index 19b227dbc1..9307cdab45 100644
--- a/Content.Shared/Examine/ExamineSystemShared.cs
+++ b/Content.Shared/Examine/ExamineSystemShared.cs
@@ -13,6 +13,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Utility;
+using Robust.Shared.Utility.Markup;
 using static Content.Shared.Interaction.SharedInteractionSystem;
 
 namespace Content.Shared.Examine
@@ -25,7 +26,7 @@ namespace Content.Shared.Examine
         /// </summary>
         /// <param name="message">The message to append to which will be displayed.</param>
         /// <param name="inDetailsRange">Whether the examiner is within the 'Details' range, allowing you to show information logically only availabe when close to the examined entity.</param>
-        void Examine(FormattedMessage message, bool inDetailsRange);
+        void Examine(FormattedMessage.Builder message, bool inDetailsRange);
     }
 
     public abstract class ExamineSystemShared : EntitySystem
@@ -212,11 +213,11 @@ namespace Content.Shared.Examine
 
         public FormattedMessage GetExamineText(EntityUid entity, EntityUid? examiner)
         {
-            var message = new FormattedMessage();
+            var message = new FormattedMessage.Builder();
 
             if (examiner == null)
             {
-                return message;
+                return new(new Section[] {});
             }
 
             var doNewline = false;
@@ -238,21 +239,15 @@ namespace Content.Shared.Examine
             //Add component statuses from components that report one
             foreach (var examineComponent in EntityManager.GetComponents<IExamine>(entity))
             {
-                var subMessage = new FormattedMessage();
-                examineComponent.Examine(subMessage, isInDetailsRange);
-                if (subMessage.Tags.Count == 0)
-                    continue;
+                examineComponent.Examine(message, isInDetailsRange);
 
                 if (doNewline)
                     message.AddText("\n");
 
-                message.AddMessage(subMessage);
                 doNewline = true;
             }
 
-            message.Pop();
-
-            return message;
+            return message.Build();
         }
     }
 
@@ -269,7 +264,7 @@ namespace Content.Shared.Examine
         /// <seealso cref="PushMessage"/>
         /// <seealso cref="PushMarkup"/>
         /// <seealso cref="PushText"/>
-        public FormattedMessage Message { get; }
+        public FormattedMessage.Builder Message { get; }
 
         /// <summary>
         ///     The entity performing the examining.
@@ -288,7 +283,7 @@ namespace Content.Shared.Examine
 
         private bool _doNewLine;
 
-        public ExaminedEvent(FormattedMessage message, EntityUid examined, EntityUid examiner, bool isInDetailsRange, bool doNewLine)
+        public ExaminedEvent(FormattedMessage.Builder message, EntityUid examined, EntityUid examiner, bool isInDetailsRange, bool doNewLine)
         {
             Message = message;
             Examined = examined;
@@ -304,9 +299,6 @@ namespace Content.Shared.Examine
         /// <seealso cref="PushText"/>
         public void PushMessage(FormattedMessage message)
         {
-            if (message.Tags.Count == 0)
-                return;
-
             if (_doNewLine)
                 Message.AddText("\n");
 
@@ -321,7 +313,7 @@ namespace Content.Shared.Examine
         /// <seealso cref="PushMessage"/>
         public void PushMarkup(string markup)
         {
-            PushMessage(FormattedMessage.FromMarkup(markup));
+            PushMessage(Basic.RenderMarkup(markup));
         }
 
         /// <summary>
@@ -329,11 +321,6 @@ namespace Content.Shared.Examine
         /// </summary>
         /// <seealso cref="PushMarkup"/>
         /// <seealso cref="PushMessage"/>
-        public void PushText(string text)
-        {
-            var msg = new FormattedMessage();
-            msg.AddText(text);
-            PushMessage(msg);
-        }
+        public void PushText(string text) => Message.AddText(text);
     }
 }