Merge remote-tracking branch 'upstream/master' into upstream

.github/workflows/build-test-debug.yml

@@ -45,13 +45,23 @@ jobs:
       run: dotnet build --configuration DebugOpt --no-restore /m
 
     - name: Run Content.Tests
-      run: dotnet test --no-build --configuration DebugOpt Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0
+      shell: pwsh
+      run: dotnet test --no-build --configuration DebugOpt Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0 NUnit.TestOutputXml="logs" NUnit.WorkDirectory="$(pwd)/test_results"
 
     - name: Run Content.IntegrationTests
       shell: pwsh
       run: |
         $env:DOTNET_gcServer=1
-        dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed
+        dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed NUnit.TestOutputXml="logs" NUnit.WorkDirectory="$(pwd)/test_results"
+
+    - name: Archive NUnit3 test results.
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: nunit3-results-${{ matrix.os }}
+        path: test_results/*
+        retention-days: 7
+        compression-level: 9
   ci-success:
     name: Build & Test Debug
     needs:

.github/workflows/close-master-pr.yml

@@ -3,19 +3,20 @@ name: Close PRs on master
 on:
   pull_request_target:
     types: [ opened, ready_for_review ]
-    
+
 jobs:
   run:
     runs-on: ubuntu-latest
-    if: ${{github.head_ref == 'master' || github.head_ref == 'main' || github.head_ref == 'develop'}}
-    
-    steps:    
+    if: ${{(github.head_ref == 'master' || github.head_ref == 'main' || github.head_ref == 'develop' || github.head_ref == 'stable' || github.head_ref == 'staging')
+        && github.event.pull_request.head.repo.fork}}
+
+    steps:
     - uses: superbrothers/close-pull-request@v3
       with:
-        comment: "Благодарим вас за вклад в репозиторий Space Station 14. К сожалению, похоже, что вы отправили свой PR из master-ветки. Мы предлагаем вам следовать [нашей документации по использованию git](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html) \n\n Вы можете переместить текущую работу из master-ветки в другую ветку, выполнив команду `git branch <название_ветки>` и сбросив измененив в  master-ветке."
+        comment: "Спасибо за ваш вклад! Похоже, вы создали запрос на удаление из основной ветки или другой основной ветки разработки. Это [то, чего вам следует избегать] (https://jmeridth.com/posts/do-not-issue-pull-requests-from-your-master-branch/), и, таким образом, этот запрос на удаление был автоматически закрыт. \n \n Мы рекомендуем вам следовать [нашему использованию git documentation](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html). \n \n Вы можете перенести свою текущую работу в другую ветку, выполнив [эти команды](https://ohshitgit.com/#accidental-commit-master). Затем вы можете повторно создать свой запрос на извлечение, используя новую ветку."
+
+    # If you prefer to just comment on the pr and not close it, uncomment the below and comment the above
 
-    # If you prefer to just comment on the pr and not close it, uncomment the bellow and comment the above
-      
     # - uses: actions/github-script@v7
     #   with:
     #     script: |
@@ -23,5 +24,4 @@ jobs:
     #         issue_number: ${{ github.event.number }},
     #         owner: context.repo.owner,
     #         repo: context.repo.repo,
-    #         body: "Thank you for contributing to the Space Station 14 repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow [our git usage documentation](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html) \n\n You can move your current work from the master branch to another branch by doing `git branch <branch_name` and resetting the master branch. \n\n This pr won't be automatically closed. However, a maintainer may close it for this reason."
-    #       })
+    #         body: "Thank you for your contribution! It appears you created a pull request from the master branch or another main development branch. This is [something you should avoid doing](https://jmeridth.com/posts/do-not-issue-pull-requests-from-your-master-branch/)\n\nYou can move your current work to another branch by following [these commands](https://ohshitgit.com/#accidental-commit-master). Then, you may recreate your pull request using the new branch. \n\n This pull request won't be automatically closed. However, a maintainer may close it for this reason."})

.github/workflows/test-packaging.yml

@@ -1,4 +1,4 @@
-name: Test Packaging
+name: Test Packaging
 
 on:
   push:
@@ -62,10 +62,11 @@ jobs:
           git -c submodule.Secrets.update=checkout submodule update --init
       # Corvax-Secrets-End
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
-        with:
-          dotnet-version: 10.0.x
+      # ubuntu-latest has .NET 10
+      # - name: Setup .NET Core
+      #   uses: actions/setup-dotnet@v4.1.0
+      #   with:
+      #     dotnet-version: 10.0.x
 
       - name: Install dependencies
         run: dotnet restore
@@ -74,7 +75,13 @@ jobs:
         run: dotnet build Content.Packaging --configuration Release --no-restore /m
 
       - name: Package server
-        run: dotnet run --project Content.Packaging server --platform win-x64 --platform win-arm64 --platform linux-x64 --platform linux-arm64 --platform osx-x64 --platform osx-arm64
+        run: dotnet run --project Content.Packaging server --log-build --platform win-x64 --platform win-arm64 --platform linux-x64 --platform linux-arm64 --platform osx-x64 --platform osx-arm64
 
       - name: Package client
-        run: dotnet run --project Content.Packaging client --no-wipe-release
+        run: dotnet run --project Content.Packaging client --log-build --no-wipe-release
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: binlogs
+          path: release/*.binlog
+          retention-days: 7

Content.Benchmarks/Content.Benchmarks.csproj

@@ -7,6 +7,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsTestingPlatformApplication>false</IsTestingPlatformApplication>
     <Nullable>disable</Nullable>
+    <DefineConstants>$(DefineConstants);ALLOW_BAD_PRACTICES</DefineConstants>
   </PropertyGroup>
   <Import Project="../MSBuild/Content.props" />
   <ItemGroup>

Content.Benchmarks/DeltaPressureBenchmark.cs

@@ -1,11 +1,10 @@
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Diagnosers;
 using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
-using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.CCVar;
 using Robust.Shared;
 using Robust.Shared.Analyzers;

Content.Client/Access/Systems/JobStatusSystem.cs

@@ -0,0 +1,39 @@
+using Content.Client.Overlays;
+using Content.Shared.Access.Systems;
+using Content.Shared.StatusIcon;
+using Content.Shared.StatusIcon.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Access.Systems;
+
+public sealed class JobStatusSystem : SharedJobStatusSystem
+{
+    [Dependency] private readonly ShowJobIconsSystem _showJobIcons = default!;
+    [Dependency] private readonly ShowCrewIconsSystem _showCrewIcons = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    private static readonly ProtoId<SecurityIconPrototype> CrewBorderIcon = "CrewBorderIcon";
+    private static readonly ProtoId<SecurityIconPrototype> CrewUncertainBorderIcon = "CrewUncertainBorderIcon";
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<JobStatusComponent, GetStatusIconsEvent>(OnGetStatusIconsEvent);
+    }
+
+    // show the status icons if the player has the correponding HUDs
+    private void OnGetStatusIconsEvent(Entity<JobStatusComponent> ent, ref GetStatusIconsEvent ev)
+    {
+        if (_showJobIcons.IsActive && ent.Comp.JobStatusIcon != null)
+            ev.StatusIcons.Add(_prototype.Index(ent.Comp.JobStatusIcon));
+
+        if (_showCrewIcons.IsActive)
+        {
+            if (_showCrewIcons.UncertainCrewBorder)
+                ev.StatusIcons.Add(_prototype.Index(CrewUncertainBorderIcon));
+            else if (ent.Comp.IsCrew)
+                ev.StatusIcons.Add(_prototype.Index(CrewBorderIcon));
+        }
+    }
+}

Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs

@@ -1,11 +1,9 @@
 using Content.Shared.Access;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
-using Content.Shared.CCVar;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.CrewManifest;
 using Content.Shared.Roles;
-using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Access.Components.IdCardConsoleComponent;
 
@@ -14,21 +12,13 @@ namespace Content.Client.Access.UI
     public sealed class IdCardConsoleBoundUserInterface : BoundUserInterface
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IConfigurationManager _cfgManager = default!;
         private readonly SharedIdCardConsoleSystem _idCardConsoleSystem = default!;
 
         private IdCardConsoleWindow? _window;
 
-        // CCVar.
-        private int _maxNameLength;
-        private int _maxIdJobLength;
-
         public IdCardConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
             _idCardConsoleSystem = EntMan.System<SharedIdCardConsoleSystem>();
-
-            _maxNameLength =_cfgManager.GetCVar(CCVars.MaxNameLength);
-            _maxIdJobLength = _cfgManager.GetCVar(CCVars.MaxIdJobLength);
         }
 
         protected override void Open()
@@ -77,12 +67,6 @@ namespace Content.Client.Access.UI
 
         public void SubmitData(string newFullName, string newJobTitle, List<ProtoId<AccessLevelPrototype>> newAccessList, ProtoId<JobPrototype> newJobPrototype)
         {
-            if (newFullName.Length > _maxNameLength)
-                newFullName = newFullName[.._maxNameLength];
-
-            if (newJobTitle.Length > _maxIdJobLength)
-                newJobTitle = newJobTitle[.._maxIdJobLength];
-
             SendMessage(new WriteToTargetIdMessage(
                 newFullName,
                 newJobTitle,

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

@@ -23,10 +23,6 @@ namespace Content.Client.Access.UI
 
         private readonly IdCardConsoleBoundUserInterface _owner;
 
-        // CCVar.
-        private int _maxNameLength;
-        private int _maxIdJobLength;
-
         private AccessLevelControl _accessButtons = new();
         private readonly List<string> _jobPrototypeIds = new();
         private readonly List<string> _accessGroupIds = new(); // Corvax-Wega-Add
@@ -47,11 +43,8 @@ namespace Content.Client.Access.UI
 
             _owner = owner;
 
-            _maxNameLength = _cfgManager.GetCVar(CCVars.MaxNameLength);
-            _maxIdJobLength = _cfgManager.GetCVar(CCVars.MaxIdJobLength);
-
             FullNameLineEdit.OnTextEntered += _ => SubmitData();
-            FullNameLineEdit.IsValid = s => s.Length <= _maxNameLength;
+            FullNameLineEdit.IsValid = s => s.Length <= _cfgManager.GetCVar(CCVars.MaxNameLength);
             FullNameLineEdit.OnTextChanged += _ =>
             {
                 FullNameSaveButton.Disabled = FullNameSaveButton.Text == _lastFullName;
@@ -59,7 +52,7 @@ namespace Content.Client.Access.UI
             FullNameSaveButton.OnPressed += _ => SubmitData();
 
             JobTitleLineEdit.OnTextEntered += _ => SubmitData();
-            JobTitleLineEdit.IsValid = s => s.Length <= _maxIdJobLength;
+            JobTitleLineEdit.IsValid = s => s.Length <= _cfgManager.GetCVar(CCVars.MaxIdJobLength);
             JobTitleLineEdit.OnTextChanged += _ =>
             {
                 JobTitleSaveButton.Disabled = JobTitleLineEdit.Text == _lastJobTitle;

Content.Client/Administration/UI/BanList/BanListEui.cs

@@ -1,4 +1,5 @@
-using System.Numerics;
+using System.Linq;
+using System.Numerics;
 using Content.Client.Administration.UI.BanList.Bans;
 using Content.Client.Administration.UI.BanList.RoleBans;
 using Content.Client.Eui;
@@ -73,7 +74,7 @@ public sealed class BanListEui : BaseEui
         return date.ToString("MM/dd/yyyy h:mm tt");
     }
 
-    public static void SetData<T>(IBanListLine<T> line, SharedServerBan ban) where T : SharedServerBan
+    public static void SetData<T>(IBanListLine<T> line, SharedBan ban) where T : SharedBan
     {
         line.Reason.Text = ban.Reason;
         line.BanTime.Text = FormatDate(ban.BanTime);
@@ -94,20 +95,20 @@ public sealed class BanListEui : BaseEui
         line.BanningAdmin.Text = ban.BanningAdminName;
     }
 
-    private void OnLineIdsClicked<T>(IBanListLine<T> line) where T : SharedServerBan
+    private void OnLineIdsClicked<T>(IBanListLine<T> line) where T : SharedBan
     {
         _popup?.Close();
         _popup = null;
 
         var ban = line.Ban;
         var id = ban.Id == null ? string.Empty : Loc.GetString("ban-list-id", ("id", ban.Id.Value));
-        var ip = ban.Address == null
+        var ip = ban.Addresses.Length == 0
             ? string.Empty
-            : Loc.GetString("ban-list-ip", ("ip", ban.Address.Value.address));
-        var hwid = ban.HWId == null ? string.Empty : Loc.GetString("ban-list-hwid", ("hwid", ban.HWId));
-        var guid = ban.UserId == null
+            : Loc.GetString("ban-list-ip", ("ip", string.Join(',', ban.Addresses.Select(a => a.address))));
+        var hwid = ban.HWIds.Length == 0 ? string.Empty : Loc.GetString("ban-list-hwid", ("hwid", string.Join(',', ban.HWIds)));
+        var guid = ban.UserIds.Length == 0
             ? string.Empty
-            : Loc.GetString("ban-list-guid", ("guid", ban.UserId.Value.ToString()));
+            : Loc.GetString("ban-list-guid", ("guid", string.Join(',', ban.UserIds)));
 
         _popup = new BanListIdsPopup(id, ip, hwid, guid);
 

Content.Client/Administration/UI/BanList/Bans/BanListControl.xaml.cs

@@ -16,7 +16,7 @@ public sealed partial class BanListControl : Control
         RobustXamlLoader.Load(this);
     }
 
-    public void SetBans(List<SharedServerBan> bans)
+    public void SetBans(List<SharedBan> bans)
     {
         for (var i = Bans.ChildCount - 1; i >= 1; i--)
         {

Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml.cs

@@ -7,13 +7,13 @@ using static Robust.Client.UserInterface.Controls.BaseButton;
 namespace Content.Client.Administration.UI.BanList.Bans;
 
 [GenerateTypedNameReferences]
-public sealed partial class BanListLine : BoxContainer, IBanListLine<SharedServerBan>
+public sealed partial class BanListLine : BoxContainer, IBanListLine<SharedBan>
 {
-    public SharedServerBan Ban { get; }
+    public SharedBan Ban { get; }
 
     public event Action<BanListLine>? IdsClicked;
 
-    public BanListLine(SharedServerBan ban)
+    public BanListLine(SharedBan ban)
     {
         RobustXamlLoader.Load(this);
 

Content.Client/Administration/UI/BanList/IBanListLine.cs

@@ -3,7 +3,7 @@ using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.Administration.UI.BanList;
 
-public interface IBanListLine<T> where T : SharedServerBan
+public interface IBanListLine<T> where T : SharedBan
 {
     T Ban { get; }
     Label Reason { get; }

Content.Client/Administration/UI/BanList/RoleBans/RoleBanListControl.xaml.cs

@@ -16,7 +16,7 @@ public sealed partial class RoleBanListControl : Control
         RobustXamlLoader.Load(this);
     }
 
-    public void SetRoleBans(List<SharedServerRoleBan> bans)
+    public void SetRoleBans(List<SharedBan> bans)
     {
         for (var i = RoleBans.ChildCount - 1; i >= 1; i--)
         {

Content.Client/Administration/UI/BanList/RoleBans/RoleBanListLine.xaml.cs

@@ -7,13 +7,13 @@ using static Robust.Client.UserInterface.Controls.BaseButton;
 namespace Content.Client.Administration.UI.BanList.RoleBans;
 
 [GenerateTypedNameReferences]
-public sealed partial class RoleBanListLine : BoxContainer, IBanListLine<SharedServerRoleBan>
+public sealed partial class RoleBanListLine : BoxContainer, IBanListLine<SharedBan>
 {
-    public SharedServerRoleBan Ban { get; }
+    public SharedBan Ban { get; }
 
     public event Action<RoleBanListLine>? IdsClicked;
 
-    public RoleBanListLine(SharedServerRoleBan ban)
+    public RoleBanListLine(SharedBan ban)
     {
         RobustXamlLoader.Load(this);
 
@@ -21,7 +21,7 @@ public sealed partial class RoleBanListLine : BoxContainer, IBanListLine<SharedS
         IdsHidden.OnPressed += IdsPressed;
 
         BanListEui.SetData(this, ban);
-        Role.Text = ban.Role;
+        Role.Text = string.Join(", ", ban.Roles ?? []);
     }
 
     private void IdsPressed(ButtonEventArgs buttonEventArgs)

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

@@ -70,7 +70,7 @@ public sealed partial class AdminNotesLine : BoxContainer
 
         TimeLabel.Text = Note.CreatedAt.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss");
         ServerLabel.Text = Note.ServerName ?? "Unknown";
-        RoundLabel.Text = Note.Round == null ? "Unknown round" : "Round " + Note.Round;
+        RoundLabel.Text = Note.Rounds.Length == 0 ? "Unknown round" : "Round " + string.Join(',', Note.Rounds);
         AdminLabel.Text = Note.CreatedByName;
         PlaytimeLabel.Text = $"{Note.PlaytimeAtNote.TotalHours: 0.0}h";
 
@@ -143,7 +143,12 @@ public sealed partial class AdminNotesLine : BoxContainer
 
     private string FormatRoleBanMessage()
     {
-        var banMessage = new StringBuilder($"{Loc.GetString("admin-notes-banned-from")} {string.Join(", ", Note.BannedRoles ?? new[] { "unknown" })} ");
+        var rolesText = string.Join(
+            ", ",
+            // Explicit cast here to avoid sandbox violation.
+            (IEnumerable<BanRoleDef>?)Note.BannedRoles ?? [new BanRoleDef("what", "You should not be seeing this")]);
+
+        var banMessage = new StringBuilder($"{Loc.GetString("admin-notes-banned-from")} {rolesText} ");
         return FormatBanMessageCommon(banMessage);
     }
 

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

@@ -32,9 +32,9 @@ public sealed partial class AdminNotesLinePopup : Popup
         IdLabel.Text = Loc.GetString("admin-notes-id", ("id", note.Id));
         TypeLabel.Text = Loc.GetString("admin-notes-type", ("type", note.NoteType));
         SeverityLabel.Text = Loc.GetString("admin-notes-severity", ("severity", note.NoteSeverity ?? NoteSeverity.None));
-        RoundIdLabel.Text = note.Round == null
+        RoundIdLabel.Text = note.Rounds.Length == 0
             ? Loc.GetString("admin-notes-round-id-unknown")
-            : Loc.GetString("admin-notes-round-id", ("id", note.Round));
+            : Loc.GetString("admin-notes-round-id", ("id", string.Join(',', note.Rounds)));
         CreatedByLabel.Text = Loc.GetString("admin-notes-created-by", ("author", note.CreatedByName));
         CreatedAtLabel.Text = Loc.GetString("admin-notes-created-at", ("date", note.CreatedAt.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")));
         EditedByLabel.Text = Loc.GetString("admin-notes-last-edited-by", ("author", note.EditedByName));

Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs

@@ -25,8 +25,8 @@ public sealed class ClientInnerBodyAnomalySystem : SharedInnerBodyAnomalySystem
 
         var index = _sprite.LayerMapReserve((ent.Owner, sprite), ent.Comp.LayerMap);
 
-        if (TryComp<HumanoidAppearanceComponent>(ent, out var humanoidAppearance) &&
-            ent.Comp.SpeciesSprites.TryGetValue(humanoidAppearance.Species, out var speciesSprite))
+        if (TryComp<HumanoidProfileComponent>(ent, out var humanoid) &&
+            ent.Comp.SpeciesSprites.TryGetValue(humanoid.Species, out var speciesSprite))
         {
             _sprite.LayerSetSprite((ent.Owner, sprite), index, speciesSprite);
         }

Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml

@@ -1,4 +1,4 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                 Title="{Loc 'anomaly-generator-ui-title'}"
 
@@ -32,7 +32,7 @@
             </BoxContainer>
             <!--Sprite View-->
             <PanelContainer Margin="12 0 0 0"
-                            StyleClasses="Inset"
+                            StyleClasses="BackgroundPanelDark"
                             VerticalAlignment="Center">
                 <SpriteView Name="EntityView"
                             SetSize="96 96"

Content.Client/Atmos/Components/MapAtmosphereComponent.cs

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

Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs

@@ -10,7 +10,9 @@ namespace Content.Client.Atmos.EntitySystems
     [UsedImplicitly]
     internal sealed class AtmosDebugOverlaySystem : SharedAtmosDebugOverlaySystem
     {
-        public readonly Dictionary<EntityUid, AtmosDebugOverlayMessage> TileData = new();
+        [Dependency] private readonly IOverlayManager _overlayManager = default!;
+
+        public readonly Dictionary<EntityUid, AtmosDebugOverlayMessage> TileData = [];
 
         // Configuration set by debug commands and used by AtmosDebugOverlay {
         /// <summary>Value source for display</summary>
@@ -25,6 +27,8 @@ namespace Content.Client.Atmos.EntitySystems
         public bool CfgCBM = false;
         // }
 
+        private AtmosDebugOverlay? _overlay;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -34,10 +38,6 @@ namespace Content.Client.Atmos.EntitySystems
             SubscribeNetworkEvent<AtmosDebugOverlayDisableMessage>(HandleAtmosDebugOverlayDisableMessage);
 
             SubscribeLocalEvent<GridRemovalEvent>(OnGridRemoved);
-
-            var overlayManager = IoCManager.Resolve<IOverlayManager>();
-            if(!overlayManager.HasOverlay<AtmosDebugOverlay>())
-                overlayManager.AddOverlay(new AtmosDebugOverlay(this));
         }
 
         private void OnGridRemoved(GridRemovalEvent ev)
@@ -51,19 +51,25 @@ namespace Content.Client.Atmos.EntitySystems
         private void HandleAtmosDebugOverlayMessage(AtmosDebugOverlayMessage message)
         {
             TileData[GetEntity(message.GridId)] = message;
+
+            if (_overlay is not null)
+                return;
+
+            _overlay = new AtmosDebugOverlay(this);
+            _overlayManager.AddOverlay(_overlay);
         }
 
         private void HandleAtmosDebugOverlayDisableMessage(AtmosDebugOverlayDisableMessage ev)
         {
             TileData.Clear();
+            RemoveOverlay();
         }
 
         public override void Shutdown()
         {
             base.Shutdown();
-            var overlayManager = IoCManager.Resolve<IOverlayManager>();
-            if (overlayManager.HasOverlay<AtmosDebugOverlay>())
-                overlayManager.RemoveOverlay<AtmosDebugOverlay>();
+
+            RemoveOverlay();
         }
 
         public void Reset(RoundRestartCleanupEvent ev)
@@ -75,6 +81,15 @@ namespace Content.Client.Atmos.EntitySystems
         {
             return TileData.ContainsKey(gridId);
         }
+
+        private void RemoveOverlay()
+        {
+            if (_overlay is null)
+                return;
+
+            _overlayManager.RemoveOverlay(_overlay);
+            _overlay = null;
+        }
     }
 
     internal enum AtmosDebugOverlayMode : byte

Content.Client/Atmos/EntitySystems/AtmosphereSystem.Gases.cs

@@ -1,5 +1,6 @@
 using System.Runtime.CompilerServices;
 using Content.Shared.Atmos;
+using Content.Shared.Atmos.Reactions;
 
 namespace Content.Client.Atmos.EntitySystems;
 
@@ -13,6 +14,29 @@ public sealed partial class AtmosphereSystem
      implementation.
      */
 
+    /// <inheritdoc/>
+    /// <remarks>No-op on client as reactions aren't entirely in shared.
+    /// Don't call it. Smile.</remarks>
+    public override ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder)
+    {
+        // Reactions don't work on client so don't even try.
+        throw new NotImplementedException();
+    }
+
+    public override bool IsMixtureFuel(GasMixture mixture, float epsilon = Atmospherics.Epsilon)
+    {
+        var tmp = new float[Atmospherics.AdjustedNumberOfGases];
+        NumericsHelpers.Multiply(mixture.Moles, GasFuelMask, tmp);
+        return NumericsHelpers.HorizontalAdd(tmp) > epsilon;
+    }
+
+    public override bool IsMixtureOxidizer(GasMixture mixture, float epsilon = Atmospherics.Epsilon)
+    {
+        var tmp = new float[Atmospherics.AdjustedNumberOfGases];
+        NumericsHelpers.Multiply(mixture.Moles, GasOxidizerMask, tmp);
+        return NumericsHelpers.HorizontalAdd(tmp) > epsilon;
+    }
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     protected override float GetHeatCapacityCalculation(float[] moles, bool space)
     {

Content.Client/Atmos/EntitySystems/GasTileFireOverlaySystem.cs

@@ -0,0 +1,30 @@
+using Content.Client.Atmos.Overlays;
+using JetBrains.Annotations;
+using Robust.Client.Graphics;
+
+namespace Content.Client.Atmos.EntitySystems;
+
+/// <summary>
+/// System responsible for rendering atmos fire animations using <see cref="GasTileFireOverlay"/>.
+/// </summary>
+[UsedImplicitly]
+public sealed class GasTileFireOverlaySystem : EntitySystem
+{
+    [Dependency] private readonly IOverlayManager _overlayMan = default!;
+
+    private GasTileFireOverlay _fireOverlay = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _fireOverlay = new GasTileFireOverlay();
+        _overlayMan.AddOverlay(_fireOverlay);
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+        _overlayMan.RemoveOverlay<GasTileFireOverlay>();
+    }
+}

Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs

@@ -1,106 +1,85 @@
-using Content.Client.Atmos.Overlays;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.EntitySystems;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
-using Robust.Client.ResourceManagement;
 using Robust.Shared.GameStates;
 
-namespace Content.Client.Atmos.EntitySystems
+namespace Content.Client.Atmos.EntitySystems;
+
+[UsedImplicitly]
+public sealed class GasTileOverlaySystem : SharedGasTileOverlaySystem
 {
-    [UsedImplicitly]
-    public sealed class GasTileOverlaySystem : SharedGasTileOverlaySystem
+    public override void Initialize()
     {
-        [Dependency] private readonly IResourceCache _resourceCache = default!;
-        [Dependency] private readonly IOverlayManager _overlayMan = default!;
-        [Dependency] private readonly SpriteSystem _spriteSys = default!;
-        [Dependency] private readonly SharedTransformSystem _xformSys = default!;
+        base.Initialize();
+        SubscribeNetworkEvent<GasOverlayUpdateEvent>(HandleGasOverlayUpdate);
+        SubscribeLocalEvent<GasTileOverlayComponent, ComponentHandleState>(OnHandleState);
+    }
 
-        private GasTileOverlay _overlay = default!;
+    private void OnHandleState(EntityUid gridUid, GasTileOverlayComponent comp, ref ComponentHandleState args)
+    {
+        Dictionary<Vector2i, GasOverlayChunk> modifiedChunks;
 
-        public override void Initialize()
+        switch (args.Current)
         {
-            base.Initialize();
-            SubscribeNetworkEvent<GasOverlayUpdateEvent>(HandleGasOverlayUpdate);
-            SubscribeLocalEvent<GasTileOverlayComponent, ComponentHandleState>(OnHandleState);
-
-            _overlay = new GasTileOverlay(this, EntityManager, _resourceCache, ProtoMan, _spriteSys, _xformSys);
-            _overlayMan.AddOverlay(_overlay);
-        }
-
-        public override void Shutdown()
-        {
-            base.Shutdown();
-            _overlayMan.RemoveOverlay<GasTileOverlay>();
-        }
-
-        private void OnHandleState(EntityUid gridUid, GasTileOverlayComponent comp, ref ComponentHandleState args)
-        {
-            Dictionary<Vector2i, GasOverlayChunk> modifiedChunks;
-
-            switch (args.Current)
+            // is this a delta or full state?
+            case GasTileOverlayDeltaState delta:
             {
-                // is this a delta or full state?
-                case GasTileOverlayDeltaState delta:
+                modifiedChunks = delta.ModifiedChunks;
+                foreach (var index in comp.Chunks.Keys)
                 {
-                    modifiedChunks = delta.ModifiedChunks;
-                    foreach (var index in comp.Chunks.Keys)
-                    {
-                        if (!delta.AllChunks.Contains(index))
-                            comp.Chunks.Remove(index);
-                    }
-
-                    break;
+                    if (!delta.AllChunks.Contains(index))
+                        comp.Chunks.Remove(index);
                 }
-                case GasTileOverlayState state:
-                {
-                    modifiedChunks = state.Chunks;
-                    foreach (var index in comp.Chunks.Keys)
-                    {
-                        if (!state.Chunks.ContainsKey(index))
-                            comp.Chunks.Remove(index);
-                    }
 
-                    break;
-                }
-                default:
-                    return;
+                break;
             }
-
-            foreach (var (index, data) in modifiedChunks)
+            case GasTileOverlayState state:
             {
-                comp.Chunks[index] = data;
+                modifiedChunks = state.Chunks;
+                foreach (var index in comp.Chunks.Keys)
+                {
+                    if (!state.Chunks.ContainsKey(index))
+                        comp.Chunks.Remove(index);
+                }
+
+                break;
+            }
+            default:
+                return;
+        }
+
+        foreach (var (index, data) in modifiedChunks)
+        {
+            comp.Chunks[index] = data;
+        }
+    }
+
+    private void HandleGasOverlayUpdate(GasOverlayUpdateEvent ev)
+    {
+        foreach (var (nent, removedIndicies) in ev.RemovedChunks)
+        {
+            var grid = GetEntity(nent);
+
+            if (!TryComp(grid, out GasTileOverlayComponent? comp))
+                continue;
+
+            foreach (var index in removedIndicies)
+            {
+                comp.Chunks.Remove(index);
             }
         }
 
-        private void HandleGasOverlayUpdate(GasOverlayUpdateEvent ev)
+        foreach (var (nent, gridData) in ev.UpdatedChunks)
         {
-            foreach (var (nent, removedIndicies) in ev.RemovedChunks)
+            var grid = GetEntity(nent);
+
+            if (!TryComp(grid, out GasTileOverlayComponent? comp))
+                continue;
+
+            foreach (var chunkData in gridData)
             {
-                var grid = GetEntity(nent);
-
-                if (!TryComp(grid, out GasTileOverlayComponent? comp))
-                    continue;
-
-                foreach (var index in removedIndicies)
-                {
-                    comp.Chunks.Remove(index);
-                }
-            }
-
-            foreach (var (nent, gridData) in ev.UpdatedChunks)
-            {
-                var grid = GetEntity(nent);
-
-                if (!TryComp(grid, out GasTileOverlayComponent? comp))
-                    continue;
-
-                foreach (var chunkData in gridData)
-                {
-                    comp.Chunks[chunkData.Index] = chunkData;
-                }
+                comp.Chunks[chunkData.Index] = chunkData;
             }
         }
     }

Content.Client/Atmos/EntitySystems/GasTileVisibleGasOverlaySystem.cs

@@ -0,0 +1,31 @@
+using Content.Client.Atmos.Overlays;
+using JetBrains.Annotations;
+using Robust.Client.Graphics;
+
+namespace Content.Client.Atmos.EntitySystems;
+
+/// <summary>
+///     System responsible for rendering visible atmos gasses (like plasma for example) using <see cref="GasTileVisibleGasOverlay"/>.
+/// </summary>
+[UsedImplicitly]
+public sealed class GasTileVisibleGasOverlaySystem : EntitySystem
+{
+    [Dependency] private readonly IOverlayManager _overlayMan = default!;
+
+    private GasTileVisibleGasOverlay _visibleGasOverlay = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _visibleGasOverlay = new GasTileVisibleGasOverlay();
+        _overlayMan.AddOverlay(_visibleGasOverlay);
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+        _overlayMan.RemoveOverlay<GasTileVisibleGasOverlay>();
+    }
+
+}

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

@@ -7,7 +7,7 @@
         <!-- Status (pressure, temperature, alarm state, device total, address, etc) -->
         <BoxContainer Orientation="Horizontal" Margin="0 0 0 2">
             <!-- Left column (view of entity) -->
-            <PanelContainer Margin="2 0 6 0" StyleClasses="Inset" VerticalAlignment="Center" VerticalExpand="True">
+            <PanelContainer Margin="2 0 6 0" StyleClasses="BackgroundPanelDark" VerticalAlignment="Center" VerticalExpand="True">
                 <SpriteView Name="EntityView" OverrideDirection="South" Scale="2 2" SetSize="64 64"/>
             </PanelContainer>
             <!-- Center column (pressure, temperature, alarm state) -->

Content.Client/Atmos/Overlays/GasTileDangerousTemperatureOverlay.cs

