dd

.github/CODEOWNERS

@@ -19,7 +19,7 @@
 /Resources/engineCommandPerms.yml @moonheart08 @Chief-Engineer
 /Resources/clientCommandPerms.yml @moonheart08 @Chief-Engineer
 
-/Resources/Prototypes/Maps/** @Emisse
+/Resources/Prototypes/Maps/ @Emisse
 
 /Resources/Prototypes/Body/ @DrSmugleaf # suffering
 /Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf

.github/labeler.yml

@@ -16,7 +16,7 @@
 - changed-files:
   - any-glob-to-any-file: '**/*.swsl'
 
-"Changes: No C#":
+"No C#":
 - changed-files:
   # Equiv to any-glob-to-all as long as this has one matcher. If ALL changed files are not C# files, then apply label.
   - all-globs-to-all-files: "!**/*.cs"

.github/rsi-schema.json

@@ -85,7 +85,7 @@
             "CC-BY-NC-SA-3.0",
             "CC-BY-NC-SA-4.0",
             "CC0-1.0",
-            "CLA"
+            "All rights reserved for the CrystallPunk14 project only"
          ],
          "examples":[
             "CC-BY-SA-3.0"

.github/workflows/CP14Publish.yml

@@ -1,20 +0,0 @@
-name: Publish
-
-concurrency:
-  group: publish
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Send POST-request
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ secrets.BUILD_HOST }}
-        username: ${{ secrets.BUILD_USER }}
-        password: ${{ secrets.BUILD_PASS }}
-        port: 22
-        script: sh update.sh &> /dev/null

.github/workflows/conflict-labeler.yml

@@ -16,6 +16,6 @@ jobs:
       - name: Check for Merge Conflicts
         uses: eps1lon/actions-label-merge-conflict@v3.0.0
         with:
-          dirtyLabel: "S: Merge Conflict"
+          dirtyLabel: "Merge Conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."

.github/workflows/labeler-needsreview.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: actions-ecosystem/action-add-labels@v1
       with:
-        labels: "S: Needs Review"
+        labels: "Status: Needs Review"
     - uses: actions-ecosystem/action-remove-labels@v1
       with:
-        labels: "S: Awaiting Changes"
+        labels: "Status: Awaiting Changes"

.github/workflows/labeler-review.yml

@@ -1,23 +0,0 @@
-name: "Labels: Approved"
-on:
-  pull_request_review:
-    types: [submitted]
-jobs:
-  add_label:
-    # Change the repository name after you've made sure the team name is correct for your fork!
-    if: ${{ (github.repository == 'space-wizards/space-station-14') && (github.event.review.state == 'APPROVED') }}
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-    - uses: tspascoal/get-user-teams-membership@v3
-      id: checkUserMember
-      with:
-        username: ${{ github.actor }}
-        team: "content-maintainers,junior-maintainers"
-        GITHUB_TOKEN: ${{ secrets.GH_PAT }}
-    - if: ${{ steps.checkUserMember.outputs.isTeamMember == 'true' }}
-      uses: actions-ecosystem/action-add-labels@v1
-      with:
-        labels: "S: Approved"

.github/workflows/labeler-size.yml

@@ -1,20 +0,0 @@
-name: "Labels: Size"
-on: pull_request_target
-jobs:
-  size-label:
-    runs-on: ubuntu-latest
-    steps:
-      - name: size-label
-        uses: "pascalgn/size-label-action@v0.5.5"
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-        with:
-          # Custom size configuration
-          sizes: >
-            {
-              "0": "XS",
-              "10": "S",
-              "30": "M",
-              "100": "L",
-              "1000": "XL"
-            }

.github/workflows/labeler-stable.yml

@@ -1,16 +0,0 @@
-name: "Labels: Branch stable"
-
-on:
-  pull_request_target:
-    types:
-      - opened
-    branches:
-      - 'stable'
-
-jobs:
-  add_label:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions-ecosystem/action-add-labels@v1
-      with:
-        labels: "Branch: Stable"

.github/workflows/labeler-staging.yml

@@ -1,16 +0,0 @@
-name: "Labels: Branch staging"
-
-on:
-  pull_request_target:
-    types:
-      - opened
-    branches:
-      - 'staging'
-
-jobs:
-  add_label:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions-ecosystem/action-add-labels@v1
-      with:
-        labels: "Branch: Staging"

.github/workflows/labeler-untriaged.yml

@@ -3,8 +3,6 @@
 on:
   issues:
     types: [opened]
-  pull_request_target:
-    types: [opened]
 
 jobs:
   add_label:
@@ -13,4 +11,4 @@ jobs:
     - uses: actions-ecosystem/action-add-labels@v1
       if: join(github.event.issue.labels) == ''
       with:
-        labels: "S: Untriaged"
+        labels: "Status: Untriaged"

.github/workflows/publish.yml

@@ -5,8 +5,8 @@ concurrency:
 
 on:
   workflow_dispatch:
-  # schedule:
-   # - cron: '0 10 * * *'
+  schedule:
+    - cron: '0 10 * * *'
 
 jobs:
   build:
@@ -41,10 +41,21 @@ jobs:
     - name: Package client
       run: dotnet run --project Content.Packaging client --no-wipe-release
 
