merge conflicts go brrr

Content.Client/Access/UI/AccessLevelControl.xaml.cs

@@ -25,7 +25,7 @@ public void Populate(List<ProtoId<AccessLevelPrototype>> accessLevels, IPrototyp
         {
             if (!prototypeManager.TryIndex(access, out var accessLevel))
             {
-                Logger.Error($"Unable to find accesslevel for {access}");
+                Logger.GetSawmill("accesslevelcontrol.ui").Error($"Unable to find accesslevel for {access}");
                 continue;
             }
 

Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs

@@ -1,9 +1,7 @@
 using Content.Shared.Access.Systems;
 using Content.Shared.StatusIcon;
-using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Prototypes;
 
 namespace Content.Client.Access.UI
 {

Content.Client/Actions/UI/ActionAlertTooltip.cs

@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets;
+using Content.Client.Stylesheets;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -77,9 +77,14 @@ public ActionAlertTooltip(FormattedMessage name, FormattedMessage? desc, string?
                     MaxWidth = TooltipTextMaxWidth,
                     StyleClasses = {StyleNano.StyleClassTooltipActionRequirements}
                 };
-                requiresLabel.SetMessage(FormattedMessage.FromMarkup("[color=#635c5c]" +
-                                                                     requires +
-                                                                     "[/color]"));
+                try
+                {
+                    requiresLabel.SetMessage(FormattedMessage.FromMarkupOrThrow("[color=#635c5c]" + requires + "[/color]"));
+                }
+                catch(Exception e)
+                {
+                    requiresLabel.SetMessage(e.Message);
+                }
                 vbox.AddChild(requiresLabel);
             }
         }
@@ -97,8 +102,16 @@ protected override void FrameUpdate(FrameEventArgs args)
             if (timeLeft > TimeSpan.Zero)
             {
                 var duration = Cooldown.Value.End - Cooldown.Value.Start;
-                _cooldownLabel.SetMessage(FormattedMessage.FromMarkup(
-                    $"[color=#a10505]{(int) duration.TotalSeconds} sec cooldown ({(int) timeLeft.TotalSeconds + 1} sec remaining)[/color]"));
+                try
+                {
+                    _cooldownLabel.SetMessage(FormattedMessage.FromMarkupOrThrow(
+                        $"[color=#a10505]{(int) duration.TotalSeconds} sec cooldown ({(int) timeLeft.TotalSeconds + 1} sec remaining)[/color]"));
+
+                }
+                catch(Exception e)
+                {
+                    _cooldownLabel.SetMessage(e.Message);
+                }
                 _cooldownLabel.Visible = true;
             }
             else

Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Administration.Notes;
+using Content.Shared.Administration.Notes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
@@ -12,12 +12,19 @@ public sealed partial class AdminMessagePopupMessage : Control
     public AdminMessagePopupMessage(AdminMessageEuiState.Message message)
     {
         RobustXamlLoader.Load(this);
+        try
+        {
 
-        Admin.SetMessage(FormattedMessage.FromMarkup(Loc.GetString(
-            "admin-notes-message-admin",
-            ("admin", message.AdminName),
-            ("date", message.AddedOn.ToLocalTime()))));
+            Admin.SetMessage(FormattedMessage.FromMarkupOrThrow(Loc.GetString(
+                "admin-notes-message-admin",
+                ("admin", message.AdminName),
+                ("date", message.AddedOn.ToLocalTime()))));
 
-        Message.SetMessage(message.Text);
+            Message.SetMessage(message.Text);
+        }
+        catch(Exception e)
+        {
+            Message.SetMessage(e.Message);
+        }
     }
 }

Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs

@@ -49,7 +49,14 @@ public void SetState(AdminMessageEuiState state)
             MessageContainer.AddChild(new AdminMessagePopupMessage(message));
         }
 
-        Description.SetMessage(FormattedMessage.FromMarkup(Loc.GetString("admin-notes-message-desc", ("count", state.Messages.Length))));
+        try
+        {
+            Description.SetMessage(FormattedMessage.FromMarkupOrThrow(Loc.GetString("admin-notes-message-desc", ("count", state.Messages.Length))));
+        }
+        catch (Exception e)
+        {
+            Description.SetMessage(e.Message);
+        }
     }
 
     private void OnDismissButtonPressed(BaseButton.ButtonEventArgs obj)

Content.Client/Administration/UI/CustomControls/CommandButton.cs

