Revert Rich text (#5848)

2021-12-20 12:42:42 +01:00
parent e3a1b2b37b
commit cc57d1380c
60 changed files with 212 additions and 302 deletions
--- a/Content.Server/Administration/BwoinkSystem.cs
+++ b/Content.Server/Administration/BwoinkSystem.cs
@@ -8,7 +8,6 @@ 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
 {
@@ -34,7 +33,7 @@ namespace Content.Server.Administration
                return;
            }

-            var escapedText = Basic.EscapeText(message.Text);
+            var escapedText = FormattedMessage.EscapeText(message.Text);


            var bwoinkText = senderAdmin switch
--- a/Content.Server/Atmos/Components/GasTankComponent.cs
+++ b/Content.Server/Atmos/Components/GasTankComponent.cs
@@ -24,7 +24,6 @@ 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
@@ -109,7 +108,7 @@ namespace Content.Server.Atmos.Components
            UpdateUserInterface(true);
        }

-        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        public void Examine(FormattedMessage message, bool inDetailsRange)
        {
            message.AddMarkup(Loc.GetString("comp-gas-tank-examine", ("pressure", Math.Round(Air?.Pressure ?? 0))));
            if (IsConnected)
--- a/Content.Server/Botany/Components/PlantHolderComponent.cs
+++ b/Content.Server/Botany/Components/PlantHolderComponent.cs
@@ -29,7 +29,6 @@ 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
@@ -844,7 +843,7 @@ namespace Content.Server.Botany.Components
            DoHarvest(eventArgs.User);
        }

-        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        public void Examine(FormattedMessage message, bool inDetailsRange)
        {
            if (!inDetailsRange)
                return;
--- a/Content.Server/Botany/Components/SeedComponent.cs
+++ b/Content.Server/Botany/Components/SeedComponent.cs
@@ -5,7 +5,6 @@ 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
@@ -27,7 +26,7 @@ namespace Content.Server.Botany.Components
            set => _seedName = value?.ID;
        }

-        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        public void Examine(FormattedMessage message, bool inDetailsRange)
        {
            if (!inDetailsRange)
                return;
--- a/Content.Server/Chat/Managers/ChatManager.cs
+++ b/Content.Server/Chat/Managers/ChatManager.cs
@@ -25,7 +25,6 @@ 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
@@ -193,7 +192,7 @@ namespace Content.Server.Chat.Managers
            var listeners = EntitySystem.Get<ListeningSystem>();
            listeners.PingListeners(source, message);

-            message = Basic.EscapeText(message);
+            message = FormattedMessage.EscapeText(message);

            var msg = _netManager.CreateNetMessage<MsgChatMessage>();
            msg.Channel = ChatChannel.Local;
@@ -224,7 +223,7 @@ namespace Content.Server.Chat.Managers
                return;
            }

-            action = Basic.EscapeText(action);
+            action = FormattedMessage.EscapeText(action);

            var clients = Filter.Empty()
                .AddInRange(_entManager.GetComponent<TransformComponent>(source).MapPosition, VoiceRange)
@@ -261,7 +260,7 @@ namespace Content.Server.Chat.Managers
                return;
            }

-            message = Basic.EscapeText(message);
+            message = FormattedMessage.EscapeText(message);

            var msg = _netManager.CreateNetMessage<MsgChatMessage>();
            msg.Channel = ChatChannel.OOC;
@@ -293,7 +292,7 @@ namespace Content.Server.Chat.Managers
                return;
            }

-            message = Basic.EscapeText(message);
+            message = FormattedMessage.EscapeText(message);

            var clients = GetDeadChatClients();

@@ -320,7 +319,7 @@ namespace Content.Server.Chat.Managers
                return;
            }

-            message = Basic.EscapeText(message);
+            message = FormattedMessage.EscapeText(message);

            var clients = GetDeadChatClients();

@@ -351,7 +350,7 @@ namespace Content.Server.Chat.Managers
                return;
            }

-            message = Basic.EscapeText(message);
+            message = FormattedMessage.EscapeText(message);

            var clients = _adminManager.ActiveAdmins.Select(p => p.ConnectedClient);