+    - name: Upload build artifact
+      id: artifact-upload-step
+      uses: actions/upload-artifact@v4
+      with:
+        name: build
+        path: release/*.zip
+        compression-level: 0
+        retention-days: 0
+
     - name: Publish version
-      run: Tools/publish_multi_request.py
+      run: Tools/publish_github_artifact.py
       env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
+        ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }}
         GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
 
     - name: Publish changelog (Discord)
@@ -57,3 +68,8 @@ jobs:
       run: Tools/actions_changelog_rss.py
       env:
         CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
+
+    - uses: geekyeggo/delete-artifact@v5
+      if: always()
+      with:
+        name: build

.github/workflows/update-credits.yml

@@ -19,8 +19,6 @@ jobs:
         
       - name: Get this week's Contributors
         shell: pwsh
-        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
         run: Tools/dump_github_contributors.ps1 > Resources/Credits/GitHub.txt
 
       # TODO

Content.Client/Actions/ActionsSystem.cs

@@ -51,29 +51,6 @@ namespace Content.Client.Actions
             SubscribeLocalEvent<EntityWorldTargetActionComponent, ComponentHandleState>(OnEntityWorldTargetHandleState);
         }
 
-        public override void FrameUpdate(float frameTime)
-        {
-            base.FrameUpdate(frameTime);
-
-            var worldActionQuery = EntityQueryEnumerator<WorldTargetActionComponent>();
-            while (worldActionQuery.MoveNext(out var uid, out var action))
-            {
-                UpdateAction(uid, action);
-            }
-
-            var instantActionQuery = EntityQueryEnumerator<InstantActionComponent>();
-            while (instantActionQuery.MoveNext(out var uid, out var action))
-            {
-                UpdateAction(uid, action);
-            }
-
-            var entityActionQuery = EntityQueryEnumerator<EntityTargetActionComponent>();
-            while (entityActionQuery.MoveNext(out var uid, out var action))
-            {
-                UpdateAction(uid, action);
-            }
-        }
-
         private void OnInstantHandleState(EntityUid uid, InstantActionComponent component, ref ComponentHandleState args)
         {
             if (args.Current is not InstantActionComponentState state)
@@ -118,8 +95,6 @@ namespace Content.Client.Actions
             component.Icon = state.Icon;
             component.IconOn = state.IconOn;
             component.IconColor = state.IconColor;
-            component.OriginalIconColor = state.OriginalIconColor;
-            component.DisabledIconColor = state.DisabledIconColor;
             component.Keywords.Clear();
             component.Keywords.UnionWith(state.Keywords);
             component.Enabled = state.Enabled;
@@ -150,8 +125,6 @@ namespace Content.Client.Actions
             if (!ResolveActionData(actionId, ref action))
                 return;
 
-            action.IconColor = action.Charges < 1 ? action.DisabledIconColor : action.OriginalIconColor;
-
             base.UpdateAction(actionId, action);
             if (_playerManager.LocalEntity != action.AttachedEntity)
                 return;
@@ -286,6 +259,12 @@ namespace Content.Client.Actions
 
             if (action.ClientExclusive)
             {
+                if (instantAction.Event != null)
+                {
+                    instantAction.Event.Performer = user;
+                    instantAction.Event.Action = actionId;
+                }
+
                 PerformAction(user, actions, actionId, instantAction, instantAction.Event, GameTiming.CurTime);
             }
             else

Content.Client/Actions/UI/ActionAlertTooltip.cs

@@ -101,7 +101,7 @@ namespace Content.Client.Actions.UI
             {
                 var duration = Cooldown.Value.End - Cooldown.Value.Start;
 
-                if (!FormattedMessage.TryFromMarkup(Loc.GetString("ui-actionslot-duration", ("duration", (int)duration.TotalSeconds), ("timeLeft", (int)timeLeft.TotalSeconds + 1)), out var markup))
+                if (!FormattedMessage.TryFromMarkup($"[color=#a10505]{(int) duration.TotalSeconds} sec cooldown ({(int) timeLeft.TotalSeconds + 1} sec remaining)[/color]", out var markup))
                     return;
 
                 _cooldownLabel.SetMessage(markup);

Content.Client/Administration/AdminNameOverlay.cs

@@ -2,10 +2,10 @@ using System.Numerics;
 using Content.Client.Administration.Systems;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
-using Robust.Client.UserInterface;
-using Robust.Shared;
 using Robust.Shared.Enums;
-using Robust.Shared.Configuration;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Maths;
 
 namespace Content.Client.Administration;
 
@@ -15,16 +15,14 @@ internal sealed class AdminNameOverlay : Overlay
     private readonly IEntityManager _entityManager;
     private readonly IEyeManager _eyeManager;
     private readonly EntityLookupSystem _entityLookup;
-    private readonly IUserInterfaceManager _userInterfaceManager;
     private readonly Font _font;
 
-    public AdminNameOverlay(AdminSystem system, IEntityManager entityManager, IEyeManager eyeManager, IResourceCache resourceCache, EntityLookupSystem entityLookup, IUserInterfaceManager userInterfaceManager)
+    public AdminNameOverlay(AdminSystem system, IEntityManager entityManager, IEyeManager eyeManager, IResourceCache resourceCache, EntityLookupSystem entityLookup)
     {
         _system = system;
         _entityManager = entityManager;
         _eyeManager = eyeManager;
         _entityLookup = entityLookup;
-        _userInterfaceManager = userInterfaceManager;
         ZIndex = 200;
         _font = new VectorFont(resourceCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
     }
@@ -59,18 +57,16 @@ internal sealed class AdminNameOverlay : Overlay
                 continue;
             }
 
-            var uiScale = _userInterfaceManager.RootControl.UIScale;
-            var lineoffset = new Vector2(0f, 11f) * uiScale;
+            var lineoffset = new Vector2(0f, 11f);
             var screenCoordinates = _eyeManager.WorldToScreen(aabb.Center +
                                                               new Angle(-_eyeManager.CurrentEye.Rotation).RotateVec(
                                                                   aabb.TopRight - aabb.Center)) + new Vector2(1f, 7f);
             if (playerInfo.Antag)
             {
-                args.ScreenHandle.DrawString(_font, screenCoordinates + (lineoffset * 2), "ANTAG", uiScale, Color.OrangeRed);
-;
+                args.ScreenHandle.DrawString(_font, screenCoordinates + (lineoffset * 2), "ANTAG", Color.OrangeRed);
             }
-            args.ScreenHandle.DrawString(_font, screenCoordinates+lineoffset, playerInfo.Username, uiScale, playerInfo.Connected ? Color.Yellow : Color.White);
-            args.ScreenHandle.DrawString(_font, screenCoordinates, playerInfo.CharacterName, uiScale, playerInfo.Connected ? Color.Aquamarine : Color.White);
+            args.ScreenHandle.DrawString(_font, screenCoordinates+lineoffset, playerInfo.Username, playerInfo.Connected ? Color.Yellow : Color.White);
+            args.ScreenHandle.DrawString(_font, screenCoordinates, playerInfo.CharacterName, playerInfo.Connected ? Color.Aquamarine : Color.White);
         }
     }
 }

Content.Client/Administration/Systems/AdminSystem.Overlay.cs

@@ -1,8 +1,6 @@
 using Content.Client.Administration.Managers;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
-using Robust.Client.UserInterface;
-using Robust.Shared.Configuration;
 
 namespace Content.Client.Administration.Systems
 {
@@ -13,7 +11,6 @@ namespace Content.Client.Administration.Systems
         [Dependency] private readonly IClientAdminManager _adminManager = default!;
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
-        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
 
         private AdminNameOverlay _adminNameOverlay = default!;
 
@@ -22,7 +19,7 @@ namespace Content.Client.Administration.Systems
 
         private void InitializeOverlay()
         {
-            _adminNameOverlay = new AdminNameOverlay(this, EntityManager, _eyeManager, _resourceCache, _entityLookup, _userInterfaceManager);
+            _adminNameOverlay = new AdminNameOverlay(this, EntityManager, _eyeManager, _resourceCache, _entityLookup);
             _adminManager.AdminStatusUpdated += OnAdminStatusUpdated;
         }
 

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;
@@ -13,7 +13,7 @@ public sealed partial class AdminMessagePopupMessage : Control
     {
         RobustXamlLoader.Load(this);
 
-        Admin.SetMessage(FormattedMessage.FromMarkupOrThrow(Loc.GetString(
+        Admin.SetMessage(FormattedMessage.FromMarkup(Loc.GetString(
             "admin-notes-message-admin",
             ("admin", message.AdminName),
             ("date", message.AddedOn.ToLocalTime()))));

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

@@ -49,7 +49,7 @@ public sealed partial class AdminMessagePopupWindow : Control
             MessageContainer.AddChild(new AdminMessagePopupMessage(message));
         }
 
-        Description.SetMessage(FormattedMessage.FromMarkupOrThrow(Loc.GetString("admin-notes-message-desc", ("count", state.Messages.Length))));
+        Description.SetMessage(FormattedMessage.FromMarkup(Loc.GetString("admin-notes-message-desc", ("count", state.Messages.Length))));
     }
 
     private void OnDismissButtonPressed(BaseButton.ButtonEventArgs obj)

Content.Client/Administration/UI/BanList/BanListWindow.xaml.cs

@@ -1,5 +1,4 @@
 using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 

Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs

@@ -22,11 +22,11 @@ namespace Content.Client.Administration.UI.BanPanel;
 [GenerateTypedNameReferences]
 public sealed partial class BanPanel : DefaultWindow
 {
-    public event Action<string?, (IPAddress, int)?, bool, ImmutableTypedHwid?, bool, uint, string, NoteSeverity, string[]?, bool>? BanSubmitted;
+    public event Action<string?, (IPAddress, int)?, bool, byte[]?, bool, uint, string, NoteSeverity, string[]?, bool>? BanSubmitted;
     public event Action<string>? PlayerChanged;
     private string? PlayerUsername { get; set; }
     private (IPAddress, int)? IpAddress { get; set; }
-    private ImmutableTypedHwid? Hwid { get; set; }
+    private byte[]? Hwid { get; set; }
     private double TimeEntered { get; set; }
     private uint Multiplier { get; set; }
     private bool HasBanFlag { get; set; }
@@ -371,8 +371,9 @@ public sealed partial class BanPanel : DefaultWindow
     private void OnHwidChanged()
     {
         var hwidString = HwidLine.Text;
-        ImmutableTypedHwid? hwid = null;
-        if (HwidCheckbox.Pressed && !(string.IsNullOrEmpty(hwidString) && LastConnCheckbox.Pressed) && !ImmutableTypedHwid.TryParse(hwidString, out hwid))
+        var length = 3 * (hwidString.Length / 4) - hwidString.TakeLast(2).Count(c => c == '=');
+        Hwid = new byte[length];
+        if (HwidCheckbox.Pressed && !(string.IsNullOrEmpty(hwidString) && LastConnCheckbox.Pressed) && !Convert.TryFromBase64String(hwidString, Hwid, out _))
         {
             ErrorLevel |= ErrorLevelEnum.Hwid;
             HwidLine.ModulateSelfOverride = Color.Red;
@@ -389,7 +390,7 @@ public sealed partial class BanPanel : DefaultWindow
             Hwid = null;
             return;
         }
-        Hwid = hwid;
+        Hwid = Convert.FromHexString(hwidString);
     }
 
     private void OnTypeChanged()

Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs

@@ -11,8 +11,9 @@ using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Network;
-using Robust.Shared.Configuration;
 using Robust.Shared.Utility;
+using Robust.Shared.Timing;
+using Robust.Shared.Configuration;
 
 namespace Content.Client.Administration.UI.Bwoink
 {

Content.Client/Administration/UI/Bwoink/BwoinkPanel.xaml.cs

@@ -59,7 +59,7 @@ namespace Content.Client.Administration.UI.Bwoink
                 Unread++;
 
             var formatted = new FormattedMessage(1);
-            formatted.AddMarkupOrThrow($"[color=gray]{message.SentAt.ToShortTimeString()}[/color] {message.Text}");
+            formatted.AddMarkup($"[color=gray]{message.SentAt.ToShortTimeString()}[/color] {message.Text}");
             TextOutput.AddMessage(formatted);
             LastMessage = message.SentAt;
         }

Content.Client/Administration/UI/Notes/NoteEdit.xaml

@@ -8,7 +8,6 @@
             <Label Name="ExpiryLabel" Text="{Loc admin-note-editor-expiry-label}" Visible="False" />
             <HistoryLineEdit Name="ExpiryLineEdit" PlaceHolder="{Loc admin-note-editor-expiry-placeholder}"
                              Visible="False" HorizontalExpand="True" />
-            <OptionButton Name="ExpiryLengthDropdown" Visible="False" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <OptionButton Name="TypeOption" HorizontalAlignment="Center" />

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

@@ -17,17 +17,6 @@ public sealed partial class NoteEdit : FancyWindow
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly IClientConsoleHost _console = default!;
 
-    private enum Multipliers
-    {
-        Minutes,
-        Hours,
-        Days,
-        Weeks,
-        Months,
-        Years,
-        Centuries
-    }
-
     public event Action<int, NoteType, string, NoteSeverity?, bool, DateTime?>? SubmitPressed;
 
     public NoteEdit(SharedAdminNote? note, string playerName, bool canCreate, bool canEdit)
@@ -42,20 +31,6 @@ public sealed partial class NoteEdit : FancyWindow
 
         ResetSubmitButton();
 
-        // It's weird to use minutes as the IDs, but it works and makes sense kind of :)
-        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-minutes"), (int) Multipliers.Minutes);
-        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-hours"), (int) Multipliers.Hours);
-        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-days"), (int) Multipliers.Days);
-        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-weeks"), (int) Multipliers.Weeks);
-        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-months"), (int) Multipliers.Months);
-        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-years"), (int) Multipliers.Years);
-        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-centuries"), (int) Multipliers.Centuries);
-        ExpiryLengthDropdown.OnItemSelected += OnLengthChanged;
-
-        ExpiryLengthDropdown.SelectId((int) Multipliers.Weeks);
-
-        ExpiryLineEdit.OnTextChanged += OnTextChanged;
-
         TypeOption.AddItem(Loc.GetString("admin-note-editor-type-note"), (int) NoteType.Note);
         TypeOption.AddItem(Loc.GetString("admin-note-editor-type-message"), (int) NoteType.Message);
         TypeOption.AddItem(Loc.GetString("admin-note-editor-type-watchlist"), (int) NoteType.Watchlist);
@@ -197,9 +172,8 @@ public sealed partial class NoteEdit : FancyWindow
     {
         ExpiryLabel.Visible = !PermanentCheckBox.Pressed;
         ExpiryLineEdit.Visible = !PermanentCheckBox.Pressed;
-        ExpiryLengthDropdown.Visible = !PermanentCheckBox.Pressed;
 
-        ExpiryLineEdit.Text = !PermanentCheckBox.Pressed ? 1.ToString() : string.Empty;
+        ExpiryLineEdit.Text = !PermanentCheckBox.Pressed ? DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") : string.Empty;
     }
 
     private void OnSecretPressed(BaseButton.ButtonEventArgs _)
@@ -213,16 +187,6 @@ public sealed partial class NoteEdit : FancyWindow
         SeverityOption.SelectId(args.Id);
     }
 
-    private void OnLengthChanged(OptionButton.ItemSelectedEventArgs args)
-    {
-        ExpiryLengthDropdown.SelectId(args.Id);
-    }
-
-    private void OnTextChanged(HistoryLineEdit.LineEditEventArgs args)
-    {
-        ParseExpiryTime();
-    }
-
     private void OnSubmitButtonPressed(BaseButton.ButtonEventArgs args)
     {
         if (!ParseExpiryTime())
@@ -299,24 +263,13 @@ public sealed partial class NoteEdit : FancyWindow
             return true;
         }
 
-        if (string.IsNullOrWhiteSpace(ExpiryLineEdit.Text) || !uint.TryParse(ExpiryLineEdit.Text, out var inputInt))
+        if (string.IsNullOrWhiteSpace(ExpiryLineEdit.Text) || !DateTime.TryParse(ExpiryLineEdit.Text, out var result) || DateTime.UtcNow > result)
         {
             ExpiryLineEdit.ModulateSelfOverride = Color.Red;
             return false;
         }
 
-        var mult = ExpiryLengthDropdown.SelectedId switch
-        {
-            (int) Multipliers.Minutes => TimeSpan.FromMinutes(1).TotalMinutes,
-            (int) Multipliers.Hours => TimeSpan.FromHours(1).TotalMinutes,
-            (int) Multipliers.Days => TimeSpan.FromDays(1).TotalMinutes,
-            (int) Multipliers.Weeks => TimeSpan.FromDays(7).TotalMinutes,
-            (int) Multipliers.Months => TimeSpan.FromDays(30).TotalMinutes,
-            (int) Multipliers.Years => TimeSpan.FromDays(365).TotalMinutes,
-            (int) Multipliers.Centuries => TimeSpan.FromDays(36525).TotalMinutes,
-            _ => throw new ArgumentOutOfRangeException(nameof(ExpiryLengthDropdown.SelectedId), "Multiplier out of range :(")
-        };
-        ExpiryTime = DateTime.UtcNow.AddMinutes(inputInt * mult);
+        ExpiryTime = result.ToUniversalTime();
         ExpiryLineEdit.ModulateSelfOverride = null;
         return true;
     }

Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs

@@ -1,13 +1,13 @@
-using System.Linq;
 using System.Numerics;
-using Content.Client.UserInterface.Controls;
-using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Roles;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Administration.UI.SetOutfit
@@ -64,18 +64,9 @@ namespace Content.Client.Administration.UI.SetOutfit
             PopulateByFilter(SearchBar.Text);
         }
 
-        private IEnumerable<StartingGearPrototype> GetPrototypes()
-        {
-            // Filter out any StartingGearPrototypes that belong to loadouts
-            var loadouts = _prototypeManager.EnumeratePrototypes<LoadoutPrototype>();
-            var loadoutGears = loadouts.Select(l => l.StartingGear);
-            return _prototypeManager.EnumeratePrototypes<StartingGearPrototype>()
-                .Where(p => !loadoutGears.Contains(p.ID));
-        }
-
         private void PopulateList()
         {
-            foreach (var gear in GetPrototypes())
+            foreach (var gear in _prototypeManager.EnumeratePrototypes<StartingGearPrototype>())
             {
                 OutfitList.Add(GetItem(gear, OutfitList));
             }
@@ -84,7 +75,7 @@ namespace Content.Client.Administration.UI.SetOutfit
         private void PopulateByFilter(string filter)
         {
             OutfitList.Clear();
-            foreach (var gear in GetPrototypes())
+            foreach (var gear in _prototypeManager.EnumeratePrototypes<StartingGearPrototype>())
             {
                 if (!string.IsNullOrEmpty(filter) &&
                     gear.ID.ToLowerInvariant().Contains(filter.Trim().ToLowerInvariant()))

Content.Client/Alerts/ClientAlertsSystem.cs

@@ -2,7 +2,6 @@ using System.Linq;
 using Content.Shared.Alert;
 using JetBrains.Annotations;
 using Robust.Client.Player;
-using Robust.Shared.GameStates;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
@@ -25,7 +24,8 @@ public sealed class ClientAlertsSystem : AlertsSystem
 
         SubscribeLocalEvent<AlertsComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
         SubscribeLocalEvent<AlertsComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
-        SubscribeLocalEvent<AlertsComponent, ComponentHandleState>(OnHandleState);
+
+        SubscribeLocalEvent<AlertsComponent, AfterAutoHandleStateEvent>(ClientAlertsHandleState);
     }
     protected override void LoadPrototypes()
     {
@@ -47,16 +47,6 @@ public sealed class ClientAlertsSystem : AlertsSystem
         }
     }
 
-    private void OnHandleState(Entity<AlertsComponent> alerts, ref ComponentHandleState args)
-    {
-        if (args.Current is not AlertComponentState cast)
-            return;
-
-        alerts.Comp.Alerts = cast.Alerts;
-
-        UpdateHud(alerts);
-    }
-
     protected override void AfterShowAlert(Entity<AlertsComponent> alerts)
     {
         UpdateHud(alerts);
@@ -67,6 +57,11 @@ public sealed class ClientAlertsSystem : AlertsSystem
         UpdateHud(alerts);
     }
 
+    private void ClientAlertsHandleState(Entity<AlertsComponent> alerts, ref AfterAutoHandleStateEvent args)
+    {
+        UpdateHud(alerts);
+    }
+
     private void UpdateHud(Entity<AlertsComponent> entity)
     {
         if (_playerManager.LocalEntity == entity.Owner)

Content.Client/Anomaly/AnomalySystem.cs

@@ -20,9 +20,8 @@ public sealed class AnomalySystem : SharedAnomalySystem
         SubscribeLocalEvent<AnomalyComponent, AppearanceChangeEvent>(OnAppearanceChanged);
         SubscribeLocalEvent<AnomalyComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<AnomalyComponent, AnimationCompletedEvent>(OnAnimationComplete);
-
-        SubscribeLocalEvent<AnomalySupercriticalComponent, ComponentShutdown>(OnShutdown);
     }
+
     private void OnStartup(EntityUid uid, AnomalyComponent component, ComponentStartup args)
     {
         _floating.FloatAnimation(uid, component.FloatingOffset, component.AnimationKey, component.AnimationTime);
@@ -76,13 +75,4 @@ public sealed class AnomalySystem : SharedAnomalySystem
             }
         }
     }
-
-    private void OnShutdown(Entity<AnomalySupercriticalComponent> ent, ref ComponentShutdown args)
-    {
-        if (!TryComp<SpriteComponent>(ent, out var sprite))
-            return;
-
-        sprite.Scale = Vector2.One;
-        sprite.Color = sprite.Color.WithAlpha(1f);
-    }
 }

Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs

@@ -1,50 +0,0 @@
-using Content.Shared.Anomaly.Components;
-using Content.Shared.Anomaly.Effects;
-using Content.Shared.Body.Components;
-using Robust.Client.GameObjects;
-
-namespace Content.Client.Anomaly.Effects;
-
-public sealed class ClientInnerBodyAnomalySystem : SharedInnerBodyAnomalySystem
-{
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<InnerBodyAnomalyComponent, AfterAutoHandleStateEvent>(OnAfterHandleState);
-        SubscribeLocalEvent<InnerBodyAnomalyComponent, ComponentShutdown>(OnCompShutdown);
-    }
-
-    private void OnAfterHandleState(Entity<InnerBodyAnomalyComponent> ent, ref AfterAutoHandleStateEvent args)
-    {
-        if (!TryComp<SpriteComponent>(ent, out var sprite))
-            return;
-
-        if (ent.Comp.FallbackSprite is null)
-            return;
-
-        if (!sprite.LayerMapTryGet(ent.Comp.LayerMap, out var index))
-            index = sprite.LayerMapReserveBlank(ent.Comp.LayerMap);
-
-        if (TryComp<BodyComponent>(ent, out var body) &&
-            body.Prototype is not null &&
-            ent.Comp.SpeciesSprites.TryGetValue(body.Prototype.Value, out var speciesSprite))
-        {
-            sprite.LayerSetSprite(index, speciesSprite);
-        }
-        else
-        {
-            sprite.LayerSetSprite(index, ent.Comp.FallbackSprite);
-        }
-
-        sprite.LayerSetVisible(index, true);
-        sprite.LayerSetShader(index, "unshaded");
-    }
-
-    private void OnCompShutdown(Entity<InnerBodyAnomalyComponent> ent, ref ComponentShutdown args)
-    {
-        if (!TryComp<SpriteComponent>(ent, out var sprite))
-            return;
-
-        var index = sprite.LayerMapGet(ent.Comp.LayerMap);
-        sprite.LayerSetVisible(index, false);
-    }
-}

Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs

@@ -1,5 +1,7 @@
 using Content.Shared.Anomaly;
+using Content.Shared.Gravity;
 using JetBrains.Annotations;
+using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 
 namespace Content.Client.Anomaly.Ui;

Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml

@@ -1,81 +0,0 @@
-<BoxContainer xmlns="https://spacestation14.io"
-         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-         xmlns:s="clr-namespace:Content.Client.Stylesheets"
-         xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-         Orientation="Vertical" HorizontalExpand ="True" Margin="0 0 0 3">
-
-    <!-- Device selection button -->
-    <Button Name="FocusButton" HorizontalExpand="True" SetHeight="32" Margin="12 0 0 0" StyleClasses="OpenBoth" Access="Public">
-        <BoxContainer HorizontalExpand="True" VerticalExpand="True" Orientation="Horizontal">
-
-            <!-- Alarm state -->
-            <TextureRect Stretch="Keep" HorizontalAlignment="Left" Margin="-20 -2 0 0" ModulateSelfOverride="#25252a" TexturePath="/Textures/Interface/AtmosMonitoring/status_bg.png">
-                <BoxContainer VerticalExpand="True" HorizontalExpand="True" Orientation="Horizontal" Margin="8 0">
-                    <TextureRect Name="ArrowTexture" VerticalAlignment="Center" SetSize="12 12" Stretch="KeepAspectCentered" Margin="3 0" TexturePath="/Textures/Interface/Nano/triangle_right.png"></TextureRect>
-                    <Label Name="AlarmStateLabel" HorizontalExpand="True" HorizontalAlignment="Center" FontColorOverride="#5A5A5A" Text="{Loc 'atmos-alerts-window-invalid-state'}"></Label>
-                </BoxContainer>
-            </TextureRect>
-
-            <!-- Alarm name -->
-            <Label Name="AlarmNameLabel" Text="???" HorizontalExpand="True" HorizontalAlignment="Center" Margin="5 0"></Label>
-        </BoxContainer>
-    </Button>
-
-    <!-- Panel that appears on selecting the device -->
-    <PanelContainer Name="FocusContainer" HorizontalExpand="True" Margin="1 -1 1 0" ReservesSpace="False" Visible="False" Access="Public">
-        <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BackgroundColor="#25252a"/>
-        </PanelContainer.PanelOverride>
-        <BoxContainer HorizontalExpand="True" VerticalExpand="True" Orientation="Vertical">
-
-            <!-- Atmosphere status -->
-            <Control>
-
-                <!-- Main container for displaying atmospheric data -->
-                <BoxContainer Name="MainDataContainer" HorizontalExpand="True" VerticalExpand="True" Orientation="Vertical" ReservesSpace="False" Visible="False">
-                    <BoxContainer HorizontalExpand="True" Orientation="Horizontal">
-                        <Label Name="TemperatureHeaderLabel" Text="{Loc 'atmos-alerts-window-temperature-label'}" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 2 0 0" SetHeight="24"></Label>
-                        <Label Name="PressureHeaderLabel" Text="{Loc 'atmos-alerts-window-pressure-label'}" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 2 0 0" SetHeight="24"></Label>
-                        <Label Name="OxygenationHeaderLabel" Text="{Loc 'atmos-alerts-window-oxygenation-label'}" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 2 0 0" SetHeight="24"></Label>
-                    </BoxContainer>
-                    <PanelContainer HorizontalExpand="True">
-                        <PanelContainer.PanelOverride>
-                            <gfx:StyleBoxFlat BackgroundColor="#202023"/>
-                        </PanelContainer.PanelOverride>
-                        <BoxContainer HorizontalExpand="True" Orientation="Horizontal">
-                            <Label Name="TemperatureLabel" Text="???" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#5A5A5A" Margin="0 2 0 0" SetHeight="24"></Label>
-                            <Label Name="PressureLabel" Text="???" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#5A5A5A" Margin="0 2 0 0" SetHeight="24"></Label>
-                            <Label Name="OxygenationLabel" Text="???" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#5A5A5A" Margin="0 2 0 0" SetHeight="24"></Label>
-                        </BoxContainer>
-                    </PanelContainer>
-                    <BoxContainer HorizontalExpand="True" Orientation="Horizontal">
-                        <Label Name="GasesHeaderLabel" Text="{Loc 'atmos-alerts-window-other-gases-label'}" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 4 0 0" SetHeight="24"></Label>
-                    </BoxContainer>
-                    <PanelContainer HorizontalExpand="True">
-                        <PanelContainer.PanelOverride>
-                            <gfx:StyleBoxFlat BackgroundColor="#202023"/>
-                        </PanelContainer.PanelOverride>
-
-                        <!-- Gas entries added via C# code -->
-                        <GridContainer Name="GasGridContainer" HorizontalExpand="True" Columns = "4"></GridContainer>
-                    </PanelContainer>
-                </BoxContainer>
-
-                <!-- If the alarm is inactive, this is label is diplayed instead -->
-                <Label Name="NoDataLabel" Text="{Loc 'atmos-alerts-window-no-data-available'}" HorizontalAlignment="Center" Margin="0 15" FontColorOverride="#a9a9a9" ReservesSpace="False" Visible="False"></Label>
-
-                <!-- Silencing progress bar -->
-                <controls:StripeBack Name="SilenceAlarmProgressBar" ReservesSpace="False" Visible="False" Access="Public">
-                    <PanelContainer>
-                        <Label Text="{Loc 'atmos-alerts-window-alerts-being-silenced'}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5 5 5 5"/>
-                    </PanelContainer>
-                </controls:StripeBack>
-            </Control>
-
-            <!-- Check box for silencing this alarm -->
-            <CheckBox Name="SilenceCheckBox" Text="{Loc 'atmos-alerts-window-silence-alerts'}" HorizontalAlignment="Left" Margin="5 5 5 5" Access="Public"></CheckBox>
-        </BoxContainer>
-    </PanelContainer>
-
-</BoxContainer>

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

@@ -1,215 +0,0 @@
-using Content.Client.Stylesheets;
-using Content.Shared.Atmos;
-using Content.Shared.Atmos.Components;
-using Content.Shared.Atmos.Monitor;
-using Content.Shared.FixedPoint;
-using Content.Shared.Temperature;
-using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
-using Robust.Client.ResourceManagement;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Map;
-using System.Linq;
-
-namespace Content.Client.Atmos.Consoles;
-
-[GenerateTypedNameReferences]
-public sealed partial class AtmosAlarmEntryContainer : BoxContainer
-{
-    public NetEntity NetEntity;
-    public EntityCoordinates? Coordinates;
-
-    private readonly IEntityManager _entManager;
-    private readonly IResourceCache _cache;
-
-    private Dictionary<AtmosAlarmType, string> _alarmStrings = new Dictionary<AtmosAlarmType, string>()
-    {
-        [AtmosAlarmType.Invalid] = "atmos-alerts-window-invalid-state",
-        [AtmosAlarmType.Normal] = "atmos-alerts-window-normal-state",
-        [AtmosAlarmType.Warning] = "atmos-alerts-window-warning-state",
-        [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);
-
-        _entManager = IoCManager.Resolve<IEntityManager>();
-        _cache = IoCManager.Resolve<IResourceCache>();
-
-        NetEntity = uid;
-        Coordinates = coordinates;
-
-        // Load fonts
-        var headerFont = new VectorFont(_cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Bold.ttf"), 11);
-        var normalFont = new VectorFont(_cache.GetResource<FontResource>("/Fonts/NotoSansDisplay/NotoSansDisplay-Regular.ttf"), 11);
-        var smallFont = new VectorFont(_cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
-
-        // Set fonts
-        TemperatureHeaderLabel.FontOverride = headerFont;
-        PressureHeaderLabel.FontOverride = headerFont;
-        OxygenationHeaderLabel.FontOverride = headerFont;
-        GasesHeaderLabel.FontOverride = headerFont;
-
-        TemperatureLabel.FontOverride = normalFont;
-        PressureLabel.FontOverride = normalFont;
-        OxygenationLabel.FontOverride = normalFont;
-
-        NoDataLabel.FontOverride = headerFont;
-
-        SilenceCheckBox.Label.FontOverride = smallFont;
-        SilenceCheckBox.Label.FontColorOverride = Color.DarkGray;
-    }
-
-    public void UpdateEntry(AtmosAlertsComputerEntry entry, bool isFocus, AtmosAlertsFocusDeviceData? focusData = null)
-    {
-        NetEntity = entry.NetEntity;
-        Coordinates = _entManager.GetCoordinates(entry.Coordinates);
-
-        // Load fonts
-        var normalFont = new VectorFont(_cache.GetResource<FontResource>("/Fonts/NotoSansDisplay/NotoSansDisplay-Regular.ttf"), 11);
-
-        // Update alarm state
-        if (!_alarmStrings.TryGetValue(entry.AlarmState, out var alarmString))
-            alarmString = "atmos-alerts-window-invalid-state";
-
-        AlarmStateLabel.Text = Loc.GetString(alarmString);
-        AlarmStateLabel.FontColorOverride = GetAlarmStateColor(entry.AlarmState);
-
-        // Update alarm name
-        AlarmNameLabel.Text = Loc.GetString("atmos-alerts-window-alarm-label", ("name", entry.EntityName), ("address", entry.Address));
-
-        // Focus updates
-        FocusContainer.Visible = isFocus;
-
-        if (isFocus)
-            SetAsFocus();
-        else
-            RemoveAsFocus();
-
-        if (isFocus && entry.Group == AtmosAlertsComputerGroup.AirAlarm)
-        {
-            MainDataContainer.Visible = (entry.AlarmState != AtmosAlarmType.Invalid);
-            NoDataLabel.Visible = (entry.AlarmState == AtmosAlarmType.Invalid);
-
-            if (focusData != null)
-            {
-                // Update temperature
-                var tempK = (FixedPoint2)focusData.Value.TemperatureData.Item1;
-                var tempC = (FixedPoint2)TemperatureHelpers.KelvinToCelsius(tempK.Float());
-
-                TemperatureLabel.Text = Loc.GetString("atmos-alerts-window-temperature-value", ("valueInC", tempC), ("valueInK", tempK));
-                TemperatureLabel.FontColorOverride = GetAlarmStateColor(focusData.Value.TemperatureData.Item2);
-
-                // Update pressure
-                PressureLabel.Text = Loc.GetString("atmos-alerts-window-pressure-value", ("value", (FixedPoint2)focusData.Value.PressureData.Item1));
-                PressureLabel.FontColorOverride = GetAlarmStateColor(focusData.Value.PressureData.Item2);
-
-                // Update oxygenation
-                var oxygenPercent = (FixedPoint2)0f;
-                var oxygenAlert = AtmosAlarmType.Invalid;
-
-                if (focusData.Value.GasData.TryGetValue(Gas.Oxygen, out var oxygenData))
-                {
-                    oxygenPercent = oxygenData.Item2 * 100f;
-                    oxygenAlert = oxygenData.Item3;
-                }
-
-                OxygenationLabel.Text = Loc.GetString("atmos-alerts-window-oxygenation-value", ("value", oxygenPercent));
-                OxygenationLabel.FontColorOverride = GetAlarmStateColor(oxygenAlert);
-
-                // Update other present gases
-                GasGridContainer.RemoveAllChildren();
-
-                var gasData = focusData.Value.GasData.Where(g => g.Key != Gas.Oxygen);
-
-                if (gasData.Count() == 0)
-                {
-                    // No other gases
-                    var gasLabel = new Label()
-                    {
-                        Text = Loc.GetString("atmos-alerts-window-other-gases-value-nil"),
-                        FontOverride = normalFont,
-                        FontColorOverride = StyleNano.DisabledFore,
-                        HorizontalAlignment = HAlignment.Center,
-                        VerticalAlignment = VAlignment.Center,
-                        HorizontalExpand = true,
-                        Margin = new Thickness(0, 2, 0, 0),
-                        SetHeight = 24f,
-                    };
-
-                    GasGridContainer.AddChild(gasLabel);
-                }
-
-                else
-                {
-                    // Add an entry for each gas
-                    foreach ((var gas, (var mol, var percent, var alert)) in gasData)
-                    {
-                        var gasPercent = (FixedPoint2)0f;
-                        gasPercent = percent * 100f;
-
-                        if (!_gasShorthands.TryGetValue(gas, out var gasShorthand))
-                            gasShorthand = "X";
-
-                        var gasLabel = new Label()
-                        {
-                            Text = Loc.GetString("atmos-alerts-window-other-gases-value", ("shorthand", gasShorthand), ("value", gasPercent)),
-                            FontOverride = normalFont,
-                            FontColorOverride = GetAlarmStateColor(alert),
-                            HorizontalAlignment = HAlignment.Center,
-                            VerticalAlignment = VAlignment.Center,
-                            HorizontalExpand = true,
-                            Margin = new Thickness(0, 2, 0, 0),
-                            SetHeight = 24f,
-                        };
-
-                        GasGridContainer.AddChild(gasLabel);
-                    }
-                }
-            }
-        }
-    }
-
-    public void SetAsFocus()
-    {
-        FocusButton.AddStyleClass(StyleNano.StyleClassButtonColorGreen);
-        ArrowTexture.TexturePath = "/Textures/Interface/Nano/inverted_triangle.svg.png";
-    }
-
-    public void RemoveAsFocus()
-    {
-        FocusButton.RemoveStyleClass(StyleNano.StyleClassButtonColorGreen);
-        ArrowTexture.TexturePath = "/Textures/Interface/Nano/triangle_right.png";
-        FocusContainer.Visible = false;
-    }
-
-    private Color GetAlarmStateColor(AtmosAlarmType alarmType)
-    {
-        switch (alarmType)
-        {
-            case AtmosAlarmType.Normal:
-                return StyleNano.GoodGreenFore;
-            case AtmosAlarmType.Warning:
-                return StyleNano.ConcerningOrangeFore;
-            case AtmosAlarmType.Danger:
-                return StyleNano.DangerousRedFore;
-        }
-
-        return StyleNano.DisabledFore;
-    }
-}

Content.Client/Atmos/Consoles/AtmosAlertsComputerBoundUserInterface.cs

@@ -1,52 +0,0 @@
-using Content.Shared.Atmos.Components;
-
-namespace Content.Client.Atmos.Consoles;
-
-public sealed class AtmosAlertsComputerBoundUserInterface : BoundUserInterface
-{
-    [ViewVariables]
-    private AtmosAlertsComputerWindow? _menu;
-
-    public AtmosAlertsComputerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { }
-
-    protected override void Open()
-    {
-        _menu = new AtmosAlertsComputerWindow(this, Owner);
-        _menu.OpenCentered();
-        _menu.OnClose += Close;
-
-        EntMan.TryGetComponent<TransformComponent>(Owner, out var xform);
-    }
-
-    protected override void UpdateState(BoundUserInterfaceState state)
-    {
-        base.UpdateState(state);
-
-        var castState = (AtmosAlertsComputerBoundInterfaceState) state;
-
-        if (castState == null)
-            return;
-
-        EntMan.TryGetComponent<TransformComponent>(Owner, out var xform);
-        _menu?.UpdateUI(xform?.Coordinates, castState.AirAlarms, castState.FireAlarms, castState.FocusData);
-    }
-
-    public void SendFocusChangeMessage(NetEntity? netEntity)
-    {
-        SendMessage(new AtmosAlertsComputerFocusChangeMessage(netEntity));
-    }
-
-    public void SendDeviceSilencedMessage(NetEntity netEntity, bool silenceDevice)
-    {
-        SendMessage(new AtmosAlertsComputerDeviceSilencedMessage(netEntity, silenceDevice));
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-
-        _menu?.Dispose();
-    }
-}

Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml

@@ -1,108 +0,0 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
-               xmlns:ui="clr-namespace:Content.Client.Pinpointer.UI"
-               xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-               xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-               Title="{Loc 'atmos-alerts-window-title'}"
-               Resizable="False"
-               SetSize="1120 750"
-               MinSize="1120 750">
-    <BoxContainer Orientation="Vertical">
-        <!-- Main display -->
-        <BoxContainer Orientation="Horizontal" VerticalExpand="True" HorizontalExpand="True">
-            <!-- Nav map -->
-            <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True">
-                <ui:NavMapControl Name="NavMap" Margin="5 5" VerticalExpand="True" HorizontalExpand="True">
-
-                    <!-- System warning -->
-                    <PanelContainer Name="SystemWarningPanel"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Top"
-                                    HorizontalExpand="True"
-                                    Margin="0 48 0 0"
-                                    Visible="False">
-                        <RichTextLabel Name="SystemWarningLabel" Margin="12 8 12 8"/>
-                    </PanelContainer>
-
-                </ui:NavMapControl>
-
-                <!-- Nav map legend -->
-                <BoxContainer Orientation="Horizontal" Margin="0 10 0 10">
-                    <Label Text="{Loc 'atmos-alerts-window-label-alert-types'}"
-                           Margin="20 0 5 0"/>
-                    <TextureRect Stretch="KeepAspectCentered"
-                                TexturePath="/Textures/Interface/NavMap/beveled_circle.png"
-                                Modulate="#5A5A5A"
-                                SetSize="16 16"
-                                Margin="20 0 5 0"/>
-                    <Label Text="{Loc 'atmos-alerts-window-invalid-state'}"/>
-                    <TextureRect Stretch="KeepAspectCentered"
-                                TexturePath="/Textures/Interface/NavMap/beveled_circle.png"
-                                Modulate="#32cd32"
-                                SetSize="16 16"
-                                Margin="20 0 5 0"/>
-                    <Label Text="{Loc 'atmos-alerts-window-normal-state'}"/>
-                    <TextureRect Stretch="KeepAspectCentered"
-                                TexturePath="/Textures/Interface/NavMap/beveled_triangle.png"
-                                SetSize="16 16"
-                                Modulate="#ffb648"
-                                Margin="20 0 5 0"/>
-                    <Label Text="{Loc 'atmos-alerts-window-warning-state'}"/>
-                    <TextureRect Stretch="KeepAspectCentered"
-                                TexturePath="/Textures/Interface/NavMap/beveled_square.png"
-                                SetSize="16 16"
-                                Modulate="#ff4343"
-                                Margin="20 0 5 0"/>
-                    <Label Text="{Loc 'atmos-alerts-window-danger-state'}"/>
-                </BoxContainer>
-            </BoxContainer>
-
-            <!-- Atmosphere status -->
-            <BoxContainer Orientation="Vertical" VerticalExpand="True" SetWidth="440" Margin="0 0 10 10">
-
-                <!-- Station name -->
-                <controls:StripeBack>
-                    <PanelContainer>
-                        <RichTextLabel Name="StationName" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 5 0 3"/>
-                    </PanelContainer>
-                </controls:StripeBack>
-
-                <!-- Alarm status (entries added by C# code) -->
-                <TabContainer Name="MasterTabContainer" VerticalExpand="True" HorizontalExpand="True" Margin="0 10 0 0">
-                    <ScrollContainer HorizontalExpand="True" Margin="8, 8, 8, 8">
-                        <BoxContainer Name="AlertsTable" Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True" Margin="0 0 0 10"/>
-                    </ScrollContainer>
-                    <ScrollContainer HorizontalExpand="True" Margin="8, 8, 8, 8">
-                        <BoxContainer Name="AirAlarmsTable" Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True" Margin="0 0 0 10"/>
-                    </ScrollContainer>
-                    <ScrollContainer HorizontalExpand="True" Margin="8, 8, 8, 8">
-                        <BoxContainer Name="FireAlarmsTable" Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True" Margin="0 0 0 10"/>
-                    </ScrollContainer>
-                </TabContainer>
-
-                <!-- Overlay toggles -->
-                <BoxContainer Orientation="Vertical" Margin="0 10 0 0">
-                    <Label Text="{Loc 'atmos-alerts-window-toggle-overlays'}" Margin="0 0 0 5"/>
-                    <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-                        <CheckBox Name="ShowInactiveAlarms" Text="{Loc 'atmos-alerts-window-invalid-state'}" Pressed="False" HorizontalExpand="True"/>
-                        <CheckBox Name="ShowNormalAlarms" Text="{Loc 'atmos-alerts-window-normal-state'}" Pressed="False" HorizontalExpand="True"/>
-                        <CheckBox Name="ShowWarningAlarms" Text="{Loc 'atmos-alerts-window-warning-state'}" Pressed="True" HorizontalExpand="True"/>
-                        <CheckBox Name="ShowDangerAlarms" Text="{Loc 'atmos-alerts-window-danger-state'}" Pressed="True" HorizontalExpand="True"/>
-                    </BoxContainer>
-                </BoxContainer>
-            </BoxContainer>
-
-        </BoxContainer>
-
-        <!-- Footer -->
-        <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
-            <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
-                <Label Text="{Loc 'atmos-alerts-window-flavor-left'}" StyleClasses="WindowFooterText" />
-                <Label Text="{Loc 'atmos-alerts-window-flavor-right'}" StyleClasses="WindowFooterText"
-                        HorizontalAlignment="Right" HorizontalExpand="True"  Margin="0 0 5 0" />
-                <TextureRect StyleClasses="NTLogoDark" Stretch="KeepAspectCentered"
-                        VerticalAlignment="Center" HorizontalAlignment="Right" SetSize="19 19"/>
-            </BoxContainer>
-        </BoxContainer>
-    </BoxContainer>
-</controls:FancyWindow>

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

@@ -1,611 +0,0 @@
-using Content.Client.Message;
-using Content.Client.Pinpointer.UI;
-using Content.Client.Stylesheets;
-using Content.Client.UserInterface.Controls;
-using Content.Shared.Atmos.Components;
-using Content.Shared.Atmos.Monitor;
-using Content.Shared.Pinpointer;
-using Robust.Client.AutoGenerated;
-using Robust.Client.GameObjects;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Map;
-using Robust.Shared.Timing;
-using Robust.Shared.Utility;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-
-namespace Content.Client.Atmos.Consoles;
-
-[GenerateTypedNameReferences]
-public sealed partial class AtmosAlertsComputerWindow : FancyWindow
-{
-    private readonly IEntityManager _entManager;
-    private readonly SpriteSystem _spriteSystem;
-    private readonly SharedNavMapSystem _navMapSystem;
-
-    private EntityUid? _owner;
-    private NetEntity? _trackedEntity;
-
-    private AtmosAlertsComputerEntry[]? _airAlarms = null;
-    private AtmosAlertsComputerEntry[]? _fireAlarms = null;
-    private IEnumerable<AtmosAlertsComputerEntry>? _allAlarms = null;
-
-    private IEnumerable<AtmosAlertsComputerEntry>? _activeAlarms = null;
-    private Dictionary<NetEntity, float> _deviceSilencingProgress = new();
-
-    public event Action<NetEntity?>? SendFocusChangeMessageAction;
-    public event Action<NetEntity, bool>? SendDeviceSilencedMessageAction;
-
-    private bool _autoScrollActive = false;
-    private bool _autoScrollAwaitsUpdate = false;
-
-    private const float SilencingDuration = 2.5f;
-
-    // Colors
-    private Color _wallColor = new Color(64, 64, 64);
-    private Color _tileColor = new Color(28, 28, 28);
-    private Color _monitorBlipColor = Color.Cyan;
-    private Color _untrackedEntColor = Color.DimGray;
-    private Color _regionBaseColor = new Color(154, 154, 154);
-    private Color _inactiveColor = StyleNano.DisabledFore;
-    private Color _statusTextColor = StyleNano.GoodGreenFore;
-    private Color _goodColor = Color.LimeGreen;
-    private Color _warningColor = new Color(255, 182, 72);
-    private Color _dangerColor = new Color(255, 67, 67);
-
-    public AtmosAlertsComputerWindow(AtmosAlertsComputerBoundUserInterface userInterface, EntityUid? owner)
-    {
-        RobustXamlLoader.Load(this);
-        _entManager = IoCManager.Resolve<IEntityManager>();
-        _spriteSystem = _entManager.System<SpriteSystem>();
-        _navMapSystem = _entManager.System<SharedNavMapSystem>();
-
-        // Pass the owner to nav map
-        _owner = owner;
-        NavMap.Owner = _owner;
-
-        // Set nav map colors
-        NavMap.WallColor = _wallColor;
-        NavMap.TileColor = _tileColor;
-
-        // Set nav map grid uid
-        var stationName = Loc.GetString("atmos-alerts-window-unknown-location");
-
-        if (_entManager.TryGetComponent<TransformComponent>(owner, out var xform))
-        {
-            NavMap.MapUid = xform.GridUid;
-
-            // Assign station name      
-            if (_entManager.TryGetComponent<MetaDataComponent>(xform.GridUid, out var stationMetaData))
-                stationName = stationMetaData.EntityName;
-
-            var msg = new FormattedMessage();
-            msg.TryAddMarkup(Loc.GetString("atmos-alerts-window-station-name", ("stationName", stationName)), out _);
-
-            StationName.SetMessage(msg);
-        }
-
-        else
-        {
-            StationName.SetMessage(stationName);
-            NavMap.Visible = false;
-        }
-
-        // Set trackable entity selected action
-        NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap;
-
-        // Update nav map
-        NavMap.ForceNavMapUpdate();
-
-        // Set tab container headers
-        MasterTabContainer.SetTabTitle(0, Loc.GetString("atmos-alerts-window-tab-no-alerts"));
-        MasterTabContainer.SetTabTitle(1, Loc.GetString("atmos-alerts-window-tab-air-alarms"));
-        MasterTabContainer.SetTabTitle(2, Loc.GetString("atmos-alerts-window-tab-fire-alarms"));
-
-        // Set UI toggles
-        ShowInactiveAlarms.OnToggled += _ => OnShowAlarmsToggled(ShowInactiveAlarms, AtmosAlarmType.Invalid);
-        ShowNormalAlarms.OnToggled += _ => OnShowAlarmsToggled(ShowNormalAlarms, AtmosAlarmType.Normal);
-        ShowWarningAlarms.OnToggled += _ => OnShowAlarmsToggled(ShowWarningAlarms, AtmosAlarmType.Warning);
-        ShowDangerAlarms.OnToggled += _ => OnShowAlarmsToggled(ShowDangerAlarms, AtmosAlarmType.Danger);
-
-        // Set atmos monitoring message action
-        SendFocusChangeMessageAction += userInterface.SendFocusChangeMessage;
-        SendDeviceSilencedMessageAction += userInterface.SendDeviceSilencedMessage;
-    }
-
-    #region Toggle handling
-
-    private void OnShowAlarmsToggled(CheckBox toggle, AtmosAlarmType toggledAlarmState)
-    {
-        if (_owner == null)
-            return;
-
-        if (!_entManager.TryGetComponent<AtmosAlertsComputerComponent>(_owner.Value, out var console))
-            return;
-
-        foreach (var device in console.AtmosDevices)
-        {
-            var alarmState = GetAlarmState(device.NetEntity);
-
-            if (toggledAlarmState != alarmState)
-                continue;
-
-            if (toggle.Pressed)
-                AddTrackedEntityToNavMap(device, alarmState);
-
-            else
-                NavMap.TrackedEntities.Remove(device.NetEntity);
-        }
-    }
-
-    private void OnSilenceAlertsToggled(NetEntity netEntity, bool toggleState)
-    {
-        if (!_entManager.TryGetComponent<AtmosAlertsComputerComponent>(_owner, out var console))
-            return;
-
-        if (toggleState)
-            _deviceSilencingProgress[netEntity] = SilencingDuration;
-
-        else
-            _deviceSilencingProgress.Remove(netEntity);
-
-        foreach (AtmosAlarmEntryContainer entryContainer in AlertsTable.Children)
-        {
-            if (entryContainer.NetEntity == netEntity)
-                entryContainer.SilenceAlarmProgressBar.Visible = toggleState;
-        }
-
-        SendDeviceSilencedMessageAction?.Invoke(netEntity, toggleState);
-    }
-
-    #endregion
-
-    public void UpdateUI(EntityCoordinates? consoleCoords, AtmosAlertsComputerEntry[] airAlarms, AtmosAlertsComputerEntry[] fireAlarms, AtmosAlertsFocusDeviceData? focusData)
-    {
-        if (_owner == null)
-            return;
-
-        if (!_entManager.TryGetComponent<AtmosAlertsComputerComponent>(_owner.Value, out var console))
-            return;
-
-        if (_trackedEntity != focusData?.NetEntity)
-        {
-            SendFocusChangeMessageAction?.Invoke(_trackedEntity);
-            focusData = null;
-        }
-
-        // Retain alarm data for use inbetween updates
-        _airAlarms = airAlarms;
-        _fireAlarms = fireAlarms;
-        _allAlarms = airAlarms.Concat(fireAlarms);
-
-        var silenced = console.SilencedDevices;
-
-        _activeAlarms = _allAlarms.Where(x => x.AlarmState > AtmosAlarmType.Normal &&
-            (!silenced.Contains(x.NetEntity) || _deviceSilencingProgress.ContainsKey(x.NetEntity)));
-
-        // Reset nav map data
-        NavMap.TrackedCoordinates.Clear();
-        NavMap.TrackedEntities.Clear();
-
-        // Add tracked entities to the nav map
-        foreach (var device in console.AtmosDevices)
-        {
-            if (!device.NetEntity.Valid)
-                continue;
-
-            if (!NavMap.Visible)
-                continue;
-
-            var alarmState = GetAlarmState(device.NetEntity);
-
-            if (_trackedEntity != device.NetEntity)
-            {
-                // Skip air alarms if the appropriate overlay is off
-                if (!ShowInactiveAlarms.Pressed && alarmState == AtmosAlarmType.Invalid)
-                    continue;
-
-                if (!ShowNormalAlarms.Pressed && alarmState == AtmosAlarmType.Normal)
-                    continue;
-
-                if (!ShowWarningAlarms.Pressed && alarmState == AtmosAlarmType.Warning)
-                    continue;
-
-                if (!ShowDangerAlarms.Pressed && alarmState == AtmosAlarmType.Danger)
-                    continue;
-            }
-
-            AddTrackedEntityToNavMap(device, alarmState);
-        }
-
-        // Show the monitor location
-        var consoleUid = _entManager.GetNetEntity(_owner);
-
-        if (consoleCoords != null && consoleUid != null)
-        {
-            var texture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")));
-            var blip = new NavMapBlip(consoleCoords.Value, texture, _monitorBlipColor, true, false);
-            NavMap.TrackedEntities[consoleUid.Value] = blip;
-        }
-
-        // Update the nav map
-        NavMap.ForceNavMapUpdate();
-
-        // Clear excess children from the tables
-        var activeAlarmCount = _activeAlarms.Count();
-
-        while (AlertsTable.ChildCount > activeAlarmCount)
-            AlertsTable.RemoveChild(AlertsTable.GetChild(AlertsTable.ChildCount - 1));
-
-        while (AirAlarmsTable.ChildCount > airAlarms.Length)
-            AirAlarmsTable.RemoveChild(AirAlarmsTable.GetChild(AirAlarmsTable.ChildCount - 1));
-
-        while (FireAlarmsTable.ChildCount > fireAlarms.Length)
-            FireAlarmsTable.RemoveChild(FireAlarmsTable.GetChild(FireAlarmsTable.ChildCount - 1));
-
-        // Update all entries in each table
-        for (int index = 0; index < _activeAlarms.Count(); index++)
-        {
-            var entry = _activeAlarms.ElementAt(index);
-            UpdateUIEntry(entry, index, AlertsTable, console, focusData);
-        }
-
-        for (int index = 0; index < airAlarms.Count(); index++)
-        {
-            var entry = airAlarms.ElementAt(index);
-            UpdateUIEntry(entry, index, AirAlarmsTable, console, focusData);
-        }
-
-        for (int index = 0; index < fireAlarms.Count(); index++)
-        {
-            var entry = fireAlarms.ElementAt(index);
-            UpdateUIEntry(entry, index, FireAlarmsTable, console, focusData);
-        }
-
-        // If no alerts are active, display a message
-        if (MasterTabContainer.CurrentTab == 0 && activeAlarmCount == 0)
-        {
-            var label = new RichTextLabel()
-            {
-                HorizontalExpand = true,
-                VerticalExpand = true,
-                HorizontalAlignment = HAlignment.Center,
-                VerticalAlignment = VAlignment.Center,
-            };
-
-            label.SetMarkup(Loc.GetString("atmos-alerts-window-no-active-alerts", ("color", _statusTextColor.ToHexNoAlpha())));
-
-            AlertsTable.AddChild(label);
-        }
-
-        // Update the alerts tab with the number of active alerts
-        if (activeAlarmCount == 0)
-            MasterTabContainer.SetTabTitle(0, Loc.GetString("atmos-alerts-window-tab-no-alerts"));
-
-        else
-            MasterTabContainer.SetTabTitle(0, Loc.GetString("atmos-alerts-window-tab-alerts", ("value", activeAlarmCount)));
-
-        // Update sensor regions
-        NavMap.RegionOverlays.Clear();
-        var prioritizedRegionOverlays = new Dictionary<NavMapRegionOverlay, int>();
-
-        if (_owner != null &&
-            _entManager.TryGetComponent<TransformComponent>(_owner, out var xform) &&
-            _entManager.TryGetComponent<NavMapComponent>(xform.GridUid, out var navMap))
-        {
-            var regionOverlays = _navMapSystem.GetNavMapRegionOverlays(_owner.Value, navMap, AtmosAlertsComputerUiKey.Key);
-
-            foreach (var (regionOwner, regionOverlay) in regionOverlays)
-            {
-                var alarmState = GetAlarmState(regionOwner);
-
-                if (!TryGetSensorRegionColor(regionOwner, alarmState, out var regionColor))
-                    continue;
-
-                regionOverlay.Color = regionColor;
-
-                var priority = (_trackedEntity == regionOwner) ? 999 : (int)alarmState;
-                prioritizedRegionOverlays.Add(regionOverlay, priority);
-            }
-
-            // Sort overlays according to their priority
-            var sortedOverlays = prioritizedRegionOverlays.OrderBy(x => x.Value).Select(x => x.Key).ToList();
-            NavMap.RegionOverlays = sortedOverlays;
-        }
-
-        // Auto-scroll re-enable
-        if (_autoScrollAwaitsUpdate)
-        {
-            _autoScrollActive = true;
-            _autoScrollAwaitsUpdate = false;
-        }
-    }
-
-    private void AddTrackedEntityToNavMap(AtmosAlertsDeviceNavMapData metaData, AtmosAlarmType alarmState)
-    {
-        var data = GetBlipTexture(alarmState);
-
-        if (data == null)
-            return;
-
-        var texture = data.Value.Item1;
-        var color = data.Value.Item2;
-        var coords = _entManager.GetCoordinates(metaData.NetCoordinates);
-
-        if (_trackedEntity != null && _trackedEntity != metaData.NetEntity)
-            color *= _untrackedEntColor;
-
-        var selectable = true;
-        var blip = new NavMapBlip(coords, _spriteSystem.Frame0(texture), color, _trackedEntity == metaData.NetEntity, selectable);
-
-        NavMap.TrackedEntities[metaData.NetEntity] = blip;
-    }
-
-    private bool TryGetSensorRegionColor(NetEntity regionOwner, AtmosAlarmType alarmState, out Color color)
-    {
-        color = Color.White;
-
-        var blip = GetBlipTexture(alarmState);
-
-        if (blip == null)
-            return false;
-
-        // Color the region based on alarm state and entity tracking
-        color = blip.Value.Item2 * _regionBaseColor;
-
-        if (_trackedEntity != null && _trackedEntity != regionOwner)
-            color *= _untrackedEntColor;
-
-        return true;
-    }
-
-    private void UpdateUIEntry(AtmosAlertsComputerEntry entry, int index, Control table, AtmosAlertsComputerComponent console, AtmosAlertsFocusDeviceData? focusData = null)
-    {
-        // Make new UI entry if required
-        if (index >= table.ChildCount)
-        {
-            var newEntryContainer = new AtmosAlarmEntryContainer(entry.NetEntity, _entManager.GetCoordinates(entry.Coordinates));
-
-            // On click
-            newEntryContainer.FocusButton.OnButtonUp += args =>
-            {
-                if (_trackedEntity == newEntryContainer.NetEntity)
-                {
-                    _trackedEntity = null;
-                }
-
-                else
-                {
-                    _trackedEntity = newEntryContainer.NetEntity;
-
-                    if (newEntryContainer.Coordinates != null)
-                        NavMap.CenterToCoordinates(newEntryContainer.Coordinates.Value);
-                }
-
-                // Send message to console that the focus has changed
-                SendFocusChangeMessageAction?.Invoke(_trackedEntity);
-
-                // Update affected UI elements across all tables
-                UpdateConsoleTable(console, AlertsTable, _trackedEntity);
-                UpdateConsoleTable(console, AirAlarmsTable, _trackedEntity);
-                UpdateConsoleTable(console, FireAlarmsTable, _trackedEntity);
-            };
-
-            // On toggling the silence check box
-            newEntryContainer.SilenceCheckBox.OnToggled += _ => OnSilenceAlertsToggled(newEntryContainer.NetEntity, newEntryContainer.SilenceCheckBox.Pressed);
-
-            // Add the entry to the current table
-            table.AddChild(newEntryContainer);
-        }
-
-        // Update values and UI elements
-        var tableChild = table.GetChild(index);
-
-        if (tableChild is not AtmosAlarmEntryContainer)
-        {
-            table.RemoveChild(tableChild);
-            UpdateUIEntry(entry, index, table, console, focusData);
-
-            return;
-        }
-
-        var entryContainer = (AtmosAlarmEntryContainer)tableChild;
-
-        entryContainer.UpdateEntry(entry, entry.NetEntity == _trackedEntity, focusData);
-
-        if (_trackedEntity != entry.NetEntity)
-        {
-            var silenced = console.SilencedDevices;
-            entryContainer.SilenceCheckBox.Pressed = (silenced.Contains(entry.NetEntity) || _deviceSilencingProgress.ContainsKey(entry.NetEntity));
-        }
-
-        entryContainer.SilenceAlarmProgressBar.Visible = (table == AlertsTable && _deviceSilencingProgress.ContainsKey(entry.NetEntity));
-    }
-
-    private void UpdateConsoleTable(AtmosAlertsComputerComponent console, Control table, NetEntity? currTrackedEntity)
-    {
-        foreach (var tableChild in table.Children)
-        {
-            if (tableChild is not AtmosAlarmEntryContainer)
-                continue;
-
-            var entryContainer = (AtmosAlarmEntryContainer)tableChild;
-
-            if (entryContainer.NetEntity != currTrackedEntity)
-                entryContainer.RemoveAsFocus();
-
-            else if (entryContainer.NetEntity == currTrackedEntity)
-                entryContainer.SetAsFocus();
-        }
-    }
-
-    private void SetTrackedEntityFromNavMap(NetEntity? netEntity)
-    {
-        if (netEntity == null)
-            return;
-
-        if (!_entManager.TryGetComponent<AtmosAlertsComputerComponent>(_owner, out var console))
-            return;
-
-        _trackedEntity = netEntity;
-
-        if (netEntity != null)
-        {
-            // Tab switching
-            if (MasterTabContainer.CurrentTab != 0 || _activeAlarms?.Any(x => x.NetEntity == netEntity) == false)
-            {
-                var device = console.AtmosDevices.FirstOrNull(x => x.NetEntity == netEntity);
-
-                switch (device?.Group)
-                {
-                    case AtmosAlertsComputerGroup.AirAlarm:
-                        MasterTabContainer.CurrentTab = 1; break;
-                    case AtmosAlertsComputerGroup.FireAlarm:
-                        MasterTabContainer.CurrentTab = 2; break;
-                }
-            }
-
-            // Get the scroll position of the selected entity on the selected button the UI
-            ActivateAutoScrollToFocus();
-        }
-
-        // Send message to console that the focus has changed
-        SendFocusChangeMessageAction?.Invoke(_trackedEntity);
-    }
-
-    protected override void FrameUpdate(FrameEventArgs args)
-    {
-        AutoScrollToFocus();
-
-        // Device silencing update
-        foreach ((var device, var remainingTime) in _deviceSilencingProgress)
-        {
-            var t = remainingTime - args.DeltaSeconds;
-
-            if (t <= 0)
-            {
-                _deviceSilencingProgress.Remove(device);
-
-                if (device == _trackedEntity)
-                    _trackedEntity = null;
-            }
-
-            else
-                _deviceSilencingProgress[device] = t;
-        }
-    }
-
-    private void ActivateAutoScrollToFocus()
-    {
-        _autoScrollActive = false;
-        _autoScrollAwaitsUpdate = true;
-    }
-
-    private void AutoScrollToFocus()
-    {
-        if (!_autoScrollActive)
-            return;
-
-        var scroll = MasterTabContainer.Children.ElementAt(MasterTabContainer.CurrentTab) as ScrollContainer;
-        if (scroll == null)
-            return;
-
-        if (!TryGetVerticalScrollbar(scroll, out var vScrollbar))
-            return;
-
-        if (!TryGetNextScrollPosition(out float? nextScrollPosition))
-            return;
-
-        vScrollbar.ValueTarget = nextScrollPosition.Value;
-
-        if (MathHelper.CloseToPercent(vScrollbar.Value, vScrollbar.ValueTarget))
-            _autoScrollActive = false;
-    }
-
-    private bool TryGetVerticalScrollbar(ScrollContainer scroll, [NotNullWhen(true)] out VScrollBar? vScrollBar)
-    {
-        vScrollBar = null;
-
-        foreach (var child in scroll.Children)
-        {
-            if (child is not VScrollBar)
-                continue;
-
-            var castChild = child as VScrollBar;
-
-            if (castChild != null)
-            {
-                vScrollBar = castChild;
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private bool TryGetNextScrollPosition([NotNullWhen(true)] out float? nextScrollPosition)
-    {
-        nextScrollPosition = null;
-
-        var scroll = MasterTabContainer.Children.ElementAt(MasterTabContainer.CurrentTab) as ScrollContainer;
-        if (scroll == null)
-            return false;
-
-        var container = scroll.Children.ElementAt(0) as BoxContainer;
-        if (container == null || container.Children.Count() == 0)
-            return false;
-
-        // Exit if the heights of the children haven't been initialized yet
-        if (!container.Children.Any(x => x.Height > 0))
-            return false;
-
-        nextScrollPosition = 0;
-
-        foreach (var control in container.Children)
-        {
-            if (control == null || control is not AtmosAlarmEntryContainer)
-                continue;
-
-            if (((AtmosAlarmEntryContainer)control).NetEntity == _trackedEntity)
-                return true;
-
-            nextScrollPosition += control.Height;
-        }
-
-        // Failed to find control
-        nextScrollPosition = null;
-
-        return false;
-    }
-
-    private AtmosAlarmType GetAlarmState(NetEntity netEntity)
-    {
-        var alarmState = _allAlarms?.FirstOrNull(x => x.NetEntity == netEntity)?.AlarmState;
-
-        if (alarmState == null)
-            return AtmosAlarmType.Invalid;
-
-        return alarmState.Value;
-    }
-
-    private (SpriteSpecifier.Texture, Color)? GetBlipTexture(AtmosAlarmType alarmState)
-    {
-        (SpriteSpecifier.Texture, Color)? output = null;
-
-        switch (alarmState)
-        {
-            case AtmosAlarmType.Invalid:
-                output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")), _inactiveColor); break;
-            case AtmosAlarmType.Normal:
-                output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")), _goodColor); break;
-            case AtmosAlarmType.Warning:
-                output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_triangle.png")), _warningColor); break;
-            case AtmosAlarmType.Danger:
-                output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_square.png")), _dangerColor); break;
-        }
-
-        return output;
-    }
-}

Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs

@@ -30,6 +30,7 @@ public sealed class AirAlarmBoundUserInterface : BoundUserInterface
         _window.AirAlarmModeChanged += OnAirAlarmModeChanged;
         _window.AutoModeChanged += OnAutoModeChanged;
         _window.ResyncAllRequested += ResyncAllDevices;
+        _window.AirAlarmTabChange += OnTabChanged;
     }
 
     private void ResyncAllDevices()
@@ -62,6 +63,11 @@ public sealed class AirAlarmBoundUserInterface : BoundUserInterface
         SendMessage(new AirAlarmUpdateAlarmThresholdMessage(address, type, threshold, gas));
     }
 
+    private void OnTabChanged(AirAlarmTab tab)
+    {
+        SendMessage(new AirAlarmTabSetMessage(tab));
+    }
+
     protected override void UpdateState(BoundUserInterfaceState state)
     {
         base.UpdateState(state);

Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs

@@ -23,6 +23,7 @@ public sealed partial class AirAlarmWindow : FancyWindow
     public event Action<AirAlarmMode>? AirAlarmModeChanged;
     public event Action<bool>? AutoModeChanged;
     public event Action? ResyncAllRequested;
+    public event Action<AirAlarmTab>? AirAlarmTabChange;
 
     private RichTextLabel _address => CDeviceAddress;
     private RichTextLabel _deviceTotal => CDeviceTotal;
@@ -79,6 +80,11 @@ public sealed partial class AirAlarmWindow : FancyWindow
         _tabContainer.SetTabTitle(1, Loc.GetString("air-alarm-ui-window-tab-scrubbers"));
         _tabContainer.SetTabTitle(2, Loc.GetString("air-alarm-ui-window-tab-sensors"));
 
+        _tabContainer.OnTabChanged += idx =>
+        {
+            AirAlarmTabChange!((AirAlarmTab) idx);
+        };
+
         _resyncDevices.OnPressed += _ =>
         {
             _ventDevices.RemoveAllChildren();
@@ -111,6 +117,8 @@ public sealed partial class AirAlarmWindow : FancyWindow
         {
             UpdateDeviceData(addr, dev);
         }
+
+        _tabContainer.CurrentTab = (int) state.Tab;
     }
 
     public void UpdateModeSelector(AirAlarmMode mode)

Content.Client/Audio/AmbientSoundSystem.cs

@@ -306,9 +306,6 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem
                     .WithMaxDistance(comp.Range);
 
                 var stream = _audio.PlayEntity(comp.Sound, Filter.Local(), uid, false, audioParams);
-                if (stream == null)
-                    continue;
-
                 _playingSounds[sourceEntity] = (stream.Value.Entity, comp.Sound, key);
                 playingCount++;
 

Content.Client/Audio/ClientGlobalSoundSystem.cs

@@ -67,7 +67,7 @@ public sealed class ClientGlobalSoundSystem : SharedGlobalSoundSystem
         if(!_adminAudioEnabled) return;
 
         var stream = _audio.PlayGlobal(soundEvent.Filename, Filter.Local(), false, soundEvent.AudioParams);
-        _adminAudio.Add(stream?.Entity);
+        _adminAudio.Add(stream.Value.Entity);
     }
 
     private void PlayStationEventMusic(StationEventMusicEvent soundEvent)
@@ -76,7 +76,7 @@ public sealed class ClientGlobalSoundSystem : SharedGlobalSoundSystem
         if(!_eventAudioEnabled || _eventAudio.ContainsKey(soundEvent.Type)) return;
 
         var stream = _audio.PlayGlobal(soundEvent.Filename, Filter.Local(), false, soundEvent.AudioParams);
-        _eventAudio.Add(soundEvent.Type, stream?.Entity);
+        _eventAudio.Add(soundEvent.Type, stream.Value.Entity);
     }
 
     private void PlayGameSound(GameGlobalSoundEvent soundEvent)

Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs

@@ -214,9 +214,9 @@ public sealed partial class ContentAudioSystem
             false,
             AudioParams.Default.WithVolume(_musicProto.Sound.Params.Volume + _volumeSlider));
 
-        _ambientMusicStream = strim?.Entity;
+        _ambientMusicStream = strim.Value.Entity;
 
-        if (_musicProto.FadeIn && strim != null)
+        if (_musicProto.FadeIn)
         {
             FadeIn(_ambientMusicStream, strim.Value.Component, AmbientMusicFadeTime);
         }

Content.Client/Audio/ContentAudioSystem.CP14AmbientLoop.cs

@@ -43,8 +43,6 @@ public sealed partial class ContentAudioSystem
 
    private void CP14UpdateAmbientLoops()
    {
-       return; //DISABLED UNTIL CLIENT ERROR SPAM FIXED
-
        if (_timing.CurTime <= _nextUpdateTime)
            return;
 
@@ -82,10 +80,6 @@ public sealed partial class ContentAudioSystem
                .WithLoop(true)
                .WithVolume(proto.Sound.Params.Volume + _volumeSlider)
                .WithPlayOffset(_random.NextFloat(0f, 100f)));
-
-       if (newLoop is null)
-           return;
-
        _loopStreams.Add(proto, newLoop.Value.Entity);
 
        FadeIn(newLoop.Value.Entity, newLoop.Value.Component, AmbientLoopFadeInTime);

Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs

@@ -20,6 +20,7 @@ public sealed partial class ContentAudioSystem
 {
     [Dependency] private readonly IBaseClient _client = default!;
     [Dependency] private readonly ClientGameTicker _gameTicker = default!;
+    [Dependency] private readonly IStateManager _stateManager = default!;
     [Dependency] private readonly IResourceCache _resourceCache = default!;
 
     private readonly AudioParams _lobbySoundtrackParams = new(-5f, 1, 0, 0, 0, false, 0f);
@@ -70,7 +71,7 @@ public sealed partial class ContentAudioSystem
         Subs.CVar(_configManager, CCVars.LobbyMusicEnabled, LobbyMusicCVarChanged);
         Subs.CVar(_configManager, CCVars.LobbyMusicVolume, LobbyMusicVolumeCVarChanged);
 
-        _state.OnStateChanged += StateManagerOnStateChanged;
+        _stateManager.OnStateChanged += StateManagerOnStateChanged;
 
         _client.PlayerLeaveServer += OnLeave;
 
@@ -114,7 +115,7 @@ public sealed partial class ContentAudioSystem
 
     private void LobbyMusicCVarChanged(bool musicEnabled)
     {
-        if (musicEnabled && _state.CurrentState is LobbyState)
+        if (musicEnabled && _stateManager.CurrentState is LobbyState)
         {
             StartLobbyMusic();
         }
@@ -184,7 +185,7 @@ public sealed partial class ContentAudioSystem
             false,
             _lobbySoundtrackParams.WithVolume(_lobbySoundtrackParams.Volume + SharedAudioSystem.GainToVolume(_configManager.GetCVar(CCVars.LobbyMusicVolume)))
         );
-        if (playResult == null)
+        if (playResult.Value.Entity == default)
         {
             _sawmill.Warning(
                 $"Tried to play lobby soundtrack '{{Filename}}' using {nameof(SharedAudioSystem)}.{nameof(SharedAudioSystem.PlayGlobal)} but it returned default value of EntityUid!",
@@ -233,7 +234,7 @@ public sealed partial class ContentAudioSystem
 
     private void ShutdownLobbyMusic()
     {
-        _state.OnStateChanged -= StateManagerOnStateChanged;
+        _stateManager.OnStateChanged -= StateManagerOnStateChanged;
 
         _client.PlayerLeaveServer -= OnLeave;
 

Content.Client/Buckle/BuckleSystem.cs

@@ -15,6 +15,7 @@ internal sealed class BuckleSystem : SharedBuckleSystem
     {
         base.Initialize();
 
+        SubscribeLocalEvent<BuckleComponent, ComponentHandleState>(OnHandleState);
         SubscribeLocalEvent<BuckleComponent, AppearanceChangeEvent>(OnAppearanceChange);
         SubscribeLocalEvent<StrapComponent, MoveEvent>(OnStrapMoveEvent);
     }
@@ -56,6 +57,21 @@ internal sealed class BuckleSystem : SharedBuckleSystem
         }
     }
 
+    private void OnHandleState(Entity<BuckleComponent> ent, ref ComponentHandleState args)
+    {
+        if (args.Current is not BuckleState state)
+            return;
+
+        ent.Comp.DontCollide = state.DontCollide;
+        ent.Comp.BuckleTime = state.BuckleTime;
+        var strapUid = EnsureEntity<BuckleComponent>(state.BuckledTo, ent);
+
+        SetBuckledTo(ent, strapUid == null ? null : new (strapUid.Value, null));
+
+        var (uid, component) = ent;
+
+    }
+
     private void OnAppearanceChange(EntityUid uid, BuckleComponent component, ref AppearanceChangeEvent args)
     {
         if (!TryComp<RotationVisualsComponent>(uid, out var rotVisuals))

Content.Client/Cargo/Systems/ClientPriceGunSystem.cs

@@ -1,21 +0,0 @@
-using Content.Shared.Timing;
-using Content.Shared.Cargo.Systems;
-
-namespace Content.Client.Cargo.Systems;
-
-/// <summary>
-/// This handles...
-/// </summary>
-public sealed class ClientPriceGunSystem : SharedPriceGunSystem
-{
-    [Dependency] private readonly UseDelaySystem _useDelay = default!;
-
-    protected override bool GetPriceOrBounty(EntityUid priceGunUid, EntityUid target, EntityUid user)
-    {
-        if (!TryComp(priceGunUid, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((priceGunUid, useDelay)))
-            return false;
-
-        // It feels worse if the cooldown is predicted but the popup isn't! So only do the cooldown reset on the server.
-        return true;
-    }
-}

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

@@ -1,5 +1,4 @@
-using Content.Client.CrewManifest.UI;
-using Content.Shared.CrewManifest;
+using Content.Shared.CrewManifest;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;

Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml

@@ -26,7 +26,7 @@
             Text="{Loc 'news-read-ui-next-text'}"
             ToolTip="{Loc 'news-read-ui-next-tooltip'}"/>
     </BoxContainer>
-    <controls:StripeBack Name="ArticleNameContainer">
+    <controls:StripeBack Name="АrticleNameContainer">
         <PanelContainer>
             <Label Name="PageNum" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="4,0,0,0"/>
             <Label Name="PageName" Align="Center"/>

Content.Client/CartridgeLoader/Cartridges/WantedListUi.cs

@@ -1,30 +0,0 @@
-using Content.Client.UserInterface.Fragments;
-using Content.Shared.CartridgeLoader.Cartridges;
-using Robust.Client.UserInterface;
-
-namespace Content.Client.CartridgeLoader.Cartridges;
-
-public sealed partial class WantedListUi : UIFragment
-{
-    private WantedListUiFragment? _fragment;
-
-    public override Control GetUIFragmentRoot()
-    {
-        return _fragment!;
-    }
-
-    public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner)
-    {
-        _fragment = new WantedListUiFragment();
-    }
-
-    public override void UpdateState(BoundUserInterfaceState state)
-    {
-        switch (state)
-        {
-            case WantedListUiState cast:
-                _fragment?.UpdateState(cast.Records);
-                break;
-        }
-    }
-}

Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.cs

@@ -1,240 +0,0 @@
-using System.Linq;
-using Content.Client.UserInterface.Controls;
-using Content.Shared.CriminalRecords.Systems;
-using Content.Shared.Security;
-using Content.Shared.StatusIcon;
-using Robust.Client.AutoGenerated;
-using Robust.Client.GameObjects;
-using Robust.Client.ResourceManagement;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Input;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-
-namespace Content.Client.CartridgeLoader.Cartridges;
-
-[GenerateTypedNameReferences]
-public sealed partial class WantedListUiFragment : BoxContainer
-{
-    [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    private readonly SpriteSystem _spriteSystem;
-
-    private string? _selectedTargetName;
-    private List<WantedRecord> _wantedRecords = new();
-
-    public WantedListUiFragment()
-    {
-        RobustXamlLoader.Load(this);
-        IoCManager.InjectDependencies(this);
-        _spriteSystem = _entitySystem.GetEntitySystem<SpriteSystem>();
-
-        SearchBar.OnTextChanged += OnSearchBarTextChanged;
-    }
-
-    private void OnSearchBarTextChanged(LineEdit.LineEditEventArgs args)
-    {
-        var found = !String.IsNullOrWhiteSpace(args.Text)
-            ? _wantedRecords.FindAll(r =>
-                r.TargetInfo.Name.Contains(args.Text) ||
-                r.Status.ToString().Contains(args.Text, StringComparison.OrdinalIgnoreCase))
-            : _wantedRecords;
-
-        UpdateState(found, false);
-    }
-
-    public void UpdateState(List<WantedRecord> records, bool refresh = true)
-    {
-        if (records.Count == 0)
-        {
-            NoRecords.Visible = true;
-            RecordsList.Visible = false;
-            RecordUnselected.Visible = false;
-            PersonContainer.Visible = false;
-
-            _selectedTargetName = null;
-            if (refresh)
-                _wantedRecords.Clear();
-
-            RecordsList.PopulateList(new List<ListData>());
-
-            return;
-        }
-
-        NoRecords.Visible = false;
-        RecordsList.Visible = true;
-        RecordUnselected.Visible = true;
-        PersonContainer.Visible = false;
-
-        var dataList = records.Select(r => new StatusListData(r)).ToList();
-
-        RecordsList.GenerateItem = GenerateItem;
-        RecordsList.ItemPressed = OnItemSelected;
-        RecordsList.PopulateList(dataList);
-
-        if (refresh)
-            _wantedRecords = records;
-    }
-
-    private void OnItemSelected(BaseButton.ButtonEventArgs args, ListData data)
-    {
-        if (data is not StatusListData(var record))
-            return;
-
-        FormattedMessage GetLoc(string fluentId, params (string,object)[] args)
-        {
-            var msg = new FormattedMessage();
-            var fluent = Loc.GetString(fluentId, args);
-            msg.AddMarkupPermissive(fluent);
-            return msg;
-        }
-
-        // Set personal info
-        PersonName.Text = record.TargetInfo.Name;
-        TargetAge.SetMessage(GetLoc(
-            "wanted-list-age-label",
-            ("age", record.TargetInfo.Age)
-        ));
-        TargetJob.SetMessage(GetLoc(
-            "wanted-list-job-label",
-            ("job", record.TargetInfo.JobTitle.ToLower())
-        ));
-        TargetSpecies.SetMessage(GetLoc(
-            "wanted-list-species-label",
-            ("species", record.TargetInfo.Species.ToLower())
-        ));
-        TargetGender.SetMessage(GetLoc(
-            "wanted-list-gender-label",
-            ("gender", record.TargetInfo.Gender)
-        ));
-
-        // Set reason
-        WantedReason.SetMessage(GetLoc(
-            "wanted-list-reason-label",
-            ("reason", record.Reason ?? Loc.GetString("wanted-list-unknown-reason-label"))
-        ));
-
-        // Set status
-        PersonState.SetMessage(GetLoc(
-            "wanted-list-status-label",
-            ("status", record.Status.ToString().ToLower())
-        ));
-
-        // Set initiator
-        InitiatorName.SetMessage(GetLoc(
-            "wanted-list-initiator-label",
-            ("initiator", record.Initiator ?? Loc.GetString("wanted-list-unknown-initiator-label"))
-        ));
-
-        // History table
-        // Clear table if it exists
-        HistoryTable.RemoveAllChildren();
-
-        HistoryTable.AddChild(new Label()
-        {
-            Text = Loc.GetString("wanted-list-history-table-time-col"),
-            StyleClasses = { "LabelSmall" },
-            HorizontalAlignment = HAlignment.Center,
-        });
-        HistoryTable.AddChild(new Label()
-        {
-            Text = Loc.GetString("wanted-list-history-table-reason-col"),
-            StyleClasses = { "LabelSmall" },
-            HorizontalAlignment = HAlignment.Center,
-            HorizontalExpand = true,
-        });
-
-        HistoryTable.AddChild(new Label()
-        {
-            Text = Loc.GetString("wanted-list-history-table-initiator-col"),
-            StyleClasses = { "LabelSmall" },
-            HorizontalAlignment = HAlignment.Center,
-        });
-
-        if (record.History.Count > 0)
-        {
-            HistoryTable.Visible = true;
-
-            foreach (var history in record.History.OrderByDescending(h => h.AddTime))
-            {
-                HistoryTable.AddChild(new Label()
-                {
-                    Text = $"{history.AddTime.Hours:00}:{history.AddTime.Minutes:00}:{history.AddTime.Seconds:00}",
-                    StyleClasses = { "LabelSmall" },
-                    VerticalAlignment = VAlignment.Top,
-                });
-
-                HistoryTable.AddChild(new RichTextLabel()
-                {
-                    Text = $"[color=white]{history.Crime}[/color]",
-                    HorizontalExpand = true,
-                    VerticalAlignment = VAlignment.Top,
-                    StyleClasses = { "LabelSubText" },
-                    Margin = new(10f, 0f),
-                });
-
-                HistoryTable.AddChild(new RichTextLabel()
-                {
-                    Text = $"[color=white]{history.InitiatorName}[/color]",
-                    StyleClasses = { "LabelSubText" },
-                    VerticalAlignment = VAlignment.Top,
-                });
-            }
-        }
-
-        RecordUnselected.Visible = false;
-        PersonContainer.Visible = true;
-
-        // Save selected item
-        _selectedTargetName = record.TargetInfo.Name;
-    }
-
-    private void GenerateItem(ListData data, ListContainerButton button)
-    {
-        if (data is not StatusListData(var record))
-            return;
-
-        var box = new BoxContainer() { Orientation = LayoutOrientation.Horizontal, HorizontalExpand = true };
-        var label = new Label() { Text = record.TargetInfo.Name };
-        var rect = new TextureRect()
-        {
-            TextureScale = new(2.2f),
-            VerticalAlignment = VAlignment.Center,
-            HorizontalAlignment = HAlignment.Center,
-            Margin = new(0f, 0f, 6f, 0f),
-        };
-
-        if (record.Status is not SecurityStatus.None)
-        {
-            var proto = "SecurityIcon" + record.Status switch
-            {
-                SecurityStatus.Detained => "Incarcerated",
-                _ => record.Status.ToString(),
-            };
-
-            if (_prototypeManager.TryIndex<SecurityIconPrototype>(proto, out var prototype))
-            {
-                rect.Texture = _spriteSystem.Frame0(prototype.Icon);
-            }
-        }
-
-        box.AddChild(rect);
-        box.AddChild(label);
-        button.AddChild(box);
-        button.AddStyleClass(ListContainer.StyleClassListContainerButton);
-
-        if (record.TargetInfo.Name.Equals(_selectedTargetName))
-        {
-            button.Pressed = true;
-            // For some reason the event is not called when `Pressed` changed, call it manually.
-            OnItemSelected(
-                new(button, new(new(), BoundKeyState.Down, new(), false, new(), new())),
-                data);
-        }
-    }
-}
-
-internal record StatusListData(WantedRecord Record) : ListData;

Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.xaml

@@ -1,50 +0,0 @@
-<cartridges:WantedListUiFragment xmlns:cartridges="clr-namespace:Content.Client.CartridgeLoader.Cartridges"
-        xmlns="https://spacestation14.io"
-        xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-        Orientation="Vertical"
-        VerticalExpand="True"
-        HorizontalExpand="True">
-
-    <LineEdit Name="SearchBar" PlaceHolder="{Loc 'wanted-list-search-placeholder'}"/>
-
-    <BoxContainer Name="MainContainer" Orientation="Horizontal" HorizontalExpand="True" VerticalExpand="True">
-        <Label Name="NoRecords" Text="{Loc 'wanted-list-label-no-records'}" Align="Center" VAlign="Center" HorizontalExpand="True" FontColorOverride="DarkGray"/>
-
-        <!-- Any attempts to set dimensions for ListContainer breaks the renderer, I have to roughly set sizes and margins in other controllers. -->
-        <controls:ListContainer
-            Name="RecordsList"
-            HorizontalAlignment="Left"
-            VerticalExpand="True"
-            Visible="False"
-            Toggle="True"
-            Group="True"
-            SetWidth="192" />
-
-        <Label Name="RecordUnselected"
-               Text="{Loc 'criminal-records-console-select-record-info'}"
-               Align="Center"
-               FontColorOverride="DarkGray"
-               Visible="False"
-               HorizontalExpand="True" />
-        <BoxContainer Name="PersonContainer" Orientation="Vertical" HorizontalExpand="True" SetWidth="334" Margin="5 0 77 0">
-            <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-                <Label Name="PersonName" StyleClasses="LabelBig" />
-                <RichTextLabel Name="PersonState" HorizontalAlignment="Right" HorizontalExpand="True" />
-            </BoxContainer>
-            <PanelContainer StyleClasses="LowDivider" Margin="0 5 0 5"/>
-            <ScrollContainer VerticalExpand="True" HScrollEnabled="False">
-                <BoxContainer Name="DataContainer" Orientation="Vertical">
-                    <RichTextLabel Name="TargetAge" />
-                    <RichTextLabel Name="TargetJob" />
-                    <RichTextLabel Name="TargetSpecies" />
-                    <RichTextLabel Name="TargetGender" />
-                    <PanelContainer StyleClasses="LowDivider" Margin="0 5 0 5"/>
-                    <RichTextLabel Name="InitiatorName" VerticalAlignment="Stretch"/>
-                    <RichTextLabel Name="WantedReason" VerticalAlignment="Stretch"/>
-                    <PanelContainer StyleClasses="LowDivider" Margin="0 5 0 5" />
-                    <controls:TableContainer Name="HistoryTable" Columns="3" Visible="False" HorizontalAlignment="Stretch" />
-                </BoxContainer>
-            </ScrollContainer>
-        </BoxContainer>
-    </BoxContainer>
-</cartridges:WantedListUiFragment>

Content.Client/Changelog/ChangelogTab.xaml.cs

@@ -131,13 +131,13 @@ public sealed partial class ChangelogTab : Control
                     Margin = new Thickness(6, 0, 0, 0),
                 };
                 authorLabel.SetMessage(
-                    FormattedMessage.FromMarkupOrThrow(Loc.GetString("changelog-author-changed", ("author", author))));
+                    FormattedMessage.FromMarkup(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.FromMarkupOrThrow(change.Message));
+                    text.SetMessage(FormattedMessage.FromMarkup(change.Message));
                     ChangelogBody.AddChild(new BoxContainer
                     {
                         Orientation = LayoutOrientation.Horizontal,

Content.Client/Chat/Managers/ChatManager.cs

@@ -21,16 +21,6 @@ internal sealed class ChatManager : IChatManager
         _sawmill.Level = LogLevel.Info;
     }
 
-    public void SendAdminAlert(string message)
-    {
-        // See server-side manager. This just exists for shared code.
-    }
-
-    public void SendAdminAlert(EntityUid player, string message)
-    {
-        // See server-side manager. This just exists for shared code.
-    }
-
     public void SendMessage(string text, ChatSelectChannel channel)
     {
         var str = text.ToString();

Content.Client/Chat/Managers/IChatManager.cs

@@ -2,8 +2,10 @@ using Content.Shared.Chat;
 
 namespace Content.Client.Chat.Managers
 {
-    public interface IChatManager : ISharedChatManager
+    public interface IChatManager
     {
+        void Initialize();
+
         public void SendMessage(string text, ChatSelectChannel channel);
     }
 }

Content.Client/Chat/UI/EmotesMenu.xaml.cs

@@ -19,6 +19,9 @@ public sealed partial class EmotesMenu : RadialMenu
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly ISharedPlayerManager _playerManager = default!;
 
+    private readonly SpriteSystem _spriteSystem;
+    private readonly EntityWhitelistSystem _whitelistSystem;
+
     public event Action<ProtoId<EmotePrototype>>? OnPlayEmote;
 
     public EmotesMenu()
@@ -26,8 +29,8 @@ public sealed partial class EmotesMenu : RadialMenu
         IoCManager.InjectDependencies(this);
         RobustXamlLoader.Load(this);
 
-        var spriteSystem = _entManager.System<SpriteSystem>();
-        var whitelistSystem = _entManager.System<EntityWhitelistSystem>();
+        _spriteSystem = _entManager.System<SpriteSystem>();
+        _whitelistSystem = _entManager.System<EntityWhitelistSystem>();
 
         var main = FindControl<RadialContainer>("Main");
 
@@ -37,8 +40,8 @@ public sealed partial class EmotesMenu : RadialMenu
             var player = _playerManager.LocalSession?.AttachedEntity;
             if (emote.Category == EmoteCategory.Invalid ||
                 emote.ChatTriggers.Count == 0 ||
-                !(player.HasValue && whitelistSystem.IsWhitelistPassOrNull(emote.Whitelist, player.Value)) ||
-                whitelistSystem.IsBlacklistPass(emote.Blacklist, player.Value))
+                !(player.HasValue && _whitelistSystem.IsWhitelistPassOrNull(emote.Whitelist, player.Value)) ||
+                _whitelistSystem.IsBlacklistPass(emote.Blacklist, player.Value))
                 continue;
 
             if (!emote.Available &&
@@ -60,7 +63,7 @@ public sealed partial class EmotesMenu : RadialMenu
             {
                 VerticalAlignment = VAlignment.Center,
                 HorizontalAlignment = HAlignment.Center,
-                Texture = spriteSystem.Frame0(emote.Icon),
+                Texture = _spriteSystem.Frame0(emote.Icon),
                 TextureScale = new Vector2(2f, 2f),
             };
 

Content.Client/Chat/UI/SpeechBubble.cs

@@ -180,7 +180,7 @@ namespace Content.Client.Chat.UI
             var msg = new FormattedMessage();
             if (fontColor != null)
                 msg.PushColor(fontColor.Value);
-            msg.AddMarkupOrThrow(message);
+            msg.AddMarkup(message);
             return msg;
         }
 

Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs

@@ -1,5 +1,5 @@
 using System.Linq;
-using Content.Shared.Chemistry.EntitySystems;
+using Content.Client.Chemistry.Containers.EntitySystems;
 using Content.Shared.Atmos.Prototypes;
 using Content.Shared.Body.Part;
 using Content.Shared.Chemistry;
@@ -16,7 +16,7 @@ namespace Content.Client.Chemistry.EntitySystems;
 /// <inheritdoc/>
 public sealed class ChemistryGuideDataSystem : SharedChemistryGuideDataSystem
 {
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
 
     [ValidatePrototypeId<MixingCategoryPrototype>]
     private const string DefaultMixingCategory = "DummyMix";

Content.Client/Clothing/ClientClothingSystem.cs

@@ -57,6 +57,7 @@ public sealed class ClientClothingSystem : ClothingSystem
     };
 
     [Dependency] private readonly IResourceCache _cache = default!;
+    [Dependency] private readonly ISerializationManager _serialization = default!;
     [Dependency] private readonly InventorySystem _inventorySystem = default!;
     [Dependency] private readonly DisplacementMapSystem _displacement = default!;
 
@@ -65,7 +66,6 @@ public sealed class ClientClothingSystem : ClothingSystem
         base.Initialize();
 
         SubscribeLocalEvent<ClothingComponent, GetEquipmentVisualsEvent>(OnGetVisuals);
-        SubscribeLocalEvent<ClothingComponent, InventoryTemplateUpdated>(OnInventoryTemplateUpdated);
 
         SubscribeLocalEvent<InventoryComponent, VisualsChangedEvent>(OnVisualsChanged);
         SubscribeLocalEvent<SpriteComponent, DidUnequipEvent>(OnDidUnequip);
@@ -78,7 +78,11 @@ public sealed class ClientClothingSystem : ClothingSystem
         if (args.Sprite == null)
             return;
 
-        UpdateAllSlots(uid, component);
+        var enumerator = _inventorySystem.GetSlotEnumerator((uid, component));
+        while (enumerator.NextItem(out var item, out var slot))
+        {
+            RenderEquipment(uid, item, slot.Name, component);
+        }
 
         // No clothing equipped -> make sure the layer is hidden, though this should already be handled by on-unequip.
         if (args.Sprite.LayerMapTryGet(HumanoidVisualLayers.StencilMask, out var layer))
@@ -88,23 +92,6 @@ public sealed class ClientClothingSystem : ClothingSystem
         }
     }
 
-    private void OnInventoryTemplateUpdated(Entity<ClothingComponent> ent, ref InventoryTemplateUpdated args)
-    {
-        UpdateAllSlots(ent.Owner, clothing: ent.Comp);
-    }
-
-    private void UpdateAllSlots(
-        EntityUid uid,
-        InventoryComponent? inventoryComponent = null,
-        ClothingComponent? clothing = null)
-    {
-        var enumerator = _inventorySystem.GetSlotEnumerator((uid, inventoryComponent));
-        while (enumerator.NextItem(out var item, out var slot))
-        {
-            RenderEquipment(uid, item, slot.Name, inventoryComponent, clothingComponent: clothing);
-        }
-    }
-
     private void OnGetVisuals(EntityUid uid, ClothingComponent item, GetEquipmentVisualsEvent args)
     {
         if (!TryComp(args.Equipee, out InventoryComponent? inventory))
@@ -341,8 +328,7 @@ public sealed class ClientClothingSystem : ClothingSystem
                 if (layerData.State is not null && inventory.SpeciesId is not null && layerData.State.EndsWith(inventory.SpeciesId))
                     continue;
 
-                if (_displacement.TryAddDisplacement(displacementData, sprite, index, key, revealedLayers))
-                    index++;
+                _displacement.TryAddDisplacement(displacementData, sprite, index, key, revealedLayers);
             }
         }
 

Content.Client/Commands/ActionsCommands.cs

@@ -1,4 +1,6 @@
 using Content.Client.Actions;
+using Content.Client.Actions;
+using Content.Client.Mapping;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 

Content.Client/Commands/MappingClientSideSetupCommand.cs

@@ -13,6 +13,7 @@ internal sealed class MappingClientSideSetupCommand : LocalizedCommands
 {
     [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
     [Dependency] private readonly ILightManager _lightManager = default!;
+    [Dependency] private readonly IStateManager _stateManager = default!;
 
     public override string Command => "mappingclientsidesetup";
 

Content.Client/Commands/SetMenuVisibilityCommand.cs

@@ -1,5 +1,4 @@
 using Content.Client.Verbs;
-using Content.Shared.Verbs;
 using JetBrains.Annotations;
 using Robust.Shared.Console;
 

Content.Client/Commands/ShowHealthBarsCommand.cs

@@ -1,8 +1,6 @@
-using Content.Shared.Damage.Prototypes;
 using Content.Shared.Overlays;
 using Robust.Client.Player;
 using Robust.Shared.Console;
-using Robust.Shared.Prototypes;
 using System.Linq;
 
 namespace Content.Client.Commands;
@@ -36,7 +34,7 @@ public sealed class ShowHealthBarsCommand : LocalizedCommands
         {
             var showHealthBarsComponent = new ShowHealthBarsComponent
             {
-                DamageContainers = args.Select(arg => new ProtoId<DamageContainerPrototype>(arg)).ToList(),
+                DamageContainers = args.ToList(),
                 HealthStatusIcon = null,
                 NetSyncEnabled = false
             };

Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml

@@ -4,14 +4,14 @@
     MinSize="400 225">
     <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True" Margin="5">
         <TextEdit Name="MessageInput" HorizontalExpand="True" VerticalExpand="True" Margin="0 0 0 5" MinHeight="100" />
-        <Button Name="AnnounceButton" Text="{Loc 'comms-console-menu-announcement-button'}" ToolTip="{Loc 'comms-console-menu-announcement-button-tooltip'}" StyleClasses="OpenLeft" Access="Public" />
-        <Button Name="BroadcastButton" Text="{Loc 'comms-console-menu-broadcast-button'}" ToolTip="{Loc 'comms-console-menu-broadcast-button-tooltip'}" StyleClasses="OpenLeft" Access="Public" />
+        <Button Name="AnnounceButton" Text="{Loc 'comms-console-menu-announcement-button'}" StyleClasses="OpenLeft" Access="Public" />
+        <Button Name="BroadcastButton" Text="{Loc 'comms-console-menu-broadcast-button'}" StyleClasses="OpenLeft" Access="Public" />
 
-        <OptionButton Name="AlertLevelButton" ToolTip="{Loc 'comms-console-menu-alert-level-button-tooltip'}" StyleClasses="OpenRight" Access="Public" />
+        <OptionButton Name="AlertLevelButton" StyleClasses="OpenRight" Access="Public" />
 
         <Control MinSize="10 10" />
 
         <RichTextLabel Name="CountdownLabel" VerticalExpand="True" />
-        <Button Name="EmergencyShuttleButton" Text="Placeholder Text" ToolTip="{Loc 'comms-console-menu-emergency-shuttle-button-tooltip'}" Access="Public" />
+        <Button Name="EmergencyShuttleButton" Text="Placeholder Text" Access="Public" />
     </BoxContainer>
 </controls:FancyWindow>

Content.Client/Computer/ComputerBoundUserInterface.cs

@@ -11,6 +11,8 @@ namespace Content.Client.Computer
     [Virtual]
     public class ComputerBoundUserInterface<TWindow, TState> : ComputerBoundUserInterfaceBase where TWindow : BaseWindow, IComputerWindow<TState>, new() where TState : BoundUserInterfaceState
     {
+        [Dependency] private readonly IDynamicTypeFactory _dynamicTypeFactory = default!;
+
         [ViewVariables]
         private TWindow? _window;
 

Content.Client/Construction/UI/ConstructionMenu.xaml

@@ -1,20 +1,15 @@
 <DefaultWindow xmlns="https://spacestation14.io">
     <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-        <BoxContainer Orientation="Vertical" MinWidth="243" Margin="0 0 5 0">
+        <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="0.4" Margin="0 0 5 0">
             <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="0 0 0 5">
                 <LineEdit Name="SearchBar" PlaceHolder="Search" HorizontalExpand="True"/>
                 <OptionButton Name="OptionCategories" Access="Public" MinSize="130 0"/>
             </BoxContainer>
             <ItemList Name="Recipes" Access="Public" SelectMode="Single" VerticalExpand="True"/>
-            <ScrollContainer Name="RecipesGridScrollContainer" VerticalExpand="True" Access="Public" Visible="False">
-                <GridContainer Name="RecipesGrid" Columns="5" Access="Public"/>
-            </ScrollContainer>
         </BoxContainer>
-        <BoxContainer Orientation="Vertical" HorizontalExpand="True">
-            <BoxContainer Orientation="Horizontal">
-                <Button Name="MenuGridViewButton" ToggleMode="True" Text="{Loc construction-menu-grid-view}"/>
-                <Button Name="FavoriteButton" Visible="false"/>
-            </BoxContainer>
+        <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="0.6">
+            <Button Name="FavoriteButton" Visible="false" HorizontalExpand="False"
+                HorizontalAlignment="Right" Margin="0 0 0 15"/>
             <Control>
                 <BoxContainer Orientation="Vertical" HorizontalExpand="True" Margin="0 0 0 5">
                     <BoxContainer Orientation="Horizontal" Align="Center">

Content.Client/Construction/UI/ConstructionMenu.xaml.cs

@@ -25,16 +25,11 @@ namespace Content.Client.Construction.UI
         OptionButton OptionCategories { get; }
 
         bool EraseButtonPressed { get; set; }
-        bool GridViewButtonPressed { get; set; }
         bool BuildButtonPressed { get; set; }
 
         ItemList Recipes { get; }
         ItemList RecipeStepList { get; }
 
-
-        ScrollContainer RecipesGridScrollContainer { get; }
-        GridContainer RecipesGrid { get; }
-
         event EventHandler<(string search, string catagory)> PopulateRecipes;
         event EventHandler<ItemList.Item?> RecipeSelected;
         event EventHandler RecipeFavorited;
@@ -77,16 +72,9 @@ namespace Content.Client.Construction.UI
             set => EraseButton.Pressed = value;
         }
 
-        public bool GridViewButtonPressed
-        {
-            get => MenuGridViewButton.Pressed;
-            set => MenuGridViewButton.Pressed = value;
-        }
-
         public ConstructionMenu()
         {
-            SetSize = new Vector2(560, 450);
-            MinSize = new Vector2(560, 320);
+            SetSize = MinSize = new Vector2(720, 320);
 
             IoCManager.InjectDependencies(this);
             RobustXamlLoader.Load(this);
@@ -114,9 +102,6 @@ namespace Content.Client.Construction.UI
             EraseButton.OnToggled += args => EraseButtonToggled?.Invoke(this, args.Pressed);
 
             FavoriteButton.OnPressed += args => RecipeFavorited?.Invoke(this, EventArgs.Empty);
-
-            MenuGridViewButton.OnPressed += _ =>
-                PopulateRecipes?.Invoke(this, (SearchBar.Text, Categories[OptionCategories.SelectedId]));
         }
 
         public event EventHandler? ClearAllGhosts;

Content.Client/Construction/UI/ConstructionMenuPresenter.cs

@@ -1,8 +1,7 @@
 using System.Linq;
-using System.Numerics;
-using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Systems.MenuBar.Widgets;
 using Content.Shared.Construction.Prototypes;
+using Content.Shared.Tag;
 using Content.Shared.Whitelist;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -12,6 +11,7 @@ using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.Utility;
 using Robust.Shared.Enums;
+using Robust.Shared.Graphics;
 using Robust.Shared.Prototypes;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
@@ -33,12 +33,10 @@ namespace Content.Client.Construction.UI
 
         private readonly IConstructionMenuView _constructionView;
         private readonly EntityWhitelistSystem _whitelistSystem;
-        private readonly SpriteSystem _spriteSystem;
 
         private ConstructionSystem? _constructionSystem;
         private ConstructionPrototype? _selected;
         private List<ConstructionPrototype> _favoritedRecipes = [];
-        private Dictionary<string, TextureButton> _recipeButtons = new();
         private string _selectedCategory = string.Empty;
         private string _favoriteCatName = "construction-category-favorites";
         private string _forAllCategoryName = "construction-category-all";
@@ -87,7 +85,6 @@ namespace Content.Client.Construction.UI
             IoCManager.InjectDependencies(this);
             _constructionView = new ConstructionMenu();
             _whitelistSystem = _entManager.System<EntityWhitelistSystem>();
-            _spriteSystem = _entManager.System<SpriteSystem>();
 
             // This is required so that if we load after the system is initialized, we can bind to it immediately
             if (_systemManager.TryGetEntitySystem<ConstructionSystem>(out var constructionSystem))
@@ -153,24 +150,12 @@ namespace Content.Client.Construction.UI
             PopulateInfo(_selected);
         }
 
-        private void OnGridViewRecipeSelected(object? sender, ConstructionPrototype? recipe)
-        {
-            if (recipe is null)
-            {
-                _selected = null;
-                _constructionView.ClearRecipeInfo();
-                return;
-            }
-
-            _selected = recipe;
-            if (_placementManager.IsActive && !_placementManager.Eraser) UpdateGhostPlacement();
-            PopulateInfo(_selected);
-        }
-
         private void OnViewPopulateRecipes(object? sender, (string search, string catagory) args)
         {
             var (search, category) = args;
+            var recipesList = _constructionView.Recipes;
 
+            recipesList.Clear();
             var recipes = new List<ConstructionPrototype>();
 
             var isEmptyCategory = string.IsNullOrEmpty(category) || category == _forAllCategoryName;
@@ -185,7 +170,7 @@ namespace Content.Client.Construction.UI
                 if (recipe.Hide)
                     continue;
 
-                if (!recipe.CrystallPunkAllowed) //CrystallEdge clearing recipes
+                if (!recipe.CrystallPunkAllowed) //CrystallPunk clearing recipes
                     continue;
 
                 if (_playerManager.LocalSession == null
@@ -219,73 +204,12 @@ namespace Content.Client.Construction.UI
 
             recipes.Sort((a, b) => string.Compare(a.Name, b.Name, StringComparison.InvariantCulture));
 
-            var recipesList = _constructionView.Recipes;
-            recipesList.Clear();
-
-            var recipesGrid = _constructionView.RecipesGrid;
-            recipesGrid.RemoveAllChildren();
-
-            _constructionView.RecipesGridScrollContainer.Visible = _constructionView.GridViewButtonPressed;
-            _constructionView.Recipes.Visible = !_constructionView.GridViewButtonPressed;
-
-            if (_constructionView.GridViewButtonPressed)
+            foreach (var recipe in recipes)
             {
-                foreach (var recipe in recipes)
-                {
-                    var itemButton = new TextureButton
-                    {
-                        TextureNormal = _spriteSystem.Frame0(recipe.Icon),
-                        VerticalAlignment = Control.VAlignment.Center,
-                        Name = recipe.Name,
-                        ToolTip = recipe.Name,
-                        Scale = new Vector2(1.35f),
-                        ToggleMode = true,
-                    };
-                    var itemButtonPanelContainer = new PanelContainer
-                    {
-                        PanelOverride = new StyleBoxFlat { BackgroundColor = StyleNano.ButtonColorDefault },
-                        Children = { itemButton },
-                    };
-
-                    itemButton.OnToggled += buttonToggledEventArgs =>
-                    {
-                        SelectGridButton(itemButton, buttonToggledEventArgs.Pressed);
-
-                        if (buttonToggledEventArgs.Pressed &&
-                            _selected != null &&
-                            _recipeButtons.TryGetValue(_selected.Name, out var oldButton))
-                        {
-                            oldButton.Pressed = false;
-                            SelectGridButton(oldButton, false);
-                        }
-
-                        OnGridViewRecipeSelected(this, buttonToggledEventArgs.Pressed ? recipe : null);
-                    };
-
-                    recipesGrid.AddChild(itemButtonPanelContainer);
-                    _recipeButtons[recipe.Name] = itemButton;
-                    var isCurrentButtonSelected = _selected == recipe;
-                    itemButton.Pressed = isCurrentButtonSelected;
-                    SelectGridButton(itemButton, isCurrentButtonSelected);
-                }
+                recipesList.Add(GetItem(recipe, recipesList));
             }
-            else
-            {
-                foreach (var recipe in recipes)
-                {
-                    recipesList.Add(GetItem(recipe, recipesList));
-                }
-            }
-        }
 
-        private void SelectGridButton(TextureButton button, bool select)
-        {
-            if (button.Parent is not PanelContainer buttonPanel)
-                return;
-
-            button.Modulate = select ? Color.Green : Color.White;
-            var buttonColor = select ? StyleNano.ButtonColorDefault : Color.Transparent;
-            buttonPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = buttonColor };
+            // There is apparently no way to set which
         }
 
         private void PopulateCategories(string? selectCategory = null)
@@ -336,10 +260,11 @@ namespace Content.Client.Construction.UI
 
         private void PopulateInfo(ConstructionPrototype prototype)
         {
+            var spriteSys = _systemManager.GetEntitySystem<SpriteSystem>();
             _constructionView.ClearRecipeInfo();
 
             _constructionView.SetRecipeInfo(
-                prototype.Name, prototype.Description, _spriteSystem.Frame0(prototype.Icon),
+                prototype.Name, prototype.Description, spriteSys.Frame0(prototype.Icon),
                 prototype.Type != ConstructionType.Item,
                 !_favoritedRecipes.Contains(prototype));
 
@@ -352,6 +277,7 @@ namespace Content.Client.Construction.UI
             if (_constructionSystem?.GetGuide(prototype) is not { } guide)
                 return;
 
+            var spriteSys = _systemManager.GetEntitySystem<SpriteSystem>();
 
             foreach (var entry in guide.Entries)
             {
@@ -367,20 +293,20 @@ namespace Content.Client.Construction.UI
                 // The padding needs to be applied regardless of text length... (See PadLeft documentation)
                 text = text.PadLeft(text.Length + entry.Padding);
 
-                var icon = entry.Icon != null ? _spriteSystem.Frame0(entry.Icon) : Texture.Transparent;
+                var icon = entry.Icon != null ? spriteSys.Frame0(entry.Icon) : Texture.Transparent;
                 stepList.AddItem(text, icon, false);
             }
         }
 
-        private ItemList.Item GetItem(ConstructionPrototype recipe, ItemList itemList)
+        private static ItemList.Item GetItem(ConstructionPrototype recipe, ItemList itemList)
         {
             return new(itemList)
             {
                 Metadata = recipe,
                 Text = recipe.Name,
-                Icon = _spriteSystem.Frame0(recipe.Icon),
+                Icon = recipe.Icon.Frame0(),
                 TooltipEnabled = true,
-                TooltipText = recipe.Description,
+                TooltipText = recipe.Description
             };
         }
 

Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs

@@ -1,6 +1,5 @@
 using System.Linq;
 using Content.Client.Materials;
-using Content.Client.Materials.UI;
 using Content.Client.Message;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Construction.Components;

Content.Client/Content.Client.csproj

@@ -23,6 +23,9 @@
     <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Spawners\" />
+  </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <Import Project="..\RobustToolbox\MSBuild\XamlIL.targets" />
 </Project>

Content.Client/ContextMenu/UI/EntityMenuUIController.cs

@@ -9,7 +9,6 @@ using Content.Shared.CCVar;
 using Content.Shared.Examine;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Input;
-using Content.Shared.Verbs;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
@@ -195,20 +194,8 @@ namespace Content.Client.ContextMenu.UI
                 return;
 
             // Do we need to do in-range unOccluded checks?
-            var visibility = _verbSystem.Visibility;
-
-            if (!_eyeManager.CurrentEye.DrawFov)
-            {
-                visibility &= ~MenuVisibility.NoFov;
-            }
-
-            var ev = new MenuVisibilityEvent()
-            {
-                Visibility = visibility,
-            };
-
-            _entityManager.EventBus.RaiseLocalEvent(player, ref ev);
-            visibility = ev.Visibility;
+            var ignoreFov = !_eyeManager.CurrentEye.DrawFov ||
+                (_verbSystem.Visibility & MenuVisibility.NoFov) == MenuVisibility.NoFov;
 
             _entityManager.TryGetComponent(player, out ExaminerComponent? examiner);
             var xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
@@ -222,7 +209,7 @@ namespace Content.Client.ContextMenu.UI
                     continue;
                 }
 
-                if ((visibility & MenuVisibility.NoFov) == MenuVisibility.NoFov)
+                if (ignoreFov)
                     continue;
 
                 var pos = new MapCoordinates(_xform.GetWorldPosition(xform, xformQuery), xform.MapID);

Content.Client/Crayon/UI/CrayonBoundUserInterface.cs

@@ -31,7 +31,7 @@ namespace Content.Client.Crayon.UI
         private void PopulateCrayons()
         {
             var crayonDecals = _protoManager.EnumeratePrototypes<DecalPrototype>().Where(x => x.Tags.Contains("crayon"));
-            _menu?.Populate(crayonDecals.ToList());
+            _menu?.Populate(crayonDecals);
         }
 
         public override void OnProtoReload(PrototypesReloadedEventArgs args)
@@ -44,16 +44,6 @@ namespace Content.Client.Crayon.UI
             PopulateCrayons();
         }
 
-        protected override void ReceiveMessage(BoundUserInterfaceMessage message)
-        {
-            base.ReceiveMessage(message);
-
-            if (_menu is null || message is not CrayonUsedMessage crayonMessage)
-                return;
-
-            _menu.AdvanceState(crayonMessage.DrawnDecal);
-        }
-
         protected override void UpdateState(BoundUserInterfaceState state)
         {
             base.UpdateState(state);

Content.Client/Crayon/UI/CrayonWindow.xaml

@@ -1,13 +1,14 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'crayon-window-title'}"
-            MinSize="450 500"
-            SetSize="450 500">
+            MinSize="250 300"
+            SetSize="250 300">
     <BoxContainer Orientation="Vertical">
         <ColorSelectorSliders Name="ColorSelector" Visible="False" />
-        <LineEdit Name="Search" Margin="0 0 0 8" PlaceHolder="{Loc 'crayon-window-placeholder'}" />
+        <LineEdit Name="Search" />
         <ScrollContainer VerticalExpand="True">
-            <BoxContainer Name="Grids" Orientation="Vertical">
-            </BoxContainer>
+            <GridContainer Name="Grid" Columns="6">
+                <!-- Crayon decals get added here by code -->
+            </GridContainer>
         </ScrollContainer>
     </BoxContainer>
 </DefaultWindow>

Content.Client/Crayon/UI/CrayonWindow.xaml.cs

@@ -1,10 +1,8 @@
 using System.Collections.Generic;
-using System.Linq;
 using Content.Client.Stylesheets;
 using Content.Shared.Crayon;
 using Content.Shared.Decals;
 using Robust.Client.AutoGenerated;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
@@ -20,12 +18,7 @@ namespace Content.Client.Crayon.UI
     [GenerateTypedNameReferences]
     public sealed partial class CrayonWindow : DefaultWindow
     {
-        [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
-        private readonly SpriteSystem _spriteSystem = default!;
-
-        private Dictionary<string, List<(string Name, Texture Texture)>>? _decals;
-        private List<string>? _allDecals;
-        private string? _autoSelected;
+        private Dictionary<string, Texture>? _decals;
         private string? _selected;
         private Color _color;
 
@@ -35,10 +28,8 @@ namespace Content.Client.Crayon.UI
         public CrayonWindow()
         {
             RobustXamlLoader.Load(this);
-            IoCManager.InjectDependencies(this);
-            _spriteSystem = _entitySystem.GetEntitySystem<SpriteSystem>();
 
-            Search.OnTextChanged += SearchChanged;
+            Search.OnTextChanged += _ => RefreshList();
             ColorSelector.OnColorChanged += SelectColor;
         }
 
@@ -53,94 +44,51 @@ namespace Content.Client.Crayon.UI
         private void RefreshList()
         {
             // Clear
-            Grids.DisposeAllChildren();
-
-            if (_decals == null || _allDecals == null)
+            Grid.DisposeAllChildren();
+            if (_decals == null)
                 return;
 
             var filter = Search.Text;
-            var comma = filter.IndexOf(',');
-            var first = (comma == -1 ? filter : filter[..comma]).Trim();
-
-            var names = _decals.Keys.ToList();
-            names.Sort((a, b) => a == "random" ? 1 : b == "random" ? -1 : a.CompareTo(b));
-
-            if (_autoSelected != null && first != _autoSelected && _allDecals.Contains(first))
+            foreach (var (decal, tex) in _decals)
             {
-                _selected = first;
-                _autoSelected = _selected;
-                OnSelected?.Invoke(_selected);
-            }
-
-            foreach (var categoryName in names)
-            {
-                var locName = Loc.GetString("crayon-category-" + categoryName);
-                var category = _decals[categoryName].Where(d => locName.Contains(first) || d.Name.Contains(first)).ToList();
-
-                if (category.Count == 0)
+                if (!decal.Contains(filter))
                     continue;
 
-                var label = new Label
+                var button = new TextureButton()
                 {
-                    Text = locName
+                    TextureNormal = tex,
+                    Name = decal,
+                    ToolTip = decal,
+                    Modulate = _color,
                 };
-
-                var grid = new GridContainer
+                button.OnPressed += ButtonOnPressed;
+                if (_selected == decal)
                 {
-                    Columns = 6,
-                    Margin = new Thickness(0, 0, 0, 16)
-                };
-
-                Grids.AddChild(label);
-                Grids.AddChild(grid);
-
-                foreach (var (name, texture) in category)
-                {
-                    var button = new TextureButton()
+                    var panelContainer = new PanelContainer()
                     {
-                        TextureNormal = texture,
-                        Name = name,
-                        ToolTip = name,
-                        Modulate = _color,
-                        Scale = new System.Numerics.Vector2(2, 2)
-                    };
-                    button.OnPressed += ButtonOnPressed;
-
-                    if (_selected == name)
-                    {
-                        var panelContainer = new PanelContainer()
+                        PanelOverride = new StyleBoxFlat()
                         {
-                            PanelOverride = new StyleBoxFlat()
-                            {
-                                BackgroundColor = StyleNano.ButtonColorDefault,
-                            },
-                            Children =
-                            {
-                                button,
-                            },
-                        };
-                        grid.AddChild(panelContainer);
-                    }
-                    else
-                    {
-                        grid.AddChild(button);
-                    }
+                            BackgroundColor = StyleNano.ButtonColorDefault,
+                        },
+                        Children =
+                        {
+                            button,
+                        },
+                    };
+                    Grid.AddChild(panelContainer);
+                }
+                else
+                {
+                    Grid.AddChild(button);
                 }
             }
         }
 
-        private void SearchChanged(LineEdit.LineEditEventArgs obj)
-        {
-            _autoSelected = ""; // Placeholder to kick off the auto-select in refreshlist()
-            RefreshList();
-        }
-
         private void ButtonOnPressed(ButtonEventArgs obj)
         {
             if (obj.Button.Name == null) return;
 
             _selected = obj.Button.Name;
-            _autoSelected = null;
             OnSelected?.Invoke(_selected);
             RefreshList();
         }
@@ -159,38 +107,12 @@ namespace Content.Client.Crayon.UI
             RefreshList();
         }
 
-        public void AdvanceState(string drawnDecal)
+        public void Populate(IEnumerable<DecalPrototype> prototypes)
         {
-            var filter = Search.Text;
-            if (!filter.Contains(',') || !filter.Contains(drawnDecal))
-                return;
-
-            var first = filter[..filter.IndexOf(',')].Trim();
-
-            if (first.Equals(drawnDecal, StringComparison.InvariantCultureIgnoreCase))
-            {
-                Search.Text = filter[(filter.IndexOf(',') + 1)..].Trim();
-                _autoSelected = first;
-            }
-
-            RefreshList();
-        }
-
-        public void Populate(List<DecalPrototype> prototypes)
-        {
-            _decals = [];
-            _allDecals = [];
-
-            prototypes.Sort((a, b) => a.ID.CompareTo(b.ID));
-
+            _decals = new Dictionary<string, Texture>();
             foreach (var decalPrototype in prototypes)
             {
-                var category = "random";
-                if (decalPrototype.Tags.Count > 1 && decalPrototype.Tags[1].StartsWith("crayon-"))
-                    category = decalPrototype.Tags[1].Replace("crayon-", "");
-                var list = _decals.GetOrNew(category);
-                list.Add((decalPrototype.ID, _spriteSystem.Frame0(decalPrototype.Sprite)));
-                _allDecals.Add(decalPrototype.ID);
+                _decals.Add(decalPrototype.ID, decalPrototype.Sprite.Frame0());
             }
 
             RefreshList();

Content.Client/Credits/CreditsWindow.xaml.cs

@@ -145,7 +145,7 @@ namespace Content.Client.Credits
                 var text = _resourceManager.ContentFileReadAllText($"/Credits/{path}");
                 if (markup)
                 {
-                    label.SetMessage(FormattedMessage.FromMarkupOrThrow(text.Trim()));
+                    label.SetMessage(FormattedMessage.FromMarkup(text.Trim()));
                 }
                 else
                 {

Content.Client/CrewManifest/CrewManifestUi.xaml.cs

@@ -1,4 +1,3 @@
-using Content.Client.CrewManifest.UI;
 using Content.Shared.CrewManifest;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;

Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs

@@ -227,7 +227,7 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
         StatusOptionButton.SelectId((int) criminalRecord.Status);
         if (criminalRecord.Reason is {} reason)
         {
-            var message = FormattedMessage.FromMarkupOrThrow(Loc.GetString("criminal-records-console-wanted-reason"));
+            var message = FormattedMessage.FromMarkup(Loc.GetString("criminal-records-console-wanted-reason"));
             message.AddText($": {reason}");
             WantedReason.SetMessage(message);
             WantedReason.Visible = true;

Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml

@@ -1,7 +1,6 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                 xmlns:ui="clr-namespace:Content.Client.UserInterface"
-                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                Title="{Loc door-electronics-configuration-title}">
+                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
     <Control Name="AccessLevelControlContainer" />
 
 </controls:FancyWindow>

Content.Client/Effects/ColorFlashEffectSystem.cs

@@ -124,10 +124,6 @@ public sealed class ColorFlashEffectSystem : SharedColorFlashEffectSystem
                 continue;
             }
 
-            var targetEv = new GetFlashEffectTargetEvent(ent);
-            RaiseLocalEvent(ent, ref targetEv);
-            ent = targetEv.Target;
-
             EnsureComp<ColorFlashEffectComponent>(ent, out comp);
             comp.NetSyncEnabled = false;
             comp.Color = sprite.Color;
@@ -136,9 +132,3 @@ public sealed class ColorFlashEffectSystem : SharedColorFlashEffectSystem
         }
     }
 }
-
-/// <summary>
-/// Raised on an entity to change the target for a color flash effect.
-/// </summary>
-[ByRefEvent]
-public record struct GetFlashEffectTargetEvent(EntityUid Target);

Content.Client/Ensnaring/EnsnareableSystem.cs

@@ -2,7 +2,7 @@ using Content.Shared.Ensnaring;
 using Content.Shared.Ensnaring.Components;
 using Robust.Client.GameObjects;
 
-namespace Content.Client.Ensnaring;
+namespace Content.Client.Ensnaring.Visualizers;
 
 public sealed class EnsnareableSystem : SharedEnsnareableSystem
 {
@@ -12,14 +12,13 @@ public sealed class EnsnareableSystem : SharedEnsnareableSystem
     {
         base.Initialize();
 
+        SubscribeLocalEvent<EnsnareableComponent, ComponentInit>(OnComponentInit);
         SubscribeLocalEvent<EnsnareableComponent, AppearanceChangeEvent>(OnAppearanceChange);
     }
 
-    protected override void OnEnsnareInit(Entity<EnsnareableComponent> ent, ref ComponentInit args)
+    private void OnComponentInit(EntityUid uid, EnsnareableComponent component, ComponentInit args)
     {
-        base.OnEnsnareInit(ent, ref args);
-
-        if(!TryComp<SpriteComponent>(ent.Owner, out var sprite))
+        if(!TryComp<SpriteComponent>(uid, out var sprite))
             return;
 
         // TODO remove this, this should just be in yaml.

Content.Client/Entry/EntryPoint.cs

@@ -4,7 +4,6 @@ using Content.Client.Chat.Managers;
 using Content.Client.DebugMon;
 using Content.Client.Eui;
 using Content.Client.Fullscreen;
-using Content.Client.GameTicking.Managers;
 using Content.Client.GhostKick;
 using Content.Client.Guidebook;
 using Content.Client.Input;
@@ -71,8 +70,8 @@ namespace Content.Client.Entry
         [Dependency] private readonly IResourceManager _resourceManager = default!;
         [Dependency] private readonly IReplayLoadManager _replayLoad = default!;
         [Dependency] private readonly ILogManager _logManager = default!;
+        [Dependency] private readonly ContentReplayPlaybackManager _replayMan = default!;
         [Dependency] private readonly DebugMonitorManager _debugMonitorManager = default!;
-        [Dependency] private readonly TitleWindowManager _titleWindowManager = default!;
 
         public override void Init()
         {
@@ -110,7 +109,6 @@ namespace Content.Client.Entry
             _prototypeManager.RegisterIgnore("lobbyBackground");
             _prototypeManager.RegisterIgnore("gamePreset");
             _prototypeManager.RegisterIgnore("noiseChannel");
-            _prototypeManager.RegisterIgnore("playerConnectionWhitelist");
             _prototypeManager.RegisterIgnore("spaceBiome");
             _prototypeManager.RegisterIgnore("worldgenConfig");
             _prototypeManager.RegisterIgnore("gameRule");
@@ -142,12 +140,6 @@ namespace Content.Client.Entry
             _configManager.SetCVar("interface.resolutionAutoScaleMinimum", 0.5f);
         }
 
-        public override void Shutdown()
-        {
-            base.Shutdown();
-            _titleWindowManager.Shutdown();
-        }
-
         public override void PostInit()
         {
             base.PostInit();
@@ -165,10 +157,9 @@ namespace Content.Client.Entry
             _clientPreferencesManager.Initialize();
             _euiManager.Initialize();
             _voteManager.Initialize();
-            _userInterfaceManager.SetDefaultTheme("SS14DefaultTheme");
+            _userInterfaceManager.SetDefaultTheme(_configManager.GetCVar(CCVars.UIDefaultInterfaceTheme));
             _userInterfaceManager.SetActiveTheme(_configManager.GetCVar(CVars.InterfaceTheme));
             _documentParsingManager.Initialize();
-            _titleWindowManager.Initialize();
 
             _baseClient.RunLevelChanged += (_, args) =>
             {
@@ -200,7 +191,7 @@ namespace Content.Client.Entry
                     _resourceManager,
                     ReplayConstants.ReplayZipFolder.ToRootedPath());
 
-                _playbackMan.LastLoad = (null, ReplayConstants.ReplayZipFolder.ToRootedPath());
+                _replayMan.LastLoad = (null, ReplayConstants.ReplayZipFolder.ToRootedPath());
                 _replayLoad.LoadAndStartReplay(reader);
             }
             else if (_gameController.LaunchState.FromLauncher)

Content.Client/Examine/ExamineSystem.cs

@@ -1,12 +1,7 @@
-using System.Linq;
-using System.Numerics;
-using System.Threading;
 using Content.Client.Verbs;
 using Content.Shared.Examine;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Input;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Item;
 using Content.Shared.Verbs;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
@@ -17,8 +12,13 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Map;
 using Robust.Shared.Utility;
+using System.Linq;
+using System.Numerics;
+using System.Threading;
 using static Content.Shared.Interaction.SharedInteractionSystem;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Item;
 using Direction = Robust.Shared.Maths.Direction;
 
 namespace Content.Client.Examine
@@ -35,6 +35,7 @@ namespace Content.Client.Examine
 
         private EntityUid _examinedEntity;
         private EntityUid _lastExaminedEntity;
+        private EntityUid _playerEntity;
         private Popup? _examineTooltipOpen;
         private ScreenCoordinates _popupPos;
         private CancellationTokenSource? _requestCancelTokenSource;
@@ -73,9 +74,9 @@ namespace Content.Client.Examine
         public override void Update(float frameTime)
         {
             if (_examineTooltipOpen is not {Visible: true}) return;
-            if (!_examinedEntity.Valid || _playerManager.LocalEntity is not { } player) return;
+            if (!_examinedEntity.Valid || !_playerEntity.Valid) return;
 
-            if (!CanExamine(player, _examinedEntity))
+            if (!CanExamine(_playerEntity, _examinedEntity))
                 CloseTooltip();
         }
 
@@ -113,8 +114,9 @@ namespace Content.Client.Examine
                 return false;
             }
 
-            if (_playerManager.LocalEntity is not { } player ||
-                !CanExamine(player, entity))
+            _playerEntity = _playerManager.LocalEntity ?? default;
+
+            if (_playerEntity == default || !CanExamine(_playerEntity, entity))
             {
                 return false;
             }

Content.Client/Explosion/ExplosionSystem.cs

@@ -2,4 +2,7 @@ using Content.Shared.Explosion.EntitySystems;
 
 namespace Content.Client.Explosion.EntitySystems;
 
-public sealed class ExplosionSystem : SharedExplosionSystem;
+public sealed class ExplosionSystem : SharedExplosionSystem
+{
+
+}

Content.Client/Flash/FlashOverlay.cs

@@ -16,7 +16,6 @@ namespace Content.Client.Flash
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
 
-        private readonly SharedFlashSystem _flash;
         private readonly StatusEffectsSystem _statusSys;
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
@@ -28,7 +27,6 @@ namespace Content.Client.Flash
         {
             IoCManager.InjectDependencies(this);
             _shader = _prototypeManager.Index<ShaderPrototype>("FlashedEffect").InstanceUnique();
-            _flash = _entityManager.System<SharedFlashSystem>();
             _statusSys = _entityManager.System<StatusEffectsSystem>();
         }
 
@@ -43,7 +41,7 @@ namespace Content.Client.Flash
                 || !_entityManager.TryGetComponent<StatusEffectsComponent>(playerEntity, out var status))
                 return;
 
-            if (!_statusSys.TryGetTime(playerEntity.Value, _flash.FlashedKey, out var time, status))
+            if (!_statusSys.TryGetTime(playerEntity.Value, SharedFlashSystem.FlashedKey, out var time, status))
                 return;
 
             var curTime = _timing.CurTime;

Content.Client/GPS/Components/HandheldGPSComponent.cs

@@ -0,0 +1,9 @@
+using Content.Shared.GPS;
+
+namespace Content.Client.GPS.Components
+{
+    [RegisterComponent]
+    public sealed partial class HandheldGPSComponent : SharedHandheldGPSComponent
+    {
+    }
+}

Content.Client/GPS/Systems/HandheldGpsSystem.cs

@@ -1,4 +1,4 @@
-using Content.Shared.GPS.Components;
+using Content.Client.GPS.Components;
 using Content.Client.GPS.UI;
 using Content.Client.Items;
 

Content.Client/GPS/UI/HandheldGpsStatusControl.cs

@@ -1,4 +1,4 @@
-using Content.Shared.GPS.Components;
+using Content.Client.GPS.Components;
 using Content.Client.Message;
 using Content.Client.Stylesheets;
 using Robust.Client.GameObjects;
@@ -30,13 +30,6 @@ public sealed class HandheldGpsStatusControl : Control
     {
         base.FrameUpdate(args);
 
-        // don't display the label if the gps component is being removed
-        if (_parent.Comp.LifeStage > ComponentLifeStage.Running)
-        {
-            _label.Visible = false;
-            return;
-        }
-
         _updateDif += args.DeltaSeconds;
         if (_updateDif < _parent.Comp.UpdateRate)
             return;
@@ -51,9 +44,9 @@ public sealed class HandheldGpsStatusControl : Control
         var posText = "Error";
         if (_entMan.TryGetComponent(_parent, out TransformComponent? transComp))
         {
-            var pos = _transform.GetMapCoordinates(_parent.Owner, xform: transComp);
-            var x = (int)pos.X;
-            var y = (int)pos.Y;
+            var pos =  _transform.GetMapCoordinates(_parent.Owner, xform: transComp);
+            var x = (int) pos.X;
+            var y = (int) pos.Y;
             posText = $"({x}, {y})";
         }
         _label.SetMarkup(Loc.GetString("handheld-gps-coordinates-title", ("coordinates", posText)));

Content.Client/GameTicking/Managers/TitleWindowManager.cs

@@ -1,62 +0,0 @@
-using Content.Shared.CCVar;
-using Robust.Client;
-using Robust.Client.Graphics;
-using Robust.Shared;
-using Robust.Shared.Configuration;
-
-namespace Content.Client.GameTicking.Managers;
-
-public sealed class TitleWindowManager
-{
-    [Dependency] private readonly IBaseClient _client = default!;
-    [Dependency] private readonly IClyde _clyde = default!;
-    [Dependency] private readonly IConfigurationManager _cfg = default!;
-    [Dependency] private readonly IGameController _gameController = default!;
-
-    public void Initialize()
-    {
-        _cfg.OnValueChanged(CVars.GameHostName, OnHostnameChange, true);
-        _cfg.OnValueChanged(CCVars.GameHostnameInTitlebar, OnHostnameTitleChange, true);
-
-        _client.RunLevelChanged += OnRunLevelChangedChange;
-    }
-
-    public void Shutdown()
-    {
-        _cfg.UnsubValueChanged(CVars.GameHostName, OnHostnameChange);
-        _cfg.UnsubValueChanged(CCVars.GameHostnameInTitlebar, OnHostnameTitleChange);
-    }
-
-    private void OnHostnameChange(string hostname)
-    {
-        var defaultWindowTitle = _gameController.GameTitle();
-
-        // Since the game assumes the server name is MyServer and that GameHostnameInTitlebar CCVar is true by default
-        // Lets just... not show anything. This also is used to revert back to just the game title on disconnect.
-        if (_client.RunLevel == ClientRunLevel.Initialize)
-        {
-            _clyde.SetWindowTitle(defaultWindowTitle);
-            return;
-        }
-
-        if (_cfg.GetCVar(CCVars.GameHostnameInTitlebar))
-            // If you really dislike the dash I guess change it here
-            _clyde.SetWindowTitle(hostname + " - " + defaultWindowTitle);
-        else
-            _clyde.SetWindowTitle(defaultWindowTitle);
-    }
-
-    // Clients by default assume game.hostname_in_titlebar is true
-    // but we need to clear it as soon as we join and actually receive the servers preference on this.
-    // This will ensure we rerun OnHostnameChange and set the correct title bar name.
-    private void OnHostnameTitleChange(bool colonthree)
-    {
-        OnHostnameChange(_cfg.GetCVar(CVars.GameHostName));
-    }
-
-    // This is just used we can rerun the hostname change function when we disconnect to revert back to just the games title.
-    private void OnRunLevelChangedChange(object? sender, RunLevelChangedEventArgs runLevelChangedEventArgs)
-    {
-        OnHostnameChange(_cfg.GetCVar(CVars.GameHostName));
-    }
-}

Content.Client/Ghost/GhostSystem.cs

@@ -99,8 +99,8 @@ namespace Content.Client.Ghost
             if (args.Handled)
                 return;
 
-            var locId = GhostVisibility ? "ghost-gui-toggle-ghost-visibility-popup-off" : "ghost-gui-toggle-ghost-visibility-popup-on";
-            Popup.PopupEntity(Loc.GetString(locId), args.Performer);
+            Popup.PopupEntity(Loc.GetString("ghost-gui-toggle-ghost-visibility-popup"), args.Performer);
+
             if (uid == _playerManager.LocalEntity)
                 ToggleGhostVisibility();
 

Content.Client/Gravity/GravitySystem.cs

@@ -1,5 +1,4 @@
 using Content.Shared.Gravity;
-using Content.Shared.Power;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Gravity;
@@ -22,7 +21,7 @@ public sealed partial class GravitySystem : SharedGravitySystem
         if (args.Sprite == null)
             return;
 
-        if (_appearanceSystem.TryGetData<PowerChargeStatus>(uid, PowerChargeVisuals.State, out var state, args.Component))
+        if (_appearanceSystem.TryGetData<GravityGeneratorStatus>(uid, GravityGeneratorVisuals.State, out var state, args.Component))
         {
             if (comp.SpriteMap.TryGetValue(state, out var spriteState))
             {
@@ -31,7 +30,7 @@ public sealed partial class GravitySystem : SharedGravitySystem
             }
         }
 
-        if (_appearanceSystem.TryGetData<float>(uid, PowerChargeVisuals.Charge, out var charge, args.Component))
+        if (_appearanceSystem.TryGetData<float>(uid, GravityGeneratorVisuals.Charge, out var charge, args.Component))
         {
             var layer = args.Sprite.LayerMapGet(GravityGeneratorVisualLayers.Core);
             switch (charge)

Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs

@@ -0,0 +1,38 @@
+using Content.Shared.Gravity;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Gravity.UI
+{
+    [UsedImplicitly]
+    public sealed class GravityGeneratorBoundUserInterface : BoundUserInterface
+    {
+        [ViewVariables]
+        private GravityGeneratorWindow? _window;
+
+        public GravityGeneratorBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+        {
+        }
+
+        protected override void Open()
+        {
+            base.Open();
+
+            _window = this.CreateWindow<GravityGeneratorWindow>();
+            _window.SetEntity(Owner);
+        }
+
+        protected override void UpdateState(BoundUserInterfaceState state)
+        {
+            base.UpdateState(state);
+
+            var castState = (SharedGravityGeneratorComponent.GeneratorState) state;
+            _window?.UpdateState(castState);
+        }
+
+        public void SetPowerSwitch(bool on)
+        {
+            SendMessage(new SharedGravityGeneratorComponent.SwitchGeneratorMessage(on));
+        }
+    }
+}

Content.Client/Gravity/UI/GravityGeneratorWindow.xaml

@@ -1,26 +1,27 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                Title="{Loc 'gravity-generator-window-title'}"
                 MinSize="270 130"
                 SetSize="360 180">
     <BoxContainer Margin="4 0" Orientation="Horizontal">
         <BoxContainer Orientation="Vertical" HorizontalExpand="True">
             <GridContainer Margin="2 0 0 0" Columns="2">
                 <!-- Power -->
-                <Label Text="{Loc 'power-charge-window-power'}" HorizontalExpand="True" StyleClasses="StatusFieldTitle" />
+                <Label Text="{Loc 'gravity-generator-window-power'}" HorizontalExpand="True" StyleClasses="StatusFieldTitle" />
                 <BoxContainer Orientation="Horizontal" MinWidth="120">
-                    <Button Name="OnButton" Text="{Loc 'power-charge-window-power-on'}" StyleClasses="OpenRight" />
-                    <Button Name="OffButton" Text="{Loc 'power-charge-window-power-off'}" StyleClasses="OpenLeft" />
+                    <Button Name="OnButton" Text="{Loc 'gravity-generator-window-power-on'}" StyleClasses="OpenRight" />
+                    <Button Name="OffButton" Text="{Loc 'gravity-generator-window-power-off'}" StyleClasses="OpenLeft" />
                 </BoxContainer>
                 <Control /> <!-- Empty control to act as a spacer in the grid. -->
                 <Label Name="PowerLabel" Text="0 / 0 W" />
                 <!-- Status -->
-                <Label Text="{Loc 'power-charge-window-status'}"  StyleClasses="StatusFieldTitle" />
-                <Label Name="StatusLabel" Text="{Loc 'power-charge-window-status-fully-charged'}" />
+                <Label Text="{Loc 'gravity-generator-window-status'}"  StyleClasses="StatusFieldTitle" />
+                <Label Name="StatusLabel" Text="{Loc 'gravity-generator-window-status-fully-charged'}" />
                 <!-- ETA -->
-                <Label Text="{Loc 'power-charge-window-eta'}" StyleClasses="StatusFieldTitle" />
+                <Label Text="{Loc 'gravity-generator-window-eta'}" StyleClasses="StatusFieldTitle" />
                 <Label Name="EtaLabel" Text="N/A" />
                 <!-- Charge -->
-                <Label Text="{Loc 'power-charge-window-charge'}" StyleClasses="StatusFieldTitle" />
+                <Label Text="{Loc 'gravity-generator-window-charge'}" StyleClasses="StatusFieldTitle" />
                 <ProgressBar Name="ChargeBar" MaxValue="255">
                     <Label Name="ChargeText" Margin="4 0" Text="0 %" />
                 </ProgressBar>
@@ -30,4 +31,5 @@
             <SpriteView Name="EntityView" SetSize="96 96" OverrideDirection="South" />
         </PanelContainer>
     </BoxContainer>
+
 </controls:FancyWindow>

Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs

@@ -0,0 +1,75 @@
+using Content.Shared.Gravity;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow;
+
+namespace Content.Client.Gravity.UI
+{
+    [GenerateTypedNameReferences]
+    public sealed partial class GravityGeneratorWindow : FancyWindow
+    {
+        private readonly ButtonGroup _buttonGroup = new();
+
+        public event Action<bool>? OnPowerSwitch;
+
+        public GravityGeneratorWindow()
+        {
+            RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
+
+            OnButton.Group = _buttonGroup;
+            OffButton.Group = _buttonGroup;
+
+            OnButton.OnPressed += _ => OnPowerSwitch?.Invoke(true);
+            OffButton.OnPressed += _ => OnPowerSwitch?.Invoke(false);
+        }
+
+        public void SetEntity(EntityUid uid)
+        {
+            EntityView.SetEntity(uid);
+        }
+
+        public void UpdateState(SharedGravityGeneratorComponent.GeneratorState state)
+        {
+            if (state.On)
+                OnButton.Pressed = true;
+            else
+                OffButton.Pressed = true;
+
+            PowerLabel.Text = Loc.GetString(
+                "gravity-generator-window-power-label",
+                ("draw", state.PowerDraw),
+                ("max", state.PowerDrawMax));
+
+            PowerLabel.SetOnlyStyleClass(MathHelper.CloseTo(state.PowerDraw, state.PowerDrawMax) ? "Good" : "Caution");
+
+            ChargeBar.Value = state.Charge;
+            ChargeText.Text = (state.Charge / 255f).ToString("P0");
+            StatusLabel.Text = Loc.GetString(state.PowerStatus switch
+            {
+                GravityGeneratorPowerStatus.Off => "gravity-generator-window-status-off",
+                GravityGeneratorPowerStatus.Discharging => "gravity-generator-window-status-discharging",
+                GravityGeneratorPowerStatus.Charging => "gravity-generator-window-status-charging",
+                GravityGeneratorPowerStatus.FullyCharged => "gravity-generator-window-status-fully-charged",
+                _ => throw new ArgumentOutOfRangeException()
+            });
+
+            StatusLabel.SetOnlyStyleClass(state.PowerStatus switch
+            {
+                GravityGeneratorPowerStatus.Off => "Danger",
+                GravityGeneratorPowerStatus.Discharging => "Caution",
+                GravityGeneratorPowerStatus.Charging => "Caution",
+                GravityGeneratorPowerStatus.FullyCharged => "Good",
+                _ => throw new ArgumentOutOfRangeException()
+            });
+
+            EtaLabel.Text = state.EtaSeconds >= 0
+                ? Loc.GetString("gravity-generator-window-eta-value", ("left", TimeSpan.FromSeconds(state.EtaSeconds)))
+                : Loc.GetString("gravity-generator-window-eta-none");
+
+            EtaLabel.SetOnlyStyleClass(state.EtaSeconds >= 0 ? "Caution" : "Disabled");
+        }
+    }
+}

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

@@ -140,7 +140,7 @@ public sealed partial class GuideReagentEmbed : BoxContainer, IDocumentTag, ISea
                 var i = 0;
                 foreach (var effectString in effect.EffectDescriptions)
                 {
-                    descMsg.AddMarkupOrThrow(effectString);
+                    descMsg.AddMarkup(effectString);
                     i++;
                     if (i < descriptionsCount)
                         descMsg.PushNewline();
@@ -174,7 +174,7 @@ public sealed partial class GuideReagentEmbed : BoxContainer, IDocumentTag, ISea
             var i = 0;
             foreach (var effectString in guideEntryRegistryPlant.PlantMetabolisms)
             {
-                descMsg.AddMarkupOrThrow(effectString);
+                descMsg.AddMarkup(effectString);
                 i++;
                 if (i < descriptionsCount)
                     descMsg.PushNewline();
@@ -195,7 +195,7 @@ public sealed partial class GuideReagentEmbed : BoxContainer, IDocumentTag, ISea
         FormattedMessage description = new();
         description.AddText(reagent.LocalizedDescription);
         description.PushNewline();
-        description.AddMarkupOrThrow(Loc.GetString("guidebook-reagent-physical-description",
+        description.AddMarkup(Loc.GetString("guidebook-reagent-physical-description",
             ("description", reagent.LocalizedPhysicalDescription)));
         ReagentDescription.SetMessage(description);
     }

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

@@ -179,7 +179,7 @@ public sealed partial class GuideReagentReaction : BoxContainer, ISearchableCont
         var i = 0;
         foreach (var (product, amount) in reagents.OrderByDescending(p => p.Value))
         {
-            msg.AddMarkupOrThrow(Loc.GetString("guidebook-reagent-recipes-reagent-display",
+            msg.AddMarkup(Loc.GetString("guidebook-reagent-recipes-reagent-display",
                 ("reagent", protoMan.Index<ReagentPrototype>(product).LocalizedName), ("ratio", amount)));
             i++;
             if (i < reagentCount)

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

@@ -5,7 +5,6 @@ using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Controls.FancyTree;
 using Content.Client.UserInterface.Systems.Info;
 using Content.Shared.Guidebook;
-using Content.Shared.Localizations;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -24,8 +23,6 @@ public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler
 
     private readonly ISawmill _sawmill;
 
-    public ProtoId<GuideEntryPrototype> LastEntry;
-
     public GuidebookWindow()
     {
         RobustXamlLoader.Load(this);
@@ -93,8 +90,6 @@ public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler
 
             _sawmill.Error($"Failed to parse contents of guide document {entry.Id}.");
         }
-
-        LastEntry = entry.Id;
     }
 
     public void UpdateGuides(
@@ -168,9 +163,7 @@ public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler
         var parent = forcedRoot == null ? null : AddEntry(forcedRoot.Value, null, addedEntries);
         foreach (var entry in GetSortedEntries(roots))
         {
-            if (!entry.CrystallPunkAllowed) continue; //CrystallEdge guidebook filter
-            if (entry.LocFilter is not null && entry.LocFilter != ContentLocalizationManager.Culture) continue; //CrystallEdge guidebook filter
-
+            if (!entry.CrystallPunkAllowed) continue; //CrystallPunk guidebook filter
             AddEntry(entry.Id, parent, addedEntries);
         }
 

Content.Client/Guidebook/GuidebookDataSystem.cs

@@ -1,45 +0,0 @@
-using Content.Shared.Guidebook;
-
-namespace Content.Client.Guidebook;
-
-/// <summary>
-/// Client system for storing and retrieving values extracted from entity prototypes
-/// for display in the guidebook (<see cref="RichText.ProtodataTag"/>).
-/// Requests data from the server on <see cref="Initialize"/>.
-/// Can also be pushed new data when the server reloads prototypes.
-/// </summary>
-public sealed class GuidebookDataSystem : EntitySystem
-{
-    private GuidebookData? _data;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeNetworkEvent<UpdateGuidebookDataEvent>(OnServerUpdated);
-
-        // Request data from the server
-        RaiseNetworkEvent(new RequestGuidebookDataEvent());
-    }
-
-    private void OnServerUpdated(UpdateGuidebookDataEvent args)
-    {
-        // Got new data from the server, either in response to our request, or because prototypes reloaded on the server
-        _data = args.Data;
-        _data.Freeze();
-    }
-
-    /// <summary>
-    /// Attempts to retrieve a value using the given identifiers.
-    /// See <see cref="GuidebookData.TryGetValue"/> for more information.
-    /// </summary>
-    public bool TryGetValue(string prototype, string component, string field, out object? value)
-    {
-        if (_data == null)
-        {
-            value = null;
-            return false;
-        }
-        return _data.TryGetValue(prototype, component, field, out value);
-    }
-}

Content.Client/Guidebook/GuidebookSystem.cs

@@ -32,7 +32,7 @@ public sealed class GuidebookSystem : EntitySystem
     [Dependency] private readonly RgbLightControllerSystem _rgbLightControllerSystem = default!;
     [Dependency] private readonly SharedPointLightSystem _pointLightSystem = default!;
     [Dependency] private readonly TagSystem _tags = default!;
-    [Dependency] private readonly IPrototypeManager _proto = default!; //CrystallEdge guidebook filter
+    [Dependency] private readonly IPrototypeManager _proto = default!; //CrystallPunk guidebook filter
 
     public event Action<List<ProtoId<GuideEntryPrototype>>,
         List<ProtoId<GuideEntryPrototype>>?,
@@ -47,7 +47,7 @@ public sealed class GuidebookSystem : EntitySystem
     /// <inheritdoc/>
     public override void Initialize()
     {
-        SubscribeLocalEvent<GuideHelpComponent, MapInitEvent>(OnCrystallEdgeMapInit); //CrystallEdge guidebook filter
+        SubscribeLocalEvent<GuideHelpComponent, MapInitEvent>(OnCrystallPunkMapInit); //CrystallPunk guidebook filter
         SubscribeLocalEvent<GuideHelpComponent, GetVerbsEvent<ExamineVerb>>(OnGetVerbs);
         SubscribeLocalEvent<GuideHelpComponent, ActivateInWorldEvent>(OnInteract);
 
@@ -57,12 +57,12 @@ public sealed class GuidebookSystem : EntitySystem
             OnGuidebookControlsTestGetAlternateVerbs);
     }
 
-    //CrystallEdge guidebook filter
-    private void OnCrystallEdgeMapInit(Entity<GuideHelpComponent> ent, ref MapInitEvent args)
+    //CrystallPunk guidebook filter
+    private void OnCrystallPunkMapInit(Entity<GuideHelpComponent> ent, ref MapInitEvent args)
     {
         foreach (var guide in ent.Comp.Guides)
         {
-            var guideProto = _proto.Index(guide);
+            var guideProto = _proto.Index<GuideEntryPrototype>(guide);
             if (!guideProto.CrystallPunkAllowed) //REMOVE unnecessary guidebook
             {
                 RemComp<GuideHelpComponent>(ent);
@@ -70,7 +70,7 @@ public sealed class GuidebookSystem : EntitySystem
             }
         }
     }
-    //CrystallEdge guidebook filter end
+    //CrystallPunk guidebook filter end
 
     /// <summary>
     /// Gets a user entity to use for verbs and examinations. If the player has no attached entity, this will use a

Content.Client/Guidebook/Richtext/ProtodataTag.cs

@@ -1,49 +0,0 @@
-using System.Globalization;
-using Robust.Client.UserInterface.RichText;
-using Robust.Shared.Utility;
-
-namespace Content.Client.Guidebook.RichText;
-
-/// <summary>
-/// RichText tag that can display values extracted from entity prototypes.
-/// In order to be accessed by this tag, the desired field/property must
-/// be tagged with <see cref="Shared.Guidebook.GuidebookDataAttribute"/>.
-/// </summary>
-public sealed class ProtodataTag : IMarkupTag
-{
-    [Dependency] private readonly ILogManager _logMan = default!;
-    [Dependency] private readonly IEntityManager _entMan = default!;
-
-    public string Name => "protodata";
-    private ISawmill Log => _log ??= _logMan.GetSawmill("protodata_tag");
-    private ISawmill? _log;
-
-    public string TextBefore(MarkupNode node)
-    {
-        // Do nothing with an empty tag
-        if (!node.Value.TryGetString(out var prototype))
-            return string.Empty;
-
-        if (!node.Attributes.TryGetValue("comp", out var component))
-            return string.Empty;
-        if (!node.Attributes.TryGetValue("member", out var member))
-            return string.Empty;
-        node.Attributes.TryGetValue("format", out var format);
-
-        var guidebookData = _entMan.System<GuidebookDataSystem>();
-
-        // Try to get the value
-        if (!guidebookData.TryGetValue(prototype, component.StringValue!, member.StringValue!, out var value))
-        {
-            Log.Error($"Failed to find protodata for {component}.{member} in {prototype}");
-            return "???";
-        }
-
-        // If we have a format string and a formattable value, format it as requested
-        if (!string.IsNullOrEmpty(format.StringValue) && value is IFormattable formattable)
-            return formattable.ToString(format.StringValue, CultureInfo.CurrentCulture);
-
-        // No format string given, so just use default ToString
-        return value?.ToString() ?? "NULL";
-    }
-}

Content.Client/Hands/Systems/HandsSystem.cs

@@ -130,9 +130,9 @@ namespace Content.Client.Hands.Systems
             OnPlayerHandsAdded?.Invoke(hands);
         }
 
-        public override void DoDrop(EntityUid uid, Hand hand, bool doDropInteraction = true, HandsComponent? hands = null, bool log = true)
+        public override void DoDrop(EntityUid uid, Hand hand, bool doDropInteraction = true, HandsComponent? hands = null)
         {
-            base.DoDrop(uid, hand, doDropInteraction, hands, log);
+            base.DoDrop(uid, hand, doDropInteraction, hands);
 
             if (TryComp(hand.HeldEntity, out SpriteComponent? sprite))
                 sprite.RenderOrder = EntityManager.CurrentTick.Value;

Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs

@@ -17,7 +17,6 @@ namespace Content.Client.HealthAnalyzer.UI
         protected override void Open()
         {
             base.Open();
-
             _window = this.CreateWindow<HealthAnalyzerWindow>();
 
             _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;

Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml

@@ -1,65 +1,48 @@
-<controls:FancyWindow
+<controls:FancyWindow
     xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-    MaxHeight="525"
-    MinWidth="300">
+    SetSize="250 100">
     <ScrollContainer
-        Margin="5 5 5 5"
-        ReturnMeasure="True"
         VerticalExpand="True">
         <BoxContainer
             Name="RootContainer"
-            VerticalExpand="True"
             Orientation="Vertical">
             <Label
                 Name="NoPatientDataText"
                 Text="{Loc health-analyzer-window-no-patient-data-text}" />
-
             <BoxContainer
                 Name="PatientDataContainer"
-                Margin="0 0 0 5"
-                Orientation="Vertical">
-                <BoxContainer Orientation="Horizontal" Margin="0 0 0 5">
-                    <SpriteView OverrideDirection="South" Scale="2 2" Name="SpriteView" Access="Public" SetSize="64 64" />
-                    <TextureRect Name="NoDataTex" Access="Public" SetSize="64 64" Visible="false" Stretch="KeepAspectCentered" TexturePath="/Textures/Interface/Misc/health_analyzer_out_of_range.png"/>
-                    <BoxContainer Margin="5 0 0 0" Orientation="Vertical" VerticalAlignment="Top">
-                        <RichTextLabel Name="NameLabel" SetWidth="150" />
-                        <Label Name="SpeciesLabel" VerticalAlignment="Top" StyleClasses="LabelSubText" />
-                    </BoxContainer>
-                    <Label Margin="0 0 5 0" HorizontalExpand="True" HorizontalAlignment="Right" VerticalExpand="True"
-                           VerticalAlignment="Top" Name="ScanModeLabel"
-                           Text="{Loc 'health-analyzer-window-entity-unknown-text'}" />
+                Orientation="Vertical"
+                Margin="0 0 5 10">
+                <BoxContainer Name="ScanModePanel" HorizontalExpand="True" Visible="False" Margin="0 5 0 0">
+                    <Label
+                    Name="ScanMode"
+                    Align="Left"
+                    Text="{Loc health-analyzer-window-scan-mode-text}"/>
+                    <Label
+                    Name="ScanModeText"
+                    Align="Right"
+                    HorizontalExpand="True"/>
                 </BoxContainer>
-
-                <PanelContainer StyleClasses="LowDivider" />
-
-                <GridContainer Margin="0 5 0 0" Columns="2">
-                    <Label Text="{Loc 'health-analyzer-window-entity-status-text'}" />
-                    <Label Name="StatusLabel" />
-                    <Label Text="{Loc 'health-analyzer-window-entity-temperature-text'}" />
-                    <Label Name="TemperatureLabel" />
-                    <Label Text="{Loc 'health-analyzer-window-entity-blood-level-text'}" />
-                    <Label Name="BloodLabel" />
-                    <Label Text="{Loc 'health-analyzer-window-entity-damage-total-text'}" />
-                    <Label Name="DamageLabel" />
-                </GridContainer>
+                <Label
+                    Name="PatientName"/>
+                <Label
+                    Name="Temperature"
+                    Margin="0 5 0 0"/>
+                <Label
+                    Name="BloodLevel"
+                    Margin="0 5 0 0"/>
+                <Label
+                    Name="Bleeding"
+                    Margin="0 5 0 0"/>
+                <Label
+                    Name="patientDamageAmount"
+                    Margin="0 15 0 0"/>
             </BoxContainer>
-
-            <PanelContainer Name="AlertsDivider" Visible="False" StyleClasses="LowDivider" />
-
-            <BoxContainer Name="AlertsContainer" Visible="False" Margin="0 5" Orientation="Horizontal"
-                          HorizontalExpand="True" HorizontalAlignment="Center">
-
-            </BoxContainer>
-
-            <PanelContainer StyleClasses="LowDivider" />
-
             <BoxContainer
                 Name="GroupsContainer"
-                Margin="0 5 0 5"
                 Orientation="Vertical">
             </BoxContainer>
-
         </BoxContainer>
     </ScrollContainer>
 </controls:FancyWindow>

Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs

@@ -1,20 +1,12 @@
 using System.Linq;
 using System.Numerics;
-using Content.Client.Message;
 using Content.Shared.Atmos;
 using Content.Client.UserInterface.Controls;
-using Content.Shared.Alert;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
-using Content.Shared.Humanoid;
-using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.IdentityManagement;
-using Content.Shared.Inventory;
 using Content.Shared.MedicalScanner;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
 using Content.Shared.Nutrition.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
@@ -36,6 +28,9 @@ namespace Content.Client.HealthAnalyzer.UI
         private readonly IPrototypeManager _prototypes;
         private readonly IResourceCache _cache;
 
+        private const int AnalyzerHeight = 430;
+        private const int AnalyzerWidth = 300;
+
         public HealthAnalyzerWindow()
         {
             RobustXamlLoader.Load(this);
@@ -49,6 +44,8 @@ namespace Content.Client.HealthAnalyzer.UI
 
         public void Populate(HealthAnalyzerScannedUserMessage msg)
         {
+            GroupsContainer.RemoveAllChildren();
+
             var target = _entityManager.GetEntity(msg.TargetEntity);
 
             if (target == null
@@ -60,98 +57,82 @@ namespace Content.Client.HealthAnalyzer.UI
 
             NoPatientDataText.Visible = false;
 
-            // Scan Mode
+            string entityName = Loc.GetString("health-analyzer-window-entity-unknown-text");
+            if (_entityManager.HasComponent<MetaDataComponent>(target.Value))
+            {
+                entityName = Identity.Name(target.Value, _entityManager);
+            }
 
-            ScanModeLabel.Text = msg.ScanMode.HasValue
-                ? msg.ScanMode.Value
-                    ? Loc.GetString("health-analyzer-window-scan-mode-active")
-                    : Loc.GetString("health-analyzer-window-scan-mode-inactive")
-                : Loc.GetString("health-analyzer-window-entity-unknown-text");
+            if (msg.ScanMode.HasValue)
+            {
+                ScanModePanel.Visible = true;
+                ScanModeText.Text = Loc.GetString(msg.ScanMode.Value ? "health-analyzer-window-scan-mode-active" : "health-analyzer-window-scan-mode-inactive");
+                ScanModeText.FontColorOverride = msg.ScanMode.Value ? Color.Green : Color.Red;
+            }
+            else
+            {
+                ScanModePanel.Visible = false;
+            }
 
-            ScanModeLabel.FontColorOverride = msg.ScanMode.HasValue && msg.ScanMode.Value ? Color.Green : Color.Red;
+            PatientName.Text = Loc.GetString(
+                "health-analyzer-window-entity-health-text",
+                ("entityName", entityName)
+            );
 
-            // Patient Information
+            Temperature.Text = Loc.GetString("health-analyzer-window-entity-temperature-text",
+                ("temperature", float.IsNaN(msg.Temperature) ? "N/A" : $"{msg.Temperature - Atmospherics.T0C:F1} °C ({msg.Temperature:F1} K)")
+            );
 
-            SpriteView.SetEntity(target.Value);
-            SpriteView.Visible = msg.ScanMode.HasValue && msg.ScanMode.Value;
-            NoDataTex.Visible = !SpriteView.Visible;
-
-            var name = new FormattedMessage();
-            name.PushColor(Color.White);
-            name.AddText(_entityManager.HasComponent<MetaDataComponent>(target.Value)
-                ? Identity.Name(target.Value, _entityManager)
-                : Loc.GetString("health-analyzer-window-entity-unknown-text"));
-            NameLabel.SetMessage(name);
-
-            SpeciesLabel.Text =
-                _entityManager.TryGetComponent<HumanoidAppearanceComponent>(target.Value,
-                    out var humanoidAppearanceComponent)
-                    ? Loc.GetString(_prototypes.Index<SpeciesPrototype>(humanoidAppearanceComponent.Species).Name)
-                    : Loc.GetString("health-analyzer-window-entity-unknown-species-text");
-
-            // Basic Diagnostic
-
-            TemperatureLabel.Text = !float.IsNaN(msg.Temperature)
-                ? $"{msg.Temperature - Atmospherics.T0C:F1} °C ({msg.Temperature:F1} K)"
-                : Loc.GetString("health-analyzer-window-entity-unknown-value-text");
-
-            BloodLabel.Text = !float.IsNaN(msg.BloodLevel)
-                ? $"{msg.BloodLevel * 100:F1} %"
-                : Loc.GetString("health-analyzer-window-entity-unknown-value-text");
-
-            StatusLabel.Text =
-                _entityManager.TryGetComponent<MobStateComponent>(target.Value, out var mobStateComponent)
-                    ? GetStatus(mobStateComponent.CurrentState)
-                    : Loc.GetString("health-analyzer-window-entity-unknown-text");
-
-            // Total Damage
-
-            DamageLabel.Text = damageable.TotalDamage.ToString();
-
-            // Alerts
-
-            AlertsDivider.Visible = msg.Bleeding == true;
-            AlertsContainer.Visible = msg.Bleeding == true;
+            BloodLevel.Text = Loc.GetString("health-analyzer-window-entity-blood-level-text",
+                ("bloodLevel", float.IsNaN(msg.BloodLevel) ? "N/A" : $"{msg.BloodLevel * 100:F1} %")
+            );
 
             if (msg.Bleeding == true)
             {
-                AlertsContainer.DisposeAllChildren();
-                AlertsContainer.AddChild(new Label
-                {
-                    Text = Loc.GetString("health-analyzer-window-entity-bleeding-text"),
-                    FontColorOverride = Color.Red,
-                });
+                Bleeding.Text = Loc.GetString("health-analyzer-window-entity-bleeding-text");
+                Bleeding.FontColorOverride = Color.Red;
+            }
+            else
+            {
+                Bleeding.Text = string.Empty;  // Clear the text
             }
 
-            // Damage Groups
+            patientDamageAmount.Text = Loc.GetString(
+                "health-analyzer-window-entity-damage-total-text",
+                ("amount", damageable.TotalDamage)
+            );
 
             var damageSortedGroups =
-                damageable.DamagePerGroup.OrderByDescending(damage => damage.Value)
+                damageable.DamagePerGroup.OrderBy(damage => damage.Value)
                     .ToDictionary(x => x.Key, x => x.Value);
-
             IReadOnlyDictionary<string, FixedPoint2> damagePerType = damageable.Damage.DamageDict;
 
             DrawDiagnosticGroups(damageSortedGroups, damagePerType);
-        }
 
-        private static string GetStatus(MobState mobState)
-        {
-            return mobState switch
+            if (_entityManager.TryGetComponent(target, out HungerComponent? hunger)
+                && hunger.StarvationDamage != null
+                && hunger.CurrentThreshold <= HungerThreshold.Starving)
             {
-                MobState.Alive => Loc.GetString("health-analyzer-window-entity-alive-text"),
-                MobState.Critical => Loc.GetString("health-analyzer-window-entity-critical-text"),
-                MobState.Dead => Loc.GetString("health-analyzer-window-entity-dead-text"),
-                _ => Loc.GetString("health-analyzer-window-entity-unknown-text"),
-            };
+                var box = new Control { Margin = new Thickness(0, 0, 0, 15) };
+
+                box.AddChild(CreateDiagnosticGroupTitle(
+                    Loc.GetString("health-analyzer-window-malnutrition"),
+                    "malnutrition"));
+
+                GroupsContainer.AddChild(box);
+            }
+
+            SetHeight = AnalyzerHeight;
+            SetWidth = AnalyzerWidth;
         }
 
         private void DrawDiagnosticGroups(
-            Dictionary<string, FixedPoint2> groups,
-            IReadOnlyDictionary<string, FixedPoint2> damageDict)
+            Dictionary<string, FixedPoint2> groups, IReadOnlyDictionary<string, FixedPoint2> damageDict)
         {
-            GroupsContainer.RemoveAllChildren();
+            HashSet<string> shownTypes = new();
 
-            foreach (var (damageGroupId, damageAmount) in groups)
+            // Show the total damage and type breakdown for each damage group.
+            foreach (var (damageGroupId, damageAmount) in groups.Reverse())
             {
                 if (damageAmount == 0)
                     continue;
@@ -164,6 +145,7 @@ namespace Content.Client.HealthAnalyzer.UI
 
                 var groupContainer = new BoxContainer
                 {
+                    Margin = new Thickness(0, 0, 0, 15),
                     Align = BoxContainer.AlignMode.Begin,
                     Orientation = BoxContainer.LayoutOrientation.Vertical,
                 };
@@ -177,16 +159,23 @@ namespace Content.Client.HealthAnalyzer.UI
 
                 foreach (var type in group.DamageTypes)
                 {
-                    if (!damageDict.TryGetValue(type, out var typeAmount) || typeAmount <= 0)
-                        continue;
+                    if (damageDict.TryGetValue(type, out var typeAmount) && typeAmount > 0)
+                    {
+                        // If damage types are allowed to belong to more than one damage group,
+                        // they may appear twice here. Mark them as duplicate.
+                        if (shownTypes.Contains(type))
+                            continue;
 
-                    var damageString = Loc.GetString(
-                        "health-analyzer-window-damage-type-text",
-                        ("damageType", _prototypes.Index<DamageTypePrototype>(type).LocalizedName),
-                        ("amount", typeAmount)
-                    );
+                        shownTypes.Add(type);
 
-                    groupContainer.AddChild(CreateDiagnosticItemLabel(damageString.Insert(0, " · ")));
+                        var damageString = Loc.GetString(
+                            "health-analyzer-window-damage-type-text",
+                            ("damageType", _prototypes.Index<DamageTypePrototype>(type).LocalizedName),
+                            ("amount", typeAmount)
+                        );
+
+                        groupContainer.AddChild(CreateDiagnosticItemLabel(damageString.Insert(0, "- ")));
+                    }
                 }
             }
         }
@@ -209,6 +198,7 @@ namespace Content.Client.HealthAnalyzer.UI
         {
             return new Label
             {
+                Margin = new Thickness(2, 2),
                 Text = text,
             };
         }
@@ -217,13 +207,13 @@ namespace Content.Client.HealthAnalyzer.UI
         {
             var rootContainer = new BoxContainer
             {
-                Margin = new Thickness(0, 6, 0, 0),
                 VerticalAlignment = VAlignment.Bottom,
-                Orientation = BoxContainer.LayoutOrientation.Horizontal,
+                Orientation = BoxContainer.LayoutOrientation.Horizontal
             };
 
             rootContainer.AddChild(new TextureRect
             {
+                Margin = new Thickness(0, 3),
                 SetSize = new Vector2(30, 30),
                 Texture = GetTexture(id.ToLower())
             });