@@ -0,0 +1,253 @@
+using Content.Client.Atmos.EntitySystems;
+using Content.Client.Graphics;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.EntitySystems;
+using Robust.Client.Graphics;
+using Robust.Shared.Enums;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using System.Numerics;
+
+namespace Content.Client.Atmos.Overlays;
+
+/// <summary>
+/// Renders a thermal heatmap overlay for gas tiles, used for equipment like thermal glasses.
+/// /// </summary>
+public sealed class GasTileDangerousTemperatureOverlay : Overlay
+{
+    public override bool RequestScreenTexture { get; set; } = false;
+
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly IClyde _clyde = default!;
+
+    private GasTileOverlaySystem? _gasTileOverlay;
+    private readonly SharedTransformSystem _xformSys;
+    private EntityQuery<GasTileOverlayComponent> _overlayQuery;
+
+    private readonly OverlayResourceCache<CachedResources> _resources = new();
+    private List<Entity<MapGridComponent>> _grids = new();
+
+    // Cache used to transform ThermalByte into Color for overlay
+    private readonly Color[] _colorCache = new Color[256];
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
+
+    public GasTileDangerousTemperatureOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        _xformSys = _entManager.System<SharedTransformSystem>();
+
+        _overlayQuery = _entManager.GetEntityQuery<GasTileOverlayComponent>();
+
+        for (byte i = 0; i <= ThermalByte.TempResolution; i++)
+        {
+            _colorCache[i] = PreCalculateColor(i);
+        }
+
+        _colorCache[ThermalByte.StateVacuum] = Color.Teal;
+        _colorCache[ThermalByte.StateVacuum].A = 0.6f;
+        _colorCache[ThermalByte.AtmosImpossible] = Color.Transparent;
+
+#if DEBUG // This shouldn't happend so tell me if you see this LimeGreen on the screen
+        _colorCache[ThermalByte.ReservedFuture0] = Color.LimeGreen;
+        _colorCache[ThermalByte.ReservedFuture1] = Color.LimeGreen;
+        _colorCache[ThermalByte.ReservedFuture2] = Color.LimeGreen;
+#else
+        _colorCache[ThermalByte.ReservedFuture0] = Color.Transparent;
+        _colorCache[ThermalByte.ReservedFuture1] = Color.Transparent;
+        _colorCache[ThermalByte.ReservedFuture2] = Color.Transparent;
+#endif
+    }
+
+
+    /// <summary>
+    /// Used for Calculating onscreen color from ThermalByte core value
+    /// /// </summary>
+    private static Color PreCalculateColor(byte byteTemp)
+    {
+        // Color Thresholds in Kelvin
+        // -150 C
+        const float deepFreezeK = 123.15f;
+        // -50 C
+        const float freezeStartK = 223.15f;
+        // 0 C
+        const float waterFreezeK = 273.15f;
+        // 50 C
+        const float heatStartK = 323.15f;
+        // 100 C
+        const float waterBoilK = 373.15f;
+        // 300 C
+        const float superHeatK = 573.15f;
+
+        var tempK = byteTemp * ThermalByte.TempDegreeResolution;
+
+        // Neutral Zone Check (0C to 50C)
+        // If between 273.15K and 323.15K, it's transparent.
+        if (tempK >= waterFreezeK && tempK < heatStartK)
+        {
+            return Color.Transparent;
+        }
+
+        Color resultingColor;
+
+        switch (tempK)
+        {
+            case < deepFreezeK:
+                resultingColor = Color.FromHex("#330066");
+                resultingColor.A = 0.7f;
+                break;
+            case < freezeStartK:
+                // Interpolate Deep Purple -> Blue
+                // Range: 123.15 to 223.15 (Span: 100)
+                resultingColor = Color.InterpolateBetween(
+                    Color.FromHex("#330066"),
+                    Color.Blue,
+                    (tempK - deepFreezeK) * 0.01f);
+                resultingColor.A = 0.6f;
+                break;
+            case < waterFreezeK:
+                // Interpolate Blue -> Transparent
+                // Range: 223.15 to 273.15 (Span: 50)
+
+                resultingColor = Color.InterpolateBetween(
+                    new Color(Color.Blue.R, Color.Blue.G, Color.Blue.B, 0.6f),
+                    new Color(Color.Blue.R, Color.Blue.G, Color.Blue.B, 0.2f),
+                    (tempK - freezeStartK) * 0.02f);
+                break;
+            case < waterBoilK:
+                // Interpolate Transparent -> Yellow
+                // Range: 323.15 to 373.15 (Span: 50)
+
+                resultingColor = Color.InterpolateBetween(
+                    new Color(Color.Yellow.R, Color.Yellow.G, Color.Yellow.B, 0.2f),
+                    new Color(Color.Yellow.R, Color.Yellow.G, Color.Yellow.B, 0.6f),
+                    (tempK - heatStartK) * 0.02f);
+                break;
+            case < superHeatK:
+                // Interpolate Yellow -> Red
+                // Range: 373.15 to 573.15 (Span: 200)
+                resultingColor = Color.InterpolateBetween(
+                    Color.Yellow,
+                    Color.Red,
+                    (tempK - waterBoilK) * 0.005f);
+                resultingColor.A = 0.6f;
+                break;
+            default:
+                resultingColor = Color.DarkRed;
+                resultingColor.A = 0.7f;
+                break;
+        }
+
+        return resultingColor;
+    }
+
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (args.MapId == MapId.Nullspace)
+            return false;
+
+        _gasTileOverlay ??= _entManager.System<GasTileOverlaySystem>();
+        if (_gasTileOverlay == null)
+            return false;
+
+        var target = args.Viewport.RenderTarget;
+
+        var res = _resources.GetForViewport(args.Viewport, static _ => new CachedResources());
+        if (res.TemperatureTarget is null || res.TemperatureTarget.Texture.Size != target.Size)
+        {
+            res.TemperatureTarget?.Dispose();
+            res.TemperatureTarget = _clyde.CreateRenderTarget(
+                target.Size,
+                new RenderTargetFormatParameters(RenderTargetColorFormat.Rgba8Srgb),
+                name: nameof(GasTileDangerousTemperatureOverlay));
+        }
+
+        var drawHandle = args.WorldHandle;
+        var worldBounds = args.WorldBounds;
+        var worldAABB = args.WorldAABB;
+        var mapId = args.MapId;
+        var worldToViewportLocal = args.Viewport.GetWorldToLocalMatrix();
+
+        drawHandle.RenderInRenderTarget(res.TemperatureTarget,
+            () =>
+            {
+                _grids.Clear();
+                _mapManager.FindGridsIntersecting(mapId, worldAABB, ref _grids);
+
+                foreach (var grid in _grids)
+                {
+                    if (!_overlayQuery.TryGetComponent(grid.Owner, out var comp))
+                        continue;
+
+                    var gridTileSizeVec = grid.Comp.TileSizeVector;
+                    var gridTileCenterVec = grid.Comp.TileSizeHalfVector;
+                    var gridEntToWorld = _xformSys.GetWorldMatrix(grid.Owner);
+                    var gridEntToViewportLocal = gridEntToWorld * worldToViewportLocal;
+
+                    drawHandle.SetTransform(gridEntToViewportLocal);
+
+                    var worldToGridLocal = _xformSys.GetInvWorldMatrix(grid.Owner);
+                    var floatBounds = worldToGridLocal.TransformBox(worldBounds).Enlarged(grid.Comp.TileSize);
+
+                    var localBounds = new Box2i(
+                        (int)MathF.Floor(floatBounds.Left),
+                        (int)MathF.Floor(floatBounds.Bottom),
+                        (int)MathF.Ceiling(floatBounds.Right),
+                        (int)MathF.Ceiling(floatBounds.Top));
+
+                    foreach (var chunk in comp.Chunks.Values)
+                    {
+                        var enumerator = new GasChunkEnumerator(chunk);
+                        while (enumerator.MoveNext(out var tileGas))
+                        {
+                            var tilePosition = chunk.Origin + (enumerator.X, enumerator.Y);
+                            if (!localBounds.Contains(tilePosition))
+                                continue;
+
+                            var gasColor = _colorCache[tileGas.ByteGasTemperature.Value];
+
+                            if (gasColor.A <= 0f)
+                                continue;
+
+                            drawHandle.DrawRect(
+                                Box2.CenteredAround(tilePosition + gridTileCenterVec, gridTileSizeVec),
+                                gasColor
+                            );
+                        }
+                    }
+                }
+            },
+            new Color(0, 0, 0, 0));
+
+        drawHandle.SetTransform(Matrix3x2.Identity);
+
+        return true;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        var res = _resources.GetForViewport(args.Viewport, static _ => new CachedResources());
+
+        if (res.TemperatureTarget != null)
+            args.WorldHandle.DrawTextureRect(res.TemperatureTarget.Texture, args.WorldBounds);
+        args.WorldHandle.SetTransform(Matrix3x2.Identity);
+    }
+
+    protected override void DisposeBehavior()
+    {
+        _resources.Dispose();
+        base.DisposeBehavior();
+    }
+
+    private sealed class CachedResources : IDisposable
+    {
+        public IRenderTexture? TemperatureTarget;
+
+        public void Dispose()
+        {
+            TemperatureTarget?.Dispose();
+        }
+    }
+}

Content.Client/Atmos/Overlays/GasTileFireOverlay.cs

@@ -0,0 +1,172 @@
+using Content.Client.Atmos.EntitySystems;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Species;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Enums;
+using Robust.Shared.Graphics.RSI;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using System.Numerics;
+
+namespace Content.Client.Atmos.Overlays;
+
+/// <summary>
+///     Overlay responsible for rendering atmos fire animation.
+/// </summary>
+public sealed class GasTileFireOverlay : Overlay
+{
+    [Dependency] private readonly IPrototypeManager _protoMan = default!;
+    [Dependency] private readonly IResourceCache _resourceCache = default!;
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpaceEntities | OverlaySpace.WorldSpaceBelowWorld;
+    private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+
+    private readonly SharedTransformSystem _xformSys;
+    private readonly SharedMapSystem _mapSystem = default!;
+    private readonly ShaderInstance _shader;
+
+    private readonly float[] _timer;
+    private readonly float[][] _frameDelays;
+    private readonly int[] _frameCounter;
+
+    // TODO combine textures into a single texture atlas.
+    private readonly Texture[][] _frames;
+
+    private const int FireStates = 3;
+    private const string FireRsiPath = "/Textures/Effects/fire.rsi";
+
+    public const int GasOverlayZIndex = (int)Shared.DrawDepth.DrawDepth.Effects; // Under ghosts, above mostly everything else
+
+    public GasTileFireOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        _xformSys = _entManager.System<SharedTransformSystem>();
+        _mapSystem = _entManager.System<SharedMapSystem>();
+        _shader = _protoMan.Index(UnshadedShader).Instance();
+        ZIndex = GasOverlayZIndex;
+
+        _timer = new float[FireStates];
+        _frameDelays = new float[FireStates][];
+        _frameCounter = new int[FireStates];
+        _frames = new Texture[FireStates][];
+
+        var fire = _resourceCache.GetResource<RSIResource>(FireRsiPath).RSI;
+
+        for (var i = 0; i < FireStates; i++)
+        {
+            if (!fire.TryGetState((i + 1).ToString(), out var state))
+                throw new ArgumentOutOfRangeException($"Fire RSI doesn't have state \"{i}\"!");
+
+            _frames[i] = state.GetFrames(RsiDirection.South);
+            _frameDelays[i] = state.GetDelays();
+            _frameCounter[i] = 0;
+        }
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        for (var i = 0; i < FireStates; i++)
+        {
+            var delays = _frameDelays[i];
+            if (delays.Length == 0)
+                continue;
+
+            var frameCount = _frameCounter[i];
+            _timer[i] += args.DeltaSeconds;
+            var time = delays[frameCount];
+
+            if (_timer[i] < time) continue;
+            _timer[i] -= time;
+            _frameCounter[i] = (frameCount + 1) % _frames[i].Length;
+        }
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (args.MapId == MapId.Nullspace)
+            return;
+
+        var drawHandle = args.WorldHandle;
+        var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
+        var overlayQuery = _entManager.GetEntityQuery<GasTileOverlayComponent>();
+        var gridState = (args.WorldBounds,
+            args.WorldHandle,
+            _frames,
+            _frameCounter,
+            _shader,
+            overlayQuery,
+            xformQuery,
+            _xformSys);
+
+        var mapUid = _mapSystem.GetMapOrInvalid(args.MapId);
+
+        if (args.Space != OverlaySpace.WorldSpaceEntities)
+            return;
+
+        // TODO: WorldBounds callback.
+        _mapManager.FindGridsIntersecting(args.MapId, args.WorldAABB, ref gridState,
+            static (EntityUid uid, MapGridComponent grid,
+                ref (Box2Rotated WorldBounds,
+                    DrawingHandleWorld drawHandle,
+                    Texture[][] frames,
+                    int[] frameCounter,
+                    ShaderInstance shader,
+                    EntityQuery<GasTileOverlayComponent> overlayQuery,
+                    EntityQuery<TransformComponent> xformQuery,
+                    SharedTransformSystem xformSys) state) =>
+            {
+                if (!state.overlayQuery.TryGetComponent(uid, out var comp) ||
+                    !state.xformQuery.TryGetComponent(uid, out var gridXform))
+                {
+                    return true;
+                }
+
+                var (_, _, worldMatrix, invMatrix) = state.xformSys.GetWorldPositionRotationMatrixWithInv(gridXform);
+                state.drawHandle.SetTransform(worldMatrix);
+                var floatBounds = invMatrix.TransformBox(state.WorldBounds).Enlarged(grid.TileSize);
+                var localBounds = new Box2i(
+                    (int)MathF.Floor(floatBounds.Left),
+                    (int)MathF.Floor(floatBounds.Bottom),
+                    (int)MathF.Ceiling(floatBounds.Right),
+                    (int)MathF.Ceiling(floatBounds.Top));
+
+                // Currently it would be faster to group drawing by gas rather than by chunk, but if the textures are
+                // ever moved to a single atlas, that should no longer be the case. So this is just grouping draw calls
+                // by chunk, even though its currently slower.
+
+                state.drawHandle.UseShader(state.shader);
+                foreach (var chunk in comp.Chunks.Values)
+                {
+                    var enumerator = new GasChunkEnumerator(chunk);
+
+                    while (enumerator.MoveNext(out var gas))
+                    {
+                        if (gas.FireState == 0)
+                            continue;
+
+                        var index = chunk.Origin + (enumerator.X, enumerator.Y);
+                        if (!localBounds.Contains(index))
+                            continue;
+
+                        var fireState = gas.FireState - 1;
+                        var texture = state.frames[fireState][state.frameCounter[fireState]];
+                        state.drawHandle.DrawTexture(texture, index);
+                    }
+                }
+
+                return true;
+            });
+
+        drawHandle.UseShader(null);
+        drawHandle.SetTransform(Matrix3x2.Identity);
+    }
+}

Content.Client/Atmos/Overlays/GasTileOverlay.cs

@@ -1,302 +0,0 @@
-using System.Numerics;
-using Content.Client.Atmos.Components;
-using Content.Client.Atmos.EntitySystems;
-using Content.Shared.Atmos;
-using Content.Shared.Atmos.Components;
-using Content.Shared.Atmos.EntitySystems;
-using Content.Shared.Atmos.Prototypes;
-using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
-using Robust.Client.ResourceManagement;
-using Robust.Shared.Enums;
-using Robust.Shared.Graphics.RSI;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-using Robust.Shared.Utility;
-
-namespace Content.Client.Atmos.Overlays
-{
-    public sealed class GasTileOverlay : Overlay
-    {
-        private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
-
-        private readonly IEntityManager _entManager;
-        private readonly IMapManager _mapManager;
-        private readonly SharedAtmosphereSystem _atmosphereSystem;
-        private readonly SharedMapSystem _mapSystem;
-        private readonly SharedTransformSystem _xformSys;
-
-        public override OverlaySpace Space => OverlaySpace.WorldSpaceEntities | OverlaySpace.WorldSpaceBelowWorld;
-        private readonly ShaderInstance _shader;
-
-        // Gas overlays
-        private readonly float[] _timer;
-        private readonly float[][] _frameDelays;
-        private readonly int[] _frameCounter;
-
-        // TODO combine textures into a single texture atlas.
-        private readonly Texture[][] _frames;
-
-        // Fire overlays
-        private const int FireStates = 3;
-        private const string FireRsiPath = "/Textures/Effects/fire.rsi";
-
-        private readonly float[] _fireTimer = new float[FireStates];
-        private readonly float[][] _fireFrameDelays = new float[FireStates][];
-        private readonly int[] _fireFrameCounter = new int[FireStates];
-        private readonly Texture[][] _fireFrames = new Texture[FireStates][];
-
-        private int _gasCount;
-
-        public const int GasOverlayZIndex = (int) Shared.DrawDepth.DrawDepth.Effects; // Under ghosts, above mostly everything else
-
-        public GasTileOverlay(GasTileOverlaySystem system, IEntityManager entManager, IResourceCache resourceCache, IPrototypeManager protoMan, SpriteSystem spriteSys, SharedTransformSystem xformSys)
-        {
-            _entManager = entManager;
-            _mapManager = IoCManager.Resolve<IMapManager>();
-            _atmosphereSystem = entManager.System<SharedAtmosphereSystem>();
-            _mapSystem = entManager.System<SharedMapSystem>();
-            _xformSys = xformSys;
-            _shader = protoMan.Index(UnshadedShader).Instance();
-            ZIndex = GasOverlayZIndex;
-
-            _gasCount = system.VisibleGasId.Length;
-            _timer = new float[_gasCount];
-            _frameDelays = new float[_gasCount][];
-            _frameCounter = new int[_gasCount];
-            _frames = new Texture[_gasCount][];
-
-            for (var i = 0; i < _gasCount; i++)
-            {
-                var gasPrototype = _atmosphereSystem.GetGas(system.VisibleGasId[i]);
-
-                SpriteSpecifier overlay;
-
-                if (!string.IsNullOrEmpty(gasPrototype.GasOverlaySprite) && !string.IsNullOrEmpty(gasPrototype.GasOverlayState))
-                    overlay = new SpriteSpecifier.Rsi(new (gasPrototype.GasOverlaySprite), gasPrototype.GasOverlayState);
-                else if (!string.IsNullOrEmpty(gasPrototype.GasOverlayTexture))
-                    overlay = new SpriteSpecifier.Texture(new (gasPrototype.GasOverlayTexture));
-                else
-                    continue;
-
-                switch (overlay)
-                {
-                    case SpriteSpecifier.Rsi animated:
-                        var rsi = resourceCache.GetResource<RSIResource>(animated.RsiPath).RSI;
-                        var stateId = animated.RsiState;
-
-                        if (!rsi.TryGetState(stateId, out var state))
-                            continue;
-
-                        _frames[i] = state.GetFrames(RsiDirection.South);
-                        _frameDelays[i] = state.GetDelays();
-                        _frameCounter[i] = 0;
-                        break;
-                    case SpriteSpecifier.Texture texture:
-                        _frames[i] = new[] { spriteSys.Frame0(texture) };
-                        _frameDelays[i] = Array.Empty<float>();
-                        break;
-                }
-            }
-
-            var fire = resourceCache.GetResource<RSIResource>(FireRsiPath).RSI;
-
-            for (var i = 0; i < FireStates; i++)
-            {
-                if (!fire.TryGetState((i + 1).ToString(), out var state))
-                    throw new ArgumentOutOfRangeException($"Fire RSI doesn't have state \"{i}\"!");
-
-                _fireFrames[i] = state.GetFrames(RsiDirection.South);
-                _fireFrameDelays[i] = state.GetDelays();
-                _fireFrameCounter[i] = 0;
-            }
-        }
-        protected override void FrameUpdate(FrameEventArgs args)
-        {
-            base.FrameUpdate(args);
-
-            for (var i = 0; i < _gasCount; i++)
-            {
-                var delays = _frameDelays[i];
-                if (delays.Length == 0)
-                    continue;
-
-                var frameCount = _frameCounter[i];
-                _timer[i] += args.DeltaSeconds;
-                var time = delays[frameCount];
-
-                if (_timer[i] < time)
-                    continue;
-
-                _timer[i] -= time;
-                _frameCounter[i] = (frameCount + 1) % _frames[i].Length;
-            }
-
-            for (var i = 0; i < FireStates; i++)
-            {
-                var delays = _fireFrameDelays[i];
-                if (delays.Length == 0)
-                    continue;
-
-                var frameCount = _fireFrameCounter[i];
-                _fireTimer[i] += args.DeltaSeconds;
-                var time = delays[frameCount];
-
-                if (_fireTimer[i] < time) continue;
-                _fireTimer[i] -= time;
-                _fireFrameCounter[i] = (frameCount + 1) % _fireFrames[i].Length;
-            }
-        }
-
-        protected override void Draw(in OverlayDrawArgs args)
-        {
-            if (args.MapId == MapId.Nullspace)
-                return;
-
-            var drawHandle = args.WorldHandle;
-            var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
-            var overlayQuery = _entManager.GetEntityQuery<GasTileOverlayComponent>();
-            var gridState = (args.WorldBounds,
-                args.WorldHandle,
-                _gasCount,
-                _frames,
-                _frameCounter,
-                _fireFrames,
-                _fireFrameCounter,
-                _shader,
-                overlayQuery,
-                xformQuery,
-                _xformSys);
-
-            var mapUid = _mapSystem.GetMapOrInvalid(args.MapId);
-
-            if (_entManager.TryGetComponent<MapAtmosphereComponent>(mapUid, out var atmos))
-                DrawMapOverlay(drawHandle, args, mapUid, atmos);
-
-            if (args.Space != OverlaySpace.WorldSpaceEntities)
-                return;
-
-            // TODO: WorldBounds callback.
-            _mapManager.FindGridsIntersecting(args.MapId, args.WorldAABB, ref gridState,
-                static (EntityUid uid, MapGridComponent grid,
-                    ref (Box2Rotated WorldBounds,
-                        DrawingHandleWorld drawHandle,
-                        int gasCount,
-                        Texture[][] frames,
-                        int[] frameCounter,
-                        Texture[][] fireFrames,
-                        int[] fireFrameCounter,
-                        ShaderInstance shader,
-                        EntityQuery<GasTileOverlayComponent> overlayQuery,
-                        EntityQuery<TransformComponent> xformQuery,
-                        SharedTransformSystem xformSys) state) =>
-                {
-                    if (!state.overlayQuery.TryGetComponent(uid, out var comp) ||
-                        !state.xformQuery.TryGetComponent(uid, out var gridXform))
-                        {
-                            return true;
-                        }
-
-                    var (_, _, worldMatrix, invMatrix) = state.xformSys.GetWorldPositionRotationMatrixWithInv(gridXform);
-                    state.drawHandle.SetTransform(worldMatrix);
-                    var floatBounds = invMatrix.TransformBox(state.WorldBounds).Enlarged(grid.TileSize);
-                    var localBounds = new Box2i(
-                        (int) MathF.Floor(floatBounds.Left),
-                        (int) MathF.Floor(floatBounds.Bottom),
-                        (int) MathF.Ceiling(floatBounds.Right),
-                        (int) MathF.Ceiling(floatBounds.Top));
-
-                    // Currently it would be faster to group drawing by gas rather than by chunk, but if the textures are
-                    // ever moved to a single atlas, that should no longer be the case. So this is just grouping draw calls
-                    // by chunk, even though its currently slower.
-
-                    state.drawHandle.UseShader(null);
-                    foreach (var chunk in comp.Chunks.Values)
-                    {
-                        var enumerator = new GasChunkEnumerator(chunk);
-
-                        while (enumerator.MoveNext(out var gas))
-                        {
-                            if (gas.Opacity == null!)
-                                continue;
-
-                            var tilePosition = chunk.Origin + (enumerator.X, enumerator.Y);
-                            if (!localBounds.Contains(tilePosition))
-                                continue;
-
-                            for (var i = 0; i < state.gasCount; i++)
-                            {
-                                var opacity = gas.Opacity[i];
-                                if (opacity > 0)
-                                    state.drawHandle.DrawTexture(state.frames[i][state.frameCounter[i]], tilePosition, Color.White.WithAlpha(opacity));
-                            }
-                        }
-                    }
-
-                    // And again for fire, with the unshaded shader
-                    state.drawHandle.UseShader(state.shader);
-                    foreach (var chunk in comp.Chunks.Values)
-                    {
-                        var enumerator = new GasChunkEnumerator(chunk);
-
-                        while (enumerator.MoveNext(out var gas))
-                        {
-                            if (gas.FireState == 0)
-                                continue;
-
-                            var index = chunk.Origin + (enumerator.X, enumerator.Y);
-                            if (!localBounds.Contains(index))
-                                continue;
-
-                            var fireState = gas.FireState - 1;
-                            var texture = state.fireFrames[fireState][state.fireFrameCounter[fireState]];
-                            state.drawHandle.DrawTexture(texture, index);
-                        }
-                    }
-
-                    return true;
-                });
-
-            drawHandle.UseShader(null);
-            drawHandle.SetTransform(Matrix3x2.Identity);
-        }
-
-        private void DrawMapOverlay(
-            DrawingHandleWorld handle,
-            OverlayDrawArgs args,
-            EntityUid map,
-            MapAtmosphereComponent atmos)
-        {
-            var mapGrid = _entManager.HasComponent<MapGridComponent>(map);
-
-            // map-grid atmospheres get drawn above grids
-            if (mapGrid && args.Space != OverlaySpace.WorldSpaceEntities)
-                return;
-
-            // Normal map atmospheres get drawn below grids
-            if (!mapGrid && args.Space != OverlaySpace.WorldSpaceBelowWorld)
-                return;
-
-            var bottomLeft = args.WorldAABB.BottomLeft.Floored();
-            var topRight = args.WorldAABB.TopRight.Ceiled();
-
-            for (var x = bottomLeft.X; x <= topRight.X; x++)
-            {
-                for (var y = bottomLeft.Y; y <= topRight.Y; y++)
-                {
-                    var tilePosition = new Vector2(x, y);
-
-                    for (var i = 0; i < atmos.OverlayData.Opacity.Length; i++)
-                    {
-                        var opacity = atmos.OverlayData.Opacity[i];
-
-                        if (opacity > 0)
-                            handle.DrawTexture(_frames[i][_frameCounter[i]], tilePosition, Color.White.WithAlpha(opacity));
-                    }
-                }
-            }
-        }
-    }
-}

Content.Client/Atmos/Overlays/GasTileVisibleGasOverlay.cs

@@ -0,0 +1,258 @@
+using Content.Client.Atmos.Components;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.EntitySystems;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Enums;
+using Robust.Shared.Graphics.RSI;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+using System.Numerics;
+using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
+
+namespace Content.Client.Atmos.Overlays;
+
+/// <summary>
+/// Overlay responsible for rendering visible atmos gasses (like plasma for example) usin.
+/// </summary>
+public sealed class GasTileVisibleGasOverlay : Overlay
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IResourceCache _resourceCache = default!;
+    [Dependency] private readonly IPrototypeManager _protoManager = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
+
+    private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+
+    private readonly SharedAtmosphereSystem _atmosphereSystem;
+    private readonly SharedMapSystem _mapSystem;
+    private readonly SharedTransformSystem _xformSys;
+    private readonly SharedGasTileOverlaySystem _gasTileOverlaySystem;
+    private readonly SpriteSystem _spriteSystem;
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpaceEntities | OverlaySpace.WorldSpaceBelowWorld;
+    private readonly ShaderInstance _shader;
+
+    // Gas overlays
+    private readonly float[] _timer;
+    private readonly float[][] _frameDelays;
+    private readonly int[] _frameCounter;
+
+    // TODO combine textures into a single texture atlas.
+    private readonly Texture[][] _frames;
+
+    private readonly int _gasCount;
+
+    public const int GasOverlayZIndex = (int)DrawDepth.Gasses; // Under ghosts and fire, above mostly everything else
+
+    public GasTileVisibleGasOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        _atmosphereSystem = _entManager.System<SharedAtmosphereSystem>();
+        _mapSystem = _entManager.System<SharedMapSystem>();
+        _xformSys = _entManager.System<SharedTransformSystem>();
+        _gasTileOverlaySystem = _entManager.System<SharedGasTileOverlaySystem>();
+        _spriteSystem = _entManager.System<SpriteSystem>();
+
+        _shader = _protoManager.Index(UnshadedShader).Instance();
+        ZIndex = GasOverlayZIndex;
+
+        _gasCount = _gasTileOverlaySystem.VisibleGasId.Length;
+        _timer = new float[_gasCount];
+        _frameDelays = new float[_gasCount][];
+        _frameCounter = new int[_gasCount];
+        _frames = new Texture[_gasCount][];
+
+        for (var i = 0; i < _gasCount; i++)
+        {
+            var gasPrototype = _atmosphereSystem.GetGas(_gasTileOverlaySystem.VisibleGasId[i]);
+
+            SpriteSpecifier overlay;
+
+            if (!string.IsNullOrEmpty(gasPrototype.GasOverlaySprite) &&
+                !string.IsNullOrEmpty(gasPrototype.GasOverlayState))
+                overlay = new SpriteSpecifier.Rsi(new(gasPrototype.GasOverlaySprite), gasPrototype.GasOverlayState);
+            else if (!string.IsNullOrEmpty(gasPrototype.GasOverlayTexture))
+                overlay = new SpriteSpecifier.Texture(new(gasPrototype.GasOverlayTexture));
+            else
+                continue;
+
+            switch (overlay)
+            {
+                case SpriteSpecifier.Rsi animated:
+                    var rsi = _resourceCache.GetResource<RSIResource>(animated.RsiPath).RSI;
+                    var stateId = animated.RsiState;
+
+                    if (!rsi.TryGetState(stateId, out var state))
+                        continue;
+
+                    _frames[i] = state.GetFrames(RsiDirection.South);
+                    _frameDelays[i] = state.GetDelays();
+                    _frameCounter[i] = 0;
+                    break;
+                case SpriteSpecifier.Texture texture:
+                    _frames[i] = new[] { _spriteSystem.Frame0(texture) };
+                    _frameDelays[i] = Array.Empty<float>();
+                    break;
+            }
+        }
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        for (var i = 0; i < _gasCount; i++)
+        {
+            var delays = _frameDelays[i];
+            if (delays.Length == 0)
+                continue;
+
+            var frameCount = _frameCounter[i];
+            _timer[i] += args.DeltaSeconds;
+            var time = delays[frameCount];
+
+            if (_timer[i] < time)
+                continue;
+
+            _timer[i] -= time;
+            _frameCounter[i] = (frameCount + 1) % _frames[i].Length;
+        }
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (args.MapId == MapId.Nullspace)
+            return;
+
+        var drawHandle = args.WorldHandle;
+        var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
+        var overlayQuery = _entManager.GetEntityQuery<GasTileOverlayComponent>();
+        var gridState = (args.WorldBounds,
+            args.WorldHandle,
+            _gasCount,
+            _frames,
+            _frameCounter,
+            _shader,
+            overlayQuery,
+            xformQuery,
+            _xformSys);
+
+        var mapUid = _mapSystem.GetMapOrInvalid(args.MapId);
+
+        if (_entManager.TryGetComponent<MapAtmosphereComponent>(mapUid, out var atmos))
+            DrawMapOverlay(drawHandle, args, mapUid, atmos);
+
+        if (args.Space != OverlaySpace.WorldSpaceEntities)
+            return;
+
+        // TODO: WorldBounds callback.
+        _mapManager.FindGridsIntersecting(args.MapId,
+            args.WorldAABB,
+            ref gridState,
+            static (EntityUid uid,
+                MapGridComponent grid,
+                ref (Box2Rotated WorldBounds,
+                    DrawingHandleWorld drawHandle,
+                    int gasCount,
+                    Texture[][] frames,
+                    int[] frameCounter,
+                    ShaderInstance shader,
+                    EntityQuery<GasTileOverlayComponent> overlayQuery,
+                    EntityQuery<TransformComponent> xformQuery,
+                    SharedTransformSystem xformSys) state) =>
+            {
+                if (!state.overlayQuery.TryGetComponent(uid, out var comp) ||
+                    !state.xformQuery.TryGetComponent(uid, out var gridXform))
+                {
+                    return true;
+                }
+
+                var (_, _, worldMatrix, invMatrix) = state.xformSys.GetWorldPositionRotationMatrixWithInv(gridXform);
+                state.drawHandle.SetTransform(worldMatrix);
+                var floatBounds = invMatrix.TransformBox(state.WorldBounds).Enlarged(grid.TileSize);
+                var localBounds = new Box2i(
+                    (int)MathF.Floor(floatBounds.Left),
+                    (int)MathF.Floor(floatBounds.Bottom),
+                    (int)MathF.Ceiling(floatBounds.Right),
+                    (int)MathF.Ceiling(floatBounds.Top));
+
+                // Currently it would be faster to group drawing by gas rather than by chunk, but if the textures are
+                // ever moved to a single atlas, that should no longer be the case. So this is just grouping draw calls
+                // by chunk, even though its currently slower.
+
+                state.drawHandle.UseShader(null);
+                foreach (var chunk in comp.Chunks.Values)
+                {
+                    var enumerator = new GasChunkEnumerator(chunk);
+
+                    while (enumerator.MoveNext(out var gas))
+                    {
+                        if (gas.Opacity == null!)
+                            continue;
+
+                        var tilePosition = chunk.Origin + (enumerator.X, enumerator.Y);
+                        if (!localBounds.Contains(tilePosition))
+                            continue;
+
+                        for (var i = 0; i < state.gasCount; i++)
+                        {
+                            var opacity = gas.Opacity[i];
+                            if (opacity > 0)
+                            {
+                                state.drawHandle.DrawTexture(state.frames[i][state.frameCounter[i]],
+                                    tilePosition,
+                                    Color.White.WithAlpha(opacity));
+                            }
+                        }
+                    }
+                }
+
+                return true;
+            });
+
+        drawHandle.UseShader(null);
+        drawHandle.SetTransform(Matrix3x2.Identity);
+    }
+
+    private void DrawMapOverlay(
+        DrawingHandleWorld handle,
+        OverlayDrawArgs args,
+        EntityUid map,
+        MapAtmosphereComponent atmos)
+    {
+        var mapGrid = _entManager.HasComponent<MapGridComponent>(map);
+
+        // map-grid atmospheres get drawn above grids
+        if (mapGrid && args.Space != OverlaySpace.WorldSpaceEntities)
+            return;
+
+        // Normal map atmospheres get drawn below grids
+        if (!mapGrid && args.Space != OverlaySpace.WorldSpaceBelowWorld)
+            return;
+
+        var bottomLeft = args.WorldAABB.BottomLeft.Floored();
+        var topRight = args.WorldAABB.TopRight.Ceiled();
+
+        for (var x = bottomLeft.X; x <= topRight.X; x++)
+        {
+            for (var y = bottomLeft.Y; y <= topRight.Y; y++)
+            {
+                var tilePosition = new Vector2(x, y);
+
+                for (var i = 0; i < atmos.OverlayData.Opacity.Length; i++)
+                {
+                    var opacity = atmos.OverlayData.Opacity[i];
+
+                    if (opacity > 0)
+                        handle.DrawTexture(_frames[i][_frameCounter[i]], tilePosition, Color.White.WithAlpha(opacity));
+                }
+            }
+        }
+    }
+}

Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs

@@ -37,10 +37,9 @@ namespace Content.Client.Atmos.UI
             _window.SelectGasPressed += OnSelectGasPressed;
         }
 