@@ -369,7 +368,7 @@ namespace Content.Server.Chat.Managers
        {
            var clients = _adminManager.ActiveAdmins.Select(p => p.ConnectedClient);

-            message = Basic.EscapeText(message);
+            message = FormattedMessage.EscapeText(message);

            var msg = _netManager.CreateNetMessage<MsgChatMessage>();

@@ -383,7 +382,7 @@ namespace Content.Server.Chat.Managers

        public void SendHookOOC(string sender, string message)
        {
-            message = Basic.EscapeText(message);
+            message = FormattedMessage.EscapeText(message);

            var msg = _netManager.CreateNetMessage<MsgChatMessage>();
            msg.Channel = ChatChannel.OOC;
--- a/Content.Server/Construction/Components/MachineBoardComponent.cs
+++ b/Content.Server/Construction/Components/MachineBoardComponent.cs
@@ -8,7 +8,6 @@ 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
@@ -54,7 +53,7 @@ namespace Content.Server.Construction.Components
            }
        }

-        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        public void Examine(FormattedMessage message, bool inDetailsRange)
        {
            message.AddMarkup(Loc.GetString("machine-board-component-on-examine-label") + "\n");
            foreach (var (part, amount) in Requirements)
--- a/Content.Server/Construction/Components/MachinePartComponent.cs
+++ b/Content.Server/Construction/Components/MachinePartComponent.cs
@@ -4,7 +4,6 @@ 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
@@ -39,7 +38,7 @@ namespace Content.Server.Construction.Components
        [DataField("rating")]
        public int Rating { get; private set; } = 1;

-        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        public void Examine(FormattedMessage 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");
--- a/Content.Server/Construction/Conditions/MachineFrameComplete.cs
+++ b/Content.Server/Construction/Conditions/MachineFrameComplete.cs
@@ -9,7 +9,6 @@ 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
 {
--- a/Content.Server/Examine/ExamineSystem.cs
+++ b/Content.Server/Examine/ExamineSystem.cs
@@ -5,18 +5,17 @@ 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.Builder _entityNotFoundMessage;
+        private static readonly FormattedMessage _entityNotFoundMessage;

        static ExamineSystem()
        {
-            _entityNotFoundMessage = new FormattedMessage.Builder();
+            _entityNotFoundMessage = new FormattedMessage();
            _entityNotFoundMessage.AddText(Loc.GetString("examine-system-entity-does-not-exist"));
        }

@@ -40,7 +39,7 @@ namespace Content.Server.Examine
                || !CanExamine(playerEnt, request.EntityUid))
            {
                RaiseNetworkEvent(new ExamineSystemMessages.ExamineInfoResponseMessage(
-                    request.EntityUid, _entityNotFoundMessage.Build()), channel);
+                    request.EntityUid, _entityNotFoundMessage), channel);
                return;
            }

--- 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.Builder message, bool inDetailsRange)
+        public void Examine(FormattedMessage message, bool inDetailsRange)
        {
            message.AddText(Loc.GetString("examine-radio-frequency", ("frequency", BroadcastFrequency)));
            message.AddText("\n");
--- a/Content.Server/Labels/Label/LabelSystem.cs
+++ b/Content.Server/Labels/Label/LabelSystem.cs
@@ -9,7 +9,6 @@ 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
 {
@@ -56,7 +55,9 @@ namespace Content.Server.Labels
            if (label.CurrentLabel == null)
                return;

-            args.Message.AddText(Loc.GetString("hand-labeler-has-label", ("label", label.CurrentLabel)));
+            var message = new FormattedMessage();
+            message.AddText(Loc.GetString("hand-labeler-has-label", ("label", label.CurrentLabel)));
+            args.PushMessage(message);
        }

        private void OnExamined(EntityUid uid, PaperLabelComponent comp, ExaminedEvent args)
--- a/Content.Server/Light/Components/EmergencyLightComponent.cs
+++ b/Content.Server/Light/Components/EmergencyLightComponent.cs
@@ -9,7 +9,6 @@ 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
@@ -149,9 +148,9 @@ namespace Content.Server.Light.Components
            }
        }

-        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
        {
-            message.AddMessage(Basic.BuildMarkup(Loc.GetString("emergency-light-component-on-examine",("batteryStateText", Loc.GetString(BatteryStateText[State])))));
+            message.AddMarkup(Loc.GetString("emergency-light-component-on-examine",("batteryStateText", Loc.GetString(BatteryStateText[State]))));
        }

        public enum EmergencyLightState
--- a/Content.Server/Light/Components/HandheldLightComponent.cs
+++ b/Content.Server/Light/Components/HandheldLightComponent.cs
@@ -22,7 +22,6 @@ 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
@@ -84,7 +83,7 @@ namespace Content.Server.Light.Components
            return true;
        }