@@ -41,7 +41,7 @@ public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out
         {
             if (args.Count != 2 || !args.TryGetValue("Text", out var text) || !args.TryGetValue("Command", out var command))
             {
-                Logger.Error($"Invalid arguments passed to {nameof(CommandButton)}");
+                Logger.GetSawmill("commandbutton.ui").Error($"Invalid arguments passed to {nameof(CommandButton)}");
                 control = null;
                 return false;
             }

Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs

@@ -61,7 +61,7 @@ private void Refresh()
         if (iconPath is null)
         {
             SeverityRect.Visible = false;
-            Logger.WarningS("admin.notes", $"Could not find an icon for note ID {Note.Id}");
+            Logger.GetSawmill("admin.notes").Warning($"Could not find an icon for note ID {Note.Id}");
         }
         else
         {

Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs

@@ -31,6 +31,19 @@ public sealed partial class AtmosAlarmEntryContainer : BoxContainer
         [AtmosAlarmType.Danger] = "atmos-alerts-window-danger-state",
     };
 
+    private Dictionary<Gas, string> _gasShorthands = new Dictionary<Gas, string>()
+    {
+        [Gas.Ammonia] = "NH₃",
+        [Gas.CarbonDioxide] = "CO₂",
+        [Gas.Frezon] = "F",
+        [Gas.Nitrogen] = "N₂",
+        [Gas.NitrousOxide] = "N₂O",
+        [Gas.Oxygen] = "O₂",
+        [Gas.Plasma] = "P",
+        [Gas.Tritium] = "T",
+        [Gas.WaterVapor] = "H₂O",
+    };
+
     public AtmosAlarmEntryContainer(NetEntity uid, EntityCoordinates? coordinates)
     {
         RobustXamlLoader.Load(this);
@@ -196,4 +209,4 @@ private Color GetAlarmStateColor(AtmosAlarmType alarmType)
 
         return StyleNano.DisabledFore;
     }
-}
+}

Content.Client/Body/Systems/BodySystem.cs

@@ -47,6 +47,10 @@ private void ApplyMarkingToPart(MarkingPrototype markingPrototype,
                 sprite.LayerSetColor(layerId, colors[j]);
             else
                 sprite.LayerSetColor(layerId, Color.White);
+
+            var shaders = markingPrototype.Shaders;
+            if (shaders is not null && shaders.ContainsKey(rsi.RsiState))
+                sprite.LayerSetShader(layerId, shaders[rsi.RsiState]);
         }
     }
 

Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml

@@ -3,7 +3,7 @@
     <PanelContainer StyleClasses="BackgroundDark"></PanelContainer>
     <BoxContainer Name="SettingsBox" Orientation="Horizontal" HorizontalExpand="True" VerticalExpand="False">
         <Label Text="{Loc 'glimmer-monitor-interval'}"/>
-        <Button Name="IntervalButton6s" Access="Public" Text="6s" StyleClasses="OpenRight"/>
+        <Button Name="IntervalButton6s" Access="Public" Text="Realtime" StyleClasses="OpenRight"/>
         <Button Name="IntervalButton1" Access="Public" Text="1m" StyleClasses="OpenRight"/>
         <Button Name="IntervalButton5" Access="Public" Text="5m" StyleClasses="OpenBoth"/>
         <Button Name="IntervalButton10" Access="Public" Text="10m" StyleClasses="OpenLeft"/>

Content.Client/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml.cs

@@ -25,7 +25,7 @@ public MailMetricUiFragment()
         ExpiredMailSpesos.StyleClasses.Add("Danger");
         DamagedMailCount.StyleClasses.Add("Danger");
         DamagedMailSpesos.StyleClasses.Add("Danger");
-        UnopenedMailCount.StyleClasses.Add("Caution");
+        UnopenedMailCount.StyleClasses.Add("Danger");
     }
 
     public void UpdateState(MailMetricUiState state)

Content.Client/Clock/ClockSystem.cs

@@ -0,0 +1,26 @@
+using Content.Shared.Clock;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Clock;
+
+public sealed class ClockSystem : SharedClockSystem
+{
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<ClockComponent, SpriteComponent>();
+        while (query.MoveNext(out var uid, out var comp, out var sprite))
+        {
+            if (!sprite.LayerMapTryGet(ClockVisualLayers.HourHand, out var hourLayer) ||
+                !sprite.LayerMapTryGet(ClockVisualLayers.MinuteHand, out var minuteLayer))
+                continue;
+
+            var time = GetClockTime((uid, comp));
+            var hourState = $"{comp.HoursBase}{time.Hours % 12}";
+            var minuteState = $"{comp.MinutesBase}{time.Minutes / 5}";
+            sprite.LayerSetState(hourLayer, hourState);
+            sprite.LayerSetState(minuteLayer, minuteState);
+        }
+    }
+}