-        private void OnToggleStatusButtonPressed()
+        private void OnToggleStatusButtonPressed(bool status)
         {
-            if (_window is null) return;
-            SendMessage(new GasFilterToggleStatusMessage(_window.FilterStatus));
+            SendMessage(new GasFilterToggleStatusMessage(status));
         }
 
         private void OnFilterTransferRatePressed(string value)

Content.Client/Atmos/UI/GasFilterWindow.xaml

@@ -1,11 +1,12 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+            xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
             MinSize="480 400" Title="Filter">
     <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
-        <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <Label Text="{Loc comp-gas-filter-ui-filter-status}"/>
-            <Button Name="ToggleStatusButton"/>
-        </BoxContainer>
+        <controls:SwitchButton
+            Name="ToggleStatusButton"
+            HorizontalAlignment="Left"
+            Pressed="True" />
 
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <Label Text="{Loc comp-gas-filter-ui-filter-transfer-rate}"/>

Content.Client/Atmos/UI/GasFilterWindow.xaml.cs

@@ -18,11 +18,10 @@ namespace Content.Client.Atmos.UI
     {
         private readonly ButtonGroup _buttonGroup = new();
 
-        public bool FilterStatus = true;
         public string? SelectedGas;
         public string? CurrentGasId;
 
-        public event Action? ToggleStatusButtonPressed;
+        public event Action<bool>? ToggleStatusButtonPressed;
         public event Action<string>? FilterTransferRateChanged;
         public event Action? SelectGasPressed;
 
@@ -30,8 +29,7 @@ namespace Content.Client.Atmos.UI
         {
             RobustXamlLoader.Load(this);
 
-            ToggleStatusButton.OnPressed += _ => SetFilterStatus(!FilterStatus);
-            ToggleStatusButton.OnPressed += _ => ToggleStatusButtonPressed?.Invoke();
+            ToggleStatusButton.OnToggled += _ => ToggleStatusButtonPressed?.Invoke(ToggleStatusButton.Pressed);
 
             FilterTransferRateInput.OnTextChanged += _ => SetFilterRate.Disabled = false;
             SetFilterRate.OnPressed += _ =>
@@ -53,15 +51,7 @@ namespace Content.Client.Atmos.UI
 
         public void SetFilterStatus(bool enabled)
         {
-            FilterStatus = enabled;
-            if (enabled)
-            {
-                ToggleStatusButton.Text = Loc.GetString("comp-gas-filter-ui-status-enabled");
-            }
-            else
-            {
-                ToggleStatusButton.Text = Loc.GetString("comp-gas-filter-ui-status-disabled");
-            }
+            ToggleStatusButton.Pressed = enabled;
         }
 
         public void SetGasFiltered(string? id, string name)

Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs

@@ -33,10 +33,9 @@ namespace Content.Client.Atmos.UI
             _window.MixerNodePercentageChanged += OnMixerSetPercentagePressed;
         }
 
-        private void OnToggleStatusButtonPressed()
+        private void OnToggleStatusButtonPressed(bool status)
         {
-            if (_window is null) return;
-            SendMessage(new GasMixerToggleStatusMessage(_window.MixerStatus));
+            SendMessage(new GasMixerToggleStatusMessage(status));
         }
 
         private void OnMixerOutputPressurePressed(string value)

Content.Client/Atmos/UI/GasMixerWindow.xaml

@@ -1,12 +1,12 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+            xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
             MinSize="200 200" Title="Gas Mixer">
     <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
-        <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <Label Text="{Loc comp-gas-mixer-ui-mixer-status}"/>
-            <Control MinSize="5 0" />
-            <Button Name="ToggleStatusButton"/>
-        </BoxContainer>
+        <controls:SwitchButton
+            Name="ToggleStatusButton"
+            HorizontalAlignment="Left"
+            Pressed="True" />
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <Label Text="{Loc comp-gas-mixer-ui-mixer-output-pressure}"/>
             <Control MinSize="5 0" />

Content.Client/Atmos/UI/GasMixerWindow.xaml.cs

@@ -21,9 +21,7 @@ namespace Content.Client.Atmos.UI
     [GenerateTypedNameReferences]
     public sealed partial class GasMixerWindow : DefaultWindow
     {
-        public bool MixerStatus = true;
-
-        public event Action? ToggleStatusButtonPressed;
+        public event Action<bool>? ToggleStatusButtonPressed;
         public event Action<string>? MixerOutputPressureChanged;
         public event Action<string>? MixerNodePercentageChanged;
 
@@ -33,8 +31,7 @@ namespace Content.Client.Atmos.UI
         {
             RobustXamlLoader.Load(this);
 
-            ToggleStatusButton.OnPressed += _ => SetMixerStatus(!MixerStatus);
-            ToggleStatusButton.OnPressed += _ => ToggleStatusButtonPressed?.Invoke();
+            ToggleStatusButton.OnToggled += _ => ToggleStatusButtonPressed?.Invoke(ToggleStatusButton.Pressed);
 
             MixerPressureOutputInput.OnTextChanged += _ => SetOutputPressureButton.Disabled = false;
             SetOutputPressureButton.OnPressed += _ =>
@@ -83,15 +80,7 @@ namespace Content.Client.Atmos.UI
 
         public void SetMixerStatus(bool enabled)
         {
-            MixerStatus = enabled;
-            if (enabled)
-            {
-                ToggleStatusButton.Text = Loc.GetString("comp-gas-mixer-ui-status-enabled");
-            }
-            else
-            {
-                ToggleStatusButton.Text = Loc.GetString("comp-gas-mixer-ui-status-disabled");
-            }
+            ToggleStatusButton.Pressed = enabled;
         }
     }
 }

Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs

@@ -42,12 +42,9 @@ public sealed class GasPressurePumpBoundUserInterface(EntityUid owner, Enum uiKe
         _window.SetOutputPressure(pump.TargetPressure);
     }
 
-    private void OnToggleStatusButtonPressed()
+    private void OnToggleStatusButtonPressed(bool status)
     {
-        if (_window is null)
-            return;
-
-        SendPredictedMessage(new GasPressurePumpToggleStatusMessage(_window.PumpStatus));
+        SendPredictedMessage(new GasPressurePumpToggleStatusMessage(status));
     }
 
     private void OnPumpOutputPressurePressed(float value)

Content.Client/Atmos/UI/GasPressurePumpWindow.xaml

@@ -4,8 +4,10 @@
             SetSize="340 110" MinSize="340 110" Title="Pressure Pump">
     <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <Label Text="{Loc comp-gas-pump-ui-pump-status}" Margin="0 0 5 0"/>
-            <Button Name="ToggleStatusButton"/>
+            <controls:SwitchButton
+                Name="ToggleStatusButton"
+                HorizontalAlignment="Left"
+                Pressed="True" />
             <Control HorizontalExpand="True"/>
             <Button HorizontalAlignment="Right" Name="SetOutputPressureButton" Text="{Loc comp-gas-pump-ui-pump-set-rate}" Disabled="True" Margin="0 0 5 0"/>
             <Button Name="SetMaxPressureButton" Text="{Loc comp-gas-pump-ui-pump-set-max}" />

Content.Client/Atmos/UI/GasPressurePumpWindow.xaml.cs

@@ -11,9 +11,7 @@ namespace Content.Client.Atmos.UI
     [GenerateTypedNameReferences]
     public sealed partial class GasPressurePumpWindow : FancyWindow
     {
-        public bool PumpStatus = true;
-
-        public event Action? ToggleStatusButtonPressed;
+        public event Action<bool>? ToggleStatusButtonPressed;
         public event Action<float>? PumpOutputPressureChanged;
 
         public float MaxPressure
@@ -33,8 +31,7 @@ namespace Content.Client.Atmos.UI
         {
             RobustXamlLoader.Load(this);
 
-            ToggleStatusButton.OnPressed += _ => SetPumpStatus(!PumpStatus);
-            ToggleStatusButton.OnPressed += _ => ToggleStatusButtonPressed?.Invoke();
+            ToggleStatusButton.OnToggled += _ => ToggleStatusButtonPressed?.Invoke(ToggleStatusButton.Pressed);
 
             PumpPressureOutputInput.OnValueChanged += _ => SetOutputPressureButton.Disabled = false;
 
@@ -59,15 +56,7 @@ namespace Content.Client.Atmos.UI
 
         public void SetPumpStatus(bool enabled)
         {
-            PumpStatus = enabled;
-            if (enabled)
-            {
-                ToggleStatusButton.Text = Loc.GetString("comp-gas-pump-ui-status-enabled");
-            }
-            else
-            {
-                ToggleStatusButton.Text = Loc.GetString("comp-gas-pump-ui-status-disabled");
-            }
+            ToggleStatusButton.Pressed = enabled;
         }
     }
 }

Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs

@@ -37,7 +37,7 @@ namespace Content.Client.Atmos.UI
 
             _window = this.CreateWindow<GasThermomachineWindow>();
 
-            _window.ToggleStatusButton.OnPressed += _ => OnToggleStatusButtonPressed();
+            _window.ToggleStatusButton.OnToggled += _ => OnToggleStatusButtonPressed();
             _window.TemperatureSpinbox.OnValueChanged += _ => OnTemperatureChanged(_window.TemperatureSpinbox.Value);
             _window.Entity = Owner;
             Update();
@@ -45,9 +45,6 @@ namespace Content.Client.Atmos.UI
 
         private void OnToggleStatusButtonPressed()
         {
-            if (_window is null) return;
-
-            _window.SetActive(!_window.Active);
             SendPredictedMessage(new GasThermomachineToggleMessage());
         }
 

Content.Client/Atmos/UI/GasThermomachineWindow.xaml

@@ -3,11 +3,11 @@
                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                MinSize="300 120" Title="{Loc comp-gas-thermomachine-ui-title-freezer}">
     <BoxContainer Name="VboxContainer" Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
-        <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <Label Text="{Loc comp-gas-thermomachine-ui-toggle}"/>
-            <Control MinSize="5 0" />
-            <Button Access="Public" Name="ToggleStatusButton"/>
-        </BoxContainer>
+        <controls:SwitchButton
+            Name="ToggleStatusButton"
+            HorizontalAlignment="Left"
+            Pressed="True"
+            Access="Public" />
         <BoxContainer Name="SpinboxHBox" Orientation="Horizontal">
             <Label Text="{Loc comp-gas-thermomachine-ui-temperature}"/>
         </BoxContainer>

Content.Client/Atmos/UI/GasThermomachineWindow.xaml.cs

@@ -12,8 +12,6 @@ public sealed partial class GasThermomachineWindow : FancyWindow
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
 
-    public bool Active = true;
-
     public FloatSpinBox TemperatureSpinbox;
 
     public EntityUid Entity;
@@ -30,15 +28,7 @@ public sealed partial class GasThermomachineWindow : FancyWindow
 
     public void SetActive(bool active)
     {
-        Active = active;
-        if (active)
-        {
-            ToggleStatusButton.Text = Loc.GetString("comp-gas-thermomachine-ui-status-enabled");
-        }
-        else
-        {
-            ToggleStatusButton.Text = Loc.GetString("comp-gas-thermomachine-ui-status-disabled");
-        }
+        ToggleStatusButton.Pressed = active;
     }
 
     public void SetTemperature(float temperature)

Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs

@@ -38,11 +38,9 @@ namespace Content.Client.Atmos.UI
             Update();
         }
 
-        private void OnToggleStatusButtonPressed()
+        private void OnToggleStatusButtonPressed(bool status)
         {
-            if (_window is null) return;
-
-            SendPredictedMessage(new GasVolumePumpToggleStatusMessage(_window.PumpStatus));
+            SendPredictedMessage(new GasVolumePumpToggleStatusMessage(status));
         }
 
         private void OnPumpTransferRatePressed(string value)

Content.Client/Atmos/UI/GasVolumePumpWindow.xaml

@@ -3,11 +3,10 @@
             xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
             MinSize="200 120" Title="Volume Pump">
     <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
-        <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <Label Text="{Loc comp-gas-pump-ui-pump-status}"/>
-            <Control MinSize="5 0" />
-            <Button Name="ToggleStatusButton"/>
-        </BoxContainer>
+        <controls:SwitchButton
+            Name="ToggleStatusButton"
+            HorizontalAlignment="Left"
+            Pressed="True" />
 
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <Label Text="{Loc comp-gas-pump-ui-pump-transfer-rate}"/>

Content.Client/Atmos/UI/GasVolumePumpWindow.xaml.cs

@@ -19,17 +19,14 @@ namespace Content.Client.Atmos.UI
     [GenerateTypedNameReferences]
     public sealed partial class GasVolumePumpWindow : FancyWindow
     {
-        public bool PumpStatus = true;
-
-        public event Action? ToggleStatusButtonPressed;
+        public event Action<bool>? ToggleStatusButtonPressed;
         public event Action<string>? PumpTransferRateChanged;
 
         public GasVolumePumpWindow()
         {
             RobustXamlLoader.Load(this);
 
-            ToggleStatusButton.OnPressed += _ => SetPumpStatus(!PumpStatus);
-            ToggleStatusButton.OnPressed += _ => ToggleStatusButtonPressed?.Invoke();
+            ToggleStatusButton.OnToggled += _ => ToggleStatusButtonPressed?.Invoke(ToggleStatusButton.Pressed);
 
             PumpTransferRateInput.OnTextChanged += _ => SetTransferRateButton.Disabled = false;
             SetTransferRateButton.OnPressed += _ =>
@@ -52,15 +49,7 @@ namespace Content.Client.Atmos.UI
 
         public void SetPumpStatus(bool enabled)
         {
-            PumpStatus = enabled;
-            if (enabled)
-            {
-                ToggleStatusButton.Text = Loc.GetString("comp-gas-pump-ui-status-enabled");
-            }
-            else
-            {
-                ToggleStatusButton.Text = Loc.GetString("comp-gas-pump-ui-status-disabled");
-            }
+            ToggleStatusButton.Pressed = enabled;
         }
     }
 }

Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs

@@ -24,7 +24,7 @@ public sealed class SpaceHeaterBoundUserInterface : BoundUserInterface
 
         _window = this.CreateWindow<SpaceHeaterWindow>();
 
-        _window.ToggleStatusButton.OnPressed += _ => OnToggleStatusButtonPressed();
+        _window.ToggleStatusButton.OnToggled += _ => OnToggleStatusButtonPressed();
         _window.IncreaseTempRange.OnPressed += _ => OnTemperatureRangeChanged(_window.TemperatureChangeDelta);
         _window.DecreaseTempRange.OnPressed += _ => OnTemperatureRangeChanged(-_window.TemperatureChangeDelta);
         _window.ModeSelector.OnItemSelected += OnModeChanged;
@@ -34,7 +34,6 @@ public sealed class SpaceHeaterBoundUserInterface : BoundUserInterface
 
     private void OnToggleStatusButtonPressed()
     {
-        _window?.SetActive(!_window.Active);
         SendMessage(new SpaceHeaterToggleMessage());
     }
 

Content.Client/Atmos/UI/SpaceHeaterWindow.xaml

@@ -1,13 +1,15 @@
 <DefaultWindow xmlns="https://spacestation14.io"
                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+               xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                MinSize="280 160" Title="{Loc comp-space-heater-ui-title}">
 
     <BoxContainer Name="VboxContainer" Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
 
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-                <Button Text="{Loc comp-space-heater-ui-status-disabled}" Access="Public" Name="ToggleStatusButton"/>
-            </BoxContainer>
+            <controls:SwitchButton
+                Name="ToggleStatusButton"
+                HorizontalExpand="True"
+                Access="Public" />
             <BoxContainer Orientation="Horizontal" SeparationOverride="5">
                 <Label Text="{Loc comp-space-heater-ui-mode}"/>
                 <OptionButton Access="Public" Name="ModeSelector"/>

Content.Client/Atmos/UI/SpaceHeaterWindow.xaml.cs

@@ -15,7 +15,6 @@ public sealed partial class SpaceHeaterWindow : DefaultWindow
 {
     // To account for a minimum delta temperature for atmos equalization to trigger we use a fixed step for target temperature increment/decrement
     public int TemperatureChangeDelta = 5;
-    public bool Active;
 
     // Temperatures range bounds in Kelvin (K)
     public float MinTemp;
@@ -49,17 +48,7 @@ public sealed partial class SpaceHeaterWindow : DefaultWindow
 
     public void SetActive(bool active)
     {
-        Active = active;
         ToggleStatusButton.Pressed = active;
-
-        if (active)
-        {
-            ToggleStatusButton.Text = Loc.GetString("comp-space-heater-ui-status-enabled");
-        }
-        else
-        {
-            ToggleStatusButton.Text = Loc.GetString("comp-space-heater-ui-status-disabled");
-        }
     }
 
     public void SetTemperature(float targetTemperature)

Content.Client/BarSign/Ui/BarSignBoundUserInterface.cs

@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Shared.BarSign;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.BarSign.Ui;
@@ -16,13 +17,12 @@ public sealed class BarSignBoundUserInterface(EntityUid owner, Enum uiKey) : Bou
     {
         base.Open();
 
-        var sign = EntMan.GetComponentOrNull<BarSignComponent>(Owner)?.Current is { } current
-            ? _prototype.Index(current)
-            : null;
         var allSigns = BarSignSystem.GetAllBarSigns(_prototype)
             .OrderBy(p => Loc.GetString(p.Name))
             .ToList();
-        _menu = new(sign, allSigns);
+
+        _menu = this.CreateWindow<BarSignMenu>();
+        _menu.LoadSigns(allSigns);
 
         _menu.OnSignSelected += id =>
         {
@@ -30,16 +30,17 @@ public sealed class BarSignBoundUserInterface(EntityUid owner, Enum uiKey) : Bou
         };
 
         _menu.OnClose += Close;
-        _menu.OpenCentered();
+        _menu.OpenToLeft();
     }
 
     public override void Update()
     {
-        if (!EntMan.TryGetComponent<BarSignComponent>(Owner, out var signComp))
+        if (!EntMan.TryGetComponent<BarSignComponent>(Owner, out var signComp)
+            || !_prototype.Resolve(signComp.Current, out var signPrototype))
             return;
 
-        if (_prototype.Resolve(signComp.Current, out var signPrototype))
-            _menu?.UpdateState(signPrototype);
+        _menu?.UpdateState(signPrototype);
     }
+
 }
 

Content.Client/BarSign/Ui/BarSignMenu.xaml.cs

@@ -8,23 +8,13 @@ namespace Content.Client.BarSign.Ui;
 [GenerateTypedNameReferences]
 public sealed partial class BarSignMenu : FancyWindow
 {
-    private string? _currentId;
-
-    private readonly List<BarSignPrototype> _cachedPrototypes = new();
+    private List<BarSignPrototype> _cachedPrototypes = new();
 
     public event Action<string>? OnSignSelected;
 
-    public BarSignMenu(BarSignPrototype? currentSign, List<BarSignPrototype> signs)
+    public BarSignMenu()
     {
         RobustXamlLoader.Load(this);
-        _currentId = currentSign?.ID;
-
-        _cachedPrototypes.Clear();
-        _cachedPrototypes = signs;
-        foreach (var proto in _cachedPrototypes)
-        {
-            SignOptions.AddItem(Loc.GetString(proto.Name));
-        }
 
         SignOptions.OnItemSelected += idx =>
         {
@@ -32,18 +22,21 @@ public sealed partial class BarSignMenu : FancyWindow
             SignOptions.SelectId(idx.Id);
         };
 
-        if (currentSign != null)
+    }
+
+    public void LoadSigns(List<BarSignPrototype> signs)
+    {
+        _cachedPrototypes.Clear();
+        _cachedPrototypes = signs;
+
+        foreach (var proto in _cachedPrototypes)
         {
-            var idx = _cachedPrototypes.IndexOf(currentSign);
-            SignOptions.TrySelectId(idx);
+            SignOptions.AddItem(Loc.GetString(proto.Name));
         }
     }
 
     public void UpdateState(BarSignPrototype newSign)
     {
-        if (_currentId != null && newSign.ID == _currentId)
-            return;
-        _currentId = newSign.ID;
         var idx = _cachedPrototypes.IndexOf(newSign);
         SignOptions.TrySelectId(idx);
     }

Content.Client/Body/Systems/BodySystem.cs

@@ -1,7 +0,0 @@
-using Content.Shared.Body.Systems;
-
-namespace Content.Client.Body.Systems;
-
-public sealed class BodySystem : SharedBodySystem
-{
-}

Content.Client/Body/Systems/MetabolizerSystem.cs

@@ -1,6 +0,0 @@
-using Content.Shared.Body.Systems;
-
-namespace Content.Client.Body.Systems;
-
-/// <inheritdoc/>
-public sealed class MetabolizerSystem : SharedMetabolizerSystem;

Content.Client/Body/VisualBodySystem.cs

@@ -0,0 +1,264 @@
+using System.Linq;
+using Content.Shared.Body;
+using Content.Shared.CCVar;
+using Content.Shared.Humanoid.Markings;
+using Content.Shared.Humanoid;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Body;
+
+public sealed class VisualBodySystem : SharedVisualBodySystem
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly MarkingManager _marking = default!;
+    [Dependency] private readonly SpriteSystem _sprite = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<VisualOrganComponent, OrganGotInsertedEvent>(OnOrganGotInserted);
+        SubscribeLocalEvent<VisualOrganComponent, OrganGotRemovedEvent>(OnOrganGotRemoved);
+        SubscribeLocalEvent<VisualOrganComponent, AfterAutoHandleStateEvent>(OnOrganState);
+
+        SubscribeLocalEvent<VisualOrganMarkingsComponent, OrganGotInsertedEvent>(OnMarkingsGotInserted);
+        SubscribeLocalEvent<VisualOrganMarkingsComponent, OrganGotRemovedEvent>(OnMarkingsGotRemoved);
+        SubscribeLocalEvent<VisualOrganMarkingsComponent, AfterAutoHandleStateEvent>(OnMarkingsState);
+
+        SubscribeLocalEvent<VisualOrganMarkingsComponent, BodyRelayedEvent<HumanoidLayerVisibilityChangedEvent>>(OnMarkingsChangedVisibility);
+
+        Subs.CVar(_cfg, CCVars.AccessibilityClientCensorNudity, OnCensorshipChanged, true);
+        Subs.CVar(_cfg, CCVars.AccessibilityServerCensorNudity, OnCensorshipChanged, true);
+    }
+
+    private void OnCensorshipChanged(bool value)
+    {
+        var query = AllEntityQuery<OrganComponent, VisualOrganMarkingsComponent>();
+        while (query.MoveNext(out var ent, out var organComp, out var markingsComp))
+        {
+            if (organComp.Body is not { } body)
+                continue;
+
+            RemoveMarkings((ent, markingsComp), body);
+            ApplyMarkings((ent, markingsComp), body);
+        }
+    }
+
+    private void OnOrganGotInserted(Entity<VisualOrganComponent> ent, ref OrganGotInsertedEvent args)
+    {
+        ApplyVisual(ent, args.Target);
+    }
+
+    private void OnOrganGotRemoved(Entity<VisualOrganComponent> ent, ref OrganGotRemovedEvent args)
+    {
+        RemoveVisual(ent, args.Target);
+    }
+
+    private void OnOrganState(Entity<VisualOrganComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        if (Comp<OrganComponent>(ent).Body is not { } body)
+            return;
+
+        ApplyVisual(ent, body);
+    }
+
+    private void ApplyVisual(Entity<VisualOrganComponent> ent, EntityUid target)
+    {
+        if (!_sprite.LayerMapTryGet(target, ent.Comp.Layer, out var index, true))
+            return;
+
+        _sprite.LayerSetData(target, index, ent.Comp.Data);
+    }
+
+    private void RemoveVisual(Entity<VisualOrganComponent> ent, EntityUid target)
+    {
+        if (!_sprite.LayerMapTryGet(target, ent.Comp.Layer, out var index, true))
+            return;
+
+        _sprite.LayerSetRsiState(target, index, RSI.StateId.Invalid);
+    }
+
+    private void OnMarkingsGotInserted(Entity<VisualOrganMarkingsComponent> ent, ref OrganGotInsertedEvent args)
+    {
+        ApplyMarkings(ent, args.Target);
+    }
+
+    private void OnMarkingsGotRemoved(Entity<VisualOrganMarkingsComponent> ent, ref OrganGotRemovedEvent args)
+    {
+        RemoveMarkings(ent, args.Target);
+    }
+
+    private void OnMarkingsState(Entity<VisualOrganMarkingsComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        if (Comp<OrganComponent>(ent).Body is not { } body)
+            return;
+
+        RemoveMarkings(ent, body);
+        ApplyMarkings(ent, body);
+    }
+
+    protected override void SetOrganColor(Entity<VisualOrganComponent> ent, Color color)
+    {
+        base.SetOrganColor(ent, color);
+
+        if (Comp<OrganComponent>(ent).Body is not { } body)
+            return;
+
+        ApplyVisual(ent, body);
+    }
+
+    protected override void SetOrganMarkings(Entity<VisualOrganMarkingsComponent> ent, Dictionary<HumanoidVisualLayers, List<Marking>> markings)
+    {
+        base.SetOrganMarkings(ent, markings);
+
+        if (Comp<OrganComponent>(ent).Body is not { } body)
+            return;
+
+        RemoveMarkings(ent, body);
+        ApplyMarkings(ent, body);
+    }
+
+    protected override void SetOrganAppearance(Entity<VisualOrganComponent> ent, PrototypeLayerData data)
+    {
+        base.SetOrganAppearance(ent, data);
+
+        if (Comp<OrganComponent>(ent).Body is not { } body)
+            return;
+
+        ApplyVisual(ent, body);
+    }
+
+    private IEnumerable<Marking> AllMarkings(Entity<VisualOrganMarkingsComponent> ent)
+    {
+        foreach (var markings in ent.Comp.Markings.Values)
+        {
+            foreach (var marking in markings)
+            {
+                yield return marking;
+            }
+        }
+
+        var censorNudity = _cfg.GetCVar(CCVars.AccessibilityClientCensorNudity) || _cfg.GetCVar(CCVars.AccessibilityServerCensorNudity);
+        if (!censorNudity)
+            yield break;
+
+        var group = _prototype.Index(ent.Comp.MarkingData.Group);
+        foreach (var layer in ent.Comp.MarkingData.Layers)
+        {
+            if (!group.Limits.TryGetValue(layer, out var layerLimits))
+                continue;
+
+            if (layerLimits.NudityDefault.Count < 1)
+                continue;
+
+            var markings = ent.Comp.Markings.GetValueOrDefault(layer) ?? [];
+            if (markings.Any(marking => _marking.TryGetMarking(marking, out var proto) && proto.BodyPart == layer))
+                continue;
+
+            foreach (var marking in layerLimits.NudityDefault)
+            {
+                yield return new(marking, 1);
+            }
+        }
+    }
+
+    private void ApplyMarkings(Entity<VisualOrganMarkingsComponent> ent, EntityUid target)
+    {
+        var applied = new List<Marking>();
+        foreach (var marking in AllMarkings(ent))
+        {
+            if (!_marking.TryGetMarking(marking, out var proto))
+                continue;
+
+            if (!_sprite.LayerMapTryGet(target, proto.BodyPart, out var index, true))
+                continue;
+
+            for (var i = 0; i < proto.Sprites.Count; i++)
+            {
+                var sprite = proto.Sprites[i];
+
+                DebugTools.Assert(sprite is SpriteSpecifier.Rsi);
+                if (sprite is not SpriteSpecifier.Rsi rsi)
+                    continue;
+
+                var layerId = $"{proto.ID}-{rsi.RsiState}";
+
+                if (!_sprite.LayerMapTryGet(target, layerId, out _, false))
+                {
+                    var layer = _sprite.AddLayer(target, sprite, index + i + 1);
+                    _sprite.LayerMapSet(target, layerId, layer);
+                    _sprite.LayerSetSprite(target, layerId, rsi);
+                }
+
+                if (marking.MarkingColors is not null && i < marking.MarkingColors.Count)
+                    _sprite.LayerSetColor(target, layerId, marking.MarkingColors[i]);
+                else
+                    _sprite.LayerSetColor(target, layerId, Color.White);
+            }
+
+            applied.Add(marking);
+        }
+        ent.Comp.AppliedMarkings = applied;
+    }
+
+    private void RemoveMarkings(Entity<VisualOrganMarkingsComponent> ent, EntityUid target)
+    {
+        foreach (var marking in ent.Comp.AppliedMarkings)
+        {
+            if (!_marking.TryGetMarking(marking, out var proto))
+                continue;
+
+            foreach (var sprite in proto.Sprites)
+            {
+                DebugTools.Assert(sprite is SpriteSpecifier.Rsi);
+                if (sprite is not SpriteSpecifier.Rsi rsi)
+                    continue;
+
+                var layerId = $"{proto.ID}-{rsi.RsiState}";
+
+                if (!_sprite.LayerMapTryGet(target, layerId, out var index, false))
+                    continue;
+
+                _sprite.LayerMapRemove(target, layerId);
+                _sprite.RemoveLayer(target, index);
+            }
+        }
+    }
+
+    private void OnMarkingsChangedVisibility(Entity<VisualOrganMarkingsComponent> ent, ref BodyRelayedEvent<HumanoidLayerVisibilityChangedEvent> args)
+    {
+        if (!ent.Comp.HideableLayers.Contains(args.Args.Layer))
+            return;
+
+        foreach (var markings in ent.Comp.Markings.Values)
+        {
+            foreach (var marking in markings)
+            {
+                if (!_marking.TryGetMarking(marking, out var proto))
+                    continue;
+
+                if (proto.BodyPart != args.Args.Layer && !(ent.Comp.DependentHidingLayers.TryGetValue(args.Args.Layer, out var dependent) && dependent.Contains(proto.BodyPart)))
+                    continue;
+
+                foreach (var sprite in proto.Sprites)
+                {
+                    DebugTools.Assert(sprite is SpriteSpecifier.Rsi);
+                    if (sprite is not SpriteSpecifier.Rsi rsi)
+                        continue;
+
+                    var layerId = $"{proto.ID}-{rsi.RsiState}";
+
+                    if (!_sprite.LayerMapTryGet(args.Body.Owner, layerId, out var index, true))
+                        continue;
+
+                    _sprite.LayerSetVisible(args.Body.Owner, index, args.Args.Visible);
+                }
+            }
+        }
+    }
+}

Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs

@@ -70,9 +70,9 @@ namespace Content.Client.Cargo.BUI
 
             _menu.OnClose += Close;
 
-            _menu.OnItemSelected += (args) =>
+            _menu.OnItemSelected += (row) =>
             {
-                if (args.Button.Parent is not CargoProductRow row)
+                if (row == null)
                     return;
 
                 description.Clear();
@@ -175,23 +175,23 @@ namespace Content.Client.Cargo.BUI
             return true;
         }
 
-        private void RemoveOrder(ButtonEventArgs args)
+        private void RemoveOrder(CargoOrderData? order)
         {
-            if (args.Button.Parent?.Parent is not CargoOrderRow row || row.Order == null)
+            if (order == null)
                 return;
 
-            SendMessage(new CargoConsoleRemoveOrderMessage(row.Order.OrderId));
+            SendMessage(new CargoConsoleRemoveOrderMessage(order.OrderId));
         }
 
-        private void ApproveOrder(ButtonEventArgs args)
+        private void ApproveOrder(CargoOrderData? order)
         {
-            if (args.Button.Parent?.Parent is not CargoOrderRow row || row.Order == null)
+            if (order == null)
                 return;
 
             if (OrderCount >= OrderCapacity)
                 return;
 
-            SendMessage(new CargoConsoleApproveOrderMessage(row.Order.OrderId));
+            SendMessage(new CargoConsoleApproveOrderMessage(order.OrderId));
         }
     }
 }

Content.Client/Cargo/UI/CargoConsoleMenu.xaml

@@ -1,86 +1,226 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
-                           xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-                           xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                           SetSize="600 600"
-                           MinSize="600 600">
-    <BoxContainer Orientation="Vertical" Margin="15 5 15 10">
-        <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc 'cargo-console-menu-account-name-label'}"
-                   StyleClasses="LabelKeyText" />
-            <RichTextLabel Name="AccountNameLabel"
-                   Text="{Loc 'cargo-console-menu-account-name-none-text'}" />
-        </BoxContainer>
-        <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc 'cargo-console-menu-points-label'}"
-                   StyleClasses="LabelKeyText" />
-            <RichTextLabel Name="PointsLabel"
-                   Text="$0" />
-        </BoxContainer>
-        <Control MinHeight="10"/>
+<controls:FancyWindow
+    xmlns="https://spacestation14.io"
+    xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    MinSize="540 390"
+    SetSize="995 600">
+
+    <!-- Main Container -->
+    <BoxContainer Orientation="Vertical"
+        VerticalExpand="True">
+
         <TabContainer Name="TabContainer" VerticalExpand="True">