-        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
        {
            if (Activated)
            {
--- a/Content.Server/Mind/Components/MindComponent.cs
+++ b/Content.Server/Mind/Components/MindComponent.cs
@@ -10,7 +10,6 @@ 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
@@ -126,7 +125,7 @@ namespace Content.Server.Mind.Components
            }
        }

-        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        public void Examine(FormattedMessage message, bool inDetailsRange)
        {
            if (!ShowExamineInfo || !inDetailsRange)
            {
--- a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs
+++ b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs
@@ -19,7 +19,6 @@ 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
@@ -49,7 +48,7 @@ namespace Content.Server.Morgue.Components

        private CancellationTokenSource? _cremateCancelToken;

-        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
        {
            if (Appearance == null) return;

--- a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs
+++ b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs
@@ -21,7 +21,6 @@ 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
@@ -173,7 +172,7 @@ namespace Content.Server.Morgue.Components
            }
        }

-        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
        {
            if (Appearance == null) return;

--- a/Content.Server/NodeContainer/NodeContainerComponent.cs
+++ b/Content.Server/NodeContainer/NodeContainerComponent.cs
@@ -7,7 +7,6 @@ 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
@@ -44,20 +43,28 @@ namespace Content.Server.NodeContainer
            return false;
        }

-        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        public void Examine(FormattedMessage message, bool inDetailsRange)
        {
            if (!_examinable || !inDetailsRange) return;

            foreach (var node in Nodes.Values)
            {
                if (node == null) continue;
-                message.AddMarkup(node.NodeGroupID switch
+                switch (node.NodeGroupID)
                {
-                    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",
-                    _ => ""
-                });
+                    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;
+                }
            }
        }
    }
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -29,7 +29,6 @@ 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
 {
--- a/Content.Server/Paper/PaperComponent.cs
+++ b/Content.Server/Paper/PaperComponent.cs
@@ -10,7 +10,6 @@ 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
@@ -61,7 +60,7 @@ namespace Content.Server.Paper
            UserInterface?.SetState(new PaperBoundUserInterfaceState(Content, _mode));
        }