Content.Client/ContextMenu/UI/ContextMenuUIController.cs

@@ -131,7 +131,7 @@ private void OnMouseEntered(ContextMenuElement element)
         {
             if (!Menus.TryPeek(out var topMenu))
             {
-                Logger.Error("Context Menu: Mouse entered menu without any open menus?");
+                Logger.GetSawmill("contextmenu.ui").Error("Context Menu: Mouse entered menu without any open menus?");
                 return;
             }
 
@@ -181,7 +181,7 @@ public void OpenSubMenu(ContextMenuElement element)
         {
             if (!Menus.TryPeek(out var topMenu))
             {
-                Logger.Error("Context Menu: Attempting to open sub menu without any open menus?");
+                Logger.GetSawmill("contextmenu.ui").Error("Context Menu: Attempting to open sub menu without any open menus?");
                 return;
             }
 

Content.Client/ContextMenu/UI/EntityMenuUIController.cs

@@ -306,7 +306,7 @@ private void RemoveEntity(EntityUid entity)
             // find the element associated with this entity
             if (!Elements.TryGetValue(entity, out var element))
             {
-                Logger.Error($"Attempted to remove unknown entity from the entity menu: {_entityManager.GetComponent<MetaDataComponent>(entity).EntityName} ({entity})");
+                Logger.GetSawmill("entitymenucontroller.ui").Error($"Attempted to remove unknown entity from the entity menu: {_entityManager.GetComponent<MetaDataComponent>(entity).EntityName} ({entity})");
                 return;
             }
 

Content.Client/DeltaV/Silicons/Laws/SlavedBorgSystem.cs

@@ -0,0 +1,5 @@
+using Content.Shared.DeltaV.Silicons.Laws;
+
+namespace Content.Client.DeltaV.Silicons.Laws;
+
+public sealed class SlavedBorgSystem : SharedSlavedBorgSystem;

Content.Client/Entry/EntryPoint.cs

@@ -74,7 +74,6 @@ public sealed class EntryPoint : GameClient
         [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly JoinQueueManager _joinQueue = default!;
         [Dependency] private readonly DiscordAuthManager _discordAuth = default!;
-        [Dependency] private readonly ContentReplayPlaybackManager _replayMan = default!;
         [Dependency] private readonly DebugMonitorManager _debugMonitorManager = default!;
 
         public override void Init()

Content.Client/Examine/ExamineSystem.cs

@@ -359,7 +359,7 @@ public void DoExamine(EntityUid entity, bool centeredOnCursor = true, EntityUid?
             FormattedMessage message;
 
             // Basically this just predicts that we can't make out the entity if we have poor vision.
-            var canSeeClearly = !HasComp<BlurryVisionComponent>(playerEnt);
+            var canSeeClearly = !HasComp<BlurryVisionComponent>(playerEnt) || TryComp<BlurryVisionComponent>(playerEnt, out var blur) && blur.Magnitude == 0;
 
             OpenTooltip(playerEnt.Value, entity, centeredOnCursor, false, knowTarget: canSeeClearly);
 

Content.Client/Eye/PenLight/UI/PenLightBoundUserInterface.cs

@@ -21,12 +21,21 @@ protected override void Open()
             };
             _window.OnClose += Close;
             _window.OpenCentered();
+            // If there's a stored message, apply it
+            if (LastReceivedMessage is PenLightUserMessage lastMessage)
+                _window.Diagnose(lastMessage);
         }
 
+        private PenLightUserMessage? LastReceivedMessage;
+
         protected override void ReceiveMessage(BoundUserInterfaceMessage message)
         {
-            if (_window == null
-                || message is not PenLightUserMessage cast)
+            if (message is not PenLightUserMessage cast)
+                return;
+
+            LastReceivedMessage = cast; // Store the message in case UI isn't open yet
+
+            if (_window == null)
                 return;
 
             _window.Diagnose(cast);

Content.Client/Guidebook/Controls/GuideEntityEmbed.xaml.cs

@@ -135,7 +135,7 @@ public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out
     {
         if (!args.TryGetValue("Entity", out var proto))
         {
-            Logger.Error("Entity embed tag is missing entity prototype argument");
+            Logger.GetSawmill("guide.entity.embed").Error("Entity embed tag is missing entity prototype argument");
             control = null;
             return false;
         }

Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs

@@ -62,13 +62,13 @@ public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out
         control = null;
         if (!args.TryGetValue("Reagent", out var id))
         {
-            Logger.Error("Reagent embed tag is missing reagent prototype argument");
+            Logger.GetSawmill("guide.regent.embed").Error("Reagent embed tag is missing reagent prototype argument");
             return false;
         }
 
         if (!_prototype.TryIndex<ReagentPrototype>(id, out var reagent))
         {
-            Logger.Error($"Specified reagent prototype \"{id}\" is not a valid reagent prototype");
+            Logger.GetSawmill("guideregent.embed").Error($"Specified reagent prototype \"{id}\" is not a valid reagent prototype");
             return false;
         }
 

Content.Client/Guidebook/Controls/GuideReagentGroupEmbed.xaml.cs

@@ -42,7 +42,7 @@ public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out
         control = null;
         if (!args.TryGetValue("Group", out var group))
         {
-            Logger.Error("Reagent group embed tag is missing group argument");
+            Logger.GetSawmill("guide.regentgroup.embed").Error("Reagent group embed tag is missing group argument");
             return false;
         }
 

Content.Client/Guidebook/Controls/GuideTechDisciplineEmbed.xaml.cs

@@ -42,7 +42,7 @@ public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out
         control = null;
         if (!args.TryGetValue("Discipline", out var group))
         {
-            Logger.Error("Technology discipline embed tag is missing discipline argument");
+            Logger.GetSawmill("guide.techdisciplin.embed").Error("Technology discipline embed tag is missing discipline argument");
             return false;
         }
 

Content.Client/Guidebook/Controls/GuideTechnologyEmbed.xaml.cs

@@ -61,13 +61,13 @@ public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out
         control = null;
         if (!args.TryGetValue("Technology", out var id))
         {
-            Logger.Error("Technology embed tag is missing technology prototype argument");
+            Logger.GetSawmill("guidetechnology.embed").Error("Technology embed tag is missing technology prototype argument");
             return false;
         }
 
         if (!_prototype.TryIndex<TechnologyPrototype>(id, out var technology))
         {
-            Logger.Error($"Specified technology prototype \"{id}\" is not a valid technology prototype");
+            Logger.GetSawmill("guidetechnology.embed").Error($"Specified technology prototype \"{id}\" is not a valid technology prototype");
             return false;
         }
 

Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs

@@ -63,7 +63,7 @@ private void ShowGuide(GuideEntry entry)
         if (!_parsingMan.TryAddMarkup(EntryContainer, file.ReadToEnd()))
         {
             EntryContainer.AddChild(new Label() { Text = "ERROR: Failed to parse document." });
-            Logger.Error($"Failed to parse contents of guide document {entry.Id}.");
+            Logger.GetSawmill("guidebook.window").Error($"Failed to parse contents of guide document {entry.Id}.");
         }
     }
 
@@ -149,7 +149,7 @@ private void RepopulateTree(List<ProtoId<GuideEntryPrototype>>? roots = null, Pr
         {
             // TODO GUIDEBOOK Maybe allow duplicate entries?
             // E.g., for adding medicine under both chemicals & the chemist job
-            Logger.Error($"Adding duplicate guide entry: {id}");
+            Logger.GetSawmill("guidebook.window").Error($"Adding duplicate guide entry: {id}");
             return null;
         }
 

Content.Client/Guidebook/DocumentParsingManager.cs

@@ -69,7 +69,7 @@ public bool TryAddMarkup(Control control, string text, bool log = true)
         catch (Exception e)
         {
             if (log)
-                Logger.Error($"Encountered error while generating markup controls: {e}");
+                Logger.GetSawmill("document.parsing.addmarkup").Error($"Encountered error while generating markup controls: {e}");
             return false;
         }
 
@@ -82,7 +82,7 @@ private Parser<char, Control> CreateTagControlParser(string tagId, Type tagType,
             var tag = (IDocumentTag) sandbox.CreateInstance(tagType);
             if (!tag.TryParseTag(args, out var control))
             {
-                Logger.Error($"Failed to parse {tagId} args");
+                Logger.GetSawmill("document.parsing").Error($"Failed to parse {tagId} args");
                 return new Control();
             }
 

Content.Client/Guidebook/Richtext/Table.cs

@@ -15,7 +15,7 @@ public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out
 
         if (!args.TryGetValue("Columns", out var columns) || !int.TryParse(columns, out var columnsCount))
         {
-            Logger.Error("Guidebook tag \"Table\" does not specify required property \"Columns.\"");
+            Logger.GetSawmill("richtext.table").Error("Guidebook tag \"Table\" does not specify required property \"Columns.\"");
             control = null;
             return false;
         }