-            <BoxContainer Orientation="Vertical" VerticalExpand="True">
-                <BoxContainer Orientation="Horizontal">
-                    <OptionButton Name="Categories"
-                                  Prefix="{Loc 'cargo-console-menu-categories-label'}"
-                                  HorizontalExpand="True" />
-                    <LineEdit Name="SearchBar"
-                              PlaceHolder="{Loc 'cargo-console-menu-search-bar-placeholder'}"
-                              HorizontalExpand="True" />
-                </BoxContainer>
-                <Control MinHeight="5"/>
-                <ScrollContainer HorizontalExpand="True"
-                                 VerticalExpand="True"
-                                 SizeFlagsStretchRatio="2">
-                    <BoxContainer Name="Products"
-                                  Orientation="Vertical"
-                                  HorizontalExpand="True"
-                                  VerticalExpand="True">
-                        <!-- Products get added here by code -->
-                    </BoxContainer>
-                </ScrollContainer>
-                <Control MinHeight="5" Name="OrdersSpacer"/>
-                <PanelContainer VerticalExpand="True"
-                                SizeFlagsStretchRatio="1"
-                                Name="Orders">
-                    <PanelContainer.PanelOverride>
-                        <gfx:StyleBoxFlat BackgroundColor="#000000" />
-                    </PanelContainer.PanelOverride>
-                    <ScrollContainer VerticalExpand="True">
-                        <BoxContainer Orientation="Vertical" Margin="5">
-                            <Label Text="{Loc 'cargo-console-menu-requests-label'}" />
-                            <BoxContainer Name="Requests"
-                                          Orientation="Vertical"
-                                          VerticalExpand="True">
-                                <!-- Requests are added here by code -->
-                            </BoxContainer>
-                        </BoxContainer>
-                    </ScrollContainer>
-                </PanelContainer>
-            </BoxContainer>
-            <!-- Funds tab -->
-            <BoxContainer Orientation="Vertical" Margin="15">
-                <BoxContainer Orientation="Horizontal">
-                    <RichTextLabel Name="TransferLimitLabel" Margin="0 0 15 0"/>
-                    <RichTextLabel Name="UnlimitedNotifier" Text="{Loc 'cargo-console-menu-account-action-transfer-limit-unlimited-notifier'}"/>
-                </BoxContainer>
-                <BoxContainer Orientation="Horizontal">
-                    <RichTextLabel Text="{Loc 'cargo-console-menu-account-action-select'}" Margin="0 0 10 0"/>
-                    <OptionButton Name="ActionOptions"/>
-                </BoxContainer>
-                <Control MinHeight="5"/>
-                <BoxContainer Orientation="Horizontal">
-                    <RichTextLabel Name="AmountText" Text="{ Loc 'cargo-console-menu-account-action-amount'}"/>
-                    <SpinBox Name="TransferSpinBox" MinWidth="100" Value="10"/>
-                </BoxContainer>
-                <Control MinHeight="15"/>
-                <BoxContainer HorizontalAlignment="Center">
-                    <Button Name="AccountActionButton" Text="{ Loc 'cargo-console-menu-account-action-button'}" MinHeight="45" MinWidth="120"/>
-                </BoxContainer>
-                <Control VerticalExpand="True"/>
-                <BoxContainer VerticalAlignment="Bottom" HorizontalAlignment="Center">
-                    <Button Name="AccountLimitToggleButton" Text="{ Loc 'cargo-console-menu-toggle-account-lock-button'}" MinHeight="45" MinWidth="120"/>
-                </BoxContainer>
-            </BoxContainer>
+          <!-- Sub-Main Container -->
+          <BoxContainer Orientation="Horizontal"
+              VerticalExpand="True"
+              Margin="8 4 8 6">
+
+              <!-- Left Part -->
+              <BoxContainer Orientation="Vertical"
+                  SeparationOverride="4"
+                  Margin="0 0 8 0"
+                  HorizontalExpand="True">
+
+                  <!-- Info -->
+                  <BoxContainer Orientation="Vertical">
+                      <GridContainer Columns="3">
+
+                          <!-- Account -->
+                          <Label Text="{Loc 'cargo-console-menu-account-name-label'}"
+                              StyleClasses="LabelKeyText" />
+
+                          <PanelContainer StyleClasses="LowDivider" Margin="0 -2"/>
+
+                          <RichTextLabel Name="AccountNameLabel"
+                              Text="{Loc 'cargo-console-menu-account-name-none-text'}"
+                              Margin="4 0"/>
+
+                          <!-- Balance -->
+                          <Label Text="{Loc 'cargo-console-menu-points-label'}"
+                              StyleClasses="LabelKeyText"/>
+
+                          <PanelContainer StyleClasses="LowDivider" Margin="0 -2"/>
+
+                          <RichTextLabel Name="PointsLabel"
+                              Text="$0"
+                              Margin="4 0" />
+
+                          <!-- Orders Count/Capacity -->
+                          <Label Text="{Loc 'cargo-console-menu-order-capacity-label'}"
+                              StyleClasses="LabelKeyText" />
+
+                          <PanelContainer StyleClasses="LowDivider" Margin="0 -2 0 -1"/>
+
+                          <Label Name="ShuttleCapacityLabel"
+                              Text="0/20"
+                              Margin="4 0"/>
+                      </GridContainer>
+
+                      <PanelContainer StyleClasses="LowDivider" Margin="0 4.5 -8 0"/>
+                  </BoxContainer>
+
+                  <!-- Search -->
+                  <BoxContainer Orientation="Horizontal"
+                      Margin="0 2 0 0">
+
+                      <LineEdit Name="SearchBar"
+                          PlaceHolder="{Loc 'cargo-console-menu-search-bar-placeholder'}"
+                          HorizontalExpand="True" />
+
+                      <OptionButton Name="Categories"
+                          Prefix="{Loc 'cargo-console-menu-categories-label'}"
+                          StyleClasses="OpenLeft"/>
+                  </BoxContainer>
+
+                  <!-- Product list -->
+                  <ScrollContainer
+                      HorizontalExpand="False"
+                      VerticalExpand="True"
+                      HScrollEnabled="False">
+
+                      <BoxContainer Name="Products"
+                          Orientation="Vertical"
+                          HorizontalExpand="True"
+                          VerticalExpand="True">
+
+                          <!-- Products get added here by code -->
+                      </BoxContainer>
+                  </ScrollContainer>
+              </BoxContainer>
+
+              <PanelContainer StyleClasses="LowDivider" Margin="0 -8"/>
+
+              <!-- Right Part -->
+              <BoxContainer Orientation="Vertical"
+                  SizeFlagsStretchRatio="0.8"
+                  HorizontalExpand="True"
+                  Name="RightPart">
+
+                  <!-- Requests Part -->
+                  <BoxContainer Orientation="Vertical"
+                      VerticalExpand="True"
+                      SizeFlagsStretchRatio="2">
+
+                      <!-- Title -->
+                      <controls:StripeBack>
+                          <Label Text="{Loc 'cargo-console-menu-requests-label'}"
+                              HorizontalAlignment="Center"
+                              Margin="4"/>
+                      </controls:StripeBack>
+
+                      <PanelContainer VerticalExpand="True"
+                          Margin="0 -4 0 0">
+
+                          <!-- Background -->
+                          <PanelContainer.PanelOverride>
+                              <gfx:StyleBoxFlat BackgroundColor="#040404" />
+                          </PanelContainer.PanelOverride>
+
+                          <BoxContainer Orientation="Vertical">
+                              <ScrollContainer VerticalExpand="True">
+                                  <BoxContainer Name="Requests"
+                                      Orientation="Vertical"
+                                      StyleClasses="transparentItemList"
+                                      VerticalExpand="True"
+                                      SeparationOverride="8"
+                                      Margin="8">
+
+                                      <!-- Requests are added here by code -->
+                                  </BoxContainer>
+                              </ScrollContainer>
+                          </BoxContainer>
+                      </PanelContainer>
+                  </BoxContainer>
+
+                  <!-- Orders Part -->
+                  <BoxContainer Orientation="Vertical"
+                      VerticalExpand="True">
+
+                      <!-- Title -->
+                      <controls:StripeBack>
+                          <Label Text="{Loc 'cargo-console-menu-orders-label'}"
+                              HorizontalAlignment="Center"
+                              Margin="4"/>
+                      </controls:StripeBack>
+
+                      <PanelContainer VerticalExpand="True"
+                          Margin="0 -4 0 0">
+
+                          <!-- Background -->
+                          <PanelContainer.PanelOverride>
+                              <gfx:StyleBoxFlat BackgroundColor="#040404" />
+                          </PanelContainer.PanelOverride>
+
+                          <BoxContainer Orientation="Vertical"
+                              Margin="6">
+                              <ScrollContainer VerticalExpand="True">
+                                  <BoxContainer Orientation="Vertical"
+                                      StyleClasses="transparentItemList"
+                                      VerticalExpand="True"
+                                      SeparationOverride="6">
+
+                                      <!-- Orders are added here by code -->
+                                  </BoxContainer>
+                              </ScrollContainer>
+                          </BoxContainer>
+                      </PanelContainer>
+                  </BoxContainer>
+              </BoxContainer>
+          </BoxContainer>
+          <!-- Funds tab -->
+          <BoxContainer Orientation="Vertical" Margin="15">
+              <BoxContainer Orientation="Horizontal">
+                  <RichTextLabel Name="TransferLimitLabel" Margin="0 0 15 0"/>
+                  <RichTextLabel Name="UnlimitedNotifier" Text="{Loc 'cargo-console-menu-account-action-transfer-limit-unlimited-notifier'}"/>
+              </BoxContainer>
+              <BoxContainer Orientation="Horizontal">
+                  <RichTextLabel Text="{Loc 'cargo-console-menu-account-action-select'}" Margin="0 0 10 0"/>
+                  <OptionButton Name="ActionOptions"/>
+              </BoxContainer>
+              <Control MinHeight="5"/>
+              <BoxContainer Orientation="Horizontal">
+                  <RichTextLabel Name="AmountText" Text="{ Loc 'cargo-console-menu-account-action-amount'}"/>
+                  <SpinBox Name="TransferSpinBox" MinWidth="100" Value="10"/>
+              </BoxContainer>
+              <Control MinHeight="15"/>
+              <BoxContainer HorizontalAlignment="Center">
+                  <Button Name="AccountActionButton" Text="{ Loc 'cargo-console-menu-account-action-button'}" MinHeight="45" MinWidth="120"/>
+              </BoxContainer>
+              <Control VerticalExpand="True"/>
+              <BoxContainer VerticalAlignment="Bottom" HorizontalAlignment="Center">
+                  <Button Name="AccountLimitToggleButton" Text="{ Loc 'cargo-console-menu-toggle-account-lock-button'}" MinHeight="45" MinWidth="120"/>
+              </BoxContainer>
+          </BoxContainer>
         </TabContainer>
+
+        <!-- Footer -->
+        <!-- TODO: Create customControls element -->
+        <BoxContainer Orientation="Vertical"
+            VerticalAlignment="Bottom">
+
+            <PanelContainer StyleClasses="LowDivider" />
+
+            <BoxContainer Orientation="Horizontal"
+                Margin="12 0 6 2"
+                VerticalAlignment="Bottom">
+
+                <!-- Footer title -->
+                <Label Text="{Loc 'cargo-console-menu-flavor-left'}"
+                    StyleClasses="WindowFooterText" />
+
+                <!-- Version -->
+                <Label Text="{Loc 'cargo-console-menu-flavor-right'}"
+                    StyleClasses="WindowFooterText"
+                    HorizontalAlignment="Right"
+                    HorizontalExpand="True"
+                    Margin="0 0 4 0" />
+
+                <TextureRect StyleClasses="NTLogoDark"
+                    Stretch="KeepAspectCentered"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Right"
+                    SetSize="19 19"/>
+            </BoxContainer>
+        </BoxContainer>
     </BoxContainer>
 </controls:FancyWindow>

Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs

@@ -6,6 +6,7 @@ using Content.Shared.Cargo.Components;
 using Content.Shared.Cargo.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
@@ -29,9 +30,9 @@ namespace Content.Client.Cargo.UI
         private readonly EntityQuery<CargoOrderConsoleComponent> _orderConsoleQuery;
         private readonly EntityQuery<StationBankAccountComponent> _bankQuery;
 
-        public event Action<ButtonEventArgs>? OnItemSelected;
-        public event Action<ButtonEventArgs>? OnOrderApproved;
-        public event Action<ButtonEventArgs>? OnOrderCanceled;
+        public event Action<CargoProductRow?>? OnItemSelected;
+        public event Action<CargoOrderData?>? OnOrderApproved;
+        public event Action<CargoOrderData?>? OnOrderCanceled;
 
         public event Action<ProtoId<CargoAccountPrototype>?, int>? OnAccountAction;
 
@@ -164,7 +165,7 @@ namespace Content.Client.Cargo.UI
                     };
                     button.MainButton.OnPressed += args =>
                     {
-                        OnItemSelected?.Invoke(args);
+                        OnItemSelected?.Invoke(button);
                     };
                     Products.AddChild(button);
                 }
@@ -210,38 +211,66 @@ namespace Content.Client.Cargo.UI
 
             foreach (var order in orders)
             {
-                if (order.Approved)
+                if (order.Approved || !_protoManager.Resolve(order.Product, out var productProto))
                     continue;
 
-                var product = _protoManager.Index<EntityPrototype>(order.ProductId);
-                var productName = product.Name;
+                var product = _protoManager.Index<EntityPrototype>(productProto.Product);
+                var productName = productProto.Name;
+                var requester = !string.IsNullOrEmpty(order.Requester) ?
+                    order.Requester : Loc.GetString("cargo-console-menu-order-row-alerts-requester-unknown");
                 var account = _protoManager.Index(order.Account);
 
                 var row = new CargoOrderRow
                 {
                     Order = order,
+
+                    Title =
+                    {
+                        Text = Loc.GetString(
+                            "cargo-console-menu-order-row-title",
+                            ("productName", productName),
+                            ("orderAmount", order.OrderQuantity),
+                            ("orderPrice", productProto.Cost)),
+                    },
+
+                    Stride =
+                    {
+                        PanelOverride = new StyleBoxFlat
+                        {
+                            BackgroundColor = account.Color,
+                            ContentMarginBottomOverride = 2,
+                        },
+                    },
+
                     Icon = { Texture = _spriteSystem.Frame0(product) },
+
                     ProductName =
                     {
                         Text = Loc.GetString(
                             "cargo-console-menu-populate-orders-cargo-order-row-product-name-text",
-                            ("productName", productName),
-                            ("orderAmount", order.OrderQuantity),
-                            ("orderRequester", order.Requester),
+                            ("orderRequester", requester),
                             ("accountColor", account.Color),
                             ("account", Loc.GetString(account.Code)))
                     },
+
                     Description =
                     {
-                        Text = Loc.GetString("cargo-console-menu-order-reason-description",
-                                                        ("reason", order.Reason))
+                        Text = !string.IsNullOrEmpty(order.Reason) ?
+                            Loc.GetString(
+                                "cargo-console-menu-order-row-product-description",
+                                ("orderReason", order.Reason))
+                        :
+                            Loc.GetString(
+                                "cargo-console-menu-order-row-product-description",
+                                ("orderReason", Loc.GetString("cargo-console-menu-order-row-alerts-reason-absent")))
                     }
                 };
-                row.Cancel.OnPressed += (args) => { OnOrderCanceled?.Invoke(args); };
+
+                row.Cancel.OnPressed += (args) => { OnOrderCanceled?.Invoke(order); };
 
                 // TODO: Disable based on access.
                 row.SetApproveVisible(orderConsole.Mode != CargoOrderConsoleMode.SendToPrimary);
-                row.Approve.OnPressed += (args) => { OnOrderApproved?.Invoke(args); };
+                row.Approve.OnPressed += (args) => { OnOrderApproved?.Invoke(order); };
                 Requests.AddChild(row);
             }
         }
@@ -294,8 +323,7 @@ namespace Content.Client.Cargo.UI
                                            TransferSpinBox.Value > bankAccount.Accounts[orderConsole.Account] * orderConsole.TransferLimit ||
                                            _timing.CurTime < orderConsole.NextAccountActionTime;
 
-            OrdersSpacer.Visible = orderConsole.Mode != CargoOrderConsoleMode.PrintSlip;
-            Orders.Visible = orderConsole.Mode != CargoOrderConsoleMode.PrintSlip;
+            RightPart.Visible = orderConsole.Mode != CargoOrderConsoleMode.PrintSlip;
         }
     }
 }

Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml

@@ -1,33 +1,53 @@
-<DefaultWindow xmlns="https://spacestation14.io"
-            Title="{Loc 'cargo-console-order-menu-title'}">
+<DefaultWindow xmlns="https://spacestation14.io"
+               Title="{Loc 'cargo-console-order-menu-title'}"
+               MinSize="460 261">
     <BoxContainer Orientation="Vertical">
         <GridContainer Columns="2">
-            <Label Text="{Loc 'cargo-console-order-menu-product-label'}" />
+            <Label Text="{Loc 'cargo-console-order-menu-product-label'}"
+                   StyleClasses="LabelKeyText" />
+
             <Label Name="ProductName"
-                      Access="Public" />
-            <Label Text="{Loc 'cargo-console-order-menu-description-label'}" />
+                   Access="Public" />
+
+            <Label Text="{Loc 'cargo-console-order-menu-description-label'}"
+                   StyleClasses="LabelKeyText" />
+
             <RichTextLabel Name="Description"
-                        Access="Public"
-                        VerticalExpand="True"
-                        SetWidth="350"/>
-            <Label Text="{Loc 'cargo-console-order-menu-cost-label'}" />
+                           Access="Public"
+                           HorizontalExpand="True"
+                           MaxWidth="460" />
+
+            <Label Text="{Loc 'cargo-console-order-menu-cost-label'}"
+                   StyleClasses="LabelKeyText" />
+
             <Label Name="PointCost"
-                      Access="Public" />
-            <Label Text="{Loc 'cargo-console-order-menu-requester-label'}" />
+                   Access="Public" />
+
+            <Label Text="{Loc 'cargo-console-order-menu-requester-label'}"
+                   StyleClasses="LabelKeyText" />
+
             <LineEdit Name="Requester"
                       Access="Public" />
-            <Label Text="{Loc 'cargo-console-order-menu-reason-label'}" />
+
+            <Label Text="{Loc 'cargo-console-order-menu-reason-label'}"
+                   StyleClasses="LabelKeyText" />
+
             <LineEdit Name="Reason"
                       Access="Public" />
-            <Label Text="{Loc 'cargo-console-order-menu-amount-label'}" />
+
+            <Label Text="{Loc 'cargo-console-order-menu-amount-label'}"
+                   StyleClasses="LabelKeyText" />
+
             <SpinBox Name="Amount"
                      Access="Public"
                      HorizontalExpand="True"
                      Value="1" />
         </GridContainer>
+        <Control VerticalExpand="True"/>
+        <PanelContainer StyleClasses="LowDivider" Margin="0 6 0 2"/>
         <Button Name="SubmitButton"
                 Access="Public"
                 Text="{Loc 'cargo-console-order-menu-submit-button'}"
-                TextAlign="Center" />
+                VerticalAlignment="Bottom" />
     </BoxContainer>
 </DefaultWindow>

Content.Client/Cargo/UI/CargoOrderRow.xaml

@@ -1,33 +1,81 @@
-<PanelContainer xmlns="https://spacestation14.io"
-                HorizontalExpand="True"
-                Margin="0 1">
-    <BoxContainer Orientation="Horizontal"
-                  HorizontalExpand="True">
-        <TextureRect Name="Icon"
-                     Access="Public"
-                     MinSize="32 32"
-                     RectClipContent="True" />
-        <Control MinWidth="5"/>
-        <BoxContainer Orientation="Vertical"
-                      HorizontalExpand="True"
-                      VerticalExpand="True">
-            <RichTextLabel Name="ProductName"
-                   Access="Public"
-                   HorizontalExpand="True"
-                   StyleClasses="LabelSubText" />
-            <Label Name="Description"
-                   Access="Public"
-                   HorizontalExpand="True"
-                   StyleClasses="LabelSubText"
-                   ClipText="True" />
+<PanelContainer
+    xmlns="https://spacestation14.io"
+    xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    HorizontalExpand="True"
+    StyleClasses="BackgroundPanel">
+
+    <!-- Main Container -->
+    <BoxContainer Orientation="Vertical"
+                  HorizontalExpand="True"
+                  SeparationOverride="6"
+                  Margin="-14 -2">
+
+        <BoxContainer Orientation="Vertical">
+            <Control>
+                <PanelContainer StyleClasses="WindowHeadingBackground" />
+
+                <BoxContainer Margin="6">
+                    <Label Name="Title"
+                           Access="Public"
+                           MaxHeight="28"
+                           StyleClasses="LabelKeyText"/>
+                </BoxContainer>
+            </Control>
+
+            <PanelContainer Name="Stride"
+                Access="Public"
+                StyleClasses="LowDivider" />
+        </BoxContainer>
+
+        <!-- Info -->
+        <BoxContainer>
+            <TextureRect Name="Icon"
+                         Access="Public"
+                         MinSize="32 32"
+                         Margin="4"
+                         Stretch="KeepAspectCentered"
+                         RectClipContent="True"
+                         VerticalAlignment="Center"/>
+
+            <PanelContainer StyleClasses="LowDivider" Margin="4 0"/>
+
+            <BoxContainer Orientation="Vertical"
+                          HorizontalExpand="True"
+                          VerticalExpand="True">
+
+                <RichTextLabel Name="ProductName"
+                       Access="Public"
+                       HorizontalExpand="True"
+                       VerticalExpand="True"
+                       StyleClasses="LabelSubText" />
+
+                <Label Name="Description"
+                       Access="Public"
+                       HorizontalExpand="True"
+                       VerticalExpand="True"
+                       StyleClasses="LabelSubText"
+                       ClipText="True" />
+            </BoxContainer>
+        </BoxContainer>
+
+        <BoxContainer Orientation="Vertical">
+            <PanelContainer StyleClasses="LowDivider" />
+
+            <!-- Buttons -->
+            <!-- Btn's position hardcoded (args.Button.Parent?.Parent?.Parent type) in CargoConsoleBUI 158 & 166 line -->
+            <BoxContainer Margin="6">
+                <Button Name="Approve"
+                        Access="Public"
+                        Text="{Loc 'cargo-console-menu-order-row-button-approve'}"
+                        StyleClasses="OpenRight"
+                        HorizontalExpand="True"/>
+
+                <Button Name="Cancel"
+                        Access="Public"
+                        Text="{Loc 'cargo-console-menu-order-row-button-cancel'}"
+                        StyleClasses="OpenLeft"
+                        HorizontalExpand="True" />
+            </BoxContainer>
         </BoxContainer>
-        <Button Name="Approve"
-                Access="Public"
-                Text="{Loc 'cargo-console-menu-cargo-order-row-approve-button'}"
-                StyleClasses="OpenRight" />
-        <Button Name="Cancel"
-                Access="Public"
-                Text="{Loc 'cargo-console-menu-cargo-order-row-cancel-button'}"
-                StyleClasses="OpenLeft" />
     </BoxContainer>
 </PanelContainer>

Content.Client/Cargo/UI/CargoProductRow.xaml

@@ -1,26 +1,34 @@
-<PanelContainer xmlns="https://spacestation14.io"
-                HorizontalExpand="True">
-    <Button Name="MainButton"
-            ToolTip=""
-            Access="Public"
-            HorizontalExpand="True"
-            VerticalExpand="True"
-            StyleClasses="OpenBoth"/>
-    <BoxContainer Orientation="Horizontal"
-                  HorizontalExpand="True">
-        <TextureRect Name="Icon"
-                     Access="Public"
-                     MinSize="32 32"
-                     RectClipContent="True" />
-        <Label Name="ProductName"
-               Access="Public"
-               HorizontalExpand="True" />
-        <PanelContainer StyleClasses="BackgroundDark">
-            <Label Name="PointCost"
+<BoxContainer xmlns="https://spacestation14.io"
+    HorizontalExpand="True">
+    <PanelContainer HorizontalExpand="True">
+        <!-- Btn position hardcoded (args.Button.Parent?.Parent type) in CargoConsoleBUI 71 line -->
+        <Button Name="MainButton"
+                ToolTip=""
+                Access="Public"
+                VerticalExpand="False"
+                StyleClasses="OpenBoth" />
+
+        <!-- Icon & Name -->
+        <BoxContainer Orientation="Horizontal"
+                      HorizontalExpand="True"
+                      Margin="4 0">
+
+            <TextureRect Name="Icon"
+                         Access="Public"
+                         MinSize="32 32"
+                         RectClipContent="True" />
+
+            <Label Name="ProductName"
                    Access="Public"
-                   MinSize="52 32"
-                   Align="Right"
-                   Margin="0 0 5 0"/>
-        </PanelContainer>
-    </BoxContainer>
-</PanelContainer>
+                   HorizontalExpand="True"
+                   ClipText="True" />
+        </BoxContainer>
+    </PanelContainer>
+
+    <Label Name="PointCost"
+           Access="Public"
+           MinSize="56 32"
+           Align="Right"
+           Margin="0 0 5 0"
+           HorizontalAlignment="Right"/>
+</BoxContainer>

Content.Client/Cargo/UI/CargoProductRow.xaml.cs