-        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        public void Examine(FormattedMessage message, bool inDetailsRange)
        {
            if (!inDetailsRange)
                return;
--- a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs
+++ b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs
@@ -11,7 +11,6 @@ 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
@@ -99,7 +98,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.Builder message, bool inDetailsRange)
+        public void Examine(FormattedMessage message, bool inDetailsRange)
        {
            message.AddMarkup(Loc.GetString("power-receiver-component-on-examine-main",
                                            ("stateText", Loc.GetString( Powered ? "power-receiver-component-on-examine-powered" :
--- a/Content.Server/Power/Components/ExaminableBatteryComponent.cs
+++ b/Content.Server/Power/Components/ExaminableBatteryComponent.cs
@@ -3,7 +3,6 @@ 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
 {
@@ -17,7 +16,7 @@ namespace Content.Server.Power.Components
        [ViewVariables]
        [ComponentDependency] private BatteryComponent? _battery = default!;

-        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
        {
            if (_battery == null)
                return;
--- a/Content.Server/PowerCell/Components/PowerCellComponent.cs
+++ b/Content.Server/PowerCell/Components/PowerCellComponent.cs
@@ -9,7 +9,6 @@ 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
@@ -91,7 +90,7 @@ namespace Content.Server.PowerCell.Components
            return (byte) ContentHelpers.RoundToNearestLevels(fraction, 1, SharedPowerCell.PowerCellVisualsLevels);
        }

-        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
        {
            if (inDetailsRange)
            {
--- a/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs
+++ b/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs
@@ -12,7 +12,6 @@ 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
@@ -108,7 +107,7 @@ namespace Content.Server.PowerCell.Components
            _cellContainer = ContainerHelpers.EnsureContainer<ContainerSlot>(Owner, "cellslot_cell_container", out _);
        }

-        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
        {
            if (!inDetailsRange) return;
            string sizeLetter = SlotSize switch
--- a/Content.Server/Radio/Components/HandheldRadioComponent.cs
+++ b/Content.Server/Radio/Components/HandheldRadioComponent.cs
@@ -10,7 +10,6 @@ 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
@@ -109,7 +108,7 @@ namespace Content.Server.Radio.Components
            Use(eventArgs.User);
        }

-        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        public void Examine(FormattedMessage message, bool inDetailsRange)
        {
            message.AddText(Loc.GetString("handheld-radio-component-on-examine",("frequency", BroadcastFrequency)));
        }
--- a/Content.Server/Suspicion/SuspicionRoleComponent.cs
+++ b/Content.Server/Suspicion/SuspicionRoleComponent.cs
@@ -13,7 +13,6 @@ 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
@@ -126,7 +125,7 @@ namespace Content.Server.Suspicion
            Dirty();
        }

-        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
        {
            if (!IsDead())
            {
--- a/Content.Server/Toilet/ToiletComponent.cs
+++ b/Content.Server/Toilet/ToiletComponent.cs
@@ -24,7 +24,6 @@ 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
@@ -124,7 +123,7 @@ namespace Content.Server.Toilet
            return true;
        }

-        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        public void Examine(FormattedMessage message, bool inDetailsRange)
        {
            if (inDetailsRange && LidOpen)
            {
--- a/Content.Server/Warps/WarpPointComponent.cs
+++ b/Content.Server/Warps/WarpPointComponent.cs
@@ -3,7 +3,6 @@ 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
@@ -17,7 +16,7 @@ namespace Content.Server.Warps

        [ViewVariables(VVAccess.ReadWrite)] [DataField("location")] public string? Location { get; set; }

-        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        public void Examine(FormattedMessage message, bool inDetailsRange)
        {
            var loc = Location == null ? "<null>" : $"'{Location}'";
            message.AddText(Loc.GetString("warp-point-component-on-examine-success", ("location", loc)));
--- a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs
+++ b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs
@@ -13,7 +13,6 @@ 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
 {
@@ -157,7 +156,7 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
            EntitySystem.Get<EffectSystem>().CreateParticle(message);
        }

-        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        public void Examine(FormattedMessage message, bool inDetailsRange)
        {
            var text = Loc.GetString("ammo-component-on-examine",("caliber", Caliber));
            message.AddMarkup(text);
--- a/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs
+++ b/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs
@@ -14,7 +14,6 @@ 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
 {
@@ -169,7 +168,7 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
            return true;
        }

-        public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        public void Examine(FormattedMessage message, bool inDetailsRange)
        {
            var text = Loc.GetString("ranged-magazine-component-on-examine", ("magazineType", MagazineType),("caliber", Caliber));
            message.AddMarkup(text);
--- a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs
@@ -16,7 +16,6 @@ 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
@@ -329,7 +328,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
            return false;
        }

-        public override void Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        public override void Examine(FormattedMessage message, bool inDetailsRange)
        {
            base.Examine(message, inDetailsRange);

--- a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs
@@ -16,7 +16,6 @@ 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
@@ -238,7 +237,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
            return TryInsertBullet(eventArgs);
        }

-        public override void Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        public override void Examine(FormattedMessage message, bool inDetailsRange)
        {
            base.Examine(message, inDetailsRange);

--- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs
@@ -20,7 +20,6 @@ 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
@@ -431,7 +430,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
            return false;
        }

-        public override void Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        public override void Examine(FormattedMessage message, bool inDetailsRange)
        {
            base.Examine(message, inDetailsRange);

--- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs
@@ -27,7 +27,6 @@ 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
 {
@@ -408,7 +407,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
        }
        #endregion

-        public virtual void Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        public virtual void Examine(FormattedMessage message, bool inDetailsRange)
        {
            var fireRateMessage = Loc.GetString(FireRateSelector switch
            {
--- a/Content.Server/Window/WindowComponent.cs
+++ b/Content.Server/Window/WindowComponent.cs
@@ -17,7 +17,6 @@ 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
@@ -43,7 +42,7 @@ namespace Content.Server.Window
        [DataField("knockSound")]
        private SoundSpecifier _knockSound = new SoundPathSpecifier("/Audio/Effects/glass_knock.ogg");

-        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
        {
            if (!_entMan.TryGetComponent(Owner, out DamageableComponent? damageable) ||
                !_entMan.TryGetComponent(Owner, out DestructibleComponent? destructible))
--- a/Content.Server/WireHacking/WiresComponent.cs
+++ b/Content.Server/WireHacking/WiresComponent.cs
@@ -25,7 +25,6 @@ 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
@@ -535,7 +534,7 @@ namespace Content.Server.WireHacking
            return false;
        }

-        void IExamine.Examine(FormattedMessage.Builder message, bool inDetailsRange)
+        void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
        {
            message.AddMarkup(Loc.GetString(IsPanelOpen
                ? "wires-component-on-examine-panel-open"