@@ -7,7 +7,7 @@ using Robust.Client.UserInterface.XAML;
 namespace Content.Client.Cargo.UI
 {
     [GenerateTypedNameReferences]
-    public sealed partial class CargoProductRow : PanelContainer
+    public sealed partial class CargoProductRow : BoxContainer
     {
         public CargoProductPrototype? Product { get; set; }
 

Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs

@@ -34,7 +34,10 @@ namespace Content.Client.Cargo.UI
 
             foreach (var order in orders)
             {
-                 var product = protoManager.Index<EntityPrototype>(order.ProductId);
+                 if (!protoManager.Resolve(order.Product, out var productProto))
+                     continue;
+
+                 var product = protoManager.Index<EntityPrototype>(productProto.Product);
                  var productName = product.Name;
                  var account = protoManager.Index(order.Account);
 

Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Atmos.Prototypes;
-using Content.Shared.Body.Part;
+using Content.Shared.Body;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
@@ -94,7 +94,7 @@ public sealed class ChemistryGuideDataSystem : SharedChemistryGuideDataSystem
                 continue;
 
             //these bloat the hell out of blood/fat
-            if (entProto.HasComponent<BodyPartComponent>())
+            if (entProto.HasComponent<OrganComponent>())
                 continue;
 
             //these feel obvious...
@@ -116,7 +116,7 @@ public sealed class ChemistryGuideDataSystem : SharedChemistryGuideDataSystem
             }
 
 
-            if (extractableComponent.GrindableSolution is { } grindableSolutionId &&
+            if (extractableComponent.GrindableSolutionName is { } grindableSolutionId &&
                 entProto.TryGetComponent<SolutionContainerManagerComponent>(out var manager, EntityManager.ComponentFactory) &&
                 _solutionContainer.TryGetSolution(manager, grindableSolutionId, out var grindableSolution))
             {

Content.Client/CloningConsole/UI/CloningConsoleWindow.xaml

@@ -8,7 +8,7 @@
                       VerticalExpand="True"
                       HorizontalExpand="True"
                       MinSize="100 150">
-            <PanelContainer VerticalExpand="True" StyleClasses="Inset">
+            <PanelContainer VerticalExpand="True" StyleClasses="BackgroundPanelDark">
                 <BoxContainer Name="GeneticScannerContents" Margin="5 5 5 5" Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True">
                     <Label HorizontalAlignment="Center" Text="{Loc 'cloning-console-window-scanner-details-label'}" />
                     <BoxContainer Orientation="Horizontal" VerticalExpand="True" HorizontalExpand="True">
@@ -35,7 +35,7 @@
                 </BoxContainer>
             </PanelContainer>
             <Control MinSize="50 5" />
-            <PanelContainer VerticalExpand="True" StyleClasses="Inset">
+            <PanelContainer VerticalExpand="True" StyleClasses="BackgroundPanelDark">
                 <BoxContainer Name="CloningPodContents" Margin="5 5 5 5" Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True">
                     <Label HorizontalAlignment="Center" Text="{Loc 'cloning-console-window-pod-details-label'}" />
                     <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True">

Content.Client/Clothing/ClientClothingSystem.cs

@@ -331,7 +331,7 @@ public sealed class ClientClothingSystem : ClothingSystem
         // Select displacement maps
         var displacementData = inventory.Displacements.GetValueOrDefault(slot); //Default unsexed map
 
-        var equipeeSex = CompOrNull<HumanoidAppearanceComponent>(equipee)?.Sex;
+        var equipeeSex = CompOrNull<HumanoidProfileComponent>(equipee)?.Sex;
         if (equipeeSex != null)
         {
             switch (equipeeSex)

Content.Client/CombatMode/CombatModeSystem.cs

@@ -1,5 +1,4 @@
 using Content.Client.Hands.Systems;
-using Content.Client.NPC.HTN;
 using Content.Shared.CCVar;
 using Content.Shared.CombatMode;
 using Robust.Client.Graphics;
@@ -59,11 +58,6 @@ public sealed class CombatModeSystem : SharedCombatModeSystem
         UpdateHud(entity);
     }
 
-    protected override bool IsNpc(EntityUid uid)
-    {
-        return HasComp<HTNComponent>(uid);
-    }
-
     private void UpdateHud(EntityUid entity)
     {
         if (entity != _playerManager.LocalEntity || !Timing.IsFirstTimePredicted)

Content.Client/Commands/HideMechanismsCommand.cs

@@ -1,36 +0,0 @@
-using Content.Shared.Body.Organ;
-using Robust.Client.GameObjects;
-using Robust.Shared.Console;
-using Robust.Shared.Containers;
-
-namespace Content.Client.Commands;
-
-public sealed class HideMechanismsCommand : LocalizedEntityCommands
-{
-    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
-    [Dependency] private readonly SpriteSystem _spriteSystem = default!;
-
-    public override string Command => "hidemechanisms";
-
-    public override void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        var query = EntityManager.AllEntityQueryEnumerator<OrganComponent, SpriteComponent>();
-
-        while (query.MoveNext(out var uid, out _, out var sprite))
-        {
-            _spriteSystem.SetContainerOccluded((uid, sprite), false);
-
-            var tempParent = uid;
-            while (_containerSystem.TryGetContainingContainer((tempParent, null, null), out var container))
-            {
-                if (!container.ShowContents)
-                {
-                    _spriteSystem.SetContainerOccluded((uid, sprite), true);
-                    break;
-                }
-
-                tempParent = container.Owner;
-            }
-        }
-    }
-}

Content.Client/Commands/ShowMechanismsCommand.cs

@@ -1,22 +0,0 @@
-using Content.Shared.Body.Organ;
-using Robust.Client.GameObjects;
-using Robust.Shared.Console;
-
-namespace Content.Client.Commands;
-
-public sealed class ShowMechanismsCommand : LocalizedEntityCommands
-{
-    [Dependency] private readonly SpriteSystem _spriteSystem = default!;
-
-    public override string Command => "showmechanisms";
-
-    public override void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        var query = EntityManager.AllEntityQueryEnumerator<OrganComponent, SpriteComponent>();
-
-        while (query.MoveNext(out var uid, out _, out var sprite))
-        {
-            _spriteSystem.SetContainerOccluded((uid, sprite), false);
-        }
-    }
-}

Content.Client/Construction/ConstructionSystem.cs

@@ -291,7 +291,6 @@ namespace Content.Client.Construction
             _ghosts.Add(comp.GhostId, ghost.Value);
 
             var sprite = Comp<SpriteComponent>(ghost.Value);
-            _sprite.SetColor((ghost.Value, sprite), new Color(48, 255, 48, 128));
 
             if (targetProto.TryGetComponent(out IconComponent? icon, EntityManager.ComponentFactory))
             {
@@ -306,20 +305,11 @@ namespace Content.Client.Construction
                 var targetSprite = EnsureComp<SpriteComponent>(dummy);
                 EntityManager.System<AppearanceSystem>().OnChangeData(dummy, targetSprite);
 
-                for (var i = 0; i < targetSprite.AllLayers.Count(); i++)
+                _sprite.CopySprite((dummy, targetSprite), (ghost.Value, sprite));
+
+                for (var i = 0; i < sprite.AllLayers.Count(); i++)
                 {
-                    if (!targetSprite[i].Visible || !targetSprite[i].RsiState.IsValid)
-                        continue;
-
-                    var rsi = targetSprite[i].Rsi ?? targetSprite.BaseRSI;
-                    if (rsi is null || !rsi.TryGetState(targetSprite[i].RsiState, out var state) ||
-                        state.StateId.Name is null)
-                        continue;
-
-                    _sprite.AddBlankLayer((ghost.Value, sprite), i);
-                    _sprite.LayerSetSprite((ghost.Value, sprite), i, new SpriteSpecifier.Rsi(rsi.Path, state.StateId.Name));
                     sprite.LayerSetShader(i, "unshaded");
-                    _sprite.LayerSetVisible((ghost.Value, sprite), i, true);
                 }
 
                 Del(dummy);
@@ -327,6 +317,8 @@ namespace Content.Client.Construction
             else
                 return false;
 
+            _sprite.SetColor((ghost.Value, sprite), new Color(48, 255, 48, 128));
+
             if (prototype.CanBuildInImpassable)
                 EnsureComp<WallMountComponent>(ghost.Value).Arc = new(Math.Tau);
 

Content.Client/Corvax/Ipc/IpcSystem.cs

@@ -0,0 +1,81 @@
+using Content.Shared.Alert;
+using Content.Shared.Corvax.Ipc;
+using Content.Shared.Power.EntitySystems;
+using Content.Shared.PowerCell;
+using Robust.Client.Player;
+using Robust.Shared.Player;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Corvax.Ipc;
+public sealed class IpcSystem : EntitySystem
+{
+    [Dependency] private readonly PowerCellSystem _powerCell = default!;
+    [Dependency] private readonly SharedBatterySystem _battery = default!;
+    [Dependency] private readonly AlertsSystem _alerts = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    private static readonly TimeSpan AlertUpdateDelay = TimeSpan.FromSeconds(0.5f);
+    private TimeSpan _nextAlertUpdate = TimeSpan.Zero;
+    private EntityQuery<IpcComponent> _ipcQuery;
+    public override void Initialize()
+    {
+        base.Initialize();
+        _ipcQuery = GetEntityQuery<IpcComponent>();
+        SubscribeLocalEvent<IpcComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
+        SubscribeLocalEvent<IpcComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
+
+        SubscribeLocalEvent<IpcComponent, PowerCellChangedEvent>(OnPowerCellChanged);
+        SubscribeLocalEvent<IpcComponent, PowerCellSlotEmptyEvent>(OnPowerCellEmpty);
+    }
+    private void OnPowerCellChanged(EntityUid uid, IpcComponent component, ref PowerCellChangedEvent args)
+    {
+        if (_player.LocalEntity != uid)
+            return;
+        UpdateBatteryAlert((uid, component));
+    }
+    private void OnPowerCellEmpty(EntityUid uid, IpcComponent component, ref PowerCellSlotEmptyEvent args)
+    {
+        if (_player.LocalEntity != uid)
+            return;
+        UpdateBatteryAlert((uid, component));
+    }
+    private void OnPlayerAttached(Entity<IpcComponent> ent, ref LocalPlayerAttachedEvent args)
+    {
+        UpdateBatteryAlert(ent);
+    }
+    private void OnPlayerDetached(Entity<IpcComponent> ent, ref LocalPlayerDetachedEvent args)
+    {
+        _alerts.ClearAlert(ent.Owner, ent.Comp.BatteryAlert);
+        _alerts.ClearAlert(ent.Owner, ent.Comp.NoBatteryAlert);
+    }
+    private void UpdateBatteryAlert(Entity<IpcComponent> ent)
+    {
+        if (!_powerCell.TryGetBatteryFromSlot(ent.Owner, out var battery)
+            || battery.Value.Comp.MaxCharge <= 0
+            || _battery.GetCharge(battery.Value.AsNullable()) / battery.Value.Comp.MaxCharge < 0.01f)
+        {
+            _alerts.ClearAlert(ent.Owner, ent.Comp.BatteryAlert);
+            _alerts.ShowAlert(ent.Owner, ent.Comp.NoBatteryAlert);
+            return;
+        }
+        var chargePercent = (short)MathF.Round(
+            _battery.GetCharge(battery.Value.AsNullable()) / battery.Value.Comp.MaxCharge * 10f);
+        if (chargePercent == 0 && _powerCell.HasDrawCharge(ent.Owner))
+            chargePercent = 1;
+        _alerts.ClearAlert(ent.Owner, ent.Comp.NoBatteryAlert);
+        _alerts.ShowAlert(ent.Owner, ent.Comp.BatteryAlert, chargePercent);
+    }
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+        if (_player.LocalEntity is not { } localPlayer)
+            return;
+        var curTime = _timing.CurTime;
+        if (curTime < _nextAlertUpdate)
+            return;
+        _nextAlertUpdate = curTime + AlertUpdateDelay;
+        if (!_ipcQuery.TryComp(localPlayer, out var ipc))
+            return;
+        UpdateBatteryAlert((localPlayer, ipc));
+    }
+}

Content.Client/Corvax/Lobby/UI/HumanoidProfileEditor.TTS.cs

@@ -0,0 +1,59 @@
+using Content.Client.Corvax.TTS;
+using Content.Shared.Corvax.CCCVars;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Lobby.UI;
+
+public sealed partial class HumanoidProfileEditor
+{
+    private TTSTab? _ttsTab;
+
+    private void RefreshVoiceTab()
+    {
+        if (!_cfgManager.GetCVar(CCCVars.TTSEnabled))
+            return;
+
+        _ttsTab = new TTSTab();
+        var children = new List<Control>();
+        foreach (var child in TabContainer.Children)
+            children.Add(child);
+
+        TabContainer.RemoveAllChildren();
+
+        for (int i = 0; i < children.Count; i++)
+        {
+            if (i == 1) // Set the tab to the 2nd place.
+            {
+                TabContainer.AddChild(_ttsTab);
+            }
+            TabContainer.AddChild(children[i]);
+        }
+
+        TabContainer.SetTabTitle(1, Loc.GetString("humanoid-profile-editor-voice-tab"));
+
+        _ttsTab.OnVoiceSelected += voiceId =>
+        {
+            SetVoice(voiceId);
+            _ttsTab.SetSelectedVoice(voiceId);
+        };
+
+        _ttsTab.OnPreviewRequested += voiceId =>
+        {
+            _entManager.System<TTSSystem>().RequestPreviewTTS(voiceId);
+        };
+    }
+
+    private void UpdateTTSVoicesControls()
+    {
+        if (Profile is null || _ttsTab is null)
+            return;
+
+        _ttsTab.UpdateControls(Profile, Profile.Sex);
+        _ttsTab.SetSelectedVoice(Profile.Voice);
+    }
+    private void SetVoice(string newVoice)
+    {
+        Profile = Profile?.WithVoice(newVoice);
+        IsDirty = true;
+    }
+}

Content.Client/Damage/DamageVisualsComponent.cs

@@ -1,4 +1,6 @@
+using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Damage;
 
@@ -55,7 +57,7 @@ public sealed partial class DamageVisualsComponent : Component
     ///     (for example, Brute), and has a value
     ///     of a DamageVisualizerSprite (see below)
     /// </summary>
-    [DataField("damageOverlayGroups")] public  Dictionary<string, DamageVisualizerSprite>? DamageOverlayGroups;
+    [DataField("damageOverlayGroups")] public  Dictionary<ProtoId<DamageGroupPrototype>, DamageVisualizerSprite>? DamageOverlayGroups;
 
     /// <summary>
     ///     Sets if you want sprites to overlay the
@@ -84,7 +86,7 @@ public sealed partial class DamageVisualsComponent : Component
     ///     what kind of damage combination
     ///     you would want, on which threshold.
     /// </remarks>
-    [DataField("damageGroup")] public  string? DamageGroup;
+    [DataField("damageGroup")] public  ProtoId<DamageGroupPrototype>? DamageGroup;
 
     /// <summary>
     ///     Set this if you want incoming damage to be

Content.Client/Damage/DamageVisualsSystem.cs

@@ -1,12 +1,9 @@
 using System.Linq;
-using Content.Shared.Body.Components; // Corvax-Wega-Surgery
-using Content.Shared.Body.Part; // Corvax-Wega-Surgery
-using Content.Shared.Body.Systems; // Corvax-Wega-Surgery
 using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Prototypes;
+using Content.Shared.Damage.Systems;
 using Content.Shared.FixedPoint;
-using Content.Shared.Surgery.Components; // Corvax-Wega-Surgery
 using Robust.Client.GameObjects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
@@ -32,15 +29,13 @@ namespace Content.Client.Damage;
 public sealed class DamageVisualsSystem : VisualizerSystem<DamageVisualsComponent>
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly SharedBodySystem _body = default!; // Corvax-Wega-Surgery
+    [Dependency] private readonly DamageableSystem _damageable = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<DamageVisualsComponent, ComponentInit>(InitializeEntity);
-        SubscribeLocalEvent<OperatedComponent, BodyPartRemovedEvent>(OnBodyPartRemoved); // Corvax-Wega-Surgery
-        SubscribeLocalEvent<OperatedComponent, BodyPartAddedEvent>(OnBodyPartAdded); // Corvax-Wega-Surgery
     }
 
     private void InitializeEntity(EntityUid entity, DamageVisualsComponent comp, ComponentInit args)
@@ -181,7 +176,7 @@ public sealed class DamageVisualsSystem : VisualizerSystem<DamageVisualsComponen
             // See if that group is in our entity's damage container.
             else if (!damageVisComp.Overlay && damageVisComp.DamageGroup != null)
             {
-                if (!damageContainer.SupportedGroups.Contains(damageVisComp.DamageGroup))
+                if (!damageContainer.SupportedGroups.Contains(damageVisComp.DamageGroup.Value))
                 {
                     Log.Error($"Damage keys were invalid for entity {entity}.");
                     damageVisComp.Valid = false;
@@ -391,7 +386,7 @@ public sealed class DamageVisualsSystem : VisualizerSystem<DamageVisualsComponen
         if (!AppearanceSystem.TryGetData<DamageVisualizerGroupData>(uid, DamageVisualizerKeys.DamageUpdateGroups,
                 out var data, component))
         {
-            data = new DamageVisualizerGroupData(Comp<DamageableComponent>(uid).DamagePerGroup.Keys.ToList());
+            data = new DamageVisualizerGroupData(_damageable.GetDamagePerGroup(uid).Keys.ToList());
         }
 
         UpdateDamageVisuals(data.GroupList, (uid, damageComponent, spriteComponent, damageVisComp));
@@ -403,50 +398,21 @@ public sealed class DamageVisualsSystem : VisualizerSystem<DamageVisualsComponen
     ///     layer will no longer be visible, or obtain
     ///     any damage updates.
     /// </summary>
-    /// // Corvax-Wega-Surgery-Edit-start
     private void UpdateDisabledLayers(EntityUid uid, SpriteComponent spriteComponent, AppearanceComponent component, DamageVisualsComponent damageVisComp)
     {
-        if (damageVisComp.Disabled)
-        {
-            foreach (var layer in damageVisComp.TargetLayerMapKeys)
-            {
-                if (damageVisComp.TrackAllDamage)
-                {
-                    spriteComponent.LayerSetVisible($"{layer}trackDamage", false);
-                    continue;
-                }
-
-                if (damageVisComp.DamageOverlayGroups == null)
-                    continue;
-
-                foreach (var damageGroup in damageVisComp.DamageOverlayGroups.Keys)
-                {
-                    spriteComponent.LayerSetVisible($"{layer}{damageGroup}", false);
-                }
-            }
-            return;
-        }
-
         foreach (var layer in damageVisComp.TargetLayerMapKeys)
         {
-            var hasPart = HasBodyPart(uid, layer);
+            // I assume this gets set by something like body system if limbs are missing???
+            // TODO is this actually used by anything anywhere?
             AppearanceSystem.TryGetData(uid, layer, out bool disabled, component);
 
-            var isDisabled = !hasPart || disabled;
-            if (damageVisComp.DisabledLayers[layer] == isDisabled)
+            if (damageVisComp.DisabledLayers[layer] == disabled)
                 continue;
 
-            damageVisComp.DisabledLayers[layer] = isDisabled;
-
-            var threshold = damageVisComp.TrackAllDamage
-                ? damageVisComp.LastDamageThreshold
-                : damageVisComp.LastThresholdPerGroup.TryGetValue(damageVisComp.DamageGroup ?? "", out var t) ? t : FixedPoint2.Zero;
-
-            var shouldBeVisible = !isDisabled && threshold > damageVisComp.Thresholds[0];
-
+            damageVisComp.DisabledLayers[layer] = disabled;
             if (damageVisComp.TrackAllDamage)
             {
-                SpriteSystem.LayerSetVisible((uid, spriteComponent), $"{layer}trackDamage", shouldBeVisible);
+                SpriteSystem.LayerSetVisible((uid, spriteComponent), $"{layer}trackDamage", !disabled);
                 continue;
             }
 
@@ -455,11 +421,10 @@ public sealed class DamageVisualsSystem : VisualizerSystem<DamageVisualsComponen
 
             foreach (var damageGroup in damageVisComp.DamageOverlayGroups.Keys)
             {
-                SpriteSystem.LayerSetVisible((uid, spriteComponent), $"{layer}{damageGroup}", shouldBeVisible);
+                SpriteSystem.LayerSetVisible((uid, spriteComponent), $"{layer}{damageGroup}", !disabled);
             }
         }
     }
-    /// // Corvax-Wega-Surgery-Edit-end
 
     /// <summary>
     ///     Checks the overlay ordering on the current
@@ -523,11 +488,10 @@ public sealed class DamageVisualsSystem : VisualizerSystem<DamageVisualsComponen
     /// </summary>
     private void UpdateDamageVisuals(Entity<DamageableComponent, SpriteComponent, DamageVisualsComponent> entity)
     {
-        var damageComponent = entity.Comp1;
         var spriteComponent = entity.Comp2;
         var damageVisComp = entity.Comp3;
 
-        if (!CheckThresholdBoundary(damageComponent.TotalDamage, damageVisComp.LastDamageThreshold, damageVisComp, out var threshold))
+        if (!CheckThresholdBoundary(_damageable.GetTotalDamage(entity.AsNullable()), damageVisComp.LastDamageThreshold, damageVisComp, out var threshold))
             return;
 
         damageVisComp.LastDamageThreshold = threshold;
@@ -550,11 +514,11 @@ public sealed class DamageVisualsSystem : VisualizerSystem<DamageVisualsComponen
     ///     according to the list of damage groups
     ///     passed into it.
     /// </summary>
-    private void UpdateDamageVisuals(List<string> delta, Entity<DamageableComponent, SpriteComponent, DamageVisualsComponent> entity)
+    private void UpdateDamageVisuals(List<ProtoId<DamageGroupPrototype>> delta, Entity<DamageableComponent, SpriteComponent, DamageVisualsComponent> entity)
     {
-        var damageComponent = entity.Comp1;
         var spriteComponent = entity.Comp2;
         var damageVisComp = entity.Comp3;
+        var damage = _damageable.GetAllDamage((entity.Owner, entity.Comp1));
 
         foreach (var damageGroup in delta)
         {
@@ -562,7 +526,7 @@ public sealed class DamageVisualsSystem : VisualizerSystem<DamageVisualsComponen
                 continue;
 
             if (!_prototypeManager.TryIndex<DamageGroupPrototype>(damageGroup, out var damageGroupPrototype)
-                || !damageComponent.Damage.TryGetDamageInGroup(damageGroupPrototype, out var damageTotal))
+                || !damage.TryGetDamageInGroup(damageGroupPrototype, out var damageTotal))
                 continue;
 
             if (!damageVisComp.LastThresholdPerGroup.TryGetValue(damageGroup, out var lastThreshold)
@@ -627,7 +591,7 @@ public sealed class DamageVisualsSystem : VisualizerSystem<DamageVisualsComponen
         }
         else if (damageVisComp.DamageGroup != null)
         {
-            UpdateDamageVisuals(new List<string>() { damageVisComp.DamageGroup }, entity);
+            UpdateDamageVisuals(new() { damageVisComp.DamageGroup.Value }, entity);
         }
         else if (damageVisComp.DamageOverlay != null)
         {
@@ -759,63 +723,4 @@ public sealed class DamageVisualsSystem : VisualizerSystem<DamageVisualsComponen
             SpriteSystem.LayerSetRsiState(spriteEnt.AsNullable(), spriteLayer, $"{statePrefix}_{threshold}");
         }
     }
-
-    // Corvax-Wega-Surgery-start
-    private bool HasBodyPart(EntityUid uid, object layerMapKey)
-    {
-        if (layerMapKey is not Enum layerEnum)
-            return true;
-
-        var layerName = layerEnum.ToString();
-        BodyPartSymmetry? symmetry = layerName switch
-        {
-            "LArm" => BodyPartSymmetry.Left,
-            "RArm" => BodyPartSymmetry.Right,
-            "LLeg" => BodyPartSymmetry.Left,
-            "RLeg" => BodyPartSymmetry.Right,
-            _ => null
-        };
-
-        var partType = layerName switch
-        {
-            "LArm" or "RArm" => BodyPartType.Arm,
-            "LLeg" or "RLeg" => BodyPartType.Leg,
-            "Head" => BodyPartType.Head,
-            "Chest" => BodyPartType.Torso,
-            _ => BodyPartType.Other
-        };
-
-        if (TryComp<BodyComponent>(uid, out var body))
-        {
-            foreach (var (_, part) in _body.GetBodyChildrenOfType(uid, partType, body))
-            {
-                if (symmetry == null || part.Symmetry == symmetry)
-                    return true;
-            }
-            return false;
-        }
-
-        return true;
-    }
-
-    private void OnBodyPartRemoved(Entity<OperatedComponent> ent, ref BodyPartRemovedEvent args)
-    {
-        if (TryComp<DamageVisualsComponent>(ent, out var damageVisComp) &&
-            TryComp<SpriteComponent>(ent, out var spriteComponent) &&
-            TryComp<AppearanceComponent>(ent, out var appearanceComponent))
-        {
-            UpdateDisabledLayers(ent, spriteComponent, appearanceComponent, damageVisComp);
-        }
-    }
-
-    private void OnBodyPartAdded(Entity<OperatedComponent> ent, ref BodyPartAddedEvent args)
-    {
-        if (TryComp<DamageVisualsComponent>(ent, out var damageVisComp) &&
-            TryComp<SpriteComponent>(ent, out var spriteComponent) &&
-            TryComp<AppearanceComponent>(ent, out var appearanceComponent))
-        {
-            UpdateDisabledLayers(ent, spriteComponent, appearanceComponent, damageVisComp);
-        }
-    }
-    // Corvax-Wega-Surgery-end
 }

Content.Client/Entry/EntryPoint.cs

@@ -5,6 +5,7 @@ using Content.Client.DebugMon;
 using Content.Client.Corvax.TTS;
 using Content.Client.Options;
 using Content.Client.Eui;
+using Content.Client.FeedbackPopup;
 using Content.Client.Fullscreen;
 using Content.Client.GameTicking.Managers;
 using Content.Client.GhostKick;
@@ -26,6 +27,7 @@ using Content.Client.UserInterface;
 using Content.Client.Viewport;
 using Content.Client.Voting;
 using Content.Shared.Ame.Components;
+using Content.Shared.FeedbackSystem;
 using Content.Shared.Gravity;
 using Content.Shared.Localizations;
 using Robust.Client;
@@ -78,6 +80,7 @@ namespace Content.Client.Entry
         [Dependency] private readonly TitleWindowManager _titleWindowManager = default!;
         [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
         [Dependency] private readonly ClientsidePlaytimeTrackingManager _clientsidePlaytimeManager = default!;
+        [Dependency] private readonly ClientFeedbackManager _feedbackManager = null!;
 
         public override void PreInit()
         {
@@ -173,6 +176,7 @@ namespace Content.Client.Entry
             _userInterfaceManager.SetActiveTheme(_configManager.GetCVar(CVars.InterfaceTheme));
             _documentParsingManager.Initialize();
             _titleWindowManager.Initialize();
+            _feedbackManager.Initialize();
 
             _baseClient.RunLevelChanged += (_, args) =>
             {

Content.Client/Fax/UI/FaxWindow.xaml.cs

@@ -25,13 +25,13 @@ public sealed partial class FaxWindow : DefaultWindow
 
         PaperButtonPressed += OnPaperButtonPressed;
 
-        FileButton.OnPressed += _ => FileButtonPressed?.Invoke(); 
-        PaperButton.OnPressed += _ => PaperButtonPressed?.Invoke(); 
+        FileButton.OnPressed += _ => FileButtonPressed?.Invoke();
+        PaperButton.OnPressed += _ => PaperButtonPressed?.Invoke();
         CopyButton.OnPressed += _ => CopyButtonPressed?.Invoke();
         SendButton.OnPressed += _ => SendButtonPressed?.Invoke();
         RefreshButton.OnPressed += _ => RefreshButtonPressed?.Invoke();
         PeerSelector.OnItemSelected += args =>
-            PeerSelected?.Invoke((string) args.Button.GetItemMetadata(args.Id)!);
+            PeerSelected?.Invoke((string)args.Button.GetItemMetadata(args.Id)!);
     }
 
     public void UpdateState(FaxUiState state)

Content.Client/FeedbackPopup/ClientFeedbackManager.cs

@@ -0,0 +1,70 @@
+using Content.Shared.FeedbackSystem;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.FeedbackPopup;
+
+/// <inheritdoc />
+public sealed class ClientFeedbackManager : SharedFeedbackManager
+{
+    /// <summary>
+    /// A read-only set representing the currently displayed feedback popups.
+    /// </summary>
+    public override IReadOnlySet<ProtoId<FeedbackPopupPrototype>> DisplayedPopups => _displayedPopups;
+
+    private readonly HashSet<ProtoId<FeedbackPopupPrototype>> _displayedPopups = [];
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        NetManager.RegisterNetMessage<FeedbackPopupMessage>(ReceivedPopupMessage);
+        NetManager.RegisterNetMessage<OpenFeedbackPopupMessage>(_ => Open());
+    }
+
+    /// <summary>
+    /// Opens the feedback popup window.
+    /// </summary>
+    public void Open()
+    {
+        InvokeDisplayedPopupsChanged(true);
+    }
+
+    /// <inheritdoc />
+    public override void Display(List<ProtoId<FeedbackPopupPrototype>>? prototypes)
+    {
+        if (prototypes == null || !NetManager.IsClient)
+            return;
+
+        var count = _displayedPopups.Count;
+        _displayedPopups.UnionWith(prototypes);
+        InvokeDisplayedPopupsChanged(_displayedPopups.Count > count);
+    }
+
+    /// <inheritdoc />
+    public override void Remove(List<ProtoId<FeedbackPopupPrototype>>? prototypes)
+    {
+        if (!NetManager.IsClient)
+            return;
+
+        if (prototypes == null)
+        {
+            _displayedPopups.Clear();
+        }
+        else
+        {
+            _displayedPopups.ExceptWith(prototypes);
+        }
+
+        InvokeDisplayedPopupsChanged(false);
+    }
+
+    private void ReceivedPopupMessage(FeedbackPopupMessage message)
+    {
+        if (message.Remove)
+        {
+            Remove(message.FeedbackPrototypes);
+            return;
+        }
+
+        Display(message.FeedbackPrototypes);
+    }
+}

Content.Client/FeedbackPopup/FeedbackEntry.xaml

@@ -0,0 +1,24 @@
+<Control xmlns="https://spacestation14.io"
+         MinHeight="100">
+    <PanelContainer StyleClasses="BackgroundPanel" ModulateSelfOverride="#2b2b31"/>
+    <BoxContainer Orientation="Vertical">
+
+        <!-- Title -->
+        <PanelContainer StyleIdentifier="FeedbackBorderThinBottom">
+            <RichTextLabel Name="TitleLabel" Margin="12 6 6 6" />
+        </PanelContainer>
+
+        <!-- Description -->
+        <RichTextLabel Name="DescriptionLabel" StyleClasses="LabelLight" Margin="12 4 12 8" VerticalExpand="True"/>
+
+        <!-- Footer -->
+        <PanelContainer StyleIdentifier="FeedbackBorderThinTop">
+            <BoxContainer>
+                <Label FontColorOverride="#b1b1b2" StyleClasses="LabelSmall" Name="TypeLabel" Margin="14 6 6 6" />
+                <Button Name="LinkButton" Text="{Loc feedbackpopup-control-button-text}" MinWidth="80"
+                        Margin="8 6 14 6" HorizontalExpand="True" HorizontalAlignment="Right" />
+            </BoxContainer>
+        </PanelContainer>
+
+    </BoxContainer>
+</Control>

Content.Client/FeedbackPopup/FeedbackEntry.xaml.cs

@@ -0,0 +1,54 @@
+using Content.Shared.FeedbackSystem;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.FeedbackPopup;
+
+[GenerateTypedNameReferences]
+public sealed partial class FeedbackEntry : Control
+{
+    private readonly IUriOpener _uri;
+
+    private readonly FeedbackPopupPrototype? _prototype;
+
+    public FeedbackEntry(ProtoId<FeedbackPopupPrototype> popupProto, IPrototypeManager proto, IUriOpener uri)
+    {
+        RobustXamlLoader.Load(this);
+        _uri = uri;
+
+        _prototype = proto.Index(popupProto);
+
+        // Title
+        TitleLabel.Text = _prototype.Title;
+        DescriptionLabel.Text = _prototype.Description;
+        TypeLabel.Text = _prototype.ResponseType;
+
+        LinkButton.Visible = !string.IsNullOrEmpty(_prototype.ResponseLink);
+
+        // link button
+        if (!string.IsNullOrEmpty(_prototype.ResponseLink))
+        {
+            LinkButton.OnPressed += OnButtonPressed;
+        }
+    }
+
+    private void OnButtonPressed(BaseButton.ButtonEventArgs args)
+    {
+        if (!string.IsNullOrWhiteSpace(_prototype?.ResponseLink))
+            _uri.OpenUri(_prototype.ResponseLink);
+    }
+
+    protected override void Resized()
+    {
+        base.Resized();
+        // magic
+        TitleLabel.SetWidth = Width - TitleLabel.Margin.SumHorizontal;
+        TitleLabel.InvalidateArrange();
+        DescriptionLabel.SetWidth = Width - DescriptionLabel.Margin.SumHorizontal;
+        DescriptionLabel.InvalidateArrange();
+    }
+}
+

Content.Client/FeedbackPopup/FeedbackPopupSheetlet.cs

@@ -0,0 +1,36 @@
+using Content.Client.Stylesheets;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.FeedbackPopup;
+
+[CommonSheetlet]
+public sealed class FeedbackPopupSheetlet : Sheetlet<PalettedStylesheet>
+{
+    public override StyleRule[] GetRules(PalettedStylesheet sheet, object config)
+    {
+        var borderTop = new StyleBoxFlat()
+        {
+            BorderColor = sheet.SecondaryPalette.Base,
+            BorderThickness = new Thickness(0, 1, 0, 0),
+        };
+
+        var borderBottom = new StyleBoxFlat()
+        {
+            BorderColor = sheet.SecondaryPalette.Base,
+            BorderThickness = new Thickness(0, 0, 0, 1),
+        };
+
+        return
+        [
+            E<PanelContainer>()
+                .Identifier("FeedbackBorderThinTop")
+                .Prop(PanelContainer.StylePropertyPanel, borderTop),
+            E<PanelContainer>()
+                .Identifier("FeedbackBorderThinBottom")
+                .Prop(PanelContainer.StylePropertyPanel, borderBottom),
+        ];
+    }
+}

Content.Client/FeedbackPopup/FeedbackPopupUIController.cs

@@ -0,0 +1,75 @@
+using Content.Shared.FeedbackSystem;
+using Content.Shared.GameTicking;
+using Robust.Client.UserInterface.Controllers;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.FeedbackPopup;
+
+/// <summary>
+/// This handles getting feedback popup messages from the server and making a popup in the client.
+/// </summary>
+[UsedImplicitly]
+public sealed class FeedbackPopupUIController : UIController
+{
+    [Dependency] private readonly ClientFeedbackManager _feedbackManager = null!;
+    [Dependency] private readonly IPrototypeManager _proto = null!;
+    [Dependency] private readonly IUriOpener _uri = null!;
+
+    private FeedbackPopupWindow _window = null!;
+
+    public override void Initialize()
+    {
+        _window = new FeedbackPopupWindow(_proto, _uri);
+
+        SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
+        SubscribeNetworkEvent<RoundEndMessageEvent>(OnRoundEnd);
+
+        _feedbackManager.DisplayedPopupsChanged += OnPopupsChanged;
+    }
+
+    public void ToggleWindow()
+    {
+        if (_window.IsOpen)
+        {
+            _window.Close();
+        }
+        else
+        {
+            _window.OpenCentered();
+        }
+    }
+
+    private void OnRoundEnd(RoundEndMessageEvent ev, EntitySessionEventArgs args)
+    {
+        // Add round end prototypes.
+        var roundEndPrototypes = _feedbackManager.GetOriginFeedbackPrototypes(true);
+        if (roundEndPrototypes.Count == 0)
+            return;
+
+        _feedbackManager.Display(roundEndPrototypes);
+
+        // Even if no new prototypes were added, we still want to open the window.
+        if (!_window.IsOpen)
+            _window.OpenCentered();
+    }
+
+    private void OnPopupsChanged(bool newPopups)
+    {
+        UpdateWindow(_feedbackManager.DisplayedPopups);
+
+        if (newPopups && !_window.IsOpen)
+            _window.OpenCentered();
+    }
+
+    private void OnPrototypesReloaded(PrototypesReloadedEventArgs ev)
+    {
+        UpdateWindow(_feedbackManager.DisplayedPopups);
+    }
+
+    private void UpdateWindow(IReadOnlyCollection<ProtoId<FeedbackPopupPrototype>> prototypes)
+    {
+        _window.Update(prototypes);
+    }
+}

Content.Client/FeedbackPopup/FeedbackPopupWindow.xaml

@@ -0,0 +1,24 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                      xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+                      Title="{Loc feedbackpopup-window-name}" MinSize="510 460" RectClipContent="True">
+        <BoxContainer Orientation="Vertical">
+
+            <!-- main box area -->
+            <BoxContainer Margin="12 12 12 5" VerticalExpand="True">
+                <PanelContainer HorizontalExpand="True" StyleClasses="PanelDark">
+                    <ScrollContainer HorizontalExpand="True" HScrollEnabled="False">
+                        <BoxContainer Name="NotificationContainer" HorizontalExpand="True" Orientation="Vertical" Margin="10" SeparationOverride="10" />
+                    </ScrollContainer>
+                </PanelContainer>
+            </BoxContainer>
+
+            <!-- Footer -->
+            <BoxContainer Orientation="Vertical" SetHeight="30" Margin="2 0 0 0">
+                <BoxContainer SetHeight="33" Margin="10 0 10 5">
+                    <Label Text="{Loc feedbackpopup-control-ui-footer}" Margin="6 0" StyleClasses="PdaContentFooterText"/>
+                    <Label Name="NumNotifications" Margin="6 0" HorizontalExpand="True" HorizontalAlignment="Right"/>
+                </BoxContainer>
+            </BoxContainer>
+    </BoxContainer>
+</controls:FancyWindow>

Content.Client/FeedbackPopup/FeedbackPopupWindow.xaml.cs

@@ -0,0 +1,49 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.FeedbackSystem;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.FeedbackPopup;
+
+[GenerateTypedNameReferences]
+public sealed partial class FeedbackPopupWindow : FancyWindow
+{
+    private readonly IPrototypeManager _proto;
+    private readonly IUriOpener _uri;
+
+    public FeedbackPopupWindow(IPrototypeManager proto, IUriOpener uri)
+    {
+        _proto = proto;
+        _uri = uri;
+        RobustXamlLoader.Load(this);
+        DisplayNoEntryLabel();
+    }
+
+    public void Update(IReadOnlyCollection<ProtoId<FeedbackPopupPrototype>> prototypes)
+    {
+        NotificationContainer.RemoveAllChildren();
+
+        if (prototypes.Count == 0)
+            DisplayNoEntryLabel();
+
+        foreach (var proto in prototypes)
+        {
+            NotificationContainer.AddChild(new FeedbackEntry(proto, _proto, _uri));
+        }
+
+        NumNotifications.Text = Loc.GetString("feedbackpopup-control-total-surveys", ("num", prototypes.Count));
+    }
+
+    private void DisplayNoEntryLabel()
+    {
+        NotificationContainer.AddChild(new Label()
+        {
+            Text = Loc.GetString("feedbackpopup-control-no-entries"),
+            HorizontalAlignment = HAlignment.Center,
+            VerticalAlignment = VAlignment.Center,
+        });
+    }
+}

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

@@ -4,11 +4,12 @@ using Content.Client.Chemistry.EntitySystems;
 using Content.Client.Guidebook.Richtext;
 using Content.Client.Message;
 using Content.Client.UserInterface.ControlExtensions;
-using Content.Shared.Body.Prototypes;
 using Content.Shared.CCVar;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Contraband;
+using Content.Shared.Localizations;
+using Content.Shared.Metabolism;
 using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
@@ -132,17 +133,18 @@ public sealed partial class GuideReagentEmbed : BoxContainer, IDocumentTag, ISea
         #region Effects
         if (_chemistryGuideData.ReagentGuideRegistry.TryGetValue(reagent.ID, out var guideEntryRegistry) &&
             guideEntryRegistry.GuideEntries != null &&
-            guideEntryRegistry.GuideEntries.Values.Any(pair => pair.EffectDescriptions.Any()))
+            guideEntryRegistry.GuideEntries.Values.Any(pair => pair.EffectDescriptions.Any() || pair.Metabolites?.Any() == true))
         {
             EffectsDescriptionContainer.Children.Clear();
-            foreach (var (group, effect) in guideEntryRegistry.GuideEntries)
+            foreach (var (stage, effect) in guideEntryRegistry.GuideEntries)
             {
-                if (!effect.EffectDescriptions.Any())
+                var hasMetabolites = effect.Metabolites?.Any() == true;
+                if (!effect.EffectDescriptions.Any() && !hasMetabolites)
                     continue;
 
                 var groupLabel = new RichTextLabel();
-                groupLabel.SetMarkup(Loc.GetString("guidebook-reagent-effects-metabolism-group-rate",
-                    ("group", _prototype.Index<MetabolismGroupPrototype>(group).LocalizedName), ("rate", effect.MetabolismRate)));
+                groupLabel.SetMarkup(Loc.GetString("guidebook-reagent-effects-metabolism-stage-rate",
+                    ("stage", _prototype.Index<MetabolismStagePrototype>(stage).LocalizedName), ("rate", effect.MetabolismRate)));
                 var descriptionLabel = new RichTextLabel
                 {
                     Margin = new Thickness(25, 0, 10, 0)
@@ -155,9 +157,20 @@ public sealed partial class GuideReagentEmbed : BoxContainer, IDocumentTag, ISea
                 {
                     descMsg.AddMarkupOrThrow(effectString);
                     i++;
-                    if (i < descriptionsCount)
+                    if (i < descriptionsCount || hasMetabolites)
                         descMsg.PushNewline();
                 }
+                if (hasMetabolites)
+                {
+                    var metabolites = new List<string>();
+                    foreach (var (metabolite, ratio) in effect.Metabolites!)
+                    {
+                        metabolites.Add(Loc.GetString("guidebook-reagent-effects-metabolite-item", ("rate", (double)ratio), ("reagent", _prototype.Index(metabolite).LocalizedName)));
+                    }
+                    metabolites.Sort();
+
+                    descMsg.AddMarkupOrThrow(Loc.GetString("guidebook-reagent-effects-metabolites", ("items", ContentLocalizationManager.FormatList(metabolites))));
+                }
                 descriptionLabel.SetMessage(descMsg);
 
                 EffectsDescriptionContainer.AddChild(groupLabel);

Content.Client/Guidebook/Richtext/ProtodataTag.cs

@@ -6,7 +6,7 @@ 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
+/// To be accessed by this tag, the desired field/property must
 /// be tagged with <see cref="Shared.Guidebook.GuidebookDataAttribute"/>.
 /// </summary>
 public sealed class ProtodataTag : IMarkupTagHandler

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

@@ -3,6 +3,7 @@ using System.Numerics;
 using Content.Shared.Atmos;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Prototypes;
+using Content.Shared.Damage.Systems;
 using Content.Shared.FixedPoint;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Prototypes;
@@ -30,6 +31,7 @@ public sealed partial class HealthAnalyzerControl : BoxContainer
     private readonly SpriteSystem _spriteSystem;
     private readonly IPrototypeManager _prototypes;
     private readonly IResourceCache _cache;
+    private readonly DamageableSystem _damageable;
 
     public HealthAnalyzerControl()
     {
@@ -40,6 +42,7 @@ public sealed partial class HealthAnalyzerControl : BoxContainer
         _spriteSystem = _entityManager.System<SpriteSystem>();
         _prototypes = dependencies.Resolve<IPrototypeManager>();
         _cache = dependencies.Resolve<IResourceCache>();
+        _damageable = _entityManager.System<DamageableSystem>();
     }
 
     public void Populate(HealthAnalyzerUiState state)
@@ -79,9 +82,9 @@ public sealed partial class HealthAnalyzerControl : BoxContainer
         NameLabel.SetMessage(name);
 
         SpeciesLabel.Text =
-            _entityManager.TryGetComponent<HumanoidAppearanceComponent>(target.Value,
-                out var humanoidAppearanceComponent)
-                ? Loc.GetString(_prototypes.Index<SpeciesPrototype>(humanoidAppearanceComponent.Species).Name)
+            _entityManager.TryGetComponent<HumanoidProfileComponent>(target.Value,
+                out var humanoidComponent)
+                ? Loc.GetString(_prototypes.Index(humanoidComponent.Species).Name)
                 : Loc.GetString("health-analyzer-window-entity-unknown-species-text");
 
         // Basic Diagnostic
@@ -101,7 +104,7 @@ public sealed partial class HealthAnalyzerControl : BoxContainer
 
         // Total Damage
 
-        DamageLabel.Text = damageable.TotalDamage.ToString();
+        DamageLabel.Text = _damageable.GetTotalDamage(target.Value).ToString();
 
         // Alerts
 
@@ -132,10 +135,11 @@ public sealed partial class HealthAnalyzerControl : BoxContainer
         // Damage Groups
 
         var damageSortedGroups =
-            damageable.DamagePerGroup.OrderByDescending(damage => damage.Value)
+            _damageable.GetDamagePerGroup(target.Value)
+                .OrderByDescending(damage => damage.Value)
                 .ToDictionary(x => x.Key, x => x.Value);
 
-        IReadOnlyDictionary<string, FixedPoint2> damagePerType = damageable.Damage.DamageDict;
+        var damagePerType = _damageable.GetAllDamage(target.Value).DamageDict;
 
         DrawDiagnosticGroups(damageSortedGroups, damagePerType);
     }
@@ -152,8 +156,8 @@ public sealed partial class HealthAnalyzerControl : BoxContainer
     }
 
     private void DrawDiagnosticGroups(
-        Dictionary<string, FixedPoint2> groups,
-        IReadOnlyDictionary<string, FixedPoint2> damageDict)
+        Dictionary<ProtoId<DamageGroupPrototype>, FixedPoint2> groups,
+        IReadOnlyDictionary<ProtoId<DamageTypePrototype>, FixedPoint2> damageDict)
     {
         GroupsContainer.RemoveAllChildren();
 

Content.Client/Humanoid/HideableHumanoidLayersSystem.cs

@@ -0,0 +1,74 @@
+using Content.Shared.Humanoid;
+using Content.Shared.Inventory;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Humanoid;
+
+public sealed class HideableHumanoidLayersSystem : SharedHideableHumanoidLayersSystem
+{
+    [Dependency] private readonly SpriteSystem _sprite = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<HideableHumanoidLayersComponent, ComponentInit>(OnComponentInit);
+        SubscribeLocalEvent<HideableHumanoidLayersComponent, AfterAutoHandleStateEvent>(OnHandleState);
+    }
+
+    private void OnComponentInit(Entity<HideableHumanoidLayersComponent> ent, ref ComponentInit args)
+    {
+        UpdateSprite(ent);
+    }
+
+    private void OnHandleState(Entity<HideableHumanoidLayersComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        UpdateSprite(ent);
+    }
+
+    public override void SetLayerOcclusion(
+        Entity<HideableHumanoidLayersComponent?> ent,
+        HumanoidVisualLayers layer,
+        bool visible,
+        SlotFlags source)
+    {
+        base.SetLayerOcclusion(ent, layer, visible, source);
+
+        if (Resolve(ent, ref ent.Comp))
+            UpdateSprite((ent, ent.Comp));
+    }
+
+    private void UpdateSprite(Entity<HideableHumanoidLayersComponent> ent)
+    {
+        foreach (var item in ent.Comp.LastHiddenLayers)
+        {
+            if (ent.Comp.HiddenLayers.ContainsKey(item))
+                continue;
+
+            var evt = new HumanoidLayerVisibilityChangedEvent(item, true);
+            RaiseLocalEvent(ent, ref evt);
+
+            if (!_sprite.LayerMapTryGet(ent.Owner, item, out var index, true))
+                continue;
+
+            _sprite.LayerSetVisible(ent.Owner, index, true);
+        }
+
+        foreach (var item in ent.Comp.HiddenLayers.Keys)
+        {
+            if (ent.Comp.LastHiddenLayers.Contains(item))
+                continue;
+
+            var evt = new HumanoidLayerVisibilityChangedEvent(item, false);
+            RaiseLocalEvent(ent, ref evt);
+
+            if (!_sprite.LayerMapTryGet(ent.Owner, item, out var index, true))
+                continue;
+
+            _sprite.LayerSetVisible(ent.Owner, index, false);
+        }
+
+        ent.Comp.LastHiddenLayers.Clear();
+        ent.Comp.LastHiddenLayers.UnionWith(ent.Comp.HiddenLayers.Keys);
+    }
+}

Content.Client/Humanoid/HumanoidAppearanceSystem.cs

@@ -1,470 +0,0 @@
-using System.Linq; // Corvax-Wega-Hair-Extended
-using System.Numerics; // Corvax-Wega-Add
-using Content.Client.DisplacementMap;
-using Content.Shared.CCVar;
-using Content.Shared.Humanoid;
-using Content.Shared.Humanoid.Markings;
-using Content.Shared.Humanoid.Prototypes;
-using Content.Shared.Inventory;
-using Content.Shared.Preferences;
-using Robust.Client.GameObjects;
-using Robust.Shared.Configuration;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-
-namespace Content.Client.Humanoid;
-
-public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
-{
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly MarkingManager _markingManager = default!;
-    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
-    [Dependency] private readonly DisplacementMapSystem _displacement = default!;
-    [Dependency] private readonly SpriteSystem _sprite = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<HumanoidAppearanceComponent, AfterAutoHandleStateEvent>(OnHandleState);
-        Subs.CVar(_configurationManager, CCVars.AccessibilityClientCensorNudity, OnCvarChanged, true);
-        Subs.CVar(_configurationManager, CCVars.AccessibilityServerCensorNudity, OnCvarChanged, true);
-    }
-
-    private void OnHandleState(EntityUid uid, HumanoidAppearanceComponent component, ref AfterAutoHandleStateEvent args)
-    {
-        UpdateSprite((uid, component, Comp<SpriteComponent>(uid)));
-    }
-
-    private void OnCvarChanged(bool value)
-    {
-        var humanoidQuery = AllEntityQuery<HumanoidAppearanceComponent, SpriteComponent>();
-        while (humanoidQuery.MoveNext(out var uid, out var humanoidComp, out var spriteComp))
-        {
-            UpdateSprite((uid, humanoidComp, spriteComp));
-        }
-    }
-
-    // Corvax-Wega-Height-start
-    private float ConvertHeightToScale(float height)
-    {
-        const float minH = 140f, maxH = 300f;
-        const float minS = 0.65f, maxS = 1.5f;
-
-        var t = MathF.Pow((height - minH) / (maxH - minH), 0.7f);
-        return Math.Clamp(minS + t * (maxS - minS), minS, maxS);
-    }
-
-    private void ApplyHeightScale(Entity<HumanoidAppearanceComponent, SpriteComponent> entity)
-    {
-        var humanoid = entity.Comp1;
-
-        var scale = ConvertHeightToScale(humanoid.Height);
-        _sprite.SetScale(entity.Owner, new Vector2(scale, scale));
-    }
-    // Corvax-Wega-Height-end
-
-    private void UpdateSprite(Entity<HumanoidAppearanceComponent, SpriteComponent> entity)
-    {
-        UpdateLayers(entity);
-        ApplyMarkingSet(entity);
-        ApplyHeightScale(entity); // Corvax-Wega-Height
-
-        var humanoidAppearance = entity.Comp1;
-        var sprite = entity.Comp2;
-
-        sprite[_sprite.LayerMapReserve((entity.Owner, sprite), HumanoidVisualLayers.Eyes)].Color = humanoidAppearance.EyeColor;
-    }
-
-    private static bool IsHidden(HumanoidAppearanceComponent humanoid, HumanoidVisualLayers layer)
-        => humanoid.HiddenLayers.ContainsKey(layer) || humanoid.PermanentlyHidden.Contains(layer);
-
-    private void UpdateLayers(Entity<HumanoidAppearanceComponent, SpriteComponent> entity)
-    {
-        var component = entity.Comp1;
-        var sprite = entity.Comp2;
-
-        var oldLayers = new HashSet<HumanoidVisualLayers>(component.BaseLayers.Keys);
-        component.BaseLayers.Clear();
-
-        // add default species layers
-        var speciesProto = _prototypeManager.Index(component.Species);
-        var baseSprites = _prototypeManager.Index(speciesProto.SpriteSet);
-        foreach (var (key, id) in baseSprites.Sprites)
-        {
-            oldLayers.Remove(key);
-            if (!component.CustomBaseLayers.ContainsKey(key))
-                SetLayerData(entity, key, id, sexMorph: true);
-        }
-
-        // add custom layers
-        foreach (var (key, info) in component.CustomBaseLayers)
-        {
-            oldLayers.Remove(key);
-            SetLayerData(entity, key, info.Id, sexMorph: false, color: info.Color);
-        }
-
-        // hide old layers
-        // TODO maybe just remove them altogether?
-        foreach (var key in oldLayers)
-        {
-            if (_sprite.LayerMapTryGet((entity.Owner, sprite), key, out var index, false))
-                sprite[index].Visible = false;
-        }
-    }
-
-    private void SetLayerData(
-        Entity<HumanoidAppearanceComponent, SpriteComponent> entity,
-        HumanoidVisualLayers key,
-        string? protoId,
-        bool sexMorph = false,
-        Color? color = null)
-    {
-        var component = entity.Comp1;
-        var sprite = entity.Comp2;
-
-        var layerIndex = _sprite.LayerMapReserve((entity.Owner, sprite), key);
-        var layer = sprite[layerIndex];
-        layer.Visible = !IsHidden(component, key);
-
-        if (color != null)
-            layer.Color = color.Value;
-
-        if (protoId == null)
-            return;
-
-        if (sexMorph)
-            protoId = HumanoidVisualLayersExtension.GetSexMorph(key, component.Sex, protoId);
-
-        var proto = _prototypeManager.Index<HumanoidSpeciesSpriteLayer>(protoId);
-        component.BaseLayers[key] = proto;
-
-        if (proto.MatchSkin)
-            layer.Color = component.SkinColor.WithAlpha(proto.LayerAlpha);
-
-        if (proto.BaseSprite != null)
-            _sprite.LayerSetSprite((entity.Owner, sprite), layerIndex, proto.BaseSprite);
-    }
-
-    /// <summary>
-    ///     Loads a profile directly into a humanoid.
-    /// </summary>
-    /// <param name="uid">The humanoid entity's UID</param>
-    /// <param name="profile">The profile to load.</param>
-    /// <param name="humanoid">The humanoid entity's humanoid component.</param>
-    /// <remarks>
-    ///     This should not be used if the entity is owned by the server. The server will otherwise
-    ///     override this with the appearance data it sends over.
-    /// </remarks>
-    public override void LoadProfile(EntityUid uid, HumanoidCharacterProfile? profile, HumanoidAppearanceComponent? humanoid = null)
-    {
-        if (profile == null)
-            return;
-
-        if (!Resolve(uid, ref humanoid))
-        {
-            return;
-        }
-
-        var customBaseLayers = new Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo>();
-
-        var speciesPrototype = _prototypeManager.Index<SpeciesPrototype>(profile.Species);
-        var markings = new MarkingSet(speciesPrototype.MarkingPoints, _markingManager, _prototypeManager);
-
-        // Add markings that doesn't need coloring. We store them until we add all other markings that doesn't need it.
-        var markingFColored = new Dictionary<Marking, MarkingPrototype>();
-        foreach (var marking in profile.Appearance.Markings)
-        {
-            if (_markingManager.TryGetMarking(marking, out var prototype))
-            {
-                if (!prototype.ForcedColoring)
-                {
-                    markings.AddBack(prototype.MarkingCategory, marking);
-                }
-                else
-                {
-                    markingFColored.Add(marking, prototype);
-                }
-            }
-        }
-
-        // legacy: remove in the future?
-        //markings.RemoveCategory(MarkingCategories.Hair);
-        //markings.RemoveCategory(MarkingCategories.FacialHair);
-
-        // We need to ensure hair before applying it or coloring can try depend on markings that can be invalid
-        var hairColor = _markingManager.MustMatchSkin(profile.Species, HumanoidVisualLayers.Hair, out var hairAlpha, _prototypeManager)
-            ? new List<Color> { profile.Appearance.SkinColor.WithAlpha(hairAlpha) } // Corvax-Wega-Hair-Extended
-                .Concat(profile.Appearance.HairColor.Skip(1)).ToList() // Corvax-Wega-Hair-Extended
-            : profile.Appearance.HairColor; // Corvax-Wega-Hair-Extended
-        var hair = new Marking(profile.Appearance.HairStyleId,
-            hairColor); // Corvax-Wega-Hair-Extended
-
-        var facialHairColor = _markingManager.MustMatchSkin(profile.Species, HumanoidVisualLayers.FacialHair, out var facialHairAlpha, _prototypeManager)
-            ? profile.Appearance.SkinColor.WithAlpha(facialHairAlpha)
-            : profile.Appearance.FacialHairColor;
-        var facialHair = new Marking(profile.Appearance.FacialHairStyleId,
-            new[] { facialHairColor });
-
-        if (_markingManager.CanBeApplied(profile.Species, profile.Sex, hair, _prototypeManager))
-        {
-            markings.AddBack(MarkingCategories.Hair, hair);
-        }
-        if (_markingManager.CanBeApplied(profile.Species, profile.Sex, facialHair, _prototypeManager))
-        {
-            markings.AddBack(MarkingCategories.FacialHair, facialHair);
-        }
-
-        // Finally adding marking with forced colors
-        foreach (var (marking, prototype) in markingFColored)
-        {
-            var markingColors = MarkingColoring.GetMarkingLayerColors(
-                prototype,
-                profile.Appearance.SkinColor,
-                profile.Appearance.EyeColor,
-                markings
-            );
-            markings.AddBack(prototype.MarkingCategory, new Marking(marking.MarkingId, markingColors));
-        }
-
-        markings.EnsureSpecies(profile.Species, profile.Appearance.SkinColor, _markingManager, _prototypeManager);
-        markings.EnsureSexes(profile.Sex, _markingManager);
-        markings.EnsureDefault(
-            profile.Appearance.SkinColor,
-            profile.Appearance.EyeColor,
-            _markingManager);
-
-        DebugTools.Assert(IsClientSide(uid));
-
-        humanoid.MarkingSet = markings;
-        humanoid.PermanentlyHidden = new HashSet<HumanoidVisualLayers>();
-        humanoid.HiddenLayers = new Dictionary<HumanoidVisualLayers, SlotFlags>();
-        humanoid.CustomBaseLayers = customBaseLayers;
-        humanoid.Sex = profile.Sex;
-        humanoid.Gender = profile.Gender;
-        humanoid.Age = profile.Age;
-        humanoid.Species = profile.Species;
-        humanoid.SkinColor = profile.Appearance.SkinColor;
-        humanoid.EyeColor = profile.Appearance.EyeColor;
-        humanoid.Status = profile.Status; // Corvax-Wega
-        humanoid.Height = profile.Height; // Corvax-Wega-Height
-
-        UpdateSprite((uid, humanoid, Comp<SpriteComponent>(uid)));
-    }
-
-    private void ApplyMarkingSet(Entity<HumanoidAppearanceComponent, SpriteComponent> entity)
-    {
-        var humanoid = entity.Comp1;
-        var sprite = entity.Comp2;
-
-        // I am lazy and I CBF resolving the previous mess, so I'm just going to nuke the markings.
-        // Really, markings should probably be a separate component altogether.
-        ClearAllMarkings(entity);
-
-        var censorNudity = _configurationManager.GetCVar(CCVars.AccessibilityClientCensorNudity) ||
-                           _configurationManager.GetCVar(CCVars.AccessibilityServerCensorNudity);
-        // The reason we're splitting this up is in case the character already has undergarment equipped in that slot.
-        var applyUndergarmentTop = censorNudity;
-        var applyUndergarmentBottom = censorNudity;
-
-        foreach (var markingList in humanoid.MarkingSet.Markings.Values)
-        {
-            foreach (var marking in markingList)
-            {
-                if (_markingManager.TryGetMarking(marking, out var markingPrototype))
-                {
-                    ApplyMarking(markingPrototype, marking.MarkingColors, marking.Visible, entity);
-                    if (markingPrototype.BodyPart == HumanoidVisualLayers.UndergarmentTop)
-                        applyUndergarmentTop = false;
-                    else if (markingPrototype.BodyPart == HumanoidVisualLayers.UndergarmentBottom)
-                        applyUndergarmentBottom = false;
-                }
-            }
-        }
-
-        humanoid.ClientOldMarkings = new MarkingSet(humanoid.MarkingSet);
-
-        AddUndergarments(entity, applyUndergarmentTop, applyUndergarmentBottom);
-    }
-
-    private void ClearAllMarkings(Entity<HumanoidAppearanceComponent, SpriteComponent> entity)
-    {
-        var humanoid = entity.Comp1;
-        var sprite = entity.Comp2;
-
-        foreach (var markingList in humanoid.ClientOldMarkings.Markings.Values)
-        {
-            foreach (var marking in markingList)
-            {
-                RemoveMarking(marking, (entity, sprite));
-            }
-        }
-
-        humanoid.ClientOldMarkings.Clear();
-
-        foreach (var markingList in humanoid.MarkingSet.Markings.Values)
-        {
-            foreach (var marking in markingList)
-            {
-                RemoveMarking(marking, (entity, sprite));
-            }
-        }
-    }
-
-    private void RemoveMarking(Marking marking, Entity<SpriteComponent> spriteEnt)
-    {
-        if (!_markingManager.TryGetMarking(marking, out var prototype))
-            return;
-
-        foreach (var sprite in prototype.Sprites)
-        {
-            if (sprite is not SpriteSpecifier.Rsi rsi)
-                continue;
-
-            var layerId = $"{marking.MarkingId}-{rsi.RsiState}";
-            if (!_sprite.LayerMapTryGet(spriteEnt.AsNullable(), layerId, out var index, false))
-                continue;
-
-            _sprite.LayerMapRemove(spriteEnt.AsNullable(), layerId);
-            _sprite.RemoveLayer(spriteEnt.AsNullable(), index);
-
-            // If this marking is one that can be displaced, we need to remove the displacement as well; otherwise
-            // altering a marking at runtime can lead to the renderer falling over.
-            // The Vulps must be shaved.
-            // (https://github.com/space-wizards/space-station-14/issues/40135).
-            if (prototype.CanBeDisplaced)
-                _displacement.EnsureDisplacementIsNotOnSprite(spriteEnt, layerId);
-        }
-    }
-
-    private void AddUndergarments(Entity<HumanoidAppearanceComponent, SpriteComponent> entity, bool undergarmentTop, bool undergarmentBottom)
-    {
-        var humanoid = entity.Comp1;
-
-        if (undergarmentTop && humanoid.UndergarmentTop != null)
-        {
-            var marking = new Marking(humanoid.UndergarmentTop, new List<Color> { new Color() });
-            if (_markingManager.TryGetMarking(marking, out var prototype))
-            {
-                // Markings are added to ClientOldMarkings because otherwise it causes issues when toggling the feature on/off.
-                humanoid.ClientOldMarkings.Markings.Add(MarkingCategories.UndergarmentTop, new List<Marking> { marking });
-                ApplyMarking(prototype, null, true, entity);
-            }
-        }
-
-        if (undergarmentBottom && humanoid.UndergarmentBottom != null)
-        {
-            var marking = new Marking(humanoid.UndergarmentBottom, new List<Color> { new Color() });
-            if (_markingManager.TryGetMarking(marking, out var prototype))
-            {
-                humanoid.ClientOldMarkings.Markings.Add(MarkingCategories.UndergarmentBottom, new List<Marking> { marking });
-                ApplyMarking(prototype, null, true, entity);
-            }
-        }
-    }
-
-    private void ApplyMarking(MarkingPrototype markingPrototype,
-        IReadOnlyList<Color>? colors,
-        bool visible,
-        Entity<HumanoidAppearanceComponent, SpriteComponent> entity)
-    {
-        var humanoid = entity.Comp1;
-        var sprite = entity.Comp2;
-
-        if (!_sprite.LayerMapTryGet((entity.Owner, sprite), markingPrototype.BodyPart, out var targetLayer, false))
-            return;
-
-        visible &= !IsHidden(humanoid, markingPrototype.BodyPart);
-        visible &= humanoid.BaseLayers.TryGetValue(markingPrototype.BodyPart, out var setting)
-           && setting.AllowsMarkings;
-
-        for (var j = 0; j < markingPrototype.Sprites.Count; j++)
-        {
-            var markingSprite = markingPrototype.Sprites[j];
-
-            if (markingSprite is not SpriteSpecifier.Rsi rsi)
-                return;
-
-            var layerId = $"{markingPrototype.ID}-{rsi.RsiState}";
-
-            if (!_sprite.LayerMapTryGet((entity.Owner, sprite), layerId, out _, false))
-            {
-                var layer = _sprite.AddLayer((entity.Owner, sprite), markingSprite, targetLayer + j + 1);
-                _sprite.LayerMapSet((entity.Owner, sprite), layerId, layer);
-                _sprite.LayerSetSprite((entity.Owner, sprite), layerId, rsi);
-            }
-
-            _sprite.LayerSetVisible((entity.Owner, sprite), layerId, visible);
-
-            if (!visible || setting == null) // this is kinda implied
-                continue;
-
-            // Okay so if the marking prototype is modified but we load old marking data this may no longer be valid
-            // and we need to check the index is correct.
-            // So if that happens just default to white?
-            if (colors != null && j < colors.Count)
-                _sprite.LayerSetColor((entity.Owner, sprite), layerId, colors[j]);
-            else
-                _sprite.LayerSetColor((entity.Owner, sprite), layerId, Color.White);
-
-            if (humanoid.MarkingsDisplacement.TryGetValue(markingPrototype.BodyPart, out var displacementData) && markingPrototype.CanBeDisplaced)
-                _displacement.TryAddDisplacement(displacementData, (entity.Owner, sprite), targetLayer + j + 1, layerId, out _);
-        }
-    }
-
-    public override void SetSkinColor(EntityUid uid, Color skinColor, bool sync = true, bool verify = true, HumanoidAppearanceComponent? humanoid = null)
-    {
-        if (!Resolve(uid, ref humanoid) || humanoid.SkinColor == skinColor)
-            return;
-
-        base.SetSkinColor(uid, skinColor, false, verify, humanoid);
-
-        if (!TryComp(uid, out SpriteComponent? sprite))
-            return;
-
-        foreach (var (layer, spriteInfo) in humanoid.BaseLayers)
-        {
-            if (!spriteInfo.MatchSkin)
-                continue;
-
-            var index = _sprite.LayerMapReserve((uid, sprite), layer);
-            sprite[index].Color = skinColor.WithAlpha(spriteInfo.LayerAlpha);
-        }
-    }
-
-    public override void SetLayerVisibility(
-        Entity<HumanoidAppearanceComponent> ent,
-        HumanoidVisualLayers layer,
-        bool visible,
-        SlotFlags? slot,
-        ref bool dirty)
-    {
-        base.SetLayerVisibility(ent, layer, visible, slot, ref dirty);
-
-        var sprite = Comp<SpriteComponent>(ent);
-        if (!_sprite.LayerMapTryGet((ent.Owner, sprite), layer, out var index, false))
-        {
-            if (!visible)
-                return;
-            index = _sprite.LayerMapReserve((ent.Owner, sprite), layer);
-        }
-
-        var spriteLayer = sprite[index];
-        if (spriteLayer.Visible == visible)
-            return;
-
-        spriteLayer.Visible = visible;
-
-        // I fucking hate this. I'll get around to refactoring sprite layers eventually I swear
-        // Just a week away...
-
-        foreach (var markingList in ent.Comp.MarkingSet.Markings.Values)
-        {
-            foreach (var marking in markingList)
-            {
-                if (_markingManager.TryGetMarking(marking, out var markingPrototype) && markingPrototype.BodyPart == layer)
-                    ApplyMarking(markingPrototype, marking.MarkingColors, marking.Visible, (ent, ent.Comp, sprite));
-            }
-        }
-    }
-}

Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs

@@ -1,5 +1,4 @@
 using Content.Shared.Humanoid;
-using Content.Shared.Humanoid.Markings;
 using Robust.Client.UserInterface;
 
 namespace Content.Client.Humanoid;
@@ -13,6 +12,8 @@ public sealed class HumanoidMarkingModifierBoundUserInterface : BoundUserInterfa
     [ViewVariables]
     private HumanoidMarkingModifierWindow? _window;
 
+    private readonly MarkingsViewModel _markingsModel = new();
+
     public HumanoidMarkingModifierBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
     }
@@ -22,11 +23,11 @@ public sealed class HumanoidMarkingModifierBoundUserInterface : BoundUserInterfa
         base.Open();
 
         _window = this.CreateWindowCenteredLeft<HumanoidMarkingModifierWindow>();
-        _window.OnMarkingAdded += SendMarkingSet;
-        _window.OnMarkingRemoved += SendMarkingSet;
-        _window.OnMarkingColorChange += SendMarkingSetNoResend;
-        _window.OnMarkingRankChange += SendMarkingSet;
-        _window.OnLayerInfoModified += SendBaseLayer;
+        _window.MarkingPickerWidget.SetModel(_markingsModel);
+        _window.RespectLimits.OnPressed += args => _markingsModel.EnforceLimits = args.Button.Pressed;
+        _window.RespectGroupSex.OnPressed += args => _markingsModel.EnforceGroupAndSexRestrictions = args.Button.Pressed;
+
+        _markingsModel.MarkingsChanged += (_, _) => SendMarkingSet();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -34,26 +35,16 @@ public sealed class HumanoidMarkingModifierBoundUserInterface : BoundUserInterfa
         base.UpdateState(state);
 
         if (_window == null || state is not HumanoidMarkingModifierState cast)
-        {
             return;
-        }
 
-        _window.SetState(cast.MarkingSet, cast.Species, cast.Sex, cast.SkinColor, cast.CustomBaseLayers);
+        _markingsModel.OrganData = cast.OrganData;
+        _markingsModel.OrganProfileData = cast.OrganProfileData;
+        _markingsModel.Markings = cast.Markings;
     }
 
-    private void SendMarkingSet(MarkingSet set)
+    private void SendMarkingSet()
     {
-        SendMessage(new HumanoidMarkingModifierMarkingSetMessage(set, true));
-    }
-
-    private void SendMarkingSetNoResend(MarkingSet set)
-    {
-        SendMessage(new HumanoidMarkingModifierMarkingSetMessage(set, false));
-    }
-
-    private void SendBaseLayer(HumanoidVisualLayers layer, CustomBaseLayerInfo? info)
-    {
-        SendMessage(new HumanoidMarkingModifierBaseLayersSetMessage(layer, info, true));
+        SendMessage(new HumanoidMarkingModifierMarkingSetMessage(_markingsModel.Markings));
     }
 }
 

Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml

@@ -1,18 +1,10 @@
 <DefaultWindow xmlns="https://spacestation14.io"
                xmlns:humanoid="clr-namespace:Content.Client.Humanoid">
-    <ScrollContainer MinHeight="500" MinWidth="700">
-        <BoxContainer Orientation="Vertical" HorizontalExpand="True">
-            <humanoid:MarkingPicker Name="MarkingPickerWidget" />
-            <BoxContainer>
-                <CheckBox Name="MarkingForced" Text="{Loc humanoid-marking-modifier-force}" Pressed="True" />
-                <CheckBox Name="MarkingIgnoreSpecies" Text="{Loc humanoid-marking-modifier-ignore-species}" Pressed="True" />
-            </BoxContainer>
-            <Collapsible HorizontalExpand="True">
-                <CollapsibleHeading Title="{Loc humanoid-marking-modifier-base-layers}" />
-                <CollapsibleBody HorizontalExpand="True">
-                    <BoxContainer Name="BaseLayersContainer" Orientation="Vertical" HorizontalExpand="True" />
-                </CollapsibleBody>
-            </Collapsible>
+    <BoxContainer Orientation="Vertical" HorizontalExpand="True" MinHeight="500" MinWidth="700">
+        <BoxContainer>
+            <CheckBox Name="RespectLimits" Text="{Loc humanoid-marking-modifier-respect-limits}" Pressed="True" Access="Public" />
+            <CheckBox Name="RespectGroupSex" Text="{Loc humanoid-marking-modifier-respect-group-sex}" Pressed="True" Access="Public" />
         </BoxContainer>
-    </ScrollContainer>
+        <humanoid:MarkingPicker Name="MarkingPickerWidget" Access="Public" HorizontalExpand="True" VerticalExpand="True" />
+    </BoxContainer>
 </DefaultWindow>

Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs

@@ -14,147 +14,8 @@ namespace Content.Client.Humanoid;
 [GenerateTypedNameReferences]
 public sealed partial class HumanoidMarkingModifierWindow : DefaultWindow
 {
-    public Action<MarkingSet>? OnMarkingAdded;
-    public Action<MarkingSet>? OnMarkingRemoved;
-    public Action<MarkingSet>? OnMarkingColorChange;
-    public Action<MarkingSet>? OnMarkingRankChange;
-    public Action<HumanoidVisualLayers, CustomBaseLayerInfo?>? OnLayerInfoModified;
-    private readonly IPrototypeManager _protoMan = default!;
-
-    private readonly Dictionary<HumanoidVisualLayers, HumanoidBaseLayerModifier> _modifiers = new();
-
     public HumanoidMarkingModifierWindow()
     {
         RobustXamlLoader.Load(this);
-        _protoMan = IoCManager.Resolve<IPrototypeManager>();
-
-        foreach (var layer in Enum.GetValues<HumanoidVisualLayers>())
-        {
-            var modifier = new HumanoidBaseLayerModifier(layer);
-            BaseLayersContainer.AddChild(modifier);
-            _modifiers.Add(layer, modifier);
-
-            modifier.OnStateChanged += () => OnStateChanged(layer, modifier);
-        }
-
-        MarkingPickerWidget.OnMarkingAdded += set => OnMarkingAdded!(set);
-        MarkingPickerWidget.OnMarkingRemoved += set => OnMarkingRemoved!(set);
-        MarkingPickerWidget.OnMarkingColorChange += set => OnMarkingColorChange!(set);
-        MarkingPickerWidget.OnMarkingRankChange += set => OnMarkingRankChange!(set);
-        MarkingForced.OnToggled += args => MarkingPickerWidget.Forced = args.Pressed;
-        MarkingIgnoreSpecies.OnToggled += args => MarkingPickerWidget.Forced = args.Pressed;
-
-        MarkingPickerWidget.Forced = MarkingForced.Pressed;
-        MarkingPickerWidget.IgnoreSpecies = MarkingForced.Pressed;
-    }
-
-    private void OnStateChanged(HumanoidVisualLayers layer, HumanoidBaseLayerModifier modifier)
-    {
-        if (!modifier.Enabled)
-        {
-            OnLayerInfoModified?.Invoke(layer, null);
-            return;
-        }
-
-        string? state = _protoMan.HasIndex<HumanoidSpeciesSpriteLayer>(modifier.Text) ? modifier.Text : null;
-        OnLayerInfoModified?.Invoke(layer, new CustomBaseLayerInfo(state, modifier.Color));
-    }
-    public void SetState(
-        MarkingSet markings,
-        string species,
-        Sex sex,
-        Color skinColor,
-        Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo> info
-    )
-    {
-        foreach (var (layer, modifier) in _modifiers)
-        {
-            if (!info.TryGetValue(layer, out var layerInfo))
-            {
-                modifier.SetState(false, string.Empty, Color.White);
-                continue;
-            }
-
-            modifier.SetState(true, layerInfo.Id ?? string.Empty, layerInfo.Color ?? Color.White);
-        }
-
-        var eyesColor = Color.White;
-        if (info.TryGetValue(HumanoidVisualLayers.Eyes, out var eyes) && eyes.Color != null)
-        {
-            eyesColor = eyes.Color.Value;
-        }
-
-        MarkingPickerWidget.SetData(markings, species, sex, skinColor, eyesColor);
-    }
-
-    private sealed class HumanoidBaseLayerModifier : BoxContainer
-    {
-        private CheckBox _enable;
-        private LineEdit _lineEdit;
-        private ColorSelectorSliders _colorSliders;
-        private BoxContainer _infoBox;
-
-        public bool Enabled => _enable.Pressed;
-        public string Text => _lineEdit.Text;
-        public Color Color => _colorSliders.Color;
-
-        public Action? OnStateChanged;
-
-        public HumanoidBaseLayerModifier(HumanoidVisualLayers layer)
-        {
-            HorizontalExpand = true;
-            Orientation = LayoutOrientation.Vertical;
-            var labelBox = new BoxContainer
-            {
-                MinWidth = 250,
-                HorizontalExpand = true
-            };
-            AddChild(labelBox);
-
-            labelBox.AddChild(new Label
-            {
-                HorizontalExpand = true,
-                Text = layer.ToString()
-            });
-            _enable = new CheckBox
-            {
-                Text = Loc.GetString("humanoid-marking-modifier-enable"),
-                HorizontalAlignment = HAlignment.Right
-            };
-
-            labelBox.AddChild(_enable);
-            _infoBox = new BoxContainer
-            {
-                Orientation = LayoutOrientation.Vertical,
-                Visible = false
-            };
-            _enable.OnToggled += args =>
-            {
-                _infoBox.Visible = args.Pressed;
-                OnStateChanged!();
-            };
-
-            var lineEditBox = new BoxContainer { SeparationOverride = 4 };
-            lineEditBox.AddChild(new Label { Text = Loc.GetString("humanoid-marking-modifier-prototype-id") });
-
-            // TODO: This line edit should really be an options / dropdown selector, not text.
-            _lineEdit = new() { MinWidth = 200 };
-            _lineEdit.OnTextEntered += args => OnStateChanged!();
-            lineEditBox.AddChild(_lineEdit);
-            _infoBox.AddChild(lineEditBox);
-
-            _colorSliders = new();
-            _colorSliders.OnColorChanged += color => OnStateChanged!();
-            _infoBox.AddChild(_colorSliders);
-            AddChild(_infoBox);
-        }
-
-        public void SetState(bool enabled, string state, Color color)
-        {
-            _enable.Pressed = enabled;
-            _infoBox.Visible = enabled;
-            _lineEdit.Text = state;
-            _colorSliders.Color = color;
-        }
     }
 }

Content.Client/Humanoid/LayerMarkingItem.xaml

@@ -0,0 +1,23 @@
+<BoxContainer xmlns="https://spacestation14.io"
+        xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+        Orientation="Vertical"
+        HorizontalExpand="True"
+        MouseFilter="Pass">
+
+    <BoxContainer Orientation="Horizontal" SeparationOverride="4">
+        <PanelContainer SetSize="64 64" HorizontalAlignment="Right" MouseFilter="Ignore">
+            <PanelContainer.PanelOverride>
+                <graphics:StyleBoxFlat BackgroundColor="#1B1B1E" />
+            </PanelContainer.PanelOverride>
+            <LayeredTextureRect TextureScale="2 2" Name="MarkingTexture" />
+        </PanelContainer>
+
+        <Button Name="SelectButton" ToggleMode="True" HorizontalExpand="True" />
+
+        <Button Name="ColorsButton" ToggleMode="True" Visible="False">
+            <TextureRect TexturePath="/Textures/Interface/palette.svg.png" HorizontalAlignment="Center" VerticalAlignment="Center" Stretch="Scale" SetSize="24 24" />
+        </Button>
+    </BoxContainer>
+
+    <BoxContainer Name="ColorsContainer" Visible="False" Orientation="Vertical" />
+</BoxContainer>

Content.Client/Humanoid/LayerMarkingItem.xaml.cs

@@ -0,0 +1,222 @@
+using System.Linq;
+using Content.Client.Guidebook.Controls;
+using Content.Shared.Body;
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Markings;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Client.UserInterface;
+using Robust.Shared.Input;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+using Content.Corvax.Interfaces.Shared; // Corvax-Sponsors
+
+namespace Content.Client.Humanoid;
+
+[GenerateTypedNameReferences]
+public sealed partial class LayerMarkingItem : BoxContainer, ISearchableControl
+{
+    [Dependency] private readonly IEntityManager _entity = default!;
+    private ISharedSponsorsManager? _sponsorsManager; // Corvax-Sponsors
+
+    private readonly SpriteSystem _sprite;
+
+    private readonly MarkingsViewModel _markingsModel;
+    private readonly MarkingPrototype _markingPrototype;
+    private readonly ProtoId<OrganCategoryPrototype> _organ;
+    private readonly HumanoidVisualLayers _layer;
+    private bool _interactive;
+
+    private List<ColorSelectorSliders>? _colorSliders;
+
+    public event Action<GUIBoundKeyEventArgs, LayerMarkingItem>? Pressed;
+    public event Action<GUIBoundKeyEventArgs, LayerMarkingItem>? Unpressed;
+    public ProtoId<MarkingPrototype> MarkingId => _markingPrototype.ID;
+
+    public LayerMarkingItem(MarkingsViewModel model, ProtoId<OrganCategoryPrototype> organ, HumanoidVisualLayers layer, MarkingPrototype prototype, bool interactive)
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+        IoCManager.Instance!.TryResolveType(out _sponsorsManager); // Corvax-Sponsors
+
+        _sprite = _entity.System<SpriteSystem>();
+
+        _markingsModel = model;
+        _markingPrototype = prototype;
+        _organ = organ;
+        _layer = layer;
+        _interactive = interactive;
+
+        UpdateData();
+        UpdateSelection();
+
+        SelectButton.OnPressed += SelectButtonPressed;
+        ColorsButton.OnPressed += ColorsButtonPressed;
+
+        OnKeyBindDown += OnPressed;
+        OnKeyBindUp += OnUnpressed;
+
+        if (!interactive)
+        {
+            SelectButton.MouseFilter = Control.MouseFilterMode.Ignore;
+        }
+    }
+
+    protected override void EnteredTree()
+    {
+        base.EnteredTree();
+
+        _markingsModel.MarkingsReset += UpdateSelection;
+        _markingsModel.MarkingsChanged += MarkingsChanged;
+    }
+
+    protected override void ExitedTree()
+    {
+        base.ExitedTree();
+
+        _markingsModel.MarkingsReset -= UpdateSelection;
+        _markingsModel.MarkingsChanged -= MarkingsChanged;
+    }
+
+    private void MarkingsChanged(ProtoId<OrganCategoryPrototype> organ, HumanoidVisualLayers layer)
+    {
+        if (_organ != organ ||  _layer != layer)
+            return;
+
+        UpdateSelection();
+    }
+
+    private void UpdateData()
+    {
+        MarkingTexture.Textures = _markingPrototype.Sprites.Select(layer => _sprite.Frame0(layer)).ToList();
+        SelectButton.Text = Loc.GetString($"marking-{_markingPrototype.ID}");
+
+        // Corvax-Sponsors-Start
+        if (_markingPrototype.SponsorOnly && _sponsorsManager != null && _interactive)
+        {
+            SelectButton.Disabled = !_sponsorsManager.GetClientPrototypes().Contains(_markingPrototype.ID);
+        }
+        // Corvax-Sponsors-End
+    }
+
+    private void UpdateSelection()
+    {
+        var selected = _markingsModel.IsMarkingSelected(_organ, _layer, _markingPrototype.ID);
+        SelectButton.Pressed = selected && _interactive;
+        ColorsButton.Visible = selected && _interactive && _markingsModel.IsMarkingColorCustomizable(_organ, _layer, _markingPrototype.ID);
+
+        if (!selected || !_interactive)
+        {
+            ColorsButton.Pressed = false;
+            ColorsContainer.Visible = false;
+        }
+
+        if (_markingsModel.GetMarking(_organ, _layer, _markingPrototype.ID) is { } marking &&
+            _colorSliders is { } sliders)
+        {
+            for (var i = 0; i < _markingPrototype.Sprites.Count; i++)
+            {
+                sliders[i].Color = marking.MarkingColors[i];
+            }
+        }
+    }
+
+    private void SelectButtonPressed(BaseButton.ButtonEventArgs args)
+    {
+        if (!_interactive)
+        {
+            SelectButton.Pressed = false;
+            return;
+        }
+
+        if (_markingsModel.IsMarkingSelected(_organ, _layer, _markingPrototype.ID))
+        {
+            if (!_markingsModel.TryDeselectMarking(_organ, _layer, _markingPrototype.ID))
+            {
+                SelectButton.Pressed = true;
+            }
+        }
+        else
+        {
+            if (!_markingsModel.TrySelectMarking(_organ, _layer, _markingPrototype.ID))
+            {
+                SelectButton.Pressed = false;
+            }
+        }
+    }
+
+    private void ColorsButtonPressed(BaseButton.ButtonEventArgs args)
+    {
+        ColorsContainer.Visible = ColorsButton.Pressed;
+
+        if (_colorSliders is not null)
+            return;
+
+        if (_markingsModel.GetMarking(_organ, _layer, _markingPrototype.ID) is not { } marking)
+            return;
+
+        _colorSliders = new();
+
+        for (var i = 0; i < _markingPrototype.Sprites.Count; i++)
+        {
+            var container = new BoxContainer()
+            {
+                Orientation = LayoutOrientation.Vertical,
+                HorizontalExpand = true,
+            };
+
+            ColorsContainer.AddChild(container);
+
+            var selector = new ColorSelectorSliders();
+            selector.SelectorType = ColorSelectorSliders.ColorSelectorType.Hsv;
+
+            var label = _markingPrototype.Sprites[i] switch
+            {
+                SpriteSpecifier.Rsi rsi => Loc.GetString($"marking-{_markingPrototype.ID}-{rsi.RsiState}"),
+                SpriteSpecifier.Texture texture => Loc.GetString($"marking-{_markingPrototype.ID}-{texture.TexturePath.Filename}"),
+                _ => throw new InvalidOperationException("SpriteSpecifier not of known type"),
+            };
+
+            container.AddChild(new Label { Text = label });
+            container.AddChild(selector);
+
+            selector.Color = marking.MarkingColors[i];
+
+            _colorSliders.Add(selector);
+
+            var colorIndex = i;
+            selector.OnColorChanged += _ =>
+            {
+                _markingsModel.TrySetMarkingColor(_organ, _layer, _markingPrototype.ID, colorIndex, selector.Color);
+            };
+        }
+    }
+
+    public bool CheckMatchesSearch(string query)
+    {
+        return Loc.GetString($"marking-{_markingPrototype.ID}").Contains(query, StringComparison.OrdinalIgnoreCase);
+    }
+
+    public void SetHiddenState(bool state, string query)
+    {
+        Visible = CheckMatchesSearch(query) ? state : !state;
+    }
+
+    private void OnPressed(GUIBoundKeyEventArgs args)
+    {
+        if (args.Function != EngineKeyFunctions.UIClick)
+            return;
+
+        Pressed?.Invoke(args, this);
+    }
+
+    private void OnUnpressed(GUIBoundKeyEventArgs args)
+    {
+        if (args.Function != EngineKeyFunctions.UIClick)
+            return;
+
+        Unpressed?.Invoke(args, this);
+    }
+}

Content.Client/Humanoid/LayerMarkingOrderer.xaml

@@ -0,0 +1,3 @@
+<BoxContainer xmlns="https://spacestation14.io" Orientation="Vertical">
+    <BoxContainer Name="Items" Margin="4" Orientation="Vertical" />
+</BoxContainer>

Content.Client/Humanoid/LayerMarkingOrderer.xaml.cs

@@ -0,0 +1,192 @@
+using System.Linq;
+using System.Numerics;
+using Content.Client.Interaction;
+using Content.Client.Stylesheets;
+using Content.Shared.Body;
+using Content.Shared.Humanoid.Markings;
+using Content.Shared.Humanoid;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Client.UserInterface;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Humanoid;
+
+[GenerateTypedNameReferences]
+public sealed partial class LayerMarkingOrderer : BoxContainer
+{
+    private readonly ProtoId<OrganCategoryPrototype> _organ;
+    private readonly HumanoidVisualLayers _layer;
+    private readonly MarkingsViewModel _markingsModel;
+    private readonly DragDropHelper<LayerMarkingDragged> _dragDropHelper;
+    private readonly List<LayerDragDropBeacon> _beacons = new();
+    private LayerDragDropBeacon? _dragTarget;
+
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    public LayerMarkingOrderer(MarkingsViewModel markingsModel, ProtoId<OrganCategoryPrototype> organ, HumanoidVisualLayers layer)
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _markingsModel = markingsModel;
+        _organ = organ;
+        _layer = layer;
+        _dragDropHelper = new(OnBeginDrag, OnContinueDrag, OnEndDrag);
+
+        UpdateItems();
+    }
+
+    protected override void EnteredTree()
+    {
+        base.EnteredTree();
+
+        _markingsModel.MarkingsReset += UpdateItems;
+        _markingsModel.MarkingsChanged += MarkingsChanged;
+    }
+
+    protected override void ExitedTree()
+    {
+        base.ExitedTree();
+
+        _markingsModel.MarkingsReset -= UpdateItems;
+        _markingsModel.MarkingsChanged -= MarkingsChanged;
+    }
+
+    private void MarkingsChanged(ProtoId<OrganCategoryPrototype> organ, HumanoidVisualLayers layer)
+    {
+        if (_organ != organ ||  _layer != layer)
+            return;
+
+        UpdateItems();
+    }
+
+    private void UpdateItems()
+    {
+        Items.RemoveAllChildren();
+        _beacons.Clear();
+
+        if (_markingsModel.SelectedMarkings(_organ, _layer) is not { } markings)
+            return;
+
+        for (var idx = 0; idx < markings.Count; idx++)
+        {
+            var marking = markings[idx];
+
+            var container = new LayerMarkingItemContainer();
+            container.Margin = new(4);
+
+            var item = new LayerMarkingItem(_markingsModel, _organ, _layer, _prototype.Index<MarkingPrototype>(marking.MarkingId), false);
+            item.DefaultCursorShape = CursorShape.Hand;
+            item.Pressed += (args, control) => OnItemPressed(args, control, container);
+            item.Unpressed += OnItemUnpressed;
+
+            container.AddChild(item);
+
+            var before = new LayerDragDropBeacon(CandidatePosition.Before, idx);
+            var after = new LayerDragDropBeacon(CandidatePosition.After, idx);
+            _beacons.Add(before);
+            _beacons.Add(after);
+
+            Items.AddChild(before);
+            Items.AddChild(container);
+            Items.AddChild(after);
+        }
+    }
+
+    private void OnItemPressed(GUIBoundKeyEventArgs args, LayerMarkingItem control, LayerMarkingItemContainer container)
+    {
+        _dragDropHelper.MouseDown(new(control, container));
+    }
+
+    private void OnItemUnpressed(GUIBoundKeyEventArgs args, LayerMarkingItem control)
+    {
+        _dragDropHelper.EndDrag();
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        _dragDropHelper.Update(args.DeltaSeconds);
+    }
+
+    private bool OnBeginDrag()
+    {
+        var (item, container) = _dragDropHelper.Dragged;
+
+        container.Visible = false;
+        item.Orphan();
+        item.DefaultCursorShape = CursorShape.Move;
+        UserInterfaceManager.PopupRoot.AddChild(item);
+        LayoutContainer.SetPosition(item, UserInterfaceManager.MousePositionScaled.Position - new Vector2(32, 32));
+        return true;
+    }
+
+    private bool OnContinueDrag(float frameTime)
+    {
+        var (item, container) = _dragDropHelper.Dragged;
+
+        LayoutContainer.SetPosition(item, UserInterfaceManager.MousePositionScaled.Position - new Vector2(32, 32));
+
+        var closestBeacon =
+            _beacons.MinBy(beacon =>
+                (UserInterfaceManager.MousePositionScaled.Position - beacon.GlobalPosition).LengthSquared());
+
+        if (closestBeacon != _dragTarget)
+        {
+            _dragTarget?.UnbecomeTarget();
+            _dragTarget = closestBeacon;
+            _dragTarget?.BecomeTarget();
+        }
+
+        return true;
+    }
+
+    private void OnEndDrag()
+    {
+        var (item, container) = _dragDropHelper.Dragged;
+
+        container.Visible = true;
+        item.Orphan();
+        container.AddChild(item);
+        _dragTarget?.UnbecomeTarget();
+
+        if (_dragTarget != null)
+        {
+            _markingsModel.ChangeMarkingOrder(_organ, _layer, item.MarkingId, _dragTarget.CandidatePosition, _dragTarget.Index);
+        }
+    }
+}
+
+internal readonly record struct LayerMarkingDragged(LayerMarkingItem Item, LayerMarkingItemContainer Container);
+
+internal sealed class LayerMarkingItemContainer : PanelContainer
+{
+    public LayerMarkingItemContainer()
+    {
+        SetHeight = 64;
+        HorizontalExpand = true;
+    }
+}
+
+internal sealed class LayerDragDropBeacon(CandidatePosition position, int index) : PanelContainer
+{
+    public readonly CandidatePosition CandidatePosition = position;
+    public readonly int Index = index;
+
+    public void BecomeTarget()
+    {
+        SetHeight = 64;
+        HorizontalExpand = true;
+        SetOnlyStyleClass(StyleClass.PanelDropTarget);
+    }
+
+    public void UnbecomeTarget()
+    {
+        SetHeight = float.NaN;
+        RemoveStyleClass(StyleClass.PanelDropTarget);
+    }
+}

Content.Client/Humanoid/LayerMarkingPicker.xaml

@@ -0,0 +1,12 @@
+<BoxContainer xmlns="https://spacestation14.io" Orientation="Vertical">
+    <LineEdit Name="SearchBar" PlaceHolder="{Loc 'markings-search'}" HorizontalExpand="True" />
+    <ScrollContainer Name="SelectionItems" HorizontalExpand="True" VerticalExpand="True">
+        <GridContainer Name="Items" Columns="2" Margin="4" />
+    </ScrollContainer>
+    <ScrollContainer Name="OrderingItems" HorizontalExpand="True" VerticalExpand="True" Visible="False">
+    </ScrollContainer>
+    <BoxContainer HorizontalExpand="True" Margin="4">
+        <Label Name="MarkingsStatus" HorizontalExpand="True" />
+        <Button Name="ReorderButton" ToggleMode="True" Text="{Loc 'markings-reorder'}" />
+    </BoxContainer>
+</BoxContainer>

Content.Client/Humanoid/LayerMarkingPicker.xaml.cs

@@ -0,0 +1,113 @@
+using System.Linq;
+using Content.Client.UserInterface.ControlExtensions;
+using Content.Client.Guidebook.Controls;
+using Content.Shared.Body;
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Markings;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Humanoid;
+
+[GenerateTypedNameReferences]
+public sealed partial class LayerMarkingPicker : BoxContainer
+{
+    private readonly IReadOnlyDictionary<string, MarkingPrototype> _allMarkings;
+    private readonly ProtoId<OrganCategoryPrototype> _organ;
+    private readonly HumanoidVisualLayers _layer;
+    private readonly MarkingsViewModel _markingsModel;
+    private List<ISearchableControl> _searchable = new();
+    private const int _columnWidth = 500;
+
+    public LayerMarkingPicker(MarkingsViewModel markingsModel, ProtoId<OrganCategoryPrototype> organ, HumanoidVisualLayers layer, IReadOnlyDictionary<string, MarkingPrototype> allMarkings)
+    {
+        RobustXamlLoader.Load(this);
+
+        _markingsModel = markingsModel;
+        _allMarkings = allMarkings;
+        _organ = organ;
+        _layer = layer;
+
+        OrderingItems.AddChild(new LayerMarkingOrderer(markingsModel, organ, layer));
+
+        UpdateMarkings();
+
+        SearchBar.OnTextChanged += _ =>
+        {
+            foreach (var element in _searchable)
+            {
+                element.SetHiddenState(true, SearchBar.Text.Trim());
+            }
+        };
+
+        UpdateCount();
+
+        ReorderButton.OnPressed += ReorderButtonPressed;
+    }
+
+    protected override void EnteredTree()
+    {
+        base.EnteredTree();
+
+        _markingsModel.MarkingsReset += UpdateCount;
+        _markingsModel.MarkingsChanged += MarkingsChanged;
+    }
+
+    protected override void ExitedTree()
+    {
+        base.ExitedTree();
+
+        _markingsModel.MarkingsReset -= UpdateCount;
+        _markingsModel.MarkingsChanged -= MarkingsChanged;
+    }
+
+    private void MarkingsChanged(ProtoId<OrganCategoryPrototype> organ, HumanoidVisualLayers layer)
+    {
+        if (_organ != organ ||  _layer != layer)
+            return;
+
+        UpdateCount();
+    }
+
+    private void UpdateMarkings()
+    {
+        foreach (var marking in _allMarkings.Values.OrderBy(marking => Loc.GetString($"marking-{marking.ID}")))
+        {
+            var item = new LayerMarkingItem(_markingsModel, _organ, _layer, marking, true);
+            Items.AddChild(item);
+        }
+        _searchable = Items.GetSearchableControls();
+    }
+
+    private void UpdateCount()
+    {
+        _markingsModel.GetMarkingCounts(_organ, _layer, out var isRequired, out var count, out var selected);
+        MarkingsStatus.Text = Loc.GetString("markings-limits", ("required", isRequired), ("count", count), ("selectable", count - selected));
+    }
+
+    private void ReorderButtonPressed(BaseButton.ButtonEventArgs args)
+    {
+        if (ReorderButton.Pressed)
+        {
+            SelectionItems.Visible = false;
+            SearchBar.Visible = false;
+            OrderingItems.Visible = true;
+        }
+        else
+        {
+            SelectionItems.Visible = true;
+            SearchBar.Visible = true;
+            OrderingItems.Visible = false;
+        }
+    }
+
+    protected override void Resized()
+    {
+        base.Resized();
+
+        Items.Columns = (int)(Width / _columnWidth);
+    }
+}

Content.Client/Humanoid/MarkingPicker.xaml

@@ -1,37 +1,3 @@
 <Control xmlns="https://spacestation14.io">
-    <!-- Primary container -->
-    <BoxContainer Orientation="Vertical" HorizontalExpand="True">
-        <!-- Marking lists -->
-        <BoxContainer Orientation="Horizontal" SeparationOverride="5" HorizontalExpand="True">
-            <!-- Unused markings -->
-            <BoxContainer Orientation="Vertical" HorizontalExpand="True">
-                <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-                    <Label Text="{Loc 'markings-unused'}" HorizontalAlignment="Stretch" HorizontalExpand="True" />
-                    <Label Name="CMarkingPoints" Text="uwu" HorizontalAlignment="Right" />
-                </BoxContainer>
-
-                <OptionButton Name="CMarkingCategoryButton" StyleClasses="OpenLeft" />
-                <LineEdit Name="CMarkingSearch" PlaceHolder="{Loc 'markings-search'}" />
-
-                <ItemList Name="CMarkingsUnused" VerticalExpand="True" MinSize="300 250" />
-                <Button Name="CMarkingAdd" Text="{Loc 'markings-add'}" StyleClasses="OpenRight" />
-            </BoxContainer>
-
-            <!-- Used markings -->
-            <BoxContainer Orientation="Vertical" HorizontalExpand="True">
-                <Label Text="{Loc 'markings-used'}" />
-
-                <ItemList Name="CMarkingsUsed" VerticalExpand="True" MinSize="300 250" />
-
-                <BoxContainer Orientation="Horizontal">
-                    <Button Name="CMarkingRankUp" Text="{Loc 'markings-rank-up'}" StyleClasses="OpenBoth" HorizontalExpand="True" />
-                    <Button Name="CMarkingRankDown" Text="{Loc 'markings-rank-down'}" StyleClasses="OpenBoth" HorizontalExpand="True" />
-                </BoxContainer>
-                <Button Name="CMarkingRemove" Text="{Loc 'markings-remove'}" StyleClasses="OpenRight" />
-            </BoxContainer>
-        </BoxContainer>
-
-        <!-- Colors -->
-        <BoxContainer Name="CMarkingColors" Orientation="Vertical" Visible="False" />
-    </BoxContainer>
+    <TabContainer Name="OrganTabs" />
 </Control>

Content.Client/Humanoid/MarkingPicker.xaml.cs

@@ -1,577 +1,68 @@
 using System.Linq;
-using Content.Corvax.Interfaces.Shared;
-using Content.Shared.Humanoid;
-using Content.Shared.Humanoid.Markings;
-using Content.Shared.Humanoid.Prototypes;
 using Robust.Client.AutoGenerated;
-using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Client.Utility;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-using static Robust.Client.UserInterface.Controls.BoxContainer;
-using static Content.Client.Corvax.SponsorOnlyHelpers; // Corvax-Sponsors
 
 namespace Content.Client.Humanoid;
 
 [GenerateTypedNameReferences]
 public sealed partial class MarkingPicker : Control
 {
-    [Dependency] private readonly MarkingManager _markingManager = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-	private ISharedSponsorsManager? _sponsorsManager; // Corvax-Sponsors
-	
-    private readonly SpriteSystem _sprite;
-
-    public Action<MarkingSet>? OnMarkingAdded;
-    public Action<MarkingSet>? OnMarkingRemoved;
-    public Action<MarkingSet>? OnMarkingColorChange;
-    public Action<MarkingSet>? OnMarkingRankChange;
-
-    private List<Color> _currentMarkingColors = new();
-
-    private ItemList.Item? _selectedMarking;
-    private ItemList.Item? _selectedUnusedMarking;
-    private MarkingCategories _selectedMarkingCategory = MarkingCategories.Chest;
-
-    private MarkingSet _currentMarkings = new();
-
-    private List<MarkingCategories> _markingCategories = Enum.GetValues<MarkingCategories>().ToList();
-
-    private string _currentSpecies = SharedHumanoidAppearanceSystem.DefaultSpecies;
-    private Sex _currentSex = Sex.Unsexed;
-    public Color CurrentSkinColor = Color.White;
-    public Color CurrentEyeColor = Color.Black;
-    public Marking? HairMarking;
-    public Marking? FacialHairMarking;
-
-    private readonly HashSet<MarkingCategories> _ignoreCategories = new();
-
-    public string IgnoreCategories
-    {
-        get => string.Join(',',  _ignoreCategories);
-        set
-        {
-            _ignoreCategories.Clear();
-            var split = value.Split(',');
-            foreach (var category in split)
-            {
-                if (!Enum.TryParse(category, out MarkingCategories categoryParse))
-                {
-                    continue;
-                }
-
-                _ignoreCategories.Add(categoryParse);
-            }
-
-            SetupCategoryButtons();
-        }
-    }
-
-    public bool Forced { get; set; }
-
-    private bool _ignoreSpecies;
-
-    public bool IgnoreSpecies
-    {
-        get => _ignoreSpecies;
-        set
-        {
-            _ignoreSpecies = value;
-            Populate(CMarkingSearch.Text);
-        }
-    }
-
-    public void SetData(List<Marking> newMarkings, string species, Sex sex, Color skinColor, Color eyeColor)
-    {
-        var pointsProto = _prototypeManager
-            .Index<SpeciesPrototype>(species).MarkingPoints;
-        _currentMarkings = new(newMarkings, pointsProto, _markingManager);
-
-        if (!IgnoreSpecies)
-        {
-            _currentMarkings.EnsureSpecies(species, skinColor, _markingManager); // should be validated server-side but it can't hurt
-        }
-
-        _currentSpecies = species;
-        _currentSex = sex;
-        CurrentSkinColor = skinColor;
-        CurrentEyeColor = eyeColor;
-
-        Populate(CMarkingSearch.Text);
-        PopulateUsed();
-    }
-
-    public void SetData(MarkingSet set, string species, Sex sex, Color skinColor, Color eyeColor)
-    {
-        _currentMarkings = set;
-
-        if (!IgnoreSpecies)
-        {
-            _currentMarkings.EnsureSpecies(species, skinColor, _markingManager); // should be validated server-side but it can't hurt
-        }
-
-        _currentSpecies = species;
-        _currentSex = sex;
-        CurrentSkinColor = skinColor;
-        CurrentEyeColor = eyeColor;
-
-        Populate(CMarkingSearch.Text);
-        PopulateUsed();
-    }
-
-    public void SetSkinColor(Color color) => CurrentSkinColor = color;
-    public void SetEyeColor(Color color) => CurrentEyeColor = color;
+    private MarkingsViewModel? _markingsModel;
 
     public MarkingPicker()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
-        IoCManager.Instance!.TryResolveType(out _sponsorsManager); // Corvax-Sponsors
 
-        _sprite = _entityManager.System<SpriteSystem>();
-
-        CMarkingCategoryButton.OnItemSelected +=  OnCategoryChange;
-        CMarkingsUnused.OnItemSelected += item =>
-            _selectedUnusedMarking = CMarkingsUnused[item.ItemIndex];
-
-        CMarkingAdd.OnPressed += _ =>
-            MarkingAdd();
-
-        CMarkingsUsed.OnItemSelected += OnUsedMarkingSelected;
-
-        CMarkingRemove.OnPressed += _ =>
-            MarkingRemove();
-
-        CMarkingRankUp.OnPressed += _ => SwapMarkingUp();
-        CMarkingRankDown.OnPressed += _ => SwapMarkingDown();
-
-        CMarkingSearch.OnTextChanged += args => Populate(args.Text);
+        UpdateMarkings();
     }
 
-    private void SetupCategoryButtons()
+    public void SetModel(MarkingsViewModel model)
     {
-        CMarkingCategoryButton.Clear();
+        _markingsModel = model;
 
-        var validCategories = new List<MarkingCategories>();
-        for (var i = 0; i < _markingCategories.Count; i++)
+        _markingsModel.OrganDataChanged += UpdateMarkings;
+        _markingsModel.EnforcementsChanged += UpdateMarkings;
+    }
+
+    protected override void EnteredTree()
+    {
+        base.EnteredTree();
+
+        _markingsModel?.OrganDataChanged += UpdateMarkings;
+        _markingsModel?.EnforcementsChanged += UpdateMarkings;
+    }
+
+    protected override void ExitedTree()
+    {
+        base.ExitedTree();
+
+        _markingsModel?.OrganDataChanged -= UpdateMarkings;
+        _markingsModel?.EnforcementsChanged -= UpdateMarkings;
+    }
+
+    private void UpdateMarkings()
+    {
+        if (_markingsModel is null)
+            return;
+
+        OrganTabs.RemoveAllChildren();
+
+        var i = 0;
+        foreach (var (organ, organData) in _markingsModel.OrganData)
         {
-            var category = _markingCategories[i];
-            var markings = GetMarkings(category);
-            if (_ignoreCategories.Contains(category) ||
-                markings.Count == 0)
-            {
+            var control = new OrganMarkingPicker(_markingsModel, organ, organData.Layers, organData.Group);
+            if (control.Empty)
                 continue;
-            }
 
-            validCategories.Add(category);
-            CMarkingCategoryButton.AddItem(Loc.GetString($"markings-category-{category.ToString()}"), i);
+            OrganTabs.AddChild(control);
+            OrganTabs.SetTabTitle(i, Loc.GetString($"markings-organ-{organ.Id}"));
+            i++;
         }
 
-        if (validCategories.Contains(_selectedMarkingCategory))
-        {
-            CMarkingCategoryButton.SelectId(_markingCategories.IndexOf(_selectedMarkingCategory));
-        }
-        else if (validCategories.Count > 0)
-        {
-            _selectedMarkingCategory = validCategories[0];
-        }
-        else
-        {
-            _selectedMarkingCategory = MarkingCategories.Chest;
-        }
-    }
-
-    private string GetMarkingName(MarkingPrototype marking) => Loc.GetString($"marking-{marking.ID}");
-
-    private List<string> GetMarkingStateNames(MarkingPrototype marking)
-    {
-        List<string> result = new();
-        foreach (var markingState in marking.Sprites)
-        {
-            switch (markingState)
-            {
-                case SpriteSpecifier.Rsi rsi:
-                    result.Add(Loc.GetString($"marking-{marking.ID}-{rsi.RsiState}"));
-                    break;
-                case SpriteSpecifier.Texture texture:
-                    result.Add(Loc.GetString($"marking-{marking.ID}-{texture.TexturePath.Filename}"));
-                    break;
-            }
-        }
-
-        return result;
-    }
-
-    private IReadOnlyDictionary<string, MarkingPrototype> GetMarkings(MarkingCategories category)
-    {
-        return IgnoreSpecies
-            ? _markingManager.MarkingsByCategoryAndSex(category, _currentSex)
-            : _markingManager.MarkingsByCategoryAndSpeciesAndSex(category, _currentSpecies, _currentSex);
-    }
-
-    public void Populate(string filter)
-    {
-        SetupCategoryButtons();
-
-        CMarkingsUnused.Clear();
-        _selectedUnusedMarking = null;
-
-        var sortedMarkings = GetMarkings(_selectedMarkingCategory).Values.Where(m =>
-            m.ID.ToLower().Contains(filter.ToLower()) ||
-            GetMarkingName(m).ToLower().Contains(filter.ToLower())
-        ).OrderBy(p => Loc.GetString(GetMarkingName(p)));
-
-        foreach (var marking in sortedMarkings)
-        {
-            if (_currentMarkings.TryGetMarking(_selectedMarkingCategory, marking.ID, out _))
-            {
-                continue;
-            }
-
-            var item = CMarkingsUnused.AddItem($"{GetMarkingName(marking)}", _sprite.Frame0(marking.Sprites[0]));
-            // Corvax-Sponsors-Start
-            if (marking.SponsorOnly)
-                item.Text += GetSponsorOnlySuffix();
-            // Corvax-Sponsors-End
-            item.Metadata = marking;
-            // Corvax-Sponsors-Start
-            if (marking.SponsorOnly && _sponsorsManager != null)
-                item.Disabled = !_sponsorsManager.GetClientPrototypes().Contains(marking.ID);
-            // Corvax-Sponsors-End
-        }
-
-        CMarkingPoints.Visible = _currentMarkings.PointsLeft(_selectedMarkingCategory) != -1;
-    }
-
-    // Populate the used marking list. Returns a list of markings that weren't
-    // valid to add to the marking list.
-    public void PopulateUsed()
-    {
-        CMarkingsUsed.Clear();
-        CMarkingColors.Visible = false;
-        _selectedMarking = null;
-
-        if (!IgnoreSpecies)
-        {
-            _currentMarkings.EnsureSpecies(_currentSpecies, null, _markingManager);
-        }
-
-        // walk backwards through the list for visual purposes
-        foreach (var marking in _currentMarkings.GetReverseEnumerator(_selectedMarkingCategory))
-        {
-            if (!_markingManager.TryGetMarking(marking, out var newMarking))
-            {
-                continue;
-            }
-
-            var text = Loc.GetString(marking.Forced ? "marking-used-forced" : "marking-used", ("marking-name", $"{GetMarkingName(newMarking)}"),
-                ("marking-category", Loc.GetString($"markings-category-{newMarking.MarkingCategory}")));
-
-            var _item = new ItemList.Item(CMarkingsUsed)
-            {
-                Text = text,
-                Icon = _sprite.Frame0(newMarking.Sprites[0]),
-                Selectable = true,
-                Metadata = newMarking,
-                IconModulate = marking.MarkingColors[0]
-            };
-
-            CMarkingsUsed.Add(_item);
-        }
-
-        // since all the points have been processed, update the points visually
-        UpdatePoints();
-    }
-
-    private void SwapMarkingUp()
-    {
-        if (_selectedMarking == null)
-        {
-            return;
-        }
-
-        var i = CMarkingsUsed.IndexOf(_selectedMarking);
-        if (ShiftMarkingRank(i, -1))
-        {
-            OnMarkingRankChange?.Invoke(_currentMarkings);
-        }
-    }
-
-    private void SwapMarkingDown()
-    {
-        if (_selectedMarking == null)
-        {
-            return;
-        }
-
-        var i = CMarkingsUsed.IndexOf(_selectedMarking);
-        if (ShiftMarkingRank(i, 1))
-        {
-            OnMarkingRankChange?.Invoke(_currentMarkings);
-        }
-    }
-
-    private bool ShiftMarkingRank(int src, int places)
-    {
-        if (src + places >= CMarkingsUsed.Count || src + places < 0)
-        {
-            return false;
-        }
-
-        var visualDest = src + places; // what it would visually look like
-        var visualTemp = CMarkingsUsed[visualDest];
-        CMarkingsUsed[visualDest] = CMarkingsUsed[src];
-        CMarkingsUsed[src] = visualTemp;
-
-        switch (places)
-        {
-            // i.e., we're going down in rank
-            case < 0:
-                _currentMarkings.ShiftRankDownFromEnd(_selectedMarkingCategory, src);
-                break;
-            // i.e., we're going up in rank
-            case > 0:
-                _currentMarkings.ShiftRankUpFromEnd(_selectedMarkingCategory, src);
-                break;
-            // do nothing?
-            // ReSharper disable once RedundantEmptySwitchSection
-            default:
-                break;
-        }
-
-        return true;
-    }
-
-
-
-    // repopulate in case markings are restricted,
-    // and also filter out any markings that are now invalid
-    // attempt to preserve any existing markings as well:
-    // it would be frustrating to otherwise have all markings
-    // cleared, imo
-    public void SetSpecies(string species)
-    {
-        _currentSpecies = species;
-        var markingList = _currentMarkings.GetForwardEnumerator().ToList();
-
-        var speciesPrototype = _prototypeManager.Index<SpeciesPrototype>(species);
-
-        _currentMarkings = new(markingList, speciesPrototype.MarkingPoints, _markingManager, _prototypeManager);
-        _currentMarkings.EnsureSpecies(species, null, _markingManager);
-        _currentMarkings.EnsureSexes(_currentSex, _markingManager);
-
-        Populate(CMarkingSearch.Text);
-        PopulateUsed();
-    }
-
-    public void SetSex(Sex sex)
-    {
-        _currentSex = sex;
-        var markingList = _currentMarkings.GetForwardEnumerator().ToList();
-
-        var speciesPrototype = _prototypeManager.Index<SpeciesPrototype>(_currentSpecies);
-
-        _currentMarkings = new(markingList, speciesPrototype.MarkingPoints, _markingManager, _prototypeManager);
-        _currentMarkings.EnsureSpecies(_currentSpecies, null, _markingManager);
-        _currentMarkings.EnsureSexes(_currentSex, _markingManager);
-
-        Populate(CMarkingSearch.Text);
-        PopulateUsed();
-    }
-
-    private void UpdatePoints()
-    {
-        var count = _currentMarkings.PointsLeft(_selectedMarkingCategory);
-        if (count > -1)
-        {
-            CMarkingPoints.Text = Loc.GetString("marking-points-remaining", ("points", count));
-        }
-    }
-
-    private void OnCategoryChange(OptionButton.ItemSelectedEventArgs category)
-    {
-        CMarkingCategoryButton.SelectId(category.Id);
-        _selectedMarkingCategory = _markingCategories[category.Id];
-        Populate(CMarkingSearch.Text);
-        PopulateUsed();
-        UpdatePoints();
-    }
-
-    // TODO: This should be using ColorSelectorSliders once that's merged, so
-    private void OnUsedMarkingSelected(ItemList.ItemListSelectedEventArgs item)
-    {
-        _selectedMarking = CMarkingsUsed[item.ItemIndex];
-        var prototype = (MarkingPrototype) _selectedMarking.Metadata!;
-
-        if (prototype.ForcedColoring)
-        {
-            CMarkingColors.Visible = false;
-
-            return;
-        }
-
-        var stateNames = GetMarkingStateNames(prototype);
-        _currentMarkingColors.Clear();
-        CMarkingColors.RemoveAllChildren();
-        List<ColorSelectorSliders> colorSliders = new();
-        for (int i = 0; i < prototype.Sprites.Count; i++)
-        {
-            var colorContainer = new BoxContainer
-            {
-                Orientation = LayoutOrientation.Vertical,
-            };
-
-            CMarkingColors.AddChild(colorContainer);
-
-            ColorSelectorSliders colorSelector = new ColorSelectorSliders();
-            colorSelector.SelectorType = ColorSelectorSliders.ColorSelectorType.Hsv; // defaults color selector to HSV
-            colorSliders.Add(colorSelector);
-
-            colorContainer.AddChild(new Label { Text = $"{stateNames[i]} color:" });
-            colorContainer.AddChild(colorSelector);
-
-            var listing = _currentMarkings.Markings[_selectedMarkingCategory];
-
-            var color = listing[listing.Count - 1 - item.ItemIndex].MarkingColors[i];
-            var currentColor = new Color(
-                color.RByte,
-                color.GByte,
-                color.BByte
-            );
-            colorSelector.Color = currentColor;
-            _currentMarkingColors.Add(currentColor);
-            var colorIndex = _currentMarkingColors.Count - 1;
-
-            Action<Color> colorChanged = _ =>
-            {
-                _currentMarkingColors[colorIndex] = colorSelector.Color;
-
-                ColorChanged(colorIndex);
-            };
-            colorSelector.OnColorChanged += colorChanged;
-        }
-
-        CMarkingColors.Visible = true;
-    }
-
-    private void ColorChanged(int colorIndex)
-    {
-        if (_selectedMarking is null) return;
-        var markingPrototype = (MarkingPrototype) _selectedMarking.Metadata!;
-        int markingIndex = _currentMarkings.FindIndexOf(_selectedMarkingCategory, markingPrototype.ID);
-
-        if (markingIndex < 0) return;
-
-        _selectedMarking.IconModulate = _currentMarkingColors[colorIndex];
-
-        var marking = new Marking(_currentMarkings.Markings[_selectedMarkingCategory][markingIndex]);
-        marking.SetColor(colorIndex, _currentMarkingColors[colorIndex]);
-        _currentMarkings.Replace(_selectedMarkingCategory, markingIndex, marking);
-
-        OnMarkingColorChange?.Invoke(_currentMarkings);
-    }
-
-    private void MarkingAdd()
-    {
-        if (_selectedUnusedMarking is null) return;
-
-        if (_currentMarkings.PointsLeft(_selectedMarkingCategory) == 0 && !Forced)
-        {
-            return;
-        }
-
-        var marking = (MarkingPrototype) _selectedUnusedMarking.Metadata!;
-        var markingObject = marking.AsMarking();
-
-        // We need add hair markings in cloned set manually because _currentMarkings doesn't have it
-        var markingSet = new MarkingSet(_currentMarkings);
-        if (HairMarking != null)
-        {
-            markingSet.AddBack(MarkingCategories.Hair, HairMarking);
-        }
-        if (FacialHairMarking != null)
-        {
-            markingSet.AddBack(MarkingCategories.FacialHair, FacialHairMarking);
-        }
-
-        // Corvax-Wega-Hair-Extended-Edit-start
-        if (!_markingManager.MustMatchSkin(_currentSpecies, marking.BodyPart, out var alpha, _prototypeManager)) // Corvax-Wega-Hair-Extended
-        {
-            // Do default coloring
-            var colors = MarkingColoring.GetMarkingLayerColors(
-                marking,
-                CurrentSkinColor,
-                CurrentEyeColor,
-                markingSet
-            );
-            for (var i = 0; i < colors.Count; i++)
-            {
-                markingObject.SetColor(i, colors[i]);
-            }
-        }
-        else
-        {
-            // First color from skin, others from default colors
-            var colors = MarkingColoring.GetMarkingLayerColors(
-                marking,
-                CurrentSkinColor,
-                CurrentEyeColor,
-                markingSet
-            );
-
-            for (var i = 0; i < marking.Sprites.Count; i++)
-            {
-                var color = i == 0
-                    ? CurrentSkinColor.WithAlpha(alpha)
-                    : colors[i];
-                markingObject.SetColor(i, color);
-            }
-        }
-        // Corvax-Wega-Hair-Extended-Edit-end
-
-        markingObject.Forced = Forced;
-
-        _currentMarkings.AddBack(_selectedMarkingCategory, markingObject);
-
-        UpdatePoints();
-
-        CMarkingsUnused.Remove(_selectedUnusedMarking);
-        var item = new ItemList.Item(CMarkingsUsed)
-        {
-            Text = Loc.GetString("marking-used", ("marking-name", $"{GetMarkingName(marking)}"), ("marking-category", Loc.GetString($"markings-category-{marking.MarkingCategory}"))),
-            Icon = _sprite.Frame0(marking.Sprites[0]),
-            Selectable = true,
-            Metadata = marking,
-        };
-        CMarkingsUsed.Insert(0, item);
-
-        _selectedUnusedMarking = null;
-        OnMarkingAdded?.Invoke(_currentMarkings);
-    }
-
-    private void MarkingRemove()
-    {
-        if (_selectedMarking is null) return;
-
-        var marking = (MarkingPrototype) _selectedMarking.Metadata!;
-
-        _currentMarkings.Remove(_selectedMarkingCategory, marking.ID);
-
-        UpdatePoints();
-
-        CMarkingsUsed.Remove(_selectedMarking);
-
-        if (marking.MarkingCategory == _selectedMarkingCategory)
-        {
-            var item = CMarkingsUnused.AddItem($"{GetMarkingName(marking)}", _sprite.Frame0(marking.Sprites[0]));
-            item.Metadata = marking;
-        }
-        _selectedMarking = null;
-        CMarkingColors.Visible = false;
-        OnMarkingRemoved?.Invoke(_currentMarkings);
+        if (i > 0)
+            OrganTabs.CurrentTab = 0;
+        OrganTabs.TabsVisible = i > 1;
     }
 }

Content.Client/Humanoid/MarkingsViewModel.cs

@@ -0,0 +1,503 @@
+using System.Linq;
+using Content.Shared.Body;
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Markings;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Humanoid;
+
+/// <summary>
+/// View model for UIs manipulating a set of markings, responsible for applying markings logic and keeping state synchronized.
+/// </summary>
+public sealed class MarkingsViewModel
+{
+    [Dependency] private readonly MarkingManager _marking = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    private bool _enforceLimits = true;
+
+    /// <summary>
+    /// Whether the markings view model will enforce limitations on how many markings an organ can have
+    /// </summary>
+    /// <seealso cref="EnforcementsChanged" />
+    public bool EnforceLimits
+    {
+        get => _enforceLimits;
+        set
+        {
+            if (_enforceLimits == value)
+                return;
+
+            _enforceLimits = value;
+            EnforcementsChanged?.Invoke();
+        }
+    }
+
+    private bool _enforceGroupAndSexRestrictions = true;
+
+    /// <summary>
+    /// Whether the markings view model will enforce restrictions on the group and sex of markings for an organ
+    /// </summary>
+    /// <seealso cref="EnforcementsChanged" />
+    public bool EnforceGroupAndSexRestrictions
+    {
+        get => _enforceGroupAndSexRestrictions;
+        set
+        {
+            if (_enforceGroupAndSexRestrictions == value)
+                return;
+
+            _enforceGroupAndSexRestrictions = value;
+            EnforcementsChanged?.Invoke();
+        }
+    }
+
+    private bool AnyEnforcementsLifted => !_enforceLimits || !_enforceGroupAndSexRestrictions;
+
+    /// <summary>
+    /// Raised whenever the view model is enforcing a different set of constraints on possible markings than before
+    /// </summary>
+    /// <seealso cref="EnforceLimits" />
+    /// <seealso cref="EnforceGroupAndSexRestrictions" />
+    public event Action? EnforcementsChanged;
+
+    private Dictionary<ProtoId<OrganCategoryPrototype>, OrganProfileData> _organProfileData = new();
+
+    /// <summary>
+    /// The organ profile data this view model is concerned with.
+    /// </summary>
+    public Dictionary<ProtoId<OrganCategoryPrototype>, OrganProfileData> OrganProfileData
+    {
+        get => _organProfileData;
+        set
+        {
+            _organProfileData = value.ShallowClone();
+            OrganProfileDataChanged?.Invoke(true);
+        }
+    }
+
+    /// <summary>
+    /// Sets the sex of all organ profiles in the view model.
+    /// </summary>
+    /// <param name="sex">The new sex</param>
+    public void SetOrganSexes(Sex sex)
+    {
+        foreach (var (organ, data) in _organProfileData)
+        {
+            _organProfileData[organ] = data with { Sex = sex };
+        }
+        OrganProfileDataChanged?.Invoke(true);
+    }
+
+    /// <summary>
+    /// Sets the skin color of all organ profiles in the view model.
+    /// </summary>
+    /// <param name="skinColor">The new skin color</param>
+    public void SetOrganSkinColor(Color skinColor)
+    {
+        foreach (var (organ, data) in _organProfileData)
+        {
+            _organProfileData[organ] = data with { SkinColor = skinColor };
+        }
+        OrganProfileDataChanged?.Invoke(false);
+    }
+
+    /// <summary>
+    /// Sets the eye color of all organ profiles in the view model.
+    /// </summary>
+    /// <param name="eyeColor">The new eye color</param>
+    public void SetOrganEyeColor(Color eyeColor)
+    {
+        foreach (var (organ, data) in _organProfileData)
+        {
+            _organProfileData[organ] = data with { EyeColor = eyeColor };
+        }
+        OrganProfileDataChanged?.Invoke(false);
+    }
+
+    /// <summary>
+    /// Raised whenever the organ profile data changes.
+    /// The boolean value represents whether the set of possible markings may have changed.
+    /// </summary>
+    /// <seealso cref="OrganProfileData" />
+    /// <seealso cref="SetOrganSexes" />
+    /// <seealso cref="SetOrganSkinColor" />
+    /// <seealso cref="SetOrganEyeColor" />
+    public event Action<bool>? OrganProfileDataChanged;
+
+    private Dictionary<ProtoId<OrganCategoryPrototype>, Dictionary<HumanoidVisualLayers, List<Marking>>> _markings = new();
+
+    /// <summary>
+    /// The currently applied set of markings
+    /// </summary>
+    public Dictionary<ProtoId<OrganCategoryPrototype>, Dictionary<HumanoidVisualLayers, List<Marking>>> Markings
+    {
+        get => _markings;
+        set
+        {
+            _markings = value.ToDictionary(
+                kvp => kvp.Key,
+                kvp => kvp.Value.ToDictionary(
+                    it => it.Key,
+                    it => it.Value.ShallowClone()));
+
+            MarkingsReset?.Invoke();
+        }
+    }
+
+    /// <summary>
+    /// Raised whenever the set of markings has fully changed and requires a UI reload
+    /// </summary>
+    public event Action? MarkingsReset;
+
+    /// <summary>
+    /// Raised whenever a specific layer's markings have changed
+    /// </summary>
+    public event Action<ProtoId<OrganCategoryPrototype>, HumanoidVisualLayers>? MarkingsChanged;
+
+    private Dictionary<ProtoId<OrganCategoryPrototype>, OrganMarkingData> _organData = new();
+
+    /// <summary>
+    /// The organ marking data the view model is concerned with.
+    /// </summary>
+    public Dictionary<ProtoId<OrganCategoryPrototype>, OrganMarkingData>
+        OrganData
+    {
+        get => _organData;
+        set
+        {
+            if (_organData == value)
+                return;
+
+            _organData = value;
+            _previousColors.Clear();
+            OrganDataChanged?.Invoke();
+        }
+    }
+
+    /// <summary>
+    /// Raised whenever the organ data within the view model is changed.
+    /// </summary>
+    public event Action? OrganDataChanged;
+
+    private readonly Dictionary<ProtoId<MarkingPrototype>, List<Color>> _previousColors = new();
+
+    public MarkingsViewModel()
+    {
+        IoCManager.InjectDependencies(this);
+    }
+
+    /// <summary>
+    /// Returns whether the given marking is currently selected in the model
+    /// </summary>
+    /// <param name="organ">The organ to check for the marking within</param>
+    /// <param name="layer">The layer within the organ to check for the marking within</param>
+    /// <param name="markingId">The marking ID to check for</param>
+    /// <returns>Whether the marking is currently present within the set of selected markings</returns>
+    public bool IsMarkingSelected(ProtoId<OrganCategoryPrototype> organ,
+        HumanoidVisualLayers layer,
+        ProtoId<MarkingPrototype> markingId)
+    {
+        return GetMarking(organ, layer, markingId) is not null;
+    }
+
+    /// <summary>
+    /// Returns whether the marking at the given location can have its color customized by the user
+    /// </summary>
+    /// <inheritdoc cref="IsMarkingSelected" path="param" />
+    /// <returns>Whether the marking is capable of having its color customized by the user</returns>
+    public bool IsMarkingColorCustomizable(ProtoId<OrganCategoryPrototype> organ,
+        HumanoidVisualLayers layer,
+        ProtoId<MarkingPrototype> markingId)
+    {
+        if (!_prototype.TryIndex(markingId, out var markingProto))
+            return false;
+
+        if (markingProto.ForcedColoring)
+            return false;
+
+        if (!_organData.TryGetValue(organ, out var organData))
+            return false;
+
+        if (!_prototype.TryIndex(organData.Group, out var groupProto))
+            return false;
+
+        if (!groupProto.Appearances.TryGetValue(layer, out var appearance))
+            return true;
+
+        return !appearance.MatchSkin;
+    }
+
+    /// <summary>
+    /// Returns the currently applied marking by its ID, if it exists
+    /// </summary>
+    /// <inheritdoc cref="IsMarkingSelected" path="param" />
+    /// <returns>The marking currently applied if it exists, otherwise null</returns>
+    public Marking? GetMarking(ProtoId<OrganCategoryPrototype> organ,
+        HumanoidVisualLayers layer,
+        ProtoId<MarkingPrototype> markingId)
+    {
+        if (!_markings.TryGetValue(organ, out var markingSet))
+            return null;
+
+        if (!markingSet.TryGetValue(layer, out var markings))
+            return null;
+
+        return markings.FirstOrNull(it => it.MarkingId == markingId);
+    }
+
+    /// <summary>
+    /// Attempts to add a marking to the current set of markings
+    /// </summary>
+    /// <inheritdoc cref="IsMarkingSelected" path="param" />
+    /// <returns>Whether the marking was successfully added to the set of markings</returns>
+    public bool TrySelectMarking(ProtoId<OrganCategoryPrototype> organ,
+        HumanoidVisualLayers layer,
+        ProtoId<MarkingPrototype> markingId)
+    {
+        if (!_prototype.TryIndex(markingId, out var markingProto))
+            return false;
+
+        if (!_organData.TryGetValue(organ, out var organData) || !_organProfileData.TryGetValue(organ, out var profileData))
+            return false;
+
+        if (!organData.Layers.Contains(layer))
+            return false;
+
+        if (!_prototype.TryIndex(organData.Group, out var groupPrototype))
+            return false;
+
+        if (EnforceGroupAndSexRestrictions && !_marking.CanBeApplied(organData.Group, profileData.Sex, markingProto))
+            return false;
+
+        _markings[organ] = _markings.GetValueOrDefault(organ) ?? [];
+        var organMarkings = _markings[organ];
+        organMarkings[layer] = organMarkings.GetValueOrDefault(layer) ?? [];
+        var layerMarkings = organMarkings[layer];
+
+        var colors = _previousColors.GetValueOrDefault(markingId) ??
+                     MarkingColoring.GetMarkingLayerColors(markingProto, profileData.SkinColor, profileData.EyeColor, layerMarkings);
+        var newMarking = new Marking(markingId, colors) { Forced = AnyEnforcementsLifted };
+
+        var limits = groupPrototype.Limits.GetValueOrDefault(layer);
+        if (limits is null || !EnforceLimits)
+        {
+            layerMarkings.Add(newMarking);
+            MarkingsChanged?.Invoke(organ, layer);
+            return true;
+        }
+
+        if (limits.Limit == 1 && layerMarkings.Count == 1)
+        {
+            layerMarkings.Clear();
+            layerMarkings.Add(newMarking);
+            MarkingsChanged?.Invoke(organ, layer);
+            return true;
+        }
+
+        if (layerMarkings.Count < limits.Limit)
+        {
+            layerMarkings.Add(newMarking);
+            MarkingsChanged?.Invoke(organ, layer);
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Returns the list of currently selected markings for the layer on the given organ
+    /// </summary>
+    /// <param name="organ">The organ to look up the layer within</param>
+    /// <param name="layer">The layer within the organ to look up</param>
+    /// <returns>The set of markings for the provided organ if it has any, or null</returns>
+    public List<Marking>? SelectedMarkings(ProtoId<OrganCategoryPrototype> organ,
+        HumanoidVisualLayers layer)
+    {
+        return !_markings.TryGetValue(organ, out var organMarkings)
+            ? null
+            : organMarkings.GetValueOrDefault(layer);
+    }
+
+    /// <summary>
+    /// Attempts to remove a marking from the current set of markings
+    /// </summary>
+    /// <inheritdoc cref="IsMarkingSelected" path="param" />
+    /// <returns>Whether the marking was successfully removed from the set of markings</returns>
+    public bool TryDeselectMarking(ProtoId<OrganCategoryPrototype> organ,
+        HumanoidVisualLayers layer,
+        ProtoId<MarkingPrototype> markingId)
+    {
+        if (!_organData.TryGetValue(organ, out var organData))
+            return false;
+
+        if (!organData.Layers.Contains(layer))
+            return false;
+
+        if (!_prototype.TryIndex(organData.Group, out var groupPrototype))
+            return false;
+
+        var limits = groupPrototype.Limits.GetValueOrDefault(layer);
+
+        _markings[organ] = _markings.GetValueOrDefault(organ) ?? [];
+        var organMarkings = _markings[organ];
+        organMarkings[layer] = organMarkings.GetValueOrDefault(layer) ?? [];
+        var layerMarkings = organMarkings[layer];
+
+        var count = layerMarkings.Count(marking => marking.MarkingId == markingId);
+        if (count == 0)
+            return false;
+
+        if (EnforceLimits && limits is not null && limits.Required && (layerMarkings.Count - count) <= 0)
+            return false;
+
+        if (layerMarkings.Find(marking => marking.MarkingId == markingId) is { } removingMarking)
+        {
+            _previousColors[removingMarking.MarkingId] = removingMarking.MarkingColors.ToList();
+        }
+        layerMarkings.RemoveAll(marking => marking.MarkingId == markingId);
+        MarkingsChanged?.Invoke(organ, layer);
+
+        return true;
+    }
+
+    /// <summary>
+    /// Attempts to set the color of the specified marking at the given index
+    /// </summary>
+    /// <inheritdoc cref="IsMarkingSelected" path="param" />
+    /// <param name="colorIndex">The index within the marking's color array to set</param>
+    /// <param name="color">The new color to set</param>
+    public void TrySetMarkingColor(ProtoId<OrganCategoryPrototype> organ,
+        HumanoidVisualLayers layer,
+        ProtoId<MarkingPrototype> markingId,
+        int colorIndex,
+        Color color)
+    {
+        if (!_markings.TryGetValue(organ, out var markingSet))
+            return;
+
+        if (!markingSet.TryGetValue(layer, out var markings))
+            return;
+
+        var markingIdx = markings.FindIndex(it => it.MarkingId == markingId);
+        if (markingIdx == -1)
+            return;
+
+        markings[markingIdx] = markings[markingIdx].WithColorAt(colorIndex, color);
+        MarkingsChanged?.Invoke(organ, layer);
+    }
+
+    /// <summary>
+    /// Ensures the markings within the model are valid.
+    /// </summary>
+    public void ValidateMarkings()
+    {
+        foreach (var (organ, organData) in _organData)
+        {
+            if (!_organProfileData.TryGetValue(organ, out var organProfileData))
+            {
+                _markings.Remove(organ);
+                continue;
+            }
+
+            var actualMarkings = _markings.GetValueOrDefault(organ)?.ShallowClone() ?? [];
+
+            _marking.EnsureValidColors(actualMarkings);
+            _marking.EnsureValidGroupAndSex(actualMarkings, organData.Group, organProfileData.Sex);
+            _marking.EnsureValidLayers(actualMarkings, organData.Layers);
+            _marking.EnsureValidLimits(actualMarkings, organData.Group, organData.Layers, organProfileData.SkinColor, organProfileData.EyeColor);
+
+            _markings[organ] = actualMarkings;
+        }
+
+        MarkingsReset?.Invoke();
+    }
+
+    /// <summary>
+    /// Gets the count data for an organ layer.
+    /// </summary>
+    /// <param name="organ">The organ to look up count data for</param>
+    /// <param name="layer">The layer within the organ to look up count data for</param>
+    /// <param name="isRequired">Whether this layer requires at least one marking to be selected</param>
+    /// <param name="count">The maximum amount of markings that can be selected for this layer</param>
+    /// <param name="selected">The currently selected amount of markings</param>
+    public void GetMarkingCounts(ProtoId<OrganCategoryPrototype> organ, HumanoidVisualLayers layer, out bool isRequired, out int count, out int selected)
+    {
+        isRequired = false;
+        count = -1;
+        selected = 0;
+
+        if (!_organData.TryGetValue(organ, out var organData))
+            return;
+
+        if (!organData.Layers.Contains(layer))
+            return;
+
+        if (!_prototype.TryIndex(organData.Group, out var groupPrototype))
+            return;
+
+        if (!groupPrototype.Limits.TryGetValue(layer, out var limits))
+            return;
+
+        isRequired = limits.Required;
+        count = limits.Limit;
+
+        if (!_markings.TryGetValue(organ, out var organMarkings))
+            return;
+
+        if (!organMarkings.TryGetValue(layer, out var layerMarkings))
+            return;
+
+        selected = layerMarkings.Count;
+    }
+
+    /// <summary>
+    /// Reorders the specified marking ID to the index and position relative to its index
+    /// </summary>
+    /// <param name="organ">The organ to reorder the markings of</param>
+    /// <param name="layer">The layer to reorder the markings of</param>
+    /// <param name="markingId">The marking to reorder</param>
+    /// <param name="position">Whether the marking should be moved to before or after the given index</param>
+    /// <param name="positionIndex">The new position index of the marking</param>
+    public void ChangeMarkingOrder(ProtoId<OrganCategoryPrototype> organ,
+        HumanoidVisualLayers layer,
+        ProtoId<MarkingPrototype> markingId,
+        CandidatePosition position,
+        int positionIndex
+    )
+    {
+        if (!_markings.TryGetValue(organ, out var organMarkings))
+            return;
+
+        if (!organMarkings.TryGetValue(layer, out var layerMarkings))
+            return;
+
+        var currentIndex = layerMarkings.FindIndex(marking => marking.MarkingId == markingId);
+        var currentMarking = layerMarkings[currentIndex];
+
+        if (position == CandidatePosition.Before)
+        {
+            layerMarkings.RemoveAt(currentIndex);
+            var insertionIndex = currentIndex < positionIndex ? positionIndex - 1 : positionIndex;
+            layerMarkings.Insert(insertionIndex, currentMarking);
+        }
+        else if (position == CandidatePosition.After)
+        {
+            layerMarkings.RemoveAt(currentIndex);
+            var insertionIndex = currentIndex > positionIndex ? positionIndex + 1 : positionIndex;
+            layerMarkings.Insert(insertionIndex, currentMarking);
+        }
+
+        MarkingsChanged?.Invoke(organ, layer);
+    }
+}
+
+/// <summary>
+/// Specifies whether an item in a list will be moved to before or after a corresponding index
+/// </summary>
+public enum CandidatePosition
+{
+    Before,
+    After,
+}

Content.Client/Humanoid/OrganMarkingPicker.xaml

@@ -0,0 +1,3 @@
+<Control xmlns="https://spacestation14.io">
+    <TabContainer Name="LayerTabs" />
+</Control>

Content.Client/Humanoid/OrganMarkingPicker.xaml.cs

@@ -0,0 +1,104 @@
+using System.Linq;
+using Content.Corvax.Interfaces.Shared; // Corvax-Sponsors
+using Content.Shared.Body;
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Markings;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Humanoid;
+
+[GenerateTypedNameReferences]
+public sealed partial class OrganMarkingPicker : Control
+{
+    [Dependency] private readonly MarkingManager _marking = default!;
+    [Dependency] private readonly IEntityManager _entity = default!;
+    private ISharedSponsorsManager? _sponsorsManager; // Corvax-Sponsors
+
+    private readonly SpriteSystem _sprite;
+
+    private readonly MarkingsViewModel _markingsModel;
+    private readonly HashSet<HumanoidVisualLayers> _layers;
+    private readonly ProtoId<MarkingsGroupPrototype> _group;
+    private readonly ProtoId<OrganCategoryPrototype> _organ;
+
+    public OrganMarkingPicker(MarkingsViewModel markingsModel, ProtoId<OrganCategoryPrototype> organ, HashSet<HumanoidVisualLayers> layers, ProtoId<MarkingsGroupPrototype> group)
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+        IoCManager.Instance!.TryResolveType(out _sponsorsManager); // Corvax-Sponsors
+
+        _markingsModel = markingsModel;
+        _layers = layers;
+        _group = group;
+        _organ = organ;
+
+        _sprite = _entity.System<SpriteSystem>();
+
+        UpdateMarkings();
+    }
+
+    protected override void EnteredTree()
+    {
+        base.EnteredTree();
+
+        _markingsModel.OrganProfileDataChanged += OnOrganProfileDataChanged;
+        _markingsModel.EnforcementsChanged += UpdateMarkings;
+    }
+
+    protected override void ExitedTree()
+    {
+        base.ExitedTree();
+
+        _markingsModel.OrganProfileDataChanged -= OnOrganProfileDataChanged;
+        _markingsModel.EnforcementsChanged -= UpdateMarkings;
+    }
+
+    public bool Empty => LayerTabs.ChildCount == 0;
+
+    private void OnOrganProfileDataChanged(bool refresh)
+    {
+        if (refresh)
+            UpdateMarkings();
+    }
+
+    private void UpdateMarkings()
+    {
+        if (!_markingsModel.OrganProfileData.TryGetValue(_organ, out var organProfileData))
+            return;
+
+        LayerTabs.RemoveAllChildren();
+        var i = 0;
+        foreach (var layer in _layers)
+        {
+            var allMarkings =
+                _markingsModel.EnforceGroupAndSexRestrictions ? _marking.MarkingsByLayerAndGroupAndSex(layer, _group, organProfileData.Sex) : _marking.MarkingsByLayer(layer);
+
+            // Corvax-Sponsors-Start
+            /*if (_sponsorsManager != null)
+            {
+                var sponsorPrototypes = _sponsorsManager.GetClientPrototypes();
+                allMarkings = allMarkings
+                    .Where(m => !m.Value.SponsorOnly || sponsorPrototypes.Contains(m.Key))
+                    .ToDictionary(m => m.Key, m => m.Value);
+            }*/
+            // Corvax-Sponsors-End
+
+            if (allMarkings.Count == 0)
+                continue;
+
+            var control = new LayerMarkingPicker(_markingsModel, _organ, layer, allMarkings);
+            LayerTabs.AddChild(control);
+            if (Loc.TryGetString($"markings-layer-{layer}-{_group.Id}", out var layerTitle))
+                LayerTabs.SetTabTitle(i, layerTitle);
+            else
+                LayerTabs.SetTabTitle(i, Loc.GetString($"markings-layer-{layer}"));
+            i++;
+        }
+
+        LayerTabs.TabsVisible = i > 1;
+    }
+}

Content.Client/Humanoid/SingleMarkingPicker.xaml

@@ -1,25 +0,0 @@
-<BoxContainer xmlns="https://spacestation14.io"
-              Orientation="Vertical"
-              HorizontalExpand="True"
-              VerticalExpand="True">
-    <!-- "Slot" selection -->
-    <Label Name="CategoryName" />
-    <BoxContainer Name="SlotSelectorContainer" HorizontalExpand="True">
-        <OptionButton Name="SlotSelector" HorizontalExpand="True" StyleClasses="OpenBoth" />
-        <Button Name="AddButton" Text="{Loc 'marking-slot-add'}" StyleClasses="OpenBoth" />
-        <Button Name="RemoveButton" Text="{Loc 'marking-slot-remove'}" StyleClasses="OpenLeft" />
-    </BoxContainer>
-    <LineEdit Name="Search" PlaceHolder="{Loc 'markings-search'}" HorizontalExpand="True" />
-
-    <!-- Item list -->
-    <BoxContainer Name="MarkingSelectorContainer" Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
-        <ScrollContainer MinHeight="500" VerticalExpand="True" HorizontalExpand="True">
-            <ItemList Name="MarkingList" VerticalExpand="True" />
-        </ScrollContainer>
-
-        <!-- Color sliders -->
-        <ScrollContainer MinHeight="300" HorizontalExpand="True"> <!-- Corvax-Wega-Hair-Extended -->
-            <BoxContainer Name="ColorSelectorContainer" HorizontalExpand="True" />
-        </ScrollContainer>
-    </BoxContainer>
-</BoxContainer>