Merge remote-tracking branch 'upstream/master' into ed-2025-02-03-upstream-stable

# Conflicts:
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
#	Content.Client/Options/UI/OptionsMenu.xaml
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs

.github/workflows/benchmarks.yml

@@ -11,7 +11,7 @@ jobs:
     name: Run Benchmarks
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v3.6.0
       with:
         submodules: 'recursive'
     - name: Get Engine version

.github/workflows/build-docfx.yml

@@ -8,7 +8,7 @@ jobs:
   docfx:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v3.6.0
     - name: Setup submodule
       run: |
         git submodule update --init --recursive
@@ -19,7 +19,7 @@ jobs:
         cd RobustToolbox/
         git submodule update --init --recursive
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v4.1.0
+      uses: actions/setup-dotnet@v3.2.0
       with:
         dotnet-version: 9.0.x
 

.github/workflows/build-map-renderer.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout Master
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v3.6.0
 
       - name: Setup Submodule
         run: |
@@ -34,7 +34,7 @@ jobs:
           git submodule update --init --recursive
 
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
+        uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: 9.0.x
 

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

@@ -19,7 +19,7 @@ jobs:
 
     steps:
     - name: Checkout Master
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v3.6.0
 
     - name: Setup Submodule
       run: |
@@ -34,7 +34,7 @@ jobs:
         git submodule update --init --recursive
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v4.1.0
+      uses: actions/setup-dotnet@v3.2.0
       with:
         dotnet-version: 9.0.x
 

.github/workflows/check-crlf.yml

@@ -10,6 +10,6 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v3.6.0
     - name: Check for CRLF
       run: Tools/check_crlf.py

.github/workflows/publish.yml

@@ -16,11 +16,11 @@ jobs:
     - name: Install dependencies
       run: sudo apt-get install -y python3-paramiko python3-lxml
 
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v3.6.0
       with:
         submodules: 'recursive'
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v4.1.0
+      uses: actions/setup-dotnet@v3.2.0
       with:
         dotnet-version: 9.0.x
 

.github/workflows/rsi-diff.yml

@@ -11,14 +11,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v3.6.0
 
       - name: Get changed files
         id: files
         uses: Ana06/get-changed-files@v2.3.0
         with:
           format: 'space-delimited'
-          filter: |
+          filter: | 
             **.rsi
             **.png
 

.github/workflows/test-packaging.yml

@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Checkout Master
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v3.6.0
 
       - name: Setup Submodule
         run: |
@@ -49,7 +49,7 @@ jobs:
           git submodule update --init --recursive
 
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
+        uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: 9.0.x
 

.github/workflows/update-credits.yml

@@ -4,19 +4,19 @@ on:
   workflow_dispatch:
   schedule:
     - cron: 0 0 * * 0
-
+    
 jobs:
   get_credits:
     runs-on: ubuntu-latest
     # Hey there fork dev! If you like to include your own contributors in this then you can probably just change this to your own repo
     # Do this in dump_github_contributors.ps1 too into your own repo
     if: github.repository == 'space-wizards/space-station-14'
-
+    
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v3.6.0
         with:
           ref: master
-
+        
       - name: Get this week's Contributors
         shell: pwsh
         env:
@@ -25,25 +25,25 @@ jobs:
 
       # TODO
       #- name: Get this week's Patreons
-      #  run: Tools/script2dumppatreons > Resources/Credits/Patrons.yml
-
+      #  run: Tools/script2dumppatreons > Resources/Credits/Patrons.yml        
+      
       # MAKE SURE YOU ENABLED "Allow GitHub Actions to create and approve pull requests" IN YOUR ACTIONS, OTHERWISE IT WILL MOST LIKELY FAIL
 
 
-      # For this you can use a pat token of an account with direct push access to the repo if you have protected branches.
+      # For this you can use a pat token of an account with direct push access to the repo if you have protected branches. 
       # Uncomment this and comment the other line if you do this.
       # https://github.com/stefanzweifel/git-auto-commit-action#push-to-protected-branches
-
+      
       #- name: Commit new credit files
       #  uses: stefanzweifel/git-auto-commit-action@v4
       #  with:
       #    commit_message: Update Credits
       #    commit_author: PJBot <pieterjan.briers+bot@gmail.com>
-
+      
       # This will make a PR
       - name: Set current date as env variable
         run: echo "NOW=$(date +'%Y-%m-%dT%H-%M-%S')" >> $GITHUB_ENV
-
+        
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v5
         with:

.github/workflows/validate-rgas.yml

@@ -12,7 +12,7 @@ jobs:
     if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v3.6.0
     - name: Setup Submodule
       run: git submodule update --init
     - name: Pull engine updates

.github/workflows/validate-rsis.yml

@@ -13,7 +13,7 @@ jobs:
     name: Validate RSIs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v3.6.0
       - name: Setup Submodule
         run: git submodule update --init
       - name: Pull engine updates

.github/workflows/validate_mapfiles.yml

@@ -12,7 +12,7 @@ jobs:
     if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v3.6.0
     - name: Setup Submodule
       run: git submodule update --init
     - name: Pull engine updates

.github/workflows/yaml-linter.yml

@@ -13,7 +13,7 @@ jobs:
     if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v3.6.0
       - name: Setup submodule
         run: |
           git submodule update --init --recursive
@@ -24,7 +24,7 @@ jobs:
           cd RobustToolbox/
           git submodule update --init --recursive
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
+        uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: 9.0.x
       - name: Install dependencies

Content.Benchmarks/DynamicTreeBenchmark.cs

@@ -44,7 +44,7 @@ namespace Content.Benchmarks
             for (var i = 0; i < Aabbs1.Length; i++)
             {
                 var aabb = Aabbs1[i];
-                _b2Tree.CreateProxy(aabb, uint.MaxValue, i);
+                _b2Tree.CreateProxy(aabb, i);
                 _tree.Add(i);
             }
         }

Content.Client/Administration/AdminNameOverlay.cs

@@ -1,10 +1,7 @@
 using System.Linq;
 using System.Numerics;
 using Content.Client.Administration.Systems;
-using Content.Client.Stylesheets;
-using Content.Shared.Administration;
 using Content.Shared.CCVar;
-using Content.Shared.Ghost;
 using Content.Shared.Mind;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
@@ -17,54 +14,32 @@ namespace Content.Client.Administration;
 
 internal sealed class AdminNameOverlay : Overlay
 {
+    [Dependency] private readonly IConfigurationManager _config = default!;
+
     private readonly AdminSystem _system;
     private readonly IEntityManager _entityManager;
     private readonly IEyeManager _eyeManager;
     private readonly EntityLookupSystem _entityLookup;
     private readonly IUserInterfaceManager _userInterfaceManager;
     private readonly Font _font;
-    private readonly Font _fontBold;
-    private bool _overlayClassic;
-    private bool _overlaySymbols;
-    private bool _overlayPlaytime;
-    private bool _overlayStartingJob;
-    private float _ghostFadeDistance;
-    private float _ghostHideDistance;
-    private int _overlayStackMax;
-    private float _overlayMergeDistance;
 
     //TODO make this adjustable via GUI
     private readonly ProtoId<RoleTypePrototype>[] _filter =
         ["SoloAntagonist", "TeamAntagonist", "SiliconAntagonist", "FreeAgent"];
     private readonly string _antagLabelClassic = Loc.GetString("admin-overlay-antag-classic");
+    private readonly Color _antagColorClassic = Color.OrangeRed;
 
-    public AdminNameOverlay(
-        AdminSystem system,
-        IEntityManager entityManager,
-        IEyeManager eyeManager,
-        IResourceCache resourceCache,
-        EntityLookupSystem entityLookup,
-        IUserInterfaceManager userInterfaceManager,
-        IConfigurationManager config)
+    public AdminNameOverlay(AdminSystem system, IEntityManager entityManager, IEyeManager eyeManager, IResourceCache resourceCache, EntityLookupSystem entityLookup, IUserInterfaceManager userInterfaceManager)
     {
+        IoCManager.InjectDependencies(this);
+
         _system = system;
         _entityManager = entityManager;
         _eyeManager = eyeManager;
         _entityLookup = entityLookup;
         _userInterfaceManager = userInterfaceManager;
         ZIndex = 200;
-        // Setting these to a specific ttf would break the antag symbols
-        _font = resourceCache.NotoStack();
-        _fontBold = resourceCache.NotoStack(variation: "Bold");
-
-        config.OnValueChanged(CCVars.AdminOverlayClassic, (show) => { _overlayClassic = show; }, true);
-        config.OnValueChanged(CCVars.AdminOverlaySymbols, (show) => { _overlaySymbols = show; }, true);
-        config.OnValueChanged(CCVars.AdminOverlayPlaytime, (show) => { _overlayPlaytime = show; }, true);
-        config.OnValueChanged(CCVars.AdminOverlayStartingJob, (show) => { _overlayStartingJob = show; }, true);
-        config.OnValueChanged(CCVars.AdminOverlayGhostHideDistance, (f) => { _ghostHideDistance = f; }, true);
-        config.OnValueChanged(CCVars.AdminOverlayGhostFadeDistance, (f) => { _ghostFadeDistance = f; }, true);
-        config.OnValueChanged(CCVars.AdminOverlayStackMax, (i) => { _overlayStackMax = i; }, true);
-        config.OnValueChanged(CCVars.AdminOverlayMergeDistance, (f) => { _overlayMergeDistance = f; }, true);
+        _font = new VectorFont(resourceCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
     }
 
     public override OverlaySpace Space => OverlaySpace.ScreenSpace;
@@ -72,147 +47,75 @@ internal sealed class AdminNameOverlay : Overlay
     protected override void Draw(in OverlayDrawArgs args)
     {
         var viewport = args.WorldAABB;
-        var colorDisconnected = Color.White;
-        var uiScale = _userInterfaceManager.RootControl.UIScale;
-        var lineoffset = new Vector2(0f, 14f) * uiScale;
-        var drawnOverlays = new List<(Vector2,Vector2)>() ; // A saved list of the overlays already drawn
 
-        // Get all player positions before drawing overlays, so they can be sorted before iteration
-        var sortable = new List<(PlayerInfo, Box2, EntityUid, Vector2)>();
-        foreach (var info in _system.PlayerList)
+        //TODO make this adjustable via GUI
+        var classic = _config.GetCVar(CCVars.AdminOverlayClassic);
+        var playTime = _config.GetCVar(CCVars.AdminOverlayPlaytime);
+        var startingJob = _config.GetCVar(CCVars.AdminOverlayStartingJob);
+
+        foreach (var playerInfo in _system.PlayerList)
         {
-            var entity = _entityManager.GetEntity(info.NetEntity);
+            var entity = _entityManager.GetEntity(playerInfo.NetEntity);
 
-            // If entity does not exist or is on a different map, skip
-            if (entity == null
-                || !_entityManager.EntityExists(entity)
-                || _entityManager.GetComponent<TransformComponent>(entity.Value).MapID != args.MapId)
+            // Otherwise the entity can not exist yet
+            if (entity == null || !_entityManager.EntityExists(entity))
+            {
                 continue;
+            }
+
+            // if not on the same map, continue
+            if (_entityManager.GetComponent<TransformComponent>(entity.Value).MapID != args.MapId)
+            {
+                continue;
+            }
 
             var aabb = _entityLookup.GetWorldAABB(entity.Value);
-            // if not on screen, skip
+
+            // if not on screen, continue
             if (!aabb.Intersects(in viewport))
+            {
                 continue;
+            }
 
-            // Get on-screen coordinates of player
-            var screenCoordinates = _eyeManager.WorldToScreen(aabb.Center).Rounded();
+            var uiScale = _userInterfaceManager.RootControl.UIScale;
+            var lineoffset = new Vector2(0f, 14f) * uiScale;
+            var screenCoordinates = _eyeManager.WorldToScreen(aabb.Center +
+                                                              new Angle(-_eyeManager.CurrentEye.Rotation).RotateVec(
+                                                                  aabb.TopRight - aabb.Center)) + new Vector2(1f, 7f);
 
-            sortable.Add((info, aabb, entity.Value, screenCoordinates));
-        }
-
-        // Draw overlays for visible players, starting from the top of the screen
-        foreach (var info in sortable.OrderBy(s => s.Item4.Y).ToList())
-        {
-            var playerInfo = info.Item1;
-            var aabb = info.Item2;
-            var entity = info.Item3;
-            var screenCoordinatesCenter = info.Item4;
-            //the center position is kept separately, for simpler position comparison later
-            var centerOffset = new Vector2(28f, -18f) * uiScale;
-            var screenCoordinates = screenCoordinatesCenter + centerOffset;
-            var alpha = 1f;
-
-            //TODO make a smarter system where the starting offset can be modified by the predicted position and size of already-drawn overlays/stacks?
             var currentOffset = Vector2.Zero;
 
-            //  Ghosts near the cursor are made transparent/invisible
-            //  TODO would be "cheaper" if playerinfo already contained a ghost bool, this gets called every frame for every onscreen player!
-            if (_entityManager.HasComponent<GhostComponent>(entity))
-            {
-                // We want the map positions here, so we don't have to worry about resolution and such shenanigans
-                var mobPosition = aabb.Center;
-                var mousePosition = _eyeManager
-                    .ScreenToMap(_userInterfaceManager.MousePositionScaled.Position * uiScale)
-                    .Position;
-                var dist = Vector2.Distance(mobPosition, mousePosition);
-                if (dist < _ghostHideDistance)
-                    continue;
-
-                alpha = Math.Clamp((dist - _ghostHideDistance) / (_ghostFadeDistance - _ghostHideDistance), 0f, 1f);
-                colorDisconnected.A = alpha;
-            }
-
-            // If the new overlay text block is within merge distance of any previous ones
-            // merge them into a stack so they don't hide each other
-            var stack = drawnOverlays.FindAll(x =>
-                Vector2.Distance(_eyeManager.ScreenToMap(x.Item1).Position, aabb.Center) <= _overlayMergeDistance);
-            if (stack.Count > 0)
-            {
-                screenCoordinates = stack.First().Item1 + centerOffset;
-                // Replacing this overlay's coordinates for the later save with the stack root's coordinates
-                // so that other overlays don't try to stack to these coordinates
-                screenCoordinatesCenter = stack.First().Item1;
-
-                var i = 1;
-                foreach (var s in stack)
-                {
-                    // additional entries after maximum stack size is reached will be drawn over the last entry
-                    if (i <= _overlayStackMax - 1)
-                        currentOffset = lineoffset + s.Item2 ;
-                    i++;
-                }
-            }
-
-            // Character name
-            var color = Color.Aquamarine;
-            color.A = alpha;
-            args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.CharacterName, uiScale, playerInfo.Connected ? color : colorDisconnected);
+            args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.Username, uiScale, playerInfo.Connected ? Color.Yellow : Color.White);
             currentOffset += lineoffset;
 
-            // Username
-            color = Color.Yellow;
-            color.A = alpha;
-            args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.Username, uiScale, playerInfo.Connected ? color : colorDisconnected);
+            args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.CharacterName, uiScale, playerInfo.Connected ? Color.Aquamarine : Color.White);
             currentOffset += lineoffset;
 
-            // Playtime
-            if (!string.IsNullOrEmpty(playerInfo.PlaytimeString) && _overlayPlaytime)
+            if (!string.IsNullOrEmpty(playerInfo.PlaytimeString) && playTime)
             {
-                color = Color.Orange;
-                color.A = alpha;
-                args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.PlaytimeString, uiScale, playerInfo.Connected ? color : colorDisconnected);
+                args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.PlaytimeString, uiScale, playerInfo.Connected ? Color.Orange : Color.White);
                 currentOffset += lineoffset;
             }
 
-            // Job
-            if (!string.IsNullOrEmpty(playerInfo.StartingJob) && _overlayStartingJob)
+            if (!string.IsNullOrEmpty(playerInfo.StartingJob) && startingJob)
             {
-                color = Color.GreenYellow;
-                color.A = alpha;
-                args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, Loc.GetString(playerInfo.StartingJob), uiScale, playerInfo.Connected ? color : colorDisconnected);
+                args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, Loc.GetString(playerInfo.StartingJob), uiScale, playerInfo.Connected ? Color.GreenYellow : Color.White);
                 currentOffset += lineoffset;
             }
 
-            // Classic Antag Label
-            if (_overlayClassic && playerInfo.Antag)
+            if (classic && playerInfo.Antag)
             {
-                var symbol = _overlaySymbols ? Loc.GetString("player-tab-antag-prefix") : string.Empty;
-                var label = _overlaySymbols
-                    ? Loc.GetString("player-tab-character-name-antag-symbol",
-                        ("symbol", symbol),
-                        ("name", _antagLabelClassic))
-                    : _antagLabelClassic;
-                color = Color.OrangeRed;
-                color.A = alpha;
-                args.ScreenHandle.DrawString(_fontBold, screenCoordinates + currentOffset, label, uiScale, color);
+                args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, _antagLabelClassic, uiScale, Color.OrangeRed);
                 currentOffset += lineoffset;
             }
-            // Role Type
-            else if (!_overlayClassic && _filter.Contains(playerInfo.RoleProto))
+            else if (!classic && _filter.Contains(playerInfo.RoleProto))
             {
-                var symbol = _overlaySymbols && playerInfo.Antag ? playerInfo.RoleProto.Symbol : string.Empty;
-                var role = Loc.GetString(playerInfo.RoleProto.Name).ToUpper();
-                var label = _overlaySymbols
-                ? Loc.GetString("player-tab-character-name-antag-symbol", ("symbol", symbol), ("name", role))
-                : role;
-                color =  playerInfo.RoleProto.Color;
-                color.A = alpha;
-                args.ScreenHandle.DrawString(_fontBold, screenCoordinates + currentOffset, label, uiScale, color);
-                currentOffset += lineoffset;
-            }
+                var label = Loc.GetString(playerInfo.RoleProto.Name).ToUpper();
+                var color = playerInfo.RoleProto.Color;
 
-            //Save the coordinates and size of the text block, for stack merge check
-            drawnOverlays.Add((screenCoordinatesCenter, currentOffset));
+                args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, label, uiScale, color);
+                currentOffset += lineoffset;
+            }
         }
     }
 }

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

@@ -14,7 +14,6 @@ namespace Content.Client.Administration.Systems
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
         [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
-        [Dependency] private readonly IConfigurationManager _configurationManager = default!;
 
         private AdminNameOverlay _adminNameOverlay = default!;
 
@@ -23,14 +22,7 @@ namespace Content.Client.Administration.Systems
 
         private void InitializeOverlay()
         {
-            _adminNameOverlay = new AdminNameOverlay(
-                this,
-                EntityManager,
-                _eyeManager,
-                _resourceCache,
-                _entityLookup,
-                _userInterfaceManager,
-                _configurationManager);
+            _adminNameOverlay = new AdminNameOverlay(this, EntityManager, _eyeManager, _resourceCache, _entityLookup, _userInterfaceManager);
             _adminManager.AdminStatusUpdated += OnAdminStatusUpdated;
         }
 

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

@@ -2,26 +2,24 @@
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
     <PanelContainer StyleClasses="BackgroundDark">
-        <SplitContainer Orientation="Vertical" ResizeMode="NotResizable">
-            <SplitContainer Orientation="Horizontal" VerticalExpand="True">
-                <cc:PlayerListControl Access="Public" Name="ChannelSelector" HorizontalExpand="True" SizeFlagsStretchRatio="2" />
-                <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="2">
-                    <BoxContainer Access="Public" Name="BwoinkArea" VerticalExpand="True" />
+        <SplitContainer Orientation="Horizontal" VerticalExpand="True">
+            <cc:PlayerListControl Access="Public" Name="ChannelSelector" HorizontalExpand="True" SizeFlagsStretchRatio="1" />
+            <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="2">
+                <BoxContainer Access="Public" Name="BwoinkArea" VerticalExpand="True" />
+                <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+                    <CheckBox Name="AdminOnly" Access="Public" Text="{Loc 'admin-ahelp-admin-only'}" ToolTip="{Loc 'admin-ahelp-admin-only-tooltip'}" />
+                    <Control HorizontalExpand="True" MinWidth="5" />
+                    <CheckBox Name="PlaySound" Access="Public" Text="{Loc 'admin-bwoink-play-sound'}" Pressed="True" />
+                    <Control HorizontalExpand="True" MinWidth="5" />
+                    <Button Visible="True" Name="PopOut" Access="Public" Text="{Loc 'admin-logs-pop-out'}" StyleClasses="OpenBoth" HorizontalAlignment="Left" />
+                    <Control HorizontalExpand="True" />
+                    <Button Visible="False" Name="Bans" Text="{Loc 'admin-player-actions-bans'}" StyleClasses="OpenRight" />
+                    <Button Visible="False" Name="Notes" Text="{Loc 'admin-player-actions-notes'}" StyleClasses="OpenBoth" />
+                    <Button Visible="False" Name="Kick" Text="{Loc 'admin-player-actions-kick'}" StyleClasses="OpenBoth" />
+                    <Button Visible="False" Name="Ban" Text="{Loc 'admin-player-actions-ban'}" StyleClasses="OpenBoth" />
+                    <Button Visible="False" Name="Respawn" Text="{Loc 'admin-player-actions-respawn'}" StyleClasses="OpenBoth" />
+                    <Button Visible="False" Name="Follow" Text="{Loc 'admin-player-actions-follow'}" StyleClasses="OpenLeft" />
                 </BoxContainer>
-            </SplitContainer>
-            <BoxContainer Orientation="Horizontal" SetHeight="30" >
-                <CheckBox Name="AdminOnly" Access="Public" Text="{Loc 'admin-ahelp-admin-only'}" ToolTip="{Loc 'admin-ahelp-admin-only-tooltip'}" />
-                <Control HorizontalExpand="True" MinWidth="5" />
-                <CheckBox Name="PlaySound" Access="Public" Text="{Loc 'admin-bwoink-play-sound'}" Pressed="True" />
-                <Control HorizontalExpand="True" MinWidth="5" />
-                <Button Visible="True" Name="PopOut" Access="Public" Text="{Loc 'admin-logs-pop-out'}" StyleClasses="OpenBoth" HorizontalAlignment="Left" />
-                <Control HorizontalExpand="True" />
-                <Button Visible="False" Name="Bans" Text="{Loc 'admin-player-actions-bans'}" StyleClasses="OpenRight" />
-                <Button Visible="False" Name="Notes" Text="{Loc 'admin-player-actions-notes'}" StyleClasses="OpenBoth" />
-                <Button Visible="False" Name="Kick" Text="{Loc 'admin-player-actions-kick'}" StyleClasses="OpenBoth" />
-                <Button Visible="False" Name="Ban" Text="{Loc 'admin-player-actions-ban'}" StyleClasses="OpenBoth" />
-                <Button Visible="False" Name="Respawn" Text="{Loc 'admin-player-actions-respawn'}" StyleClasses="OpenBoth" />
-                <Button Visible="False" Name="Follow" Text="{Loc 'admin-player-actions-follow'}" StyleClasses="OpenLeft" />
             </BoxContainer>
         </SplitContainer>
     </PanelContainer>

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

@@ -36,9 +36,6 @@ namespace Content.Client.Administration.UI.Bwoink
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
 
-            var newPlayerThreshold = 0;
-            _cfg.OnValueChanged(CCVars.NewPlayerThreshold, (val) => { newPlayerThreshold = val; }, true);
-
             var uiController = _ui.GetUIController<AHelpUIController>();
             if (uiController.UIHelper is not AdminAHelpUIHandler helper)
                 return;
@@ -62,9 +59,9 @@ namespace Content.Client.Administration.UI.Bwoink
                 var sb = new StringBuilder();
 
                 if (info.Connected)
-                    sb.Append(info.ActiveThisRound ? '⚫' : '◐');
+                    sb.Append('●');
                 else
-                    sb.Append(info.ActiveThisRound ? '⭘' : '·');
+                    sb.Append(info.ActiveThisRound ? '○' : '·');
 
                 sb.Append(' ');
                 if (AHelpHelper.TryGetChannel(info.SessionId, out var panel) && panel.Unread > 0)
@@ -76,12 +73,10 @@ namespace Content.Client.Administration.UI.Bwoink
                     sb.Append(' ');
                 }
 
-                // Mark antagonists with symbol
                 if (info.Antag && info.ActiveThisRound)
                     sb.Append(new Rune(0x1F5E1)); // 🗡
 
-                // Mark new players with symbol
-                if (IsNewPlayer(info))
+                if (info.OverallPlaytime <= TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.NewPlayerThreshold)))
                     sb.Append(new Rune(0x23F2)); // ⏲
 
                 sb.AppendFormat("\"{0}\"", text);
@@ -89,19 +84,6 @@ namespace Content.Client.Administration.UI.Bwoink
                 return sb.ToString();
             };
 
-            // <summary>
-            // Returns true if the player's overall playtime is under the set threshold
-            // </summary>
-            bool IsNewPlayer(PlayerInfo info)
-            {
-                // Don't show every disconnected player as new, don't show 0-minute players as new if threshold is
-                if (newPlayerThreshold <= 0 || info.OverallPlaytime is null && !info.Connected)
-                    return false;
-
-                return (info.OverallPlaytime is null
-                        || info.OverallPlaytime < TimeSpan.FromMinutes(newPlayerThreshold));
-            }
-
             ChannelSelector.Comparison = (a, b) =>
             {
                 var ach = AHelpHelper.EnsurePanel(a.SessionId);
@@ -111,37 +93,31 @@ namespace Content.Client.Administration.UI.Bwoink
                 if (a.IsPinned != b.IsPinned)
                     return a.IsPinned ? -1 : 1;
 
-                // Then, any chat with unread messages.
+                // First, sort by unread. Any chat with unread messages appears first.
                 var aUnread = ach.Unread > 0;
                 var bUnread = bch.Unread > 0;
                 if (aUnread != bUnread)
                     return aUnread ? -1 : 1;
 
-                // Then, any chat with recent messages from the current round
+                // Sort by recent messages during the current round.
                 var aRecent = a.ActiveThisRound && ach.LastMessage != DateTime.MinValue;
                 var bRecent = b.ActiveThisRound && bch.LastMessage != DateTime.MinValue;
                 if (aRecent != bRecent)
                     return aRecent ? -1 : 1;
 
-                // Sort by connection status. Disconnected players will be last.
+                // Next, sort by connection status. Any disconnected players are grouped towards the end.
                 if (a.Connected != b.Connected)
                     return a.Connected ? -1 : 1;
 
-                // Sort connected players by whether they have joined the round, then by New Player status, then by Antag status
+                // Sort connected players by New Player status, then by Antag status
                 if (a.Connected && b.Connected)
                 {
-                    var aNewPlayer = IsNewPlayer(a);
-                    var bNewPlayer = IsNewPlayer(b);
+                    var aNewPlayer = a.OverallPlaytime <= TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.NewPlayerThreshold));
+                    var bNewPlayer = b.OverallPlaytime <= TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.NewPlayerThreshold));
 
-                    //  Players who have joined the round will be listed before players in the lobby
-                    if (a.ActiveThisRound != b.ActiveThisRound)
-                        return a.ActiveThisRound ? -1 : 1;
-
-                    //  Within both the joined group and lobby group, new players will be grouped and listed first
                     if (aNewPlayer != bNewPlayer)
                         return aNewPlayer ? -1 : 1;
 
-                    //  Within all four previous groups, antagonists will be listed first.
                     if (a.Antag != b.Antag)
                         return a.Antag ? -1 : 1;
                 }

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

@@ -22,9 +22,12 @@ namespace Content.Client.Administration.UI.Bwoink
                     return;
                 }
 
-                Title = $"{sel.CharacterName} / {sel.Username} | {Loc.GetString("generic-playtime-title")}: ";
+                Title = $"{sel.CharacterName} / {sel.Username}";
 
-                Title += sel.OverallPlaytime != null ? sel.PlaytimeString : Loc.GetString("generic-unknown-title");
+                if (sel.OverallPlaytime != null)
+                {
+                    Title += $" | {Loc.GetString("generic-playtime-title")}: {sel.PlaytimeString}";
+                }
             };
 
             OnOpen += () =>

Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs

@@ -2,13 +2,11 @@ using System.Linq;
 using Content.Client.Administration.Systems;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Administration;
-using Content.Shared.CCVar;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Configuration;
 using static Content.Client.Administration.UI.Tabs.PlayerTab.PlayerTabHeader;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
@@ -18,7 +16,6 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab;
 public sealed partial class PlayerTab : Control
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
-    [Dependency] private readonly IConfigurationManager _config = default!;
     [Dependency] private readonly IPlayerManager _playerMan = default!;
 
     private const string ArrowUp = "↑";
@@ -44,10 +41,6 @@ public sealed partial class PlayerTab : Control
         _adminSystem.OverlayEnabled += OverlayEnabled;
         _adminSystem.OverlayDisabled += OverlayDisabled;
 
-        _config.OnValueChanged(CCVars.AdminPlayerlistSeparateSymbols, PlayerListSettingsChanged);
-        _config.OnValueChanged(CCVars.AdminPlayerlistHighlightedCharacterColor, PlayerListSettingsChanged);
-        _config.OnValueChanged(CCVars.AdminPlayerlistRoleTypeColor, PlayerListSettingsChanged);
-
         OverlayButton.OnPressed += OverlayButtonPressed;
         ShowDisconnectedButton.OnPressed += ShowDisconnectedPressed;
 
@@ -113,11 +106,6 @@ public sealed partial class PlayerTab : Control
 
     #region ListContainer
 
-    private void PlayerListSettingsChanged(bool _)
-    {
-        RefreshPlayerList(_adminSystem.PlayerList);
-    }
-
     private void RefreshPlayerList(IReadOnlyList<PlayerInfo> players)
     {
         _players = players;
@@ -208,7 +196,8 @@ public sealed partial class PlayerTab : Control
             Header.Username => Compare(x.Username, y.Username),
             Header.Character => Compare(x.CharacterName, y.CharacterName),
             Header.Job => Compare(x.StartingJob, y.StartingJob),
-            Header.RoleType => y.SortWeight - x.SortWeight,
+            Header.Antagonist => x.Antag.CompareTo(y.Antag),
+            Header.RoleType => Compare(x.RoleProto.Name , y.RoleProto.Name),
             Header.Playtime => TimeSpan.Compare(x.OverallPlaytime ?? default, y.OverallPlaytime ?? default),
             _ => 1
         };

Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml

@@ -19,6 +19,11 @@
                HorizontalExpand="True"
                ClipText="True"/>
         <customControls:VSeparator/>
+        <Label Name="AntagonistLabel"
+               SizeFlagsStretchRatio="1"
+               HorizontalExpand="True"
+               ClipText="True"/>
+        <customControls:VSeparator/>
         <Label Name="RoleTypeLabel"
                SizeFlagsStretchRatio="2"
                HorizontalExpand="True"

Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs

@@ -1,10 +1,8 @@
 using Content.Shared.Administration;
-using Content.Shared.CCVar;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Configuration;
 
 namespace Content.Client.Administration.UI.Tabs.PlayerTab;
 
@@ -16,25 +14,17 @@ public sealed partial class PlayerTabEntry : PanelContainer
     public PlayerTabEntry(PlayerInfo player, StyleBoxFlat styleBoxFlat)
     {
         RobustXamlLoader.Load(this);
-        var config = IoCManager.Resolve<IConfigurationManager>();
 
         UsernameLabel.Text = player.Username;
         if (!player.Connected)
             UsernameLabel.StyleClasses.Add("Disabled");
         JobLabel.Text = player.StartingJob;
-        var separateAntagSymbols = config.GetCVar(CCVars.AdminPlayerlistSeparateSymbols);
-        var genericAntagSymbol = player.Antag ? Loc.GetString("player-tab-antag-prefix") : string.Empty;
-        var roleSymbol = player.Antag ? player.RoleProto.Symbol : string.Empty;
-        var symbol = separateAntagSymbols ? roleSymbol : genericAntagSymbol;
-        CharacterLabel.Text = Loc.GetString("player-tab-character-name-antag-symbol", ("symbol", symbol), ("name", player.CharacterName));
-
-        if (player.Antag && config.GetCVar(CCVars.AdminPlayerlistHighlightedCharacterColor))
-            CharacterLabel.FontColorOverride = player.RoleProto.Color;
+        CharacterLabel.Text = player.CharacterName;
         if (player.IdentityName != player.CharacterName)
             CharacterLabel.Text += $" [{player.IdentityName}]";
+        AntagonistLabel.Text = Loc.GetString(player.Antag ? "player-tab-is-antag-yes" : "player-tab-is-antag-no");
         RoleTypeLabel.Text = Loc.GetString(player.RoleProto.Name);
-        if (config.GetCVar(CCVars.AdminPlayerlistRoleTypeColor))
-            RoleTypeLabel.FontColorOverride = player.RoleProto.Color;
+        RoleTypeLabel.FontColorOverride = player.RoleProto.Color;
         BackgroundColorPanel.PanelOverride = styleBoxFlat;
         OverallPlaytimeLabel.Text = player.PlaytimeString;
         PlayerEntity = player.NetEntity;

Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml

@@ -25,6 +25,13 @@
                Text="{Loc player-tab-job}"
                MouseFilter="Pass"/>
         <cc:VSeparator/>
+        <Label Name="AntagonistLabel"
+               SizeFlagsStretchRatio="1"
+               HorizontalExpand="True"
+               ClipText="True"
+               Text="{Loc player-tab-antagonist}"
+               MouseFilter="Pass"/>
+        <cc:VSeparator/>
         <Label Name="RoleTypeLabel"
                SizeFlagsStretchRatio="2"
                HorizontalExpand="True"

Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs

@@ -18,6 +18,7 @@ public sealed partial class PlayerTabHeader : Control
         UsernameLabel.OnKeyBindDown += UsernameClicked;
         CharacterLabel.OnKeyBindDown += CharacterClicked;
         JobLabel.OnKeyBindDown += JobClicked;
+        AntagonistLabel.OnKeyBindDown += AntagonistClicked;
         RoleTypeLabel.OnKeyBindDown += RoleTypeClicked;
         PlaytimeLabel.OnKeyBindDown += PlaytimeClicked;
     }
@@ -29,6 +30,7 @@ public sealed partial class PlayerTabHeader : Control
             Header.Username => UsernameLabel,
             Header.Character => CharacterLabel,
             Header.Job => JobLabel,
+            Header.Antagonist => AntagonistLabel,
             Header.RoleType => RoleTypeLabel,
             Header.Playtime => PlaytimeLabel,
             _ => throw new ArgumentOutOfRangeException(nameof(header), header, null)
@@ -40,6 +42,7 @@ public sealed partial class PlayerTabHeader : Control
         UsernameLabel.Text = Loc.GetString("player-tab-username");
         CharacterLabel.Text = Loc.GetString("player-tab-character");
         JobLabel.Text = Loc.GetString("player-tab-job");
+        AntagonistLabel.Text = Loc.GetString("player-tab-antagonist");
         RoleTypeLabel.Text = Loc.GetString("player-tab-roletype");
         PlaytimeLabel.Text = Loc.GetString("player-tab-playtime");
     }
@@ -70,6 +73,11 @@ public sealed partial class PlayerTabHeader : Control
         HeaderClicked(args, Header.Job);
     }
 
+    private void AntagonistClicked(GUIBoundKeyEventArgs args)
+    {
+        HeaderClicked(args, Header.Antagonist);
+    }
+
     private void RoleTypeClicked(GUIBoundKeyEventArgs args)
     {
         HeaderClicked(args, Header.RoleType);
@@ -89,6 +97,7 @@ public sealed partial class PlayerTabHeader : Control
             UsernameLabel.OnKeyBindDown -= UsernameClicked;
             CharacterLabel.OnKeyBindDown -= CharacterClicked;
             JobLabel.OnKeyBindDown -= JobClicked;
+            AntagonistLabel.OnKeyBindDown -= AntagonistClicked;
             RoleTypeLabel.OnKeyBindDown -= RoleTypeClicked;
             PlaytimeLabel.OnKeyBindDown -= PlaytimeClicked;
         }
@@ -99,6 +108,7 @@ public sealed partial class PlayerTabHeader : Control
         Username,
         Character,
         Job,
+        Antagonist,
         RoleType,
         Playtime
     }

Content.Client/Alerts/ClientAlertsSystem.cs

@@ -52,7 +52,7 @@ public sealed class ClientAlertsSystem : AlertsSystem
         if (args.Current is not AlertComponentState cast)
             return;
 
-        alerts.Comp.Alerts = new(cast.Alerts);
+        alerts.Comp.Alerts = cast.Alerts;
 
         UpdateHud(alerts);
     }

Content.Client/CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs

@@ -1,5 +0,0 @@
-using Content.Shared.CartridgeLoader.Cartridges;
-
-namespace Content.Client.CartridgeLoader.Cartridges;
-
-public sealed class NanoTaskCartridgeSystem : SharedNanoTaskCartridgeSystem;

Content.Client/CartridgeLoader/Cartridges/NanoTaskItemControl.xaml

@@ -1,32 +0,0 @@
-<Control xmlns="https://spacestation14.io" xmlns:system="clr-namespace:System;assembly=System.Runtime">
-    <BoxContainer Name="MainContainer"
-                  Orientation="Horizontal"
-                  SetWidth="250">
-        <Button Name="MainButton"
-                HorizontalExpand="True"
-                VerticalExpand="True"
-                StyleClasses="ButtonSquare"
-                Margin="-1 0 0 0">
-            <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-                <BoxContainer Orientation="Vertical"
-                              VerticalExpand="True"
-                              HorizontalExpand="True"
-                              Margin="-5 0 0 0">
-                    <Label Name="TaskLabel"
-                           StyleClasses="LabelSubText" />
-                    <Label Name="TaskForLabel"
-                           StyleClasses="LabelSubText"
-                           Margin="0 -5 0 0" />
-                </BoxContainer>
-            </BoxContainer>
-        </Button>
-        <Button Name="DoneButton"
-                VerticalExpand="True"
-                Text="{Loc 'nano-task-ui-done'}">
-            <Button.StyleClasses>
-                <system:String>ButtonSmall</system:String>
-                <system:String>OpenLeft</system:String>
-            </Button.StyleClasses>
-        </Button>
-    </BoxContainer>
-</Control>

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

@@ -1,33 +0,0 @@
-using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Maths;
-using Content.Shared.CartridgeLoader.Cartridges;
-
-namespace Content.Client.CartridgeLoader.Cartridges;
-
-/// <summary>
-///     Represents a single control for a single NanoTask item
-/// </summary>
-[GenerateTypedNameReferences]
-public sealed partial class NanoTaskItemControl : Control
-{
-    public Action<int>? OnMainPressed;
-    public Action<int>? OnDonePressed;
-
-    public NanoTaskItemControl(NanoTaskItemAndId item)
-    {
-        RobustXamlLoader.Load(this);
-
-        TaskLabel.Text = item.Data.Description;
-        TaskLabel.FontColorOverride = Color.White;
-        TaskForLabel.Text = item.Data.TaskIsFor;
-
-        MainButton.OnPressed += _ => OnMainPressed?.Invoke(item.Id);
-        DoneButton.OnPressed += _ => OnDonePressed?.Invoke(item.Id);
-
-        MainButton.Disabled = item.Data.IsTaskDone;
-        DoneButton.Text = item.Data.IsTaskDone ? Loc.GetString("nano-task-ui-revert-done") : Loc.GetString("nano-task-ui-done");
-    }
-}

Content.Client/CartridgeLoader/Cartridges/NanoTaskItemPopup.xaml

@@ -1,67 +0,0 @@
-<DefaultWindow xmlns="https://spacestation14.io"
-               Title="{Loc nano-task-ui-item-title}"
-               MinSize="300 300">
-    <PanelContainer StyleClasses="AngleRect">
-        <BoxContainer Orientation="Vertical" Margin="4">
-            <!-- Task Description Input -->
-            <BoxContainer Orientation="Vertical" Margin="0 4">
-                <Label Text="{Loc nano-task-ui-description-label}"
-                       StyleClasses="LabelHeading" />
-                <PanelContainer StyleClasses="ButtonSquare">
-                    <LineEdit Name="DescriptionInput"
-                              PlaceHolder="{Loc nano-task-ui-description-placeholder}" />
-                </PanelContainer>
-            </BoxContainer>
-
-            <!-- Task Requester Input -->
-            <BoxContainer Orientation="Vertical" Margin="0 4">
-                <Label Text="{Loc nano-task-ui-requester-label}"
-                       StyleClasses="LabelHeading" />
-                <PanelContainer StyleClasses="ButtonSquare">
-                    <LineEdit Name="RequesterInput"
-                              PlaceHolder="{Loc nano-task-ui-requester-placeholder}" />
-                </PanelContainer>
-            </BoxContainer>
-
-            <!-- Severity Buttons -->
-            <BoxContainer Orientation="Horizontal"
-                          HorizontalAlignment="Center"
-                          Margin="0 8 0 0">
-                <Button Name="LowButton"
-                        Text="{Loc nano-task-ui-priority-low}"
-                        StyleClasses="OpenRight"
-                        MinSize="60 0" />
-                <Button Name="MediumButton"
-                        Text="{Loc nano-task-ui-priority-medium}"
-                        StyleClasses="ButtonSquare"
-                        MinSize="60 0" />
-                <Button Name="HighButton"
-                        Text="{Loc nano-task-ui-priority-high}"
-                        StyleClasses="OpenLeft"
-                        MinSize="60 0" />
-            </BoxContainer>
-
-            <!-- Verb Buttons -->
-            <BoxContainer Orientation="Horizontal"
-                          HorizontalAlignment="Right"
-                          Margin="0 8 0 0">
-                <Button Name="CancelButton"
-                        Text="{Loc nano-task-ui-cancel}"
-                        StyleClasses="OpenRight"
-                        MinSize="60 0" />
-                <Button Name="DeleteButton"
-                        Text="{Loc nano-task-ui-delete}"
-                        StyleClasses="ButtonSquare"
-                        MinSize="60 0" />
-                <Button Name="PrintButton"
-                        Text="{Loc nano-task-ui-print}"
-                        StyleClasses="ButtonSquare"
-                        MinSize="60 0" />
-                <Button Name="SaveButton"
-                        Text="{Loc nano-task-ui-save}"
-                        StyleClasses="OpenLeft"
-                        MinSize="60 0" />
-            </BoxContainer>
-        </BoxContainer>
-    </PanelContainer>
-</DefaultWindow>

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

@@ -1,109 +0,0 @@
-using System.Linq;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Client.UserInterface.Controls;
-using Content.Shared.CartridgeLoader.Cartridges;
-
-namespace Content.Client.CartridgeLoader.Cartridges;
-
-/// <summary>
-///     Popup displayed to edit a NanoTask item
-/// </summary>
-[GenerateTypedNameReferences]
-public sealed partial class NanoTaskItemPopup : DefaultWindow
-{
-    private readonly ButtonGroup _priorityGroup = new();
-    private int? _editingTaskId = null;
-
-    public Action<int, NanoTaskItem>? TaskSaved;
-    public Action<int>? TaskDeleted;
-    public Action<NanoTaskItem>? TaskCreated;
-    public Action<NanoTaskItem>? TaskPrinted;
-
-    private NanoTaskItem MakeItem()
-    {
-        return new(
-            description: DescriptionInput.Text,
-            taskIsFor: RequesterInput.Text,
-            isTaskDone: false,
-            priority: _priorityGroup.Pressed switch {
-                var item when item == LowButton => NanoTaskPriority.Low,
-                var item when item == MediumButton => NanoTaskPriority.Medium,
-                var item when item == HighButton => NanoTaskPriority.High,
-                _ => NanoTaskPriority.Medium,
-            }
-        );
-    }
-
-    public NanoTaskItemPopup()
-    {
-        RobustXamlLoader.Load(this);
-
-        LowButton.Group = _priorityGroup;
-        MediumButton.Group = _priorityGroup;
-        HighButton.Group = _priorityGroup;
-
-        CancelButton.OnPressed += _ => Close();
-        DeleteButton.OnPressed += _ =>
-        {
-            if (_editingTaskId is int id)
-            {
-                TaskDeleted?.Invoke(id);
-            }
-        };
-        PrintButton.OnPressed += _ =>
-        {
-            TaskPrinted?.Invoke(MakeItem());
-        };
-        SaveButton.OnPressed += _ =>
-        {
-            if (_editingTaskId is int id)
-            {
-                TaskSaved?.Invoke(id, MakeItem());
-            }
-            else
-            {
-                TaskCreated?.Invoke(MakeItem());
-            }
-        };
-
-        DescriptionInput.OnTextChanged += args =>
-        {
-            if (args.Text.Length > NanoTaskItem.MaximumStringLength)
-                DescriptionInput.Text = args.Text[..NanoTaskItem.MaximumStringLength];
-        };
-        RequesterInput.OnTextChanged += args =>
-        {
-            if (args.Text.Length > NanoTaskItem.MaximumStringLength)
-                RequesterInput.Text = args.Text[..NanoTaskItem.MaximumStringLength];
-        };
-    }
-
-    public void SetEditingTaskId(int? id)
-    {
-        _editingTaskId = id;
-        DeleteButton.Visible = id is not null;
-    }
-
-    public void ResetInputs(NanoTaskItem? item)
-    {
-        if (item is NanoTaskItem task)
-        {
-            var button = task.Priority switch {
-                NanoTaskPriority.High => HighButton,
-                NanoTaskPriority.Medium => MediumButton,
-                NanoTaskPriority.Low => LowButton,
-            };
-            button.Pressed = true;
-            DescriptionInput.Text = task.Description;
-            RequesterInput.Text = task.TaskIsFor;
-        }
-        else
-        {
-            MediumButton.Pressed = true;
-            DescriptionInput.Text = "";
-            RequesterInput.Text = "";
-        }
-    }
-}

Content.Client/CartridgeLoader/Cartridges/NanoTaskUi.cs

@@ -1,82 +0,0 @@
-using System.Linq;
-using Content.Client.UserInterface.Fragments;
-using Content.Shared.CartridgeLoader;
-using Content.Shared.CartridgeLoader.Cartridges;
-using Robust.Client.GameObjects;
-using Robust.Client.UserInterface;
-
-namespace Content.Client.CartridgeLoader.Cartridges;
-
-/// <summary>
-///     UI fragment responsible for displaying NanoTask controls in a PDA and coordinating with the NanoTaskCartridgeSystem for state
-/// </summary>
-public sealed partial class NanoTaskUi : UIFragment
-{
-    private NanoTaskUiFragment? _fragment;
-    private NanoTaskItemPopup? _popup;
-
-    public override Control GetUIFragmentRoot()
-    {
-        return _fragment!;
-    }
-
-    public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner)
-    {
-        _fragment = new NanoTaskUiFragment();
-        _popup = new NanoTaskItemPopup();
-        _fragment.NewTask += () =>
-        {
-            _popup.ResetInputs(null);
-            _popup.SetEditingTaskId(null);
-            _popup.OpenCentered();
-        };
-        _fragment.OpenTask += id =>
-        {
-            if (_fragment.Tasks.Find(task => task.Id == id) is not NanoTaskItemAndId task)
-                return;
-
-            _popup.ResetInputs(task.Data);
-            _popup.SetEditingTaskId(task.Id);
-            _popup.OpenCentered();
-        };
-        _fragment.ToggleTaskCompletion += id =>
-        {
-            if (_fragment.Tasks.Find(task => task.Id == id) is not NanoTaskItemAndId task)
-                return;
-
-            userInterface.SendMessage(new CartridgeUiMessage(new NanoTaskUiMessageEvent(new NanoTaskUpdateTask(new(id, new(
-                description: task.Data.Description,
-                taskIsFor: task.Data.TaskIsFor,
-                isTaskDone: !task.Data.IsTaskDone,
-                priority: task.Data.Priority
-            ))))));
-        };
-        _popup.TaskSaved += (id, data) =>
-        {
-            userInterface.SendMessage(new CartridgeUiMessage(new NanoTaskUiMessageEvent(new NanoTaskUpdateTask(new(id, data)))));
-            _popup.Close();
-        };
-        _popup.TaskDeleted += id =>
-        {
-            userInterface.SendMessage(new CartridgeUiMessage(new NanoTaskUiMessageEvent(new NanoTaskDeleteTask(id))));
-            _popup.Close();
-        };
-        _popup.TaskCreated += data =>
-        {
-            userInterface.SendMessage(new CartridgeUiMessage(new NanoTaskUiMessageEvent(new NanoTaskAddTask(data))));
-            _popup.Close();
-        };
-        _popup.TaskPrinted += data =>
-        {
-            userInterface.SendMessage(new CartridgeUiMessage(new NanoTaskUiMessageEvent(new NanoTaskPrintTask(data))));
-        };
-    }
-
-    public override void UpdateState(BoundUserInterfaceState state)
-    {
-        if (state is not NanoTaskUiState nanoTaskState)
-            return;
-
-        _fragment?.UpdateState(nanoTaskState.Tasks);
-    }
-}

Content.Client/CartridgeLoader/Cartridges/NanoTaskUiFragment.xaml

@@ -1,58 +0,0 @@
-<cartridges:NanoTaskUiFragment xmlns:cartridges="clr-namespace:Content.Client.CartridgeLoader.Cartridges"
-                               xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-                               xmlns="https://spacestation14.io" Margin="1 0 2 0">
-
-    <PanelContainer StyleClasses="BackgroundDark"></PanelContainer>
-    <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
-        <ScrollContainer HorizontalExpand="True" VerticalExpand="True">
-            <BoxContainer HorizontalExpand="True" VerticalExpand="True" Orientation="Vertical" Margin="8" SeparationOverride="8">
-                <!-- Heading for High Priority Items -->
-                <BoxContainer Orientation="Horizontal">
-                    <PanelContainer SetWidth="7" Margin="0 0 8 0">
-                        <PanelContainer.PanelOverride>
-                            <gfx:StyleBoxFlat BackgroundColor="#e93d58"/>
-                        </PanelContainer.PanelOverride>
-                    </PanelContainer>
-                    <Label Name="HighPriority" StyleClasses="LabelHeading"/>
-                </BoxContainer>
-                <!-- Location for High Priority Items -->
-                <GridContainer Name="HighContainer"
-                               HorizontalExpand="True"
-                               Access="Public"
-                               Columns="2" />
-
-                <!-- Heading for Medium Priority Items -->
-                <BoxContainer Orientation="Horizontal">
-                    <PanelContainer SetWidth="7" Margin="0 0 8 0">
-                        <PanelContainer.PanelOverride>
-                            <gfx:StyleBoxFlat BackgroundColor="#ef973c"/>
-                        </PanelContainer.PanelOverride>
-                    </PanelContainer>
-                    <Label Name="MediumPriority" StyleClasses="LabelHeading"/>
-                </BoxContainer>
-                <!-- Location for Medium Priority Items -->
-                <GridContainer Name="MediumContainer"
-                               HorizontalExpand="True"
-                               Access="Public"
-                               Columns="2" />
-
-                <!-- Location for Low Priority Items -->
-                <BoxContainer Orientation="Horizontal">
-                    <PanelContainer SetWidth="7" Margin="0 0 8 0">
-                        <PanelContainer.PanelOverride>
-                            <gfx:StyleBoxFlat BackgroundColor="#3dd425"/>
-                        </PanelContainer.PanelOverride>
-                    </PanelContainer>
-                    <Label Name="LowPriority" StyleClasses="LabelHeading"/>
-                </BoxContainer>
-                <!-- Location for Low Priority Items -->
-                <GridContainer Name="LowContainer"
-                               HorizontalExpand="True"
-                               Access="Public"
-                               Columns="2" />
-
-                <Button Name="NewTaskButton" Text="{Loc 'nano-task-ui-new-task'}" HorizontalAlignment="Right"/>
-            </BoxContainer>
-        </ScrollContainer>
-    </BoxContainer>
-</cartridges:NanoTaskUiFragment>

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

@@ -1,52 +0,0 @@
-using System.Linq;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-using Content.Shared.CartridgeLoader.Cartridges;
-
-namespace Content.Client.CartridgeLoader.Cartridges;
-
-/// <summary>
-///     Class displaying the main UI of NanoTask
-/// </summary>
-[GenerateTypedNameReferences]
-public sealed partial class NanoTaskUiFragment : BoxContainer
-{
-    public Action<int>? OpenTask;
-    public Action<int>? ToggleTaskCompletion;
-    public Action? NewTask;
-    public List<NanoTaskItemAndId> Tasks = new();
-
-    public NanoTaskUiFragment()
-    {
-        RobustXamlLoader.Load(this);
-        Orientation = LayoutOrientation.Vertical;
-        HorizontalExpand = true;
-        VerticalExpand = true;
-        NewTaskButton.OnPressed += _ => NewTask?.Invoke();
-    }
-    public void UpdateState(List<NanoTaskItemAndId> tasks)
-    {
-        Tasks = tasks;
-        HighContainer.RemoveAllChildren();
-        MediumContainer.RemoveAllChildren();
-        LowContainer.RemoveAllChildren();
-
-        HighPriority.Text = Loc.GetString("nano-task-ui-heading-high-priority-tasks", ("amount", tasks.Count(task => task.Data.Priority == NanoTaskPriority.High)));
-        MediumPriority.Text = Loc.GetString("nano-task-ui-heading-medium-priority-tasks", ("amount", tasks.Count(task => task.Data.Priority == NanoTaskPriority.Medium)));
-        LowPriority.Text = Loc.GetString("nano-task-ui-heading-low-priority-tasks", ("amount", tasks.Count(task => task.Data.Priority == NanoTaskPriority.Low)));
-
-        foreach (var task in tasks)
-        {
-            var container = task.Data.Priority switch {
-                NanoTaskPriority.High => HighContainer,
-                NanoTaskPriority.Medium => MediumContainer,
-                NanoTaskPriority.Low => LowContainer,
-            };
-            var control = new NanoTaskItemControl(task);
-            container.AddChild(control);
-            control.OnMainPressed += id => OpenTask?.Invoke(id);
-            control.OnDonePressed += id => ToggleTaskCompletion?.Invoke(id);
-        }
-    }
-}

Content.Client/Changelog/ChangelogTab.xaml.cs

@@ -131,13 +131,13 @@ public sealed partial class ChangelogTab : Control
                     Margin = new Thickness(6, 0, 0, 0),
                 };
                 authorLabel.SetMessage(
-                    FormattedMessage.FromMarkupOrThrow(Loc.GetString("changelog-author-changed", ("author", FormattedMessage.EscapeText(author)))));
+                    FormattedMessage.FromMarkupOrThrow(Loc.GetString("changelog-author-changed", ("author", author))));
                 ChangelogBody.AddChild(authorLabel);
 
                 foreach (var change in groupedEntry.SelectMany(c => c.Changes))
                 {
                     var text = new RichTextLabel();
-                    text.SetMessage(FormattedMessage.FromUnformatted(change.Message));
+                    text.SetMessage(FormattedMessage.FromMarkupOrThrow(change.Message));
                     ChangelogBody.AddChild(new BoxContainer
                     {
                         Orientation = LayoutOrientation.Horizontal,

Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs

@@ -28,6 +28,7 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionCo
     private void OnMapInit(EntityUid uid, SolutionContainerVisualsComponent component, MapInitEvent args)
     {
         var meta = MetaData(uid);
+        component.InitialName = meta.EntityName;
         component.InitialDescription = meta.EntityDescription;
     }
 

Content.Client/Clothing/ClientClothingSystem.cs

@@ -169,7 +169,7 @@ public sealed class ClientClothingSystem : ClothingSystem
 
         var state = $"equipped-{correctedSlot}";
 
-        if (!string.IsNullOrEmpty(clothing.EquippedPrefix))
+        if (clothing.EquippedPrefix != null)
             state = $"{clothing.EquippedPrefix}-equipped-{correctedSlot}";
 
         if (clothing.EquippedState != null)

Content.Client/Commands/DebugCommands.cs

@@ -36,6 +36,29 @@ internal sealed class ShowSubFloor : LocalizedCommands
     }
 }
 
+internal sealed class ShowSubFloorForever : LocalizedCommands
+{
+    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
+
+    public const string CommandName = "showsubfloorforever";
+    public override string Command => CommandName;
+
+    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        _entitySystemManager.GetEntitySystem<SubFloorHideSystem>().ShowAll = true;
+
+        var entMan = IoCManager.Resolve<IEntityManager>();
+        var components = entMan.EntityQuery<SubFloorHideComponent, SpriteComponent>(true);
+
+        foreach (var (_, sprite) in components)
+        {
+            sprite.DrawDepth = (int) DrawDepth.Overlays;
+        }
+    }
+}
+
 internal sealed class NotifyCommand : LocalizedCommands
 {
     [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;

Content.Client/Commands/MappingClientSideSetupCommand.cs

@@ -24,7 +24,7 @@ internal sealed class MappingClientSideSetupCommand : LocalizedCommands
         {
             _entitySystemManager.GetEntitySystem<MarkerSystem>().MarkersVisible = true;
             _lightManager.Enabled = false;
-            shell.ExecuteCommand("showsubfloor");
+            shell.ExecuteCommand("showsubfloorforever");
             _entitySystemManager.GetEntitySystem<ActionsSystem>().LoadActionAssignments("/mapping_actions.yml", false);
         }
     }

Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs

@@ -3,7 +3,6 @@ using Content.Shared.Access.Systems;
 using Content.Shared.Administration;
 using Content.Shared.CriminalRecords;
 using Content.Shared.Dataset;
-using Content.Shared.Random.Helpers;
 using Content.Shared.Security;
 using Content.Shared.StationRecords;
 using Robust.Client.AutoGenerated;
@@ -33,7 +32,7 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
 
     public readonly EntityUid Console;
 
-    [ValidatePrototypeId<LocalizedDatasetPrototype>]
+    [ValidatePrototypeId<DatasetPrototype>]
     private const string ReasonPlaceholders = "CriminalRecordsWantedReasonPlaceholders";
 
     public Action<uint?>? OnKeySelected;
@@ -334,8 +333,8 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
 
         var field = "reason";
         var title = Loc.GetString("criminal-records-status-" + status.ToString().ToLower());
-        var placeholders = _proto.Index<LocalizedDatasetPrototype>(ReasonPlaceholders);
-        var placeholder = Loc.GetString("criminal-records-console-reason-placeholder", ("placeholder", _random.Pick(placeholders))); // just funny it doesn't actually get used
+        var placeholders = _proto.Index<DatasetPrototype>(ReasonPlaceholders);
+        var placeholder = Loc.GetString("criminal-records-console-reason-placeholder", ("placeholder", _random.Pick(placeholders.Values))); // just funny it doesn't actually get used
         var prompt = Loc.GetString("criminal-records-console-reason");
         var entry = new QuickDialogEntry(field, QuickDialogEntryType.LongText, prompt, placeholder);
         var entries = new List<QuickDialogEntry>() { entry };

Content.Client/Delivery/DeliverySystem.cs

@@ -1,5 +0,0 @@
-using Content.Shared.Delivery;
-
-namespace Content.Client.Delivery;
-
-public sealed class DeliverySystem : SharedDeliverySystem;

Content.Client/Delivery/DeliveryVisualizerSystem.cs

@@ -1,45 +0,0 @@
-using Content.Shared.Delivery;
-using Content.Shared.StatusIcon;
-using Robust.Client.GameObjects;
-using Robust.Shared.Prototypes;
-
-namespace Content.Client.Delivery;
-
-public sealed class DeliveryVisualizerSystem : VisualizerSystem<DeliveryComponent>
-{
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
-    [Dependency] private readonly SpriteSystem _sprite = default!;
-
-    private static readonly ProtoId<JobIconPrototype> UnknownIcon = "JobIconUnknown";
-
-    protected override void OnAppearanceChange(EntityUid uid, DeliveryComponent component, ref AppearanceChangeEvent args)
-    {
-        if (args.Sprite == null)
-            return;
-
-        _appearance.TryGetData(uid, DeliveryVisuals.JobIcon, out string job, args.Component);
-
-        if (string.IsNullOrEmpty(job))
-            job = UnknownIcon;
-
-        if (!_prototype.TryIndex<JobIconPrototype>(job, out var icon))
-        {
-            args.Sprite.LayerSetTexture(DeliveryVisualLayers.JobStamp, _sprite.Frame0(_prototype.Index("JobIconUnknown")));
-            return;
-        }
-
-        args.Sprite.LayerSetTexture(DeliveryVisualLayers.JobStamp, _sprite.Frame0(icon.Icon));
-    }
-}
-
-public enum DeliveryVisualLayers : byte
-{
-    Icon,
-    Lock,
-    FragileStamp,
-    JobStamp,
-    PriorityTape,
-    Breakage,
-    Trash,
-}

Content.Client/Examine/ExamineButton.cs

@@ -4,7 +4,6 @@ using Content.Shared.Verbs;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Client.Utility;
 using Robust.Shared.Utility;
@@ -41,17 +40,7 @@ public sealed class ExamineButton : ContainerButton
             Disabled = true;
         }
 
-        TooltipSupplier = sender =>
-        {
-            var label = new RichTextLabel();
-            label.SetMessage(FormattedMessage.FromMarkupOrThrow(verb.Message ?? verb.Text));
-
-            var tooltip = new Tooltip();
-            tooltip.GetChild(0).Children.Clear();
-            tooltip.GetChild(0).Children.Add(label);
-
-            return tooltip;
-        };
+        ToolTip = verb.Message ?? verb.Text;
 
         Icon = new TextureRect
         {

Content.Client/Examine/ExamineSystem.cs

@@ -298,26 +298,8 @@ namespace Content.Client.Examine
             {
                 Name = "ExamineButtonsHBox",
                 Orientation = LayoutOrientation.Horizontal,
-                HorizontalAlignment = Control.HAlignment.Stretch,
-                VerticalAlignment = Control.VAlignment.Bottom,
-            };
-
-            var hoverExamineBox = new BoxContainer
-            {
-                Name = "HoverExamineHBox",
-                Orientation = LayoutOrientation.Horizontal,
-                HorizontalAlignment = Control.HAlignment.Left,
-                VerticalAlignment = Control.VAlignment.Center,
-                HorizontalExpand = true
-            };
-
-            var clickExamineBox = new BoxContainer
-            {
-                Name = "ClickExamineHBox",
-                Orientation = LayoutOrientation.Horizontal,
                 HorizontalAlignment = Control.HAlignment.Right,
-                VerticalAlignment = Control.VAlignment.Center,
-                HorizontalExpand = true
+                VerticalAlignment = Control.VAlignment.Bottom,
             };
 
             // Examine button time
@@ -334,15 +316,8 @@ namespace Content.Client.Examine
 
                 var button = new ExamineButton(examine);
 
-                if (examine.HoverVerb)
-                {
-                    hoverExamineBox.AddChild(button);
-                }
-                else
-                {
-                    button.OnPressed += VerbButtonPressed;
-                    clickExamineBox.AddChild(button);
-                }
+                button.OnPressed += VerbButtonPressed;
+                buttonsHBox.AddChild(button);
             }
 
             var vbox = _examineTooltipOpen?.GetChild(0).GetChild(0);
@@ -359,8 +334,6 @@ namespace Content.Client.Examine
             {
                 vbox.Children.Remove(hbox.First());
             }
-            buttonsHBox.AddChild(hoverExamineBox);
-            buttonsHBox.AddChild(clickExamineBox);
             vbox.AddChild(buttonsHBox);
         }
 

Content.Client/Guidebook/Controls/GuideReagentReaction.xaml

@@ -1,4 +1,5 @@
 <BoxContainer xmlns="https://spacestation14.io"
+              Orientation="Vertical"
               xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
               Orientation="Vertical"
               HorizontalAlignment="Stretch"
@@ -29,25 +30,24 @@
                            VerticalAlignment="Center"
                            Access="Public"
                            Visible="False" />
+            <!-- CP14 random reactions begin -->
+            <BoxContainer Name="RandomVariations"
+                          Orientation="Vertical"
+                          VerticalExpand="True"
+                          VerticalAlignment="Center"
+                          HorizontalAlignment="Center">
+                <controls:SplitBar MinHeight="10">
+                </controls:SplitBar>
+                <Label Name="RandomVariationsLabel"
+                       Text="{Loc 'cp14-guidebook-random-variations-title'}"
+                       Visible="False"
+                       HorizontalAlignment="Center"
+                       FontColorOverride="#1e6651" />
+                <controls:SplitBar MinHeight="10">
+                </controls:SplitBar>
+            </BoxContainer>
+            <!-- CP14 random reactions end -->
         </BoxContainer>
-        <!-- CP14 random reactions begin -->
-        <BoxContainer Name="RandomVariations"
-                      Orientation="Vertical"
-                      VerticalExpand="True"
-                      VerticalAlignment="Center"
-                      HorizontalAlignment="Center">
-            <controls:SplitBar MinHeight="10">
-            </controls:SplitBar>
-            <Label Name="RandomVariationsLabel"
-                   Text="{Loc 'cp14-guidebook-random-variations-title'}"
-                   Visible="False"
-                   HorizontalAlignment="Center"
-                   FontColorOverride="#1e6651" />
-            <controls:SplitBar MinHeight="10">
-            </controls:SplitBar>
-        </BoxContainer>
-        <!-- CP14 random reactions end -->
-
     </BoxContainer>
     <PanelContainer StyleClasses="LowDivider" Margin="0 5 0 5" />
 </BoxContainer>

Content.Client/Hands/Systems/HandsSystem.cs

@@ -349,12 +349,7 @@ namespace Content.Client.Hands.Systems
                 sprite.LayerSetData(index, layerData);
 
                 //Add displacement maps
-                if (hand.Location == HandLocation.Left && handComp.LeftHandDisplacement is not null)
-                    _displacement.TryAddDisplacement(handComp.LeftHandDisplacement, sprite, index, key, revealedLayers);
-                else if (hand.Location == HandLocation.Right && handComp.RightHandDisplacement is not null)
-                    _displacement.TryAddDisplacement(handComp.RightHandDisplacement, sprite, index, key, revealedLayers);
-                //Fallback to default displacement map
-                else if (handComp.HandDisplacement is not null)
+                if (handComp.HandDisplacement is not null)
                     _displacement.TryAddDisplacement(handComp.HandDisplacement, sprite, index, key, revealedLayers);
             }
 

Content.Client/Humanoid/HumanoidAppearanceSystem.cs

@@ -1,11 +1,8 @@
-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;
 
@@ -15,15 +12,12 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly MarkingManager _markingManager = default!;
-    [Dependency] private readonly IConfigurationManager _configurationManager = 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)
@@ -31,15 +25,6 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
         UpdateSprite(component, Comp<SpriteComponent>(uid));
     }
 
-    private void OnCvarChanged(bool value)
-    {
-        var humanoidQuery = EntityManager.AllEntityQueryEnumerator<HumanoidAppearanceComponent, SpriteComponent>();
-        while (humanoidQuery.MoveNext(out var _, out var humanoidComp, out var spriteComp))
-        {
-            UpdateSprite(humanoidComp, spriteComp);
-        }
-    }
-
     private void UpdateSprite(HumanoidAppearanceComponent component, SpriteComponent sprite)
     {
         UpdateLayers(component, sprite);
@@ -49,7 +34,7 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
     }
 
     private static bool IsHidden(HumanoidAppearanceComponent humanoid, HumanoidVisualLayers layer)
-        => humanoid.HiddenLayers.ContainsKey(layer) || humanoid.PermanentlyHidden.Contains(layer);
+        => humanoid.HiddenLayers.Contains(layer) || humanoid.PermanentlyHidden.Contains(layer);
 
     private void UpdateLayers(HumanoidAppearanceComponent component, SpriteComponent sprite)
     {
@@ -58,7 +43,7 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
 
         // add default species layers
         var speciesProto = _prototypeManager.Index(component.Species);
-        var baseSprites = _prototypeManager.Index(speciesProto.SpriteSet);
+        var baseSprites = _prototypeManager.Index<HumanoidSpeciesBaseSpritesPrototype>(speciesProto.SpriteSet);
         foreach (var (key, id) in baseSprites.Sprites)
         {
             oldLayers.Remove(key);
@@ -215,7 +200,7 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
 
         humanoid.MarkingSet = markings;
         humanoid.PermanentlyHidden = new HashSet<HumanoidVisualLayers>();
-        humanoid.HiddenLayers = new Dictionary<HumanoidVisualLayers, SlotFlags>();
+        humanoid.HiddenLayers = new HashSet<HumanoidVisualLayers>();
         humanoid.CustomBaseLayers = customBaseLayers;
         humanoid.Sex = profile.Sex;
         humanoid.Gender = profile.Gender;
@@ -233,30 +218,16 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
         // Really, markings should probably be a separate component altogether.
         ClearAllMarkings(humanoid, sprite);
 
-        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, humanoid, sprite);
-                    if (markingPrototype.BodyPart == HumanoidVisualLayers.UndergarmentTop)
-                        applyUndergarmentTop = false;
-                    else if (markingPrototype.BodyPart == HumanoidVisualLayers.UndergarmentBottom)
-                        applyUndergarmentBottom = false;
-                }
             }
         }
 
         humanoid.ClientOldMarkings = new MarkingSet(humanoid.MarkingSet);
-
-        AddUndergarments(humanoid, sprite, applyUndergarmentTop, applyUndergarmentBottom);
     }
 
     private void ClearAllMarkings(HumanoidAppearanceComponent humanoid, SpriteComponent sprite)
@@ -304,31 +275,6 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
             spriteComp.RemoveLayer(index);
         }
     }
-
-    private void AddUndergarments(HumanoidAppearanceComponent humanoid, SpriteComponent sprite, bool undergarmentTop, bool undergarmentBottom)
-    {
-        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, humanoid, sprite);
-            }
-        }
-
-        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, humanoid, sprite);
-            }
-        }
-    }
-
     private void ApplyMarking(MarkingPrototype markingPrototype,
         IReadOnlyList<Color>? colors,
         bool visible,
@@ -403,21 +349,23 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
         }
     }
 
-    public override void SetLayerVisibility(
-        Entity<HumanoidAppearanceComponent> ent,
+    protected override void SetLayerVisibility(
+        EntityUid uid,
+        HumanoidAppearanceComponent humanoid,
         HumanoidVisualLayers layer,
         bool visible,
-        SlotFlags? slot,
+        bool permanent,
         ref bool dirty)
     {
-        base.SetLayerVisibility(ent, layer, visible, slot, ref dirty);
+        base.SetLayerVisibility(uid, humanoid, layer, visible, permanent, ref dirty);
 
-        var sprite = Comp<SpriteComponent>(ent);
+        var sprite = Comp<SpriteComponent>(uid);
         if (!sprite.LayerMapTryGet(layer, out var index))
         {
             if (!visible)
                 return;
-            index = sprite.LayerMapReserveBlank(layer);
+            else
+                index = sprite.LayerMapReserveBlank(layer);
         }
 
         var spriteLayer = sprite[index];
@@ -427,14 +375,13 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
         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 markingList in humanoid.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, sprite);
+                    ApplyMarking(markingPrototype, marking.MarkingColors, marking.Visible, humanoid, sprite);
             }
         }
     }

Content.Client/IconSmoothing/IconSmoothComponent.cs

@@ -26,12 +26,6 @@ namespace Content.Client.IconSmoothing
         [ViewVariables(VVAccess.ReadWrite), DataField("key")]
         public string? SmoothKey { get; private set; }
 
-        /// <summary>
-        ///     Additional keys to smooth with.
-        /// </summary>
-        [DataField]
-        public List<string> AdditionalKeys = new();
-
         /// <summary>
         ///     Prepended to the RSI state.
         /// </summary>

Content.Client/IconSmoothing/IconSmoothSystem.cs

@@ -376,8 +376,7 @@ namespace Content.Client.IconSmoothing
             while (candidates.MoveNext(out var entity))
             {
                 if (smoothQuery.TryGetComponent(entity, out var other) &&
-                    other.SmoothKey != null &&
-                    (other.SmoothKey == smooth.SmoothKey || smooth.AdditionalKeys.Contains(other.SmoothKey)) &&
+                    other.SmoothKey == smooth.SmoothKey &&
                     other.Enabled)
                 {
                     return true;

Content.Client/Input/ContentContexts.cs

@@ -84,9 +84,6 @@ namespace Content.Client.Input
             human.AddFunction(ContentKeyFunctions.Arcade1);
             human.AddFunction(ContentKeyFunctions.Arcade2);
             human.AddFunction(ContentKeyFunctions.Arcade3);
-            //CP14 Keys
-            human.AddFunction(ContentKeyFunctions.CP14OpenSkillMenu);
-            //CP14 Keys end
 
             // actions should be common (for ghosts, mobs, etc)
             common.AddFunction(ContentKeyFunctions.OpenActionsMenu);
@@ -126,6 +123,10 @@ namespace Content.Client.Input
             common.AddFunction(ContentKeyFunctions.OpenDecalSpawnWindow);
             common.AddFunction(ContentKeyFunctions.OpenAdminMenu);
             common.AddFunction(ContentKeyFunctions.OpenGuidebook);
+
+            //CP14 Keys
+            human.AddFunction(ContentKeyFunctions.CP14OpenKnowledgeMenu);
+            //CP14 Keys end
         }
     }
 }

Content.Client/Lathe/UI/LatheMenu.xaml

@@ -59,7 +59,6 @@
                         PlaceHolder="0"
                         Text="1"
                         HorizontalExpand="True" />
-                    <Label Name="RecipeCount" Margin="8 0 8 0" MinWidth="90" Align="Right" />
                 </BoxContainer>
             </BoxContainer>
         </BoxContainer>

Content.Client/Lathe/UI/LatheMenu.xaml.cs

@@ -68,13 +68,21 @@ public sealed partial class LatheMenu : DefaultWindow
             {
                 ServerListButton.Visible = false;
             }
-
-            AmountLineEdit.SetText(latheComponent.DefaultProductionAmount.ToString());
         }
 
         MaterialsList.SetOwner(Entity);
     }
 
+    protected override void Opened()
+    {
+        base.Opened();
+
+        if (_entityManager.TryGetComponent<LatheComponent>(Entity, out var latheComp))
+        {
+            AmountLineEdit.SetText(latheComp.DefaultProductionAmount.ToString());
+        }
+    }
+
     /// <summary>
     /// Populates the list of all the recipes
     /// </summary>
@@ -112,8 +120,6 @@ public sealed partial class LatheMenu : DefaultWindow
         if (!int.TryParse(AmountLineEdit.Text, out var quantity) || quantity <= 0)
             quantity = 1;
 
-        RecipeCount.Text = Loc.GetString("lathe-menu-recipe-count", ("count", recipesToShow.Count));
-
         var sortedRecipesToShow = recipesToShow.OrderBy(_lathe.GetRecipeName);
         RecipeList.Children.Clear();
         _entityManager.TryGetComponent(Entity, out LatheComponent? lathe);

Content.Client/Light/AfterLightTargetOverlay.cs

@@ -54,6 +54,6 @@ public sealed class AfterLightTargetOverlay : Overlay
 
                 worldHandle.SetTransform(localMatrix);
                 worldHandle.DrawTextureRectRegion(lightOverlay.EnlargedLightTarget.Texture, bounds, subRegion: subRegion);
-            }, Color.Transparent);
+            }, null);
     }
 }

Content.Client/Light/EntitySystems/PlanetLightSystem.cs

@@ -16,7 +16,6 @@ public sealed class PlanetLightSystem : EntitySystem
         _overlayMan.AddOverlay(new RoofOverlay(EntityManager));
         _overlayMan.AddOverlay(new TileEmissionOverlay(EntityManager));
         _overlayMan.AddOverlay(new LightBlurOverlay());
-        _overlayMan.AddOverlay(new SunShadowOverlay());
         _overlayMan.AddOverlay(new AfterLightTargetOverlay());
     }
 
@@ -32,7 +31,6 @@ public sealed class PlanetLightSystem : EntitySystem
         _overlayMan.RemoveOverlay<RoofOverlay>();
         _overlayMan.RemoveOverlay<TileEmissionOverlay>();
         _overlayMan.RemoveOverlay<LightBlurOverlay>();
-        _overlayMan.RemoveOverlay<SunShadowOverlay>();
         _overlayMan.RemoveOverlay<AfterLightTargetOverlay>();
     }
 }

Content.Client/Light/EntitySystems/SunShadowSystem.cs

@@ -1,92 +0,0 @@
-using System.Diagnostics.Contracts;
-using System.Numerics;
-using Content.Client.GameTicking.Managers;
-using Content.Shared.Light.Components;
-using Content.Shared.Light.EntitySystems;
-using Robust.Shared.Timing;
-using Robust.Shared.Utility;
-
-namespace Content.Client.Light.EntitySystems;
-
-public sealed class SunShadowSystem : SharedSunShadowSystem
-{
-    [Dependency] private readonly ClientGameTicker _ticker = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly MetaDataSystem _metadata = default!;
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        if (!_timing.IsFirstTimePredicted)
-            return;
-
-        var mapQuery = AllEntityQuery<SunShadowCycleComponent, SunShadowComponent>();
-        while (mapQuery.MoveNext(out var uid,  out var cycle, out var shadow))
-        {
-            if (!cycle.Running || cycle.Directions.Count == 0)
-                continue;
-
-            var pausedTime = _metadata.GetPauseTime(uid);
-
-            var time = (float)(_timing.CurTime
-                .Add(cycle.Offset)
-                .Subtract(_ticker.RoundStartTimeSpan)
-                .Subtract(pausedTime)
-                .TotalSeconds % cycle.Duration.TotalSeconds);
-
-            var (direction, alpha) = GetShadow((uid, cycle), time);
-            shadow.Direction = direction;
-            shadow.Alpha = alpha;
-        }
-    }
-
-    [Pure]
-    public (Vector2 Direction, float Alpha) GetShadow(Entity<SunShadowCycleComponent> entity, float time)
-    {
-        // So essentially the values are stored as the percentages of the total duration just so it adjusts the speed
-        // dynamically and we don't have to manually handle it.
-        // It will lerp from each value to the next one with angle and length handled separately
-        var ratio = (float) (time / entity.Comp.Duration.TotalSeconds);
-
-        for (var i = entity.Comp.Directions.Count - 1; i >= 0; i--)
-        {
-            var dir = entity.Comp.Directions[i];
-
-            if (ratio > dir.Ratio)
-            {
-                var next = entity.Comp.Directions[(i + 1) % entity.Comp.Directions.Count];
-                float nextRatio;
-
-                // Last entry
-                if (i == entity.Comp.Directions.Count - 1)
-                {
-                    nextRatio = next.Ratio + 1f;
-                }
-                else
-                {
-                    nextRatio = next.Ratio;
-                }
-
-                var range = nextRatio - dir.Ratio;
-                var diff = (ratio - dir.Ratio) / range;
-                DebugTools.Assert(diff is >= 0f and <= 1f);
-
-                // We lerp angle + length separately as we don't want a straight-line lerp and want the rotation to be consistent.
-                var currentAngle = dir.Direction.ToAngle();
-                var nextAngle = next.Direction.ToAngle();
-
-                var angle = Angle.Lerp(currentAngle, nextAngle, diff);
-                // This is to avoid getting weird issues where the angle gets pretty close but length still noticeably catches up.
-                var lengthDiff = MathF.Pow(diff, 1f / 2f);
-                var length = float.Lerp(dir.Direction.Length(), next.Direction.Length(), lengthDiff);
-
-                var vector = angle.ToVec() * length;
-                var alpha = float.Lerp(dir.Alpha, next.Alpha, diff);
-                return (vector, alpha);
-            }
-        }
-
-        throw new InvalidOperationException();
-    }
-}

Content.Client/Light/LightCycleSystem.cs

@@ -1,7 +1,6 @@
 using Content.Client.GameTicking.Managers;
 using Content.Shared;
 using Content.Shared.Light.Components;
-using Content.Shared.Light.EntitySystems;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Timing;
 
@@ -12,29 +11,19 @@ public sealed class LightCycleSystem : SharedLightCycleSystem
 {
     [Dependency] private readonly ClientGameTicker _ticker = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly MetaDataSystem _metadata = default!;
 
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
-
-        if (!_timing.IsFirstTimePredicted)
-            return;
-
         var mapQuery = AllEntityQuery<LightCycleComponent, MapLightComponent>();
         while (mapQuery.MoveNext(out var uid,  out var cycle, out var map))
         {
             if (!cycle.Running)
                 continue;
 
-            // We still iterate paused entities as we still want to override the lighting color and not have
-            // it apply the server state
-            var pausedTime = _metadata.GetPauseTime(uid);
-
             var time = (float) _timing.CurTime
                 .Add(cycle.Offset)
                 .Subtract(_ticker.RoundStartTimeSpan)
-                .Subtract(pausedTime)
                 .TotalSeconds;
 
             var color = GetColor((uid, cycle), cycle.OriginalColor, time);

Content.Client/Light/RoofOverlay.cs

@@ -94,15 +94,13 @@ public sealed class RoofOverlay : Overlay
                     // Due to stencilling we essentially draw on unrooved tiles
                     while (tileEnumerator.MoveNext(out var tileRef))
                     {
-                        var color = _roof.GetColor(roofEnt, tileRef.GridIndices);
-
-                        if (color == null)
+                        if (!_roof.IsRooved(roofEnt, tileRef.GridIndices))
                         {
                             continue;
                         }
 
                         var local = _lookup.GetLocalBounds(tileRef, grid.Comp.TileSize);
-                        worldHandle.DrawRect(local, color.Value);
+                        worldHandle.DrawRect(local, roof.Color);
                     }
                 }
             }, null);

Content.Client/Light/SunShadowOverlay.cs

@@ -1,160 +0,0 @@
-using System.Numerics;
-using Content.Shared.Light.Components;
-using Robust.Client.Graphics;
-using Robust.Shared.Enums;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Physics;
-using Robust.Shared.Prototypes;
-
-namespace Content.Client.Light;
-
-public sealed class SunShadowOverlay : Overlay
-{
-    public override OverlaySpace Space => OverlaySpace.BeforeLighting;
-
-    [Dependency] private readonly IClyde _clyde = default!;
-    [Dependency] private readonly IEntityManager _entManager = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
-    [Dependency] private readonly IPrototypeManager _protoManager = default!;
-    private readonly EntityLookupSystem _lookup;
-    private readonly SharedTransformSystem _xformSys;
-
-    private readonly HashSet<Entity<SunShadowCastComponent>> _shadows = new();
-
-    private IRenderTexture? _blurTarget;
-    private IRenderTexture? _target;
-
-    public SunShadowOverlay()
-    {
-        IoCManager.InjectDependencies(this);
-        _xformSys = _entManager.System<SharedTransformSystem>();
-        _lookup = _entManager.System<EntityLookupSystem>();
-        ZIndex = AfterLightTargetOverlay.ContentZIndex + 1;
-    }
-
-    private List<Entity<MapGridComponent>> _grids = new();
-
-    protected override void Draw(in OverlayDrawArgs args)
-    {
-        var viewport = args.Viewport;
-        var eye = viewport.Eye;
-
-        if (eye == null)
-            return;
-
-        _grids.Clear();
-        _mapManager.FindGridsIntersecting(args.MapId,
-            args.WorldBounds.Enlarged(SunShadowComponent.MaxLength),
-            ref _grids);
-
-        var worldHandle = args.WorldHandle;
-        var mapId = args.MapId;
-        var worldBounds = args.WorldBounds;
-        var targetSize = viewport.LightRenderTarget.Size;
-
-        if (_target?.Size != targetSize)
-        {
-            _target = _clyde
-                .CreateRenderTarget(targetSize,
-                    new RenderTargetFormatParameters(RenderTargetColorFormat.Rgba8Srgb),
-                    name: "sun-shadow-target");
-
-            if (_blurTarget?.Size != targetSize)
-            {
-                _blurTarget = _clyde
-                    .CreateRenderTarget(targetSize, new RenderTargetFormatParameters(RenderTargetColorFormat.Rgba8Srgb), name: "sun-shadow-blur");
-            }
-        }
-
-        var lightScale = viewport.LightRenderTarget.Size / (Vector2)viewport.Size;
-        var scale = viewport.RenderScale / (Vector2.One / lightScale);
-
-        foreach (var grid in _grids)
-        {
-            if (!_entManager.TryGetComponent(grid.Owner, out SunShadowComponent? sun))
-            {
-                continue;
-            }
-
-            var direction = sun.Direction;
-            var alpha = Math.Clamp(sun.Alpha, 0f, 1f);
-
-            // Nowhere to cast to so ignore it.
-            if (direction.Equals(Vector2.Zero) || alpha == 0f)
-                continue;
-
-            // Feature todo: dynamic shadows for mobs and trees. Also ideally remove the fake tree shadows.
-            // TODO: Jittering still not quite perfect
-
-            var expandedBounds = worldBounds.Enlarged(direction.Length() + 0.01f);
-            _shadows.Clear();
-
-            // Draw shadow polys to stencil
-            args.WorldHandle.RenderInRenderTarget(_target,
-                () =>
-                {
-                    var invMatrix =
-                        _target.GetWorldToLocalMatrix(eye, scale);
-                    var indices = new Vector2[PhysicsConstants.MaxPolygonVertices * 2];
-
-                    // Go through shadows in range.
-
-                    // For each one we:
-                    // - Get the original vertices.
-                    // - Extrapolate these along the sun direction.
-                    // - Combine the above into 1 single polygon to draw.
-
-                    // Note that this is range-limited for accuracy; if you set it too high it will clip through walls or other undesirable entities.
-                    // This is probably not noticeable most of the time but if you want something "accurate" you'll want to code a solution.
-                    // Ideally the CPU would have its own shadow-map copy that we could just ray-cast each vert into though
-                    // You might need to batch verts or the likes as this could get expensive.
-                    _lookup.GetEntitiesIntersecting(mapId, expandedBounds, _shadows);
-
-                    foreach (var ent in _shadows)
-                    {
-                        var xform = _entManager.GetComponent<TransformComponent>(ent.Owner);
-                        var (worldPos, worldRot) = _xformSys.GetWorldPositionRotation(xform);
-                        // Need no rotation on matrix as sun shadow direction doesn't care.
-                        var worldMatrix = Matrix3x2.CreateTranslation(worldPos);
-                        var renderMatrix = Matrix3x2.Multiply(worldMatrix, invMatrix);
-                        var pointCount = ent.Comp.Points.Length;
-
-                        Array.Copy(ent.Comp.Points, indices, pointCount);
-
-                        for (var i = 0; i < pointCount; i++)
-                        {
-                            // Update point based on entity rotation.
-                            indices[i] = worldRot.RotateVec(indices[i]);
-
-                            // Add the offset point by the sun shadow direction.
-                            indices[pointCount + i] = indices[i] + direction;
-                        }
-
-                        var points = PhysicsHull.ComputePoints(indices, pointCount * 2);
-                        worldHandle.SetTransform(renderMatrix);
-
-                        worldHandle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, points, Color.White);
-                    }
-                },
-                Color.Transparent);
-
-            // Slightly blur it just to avoid aliasing issues on the later viewport-wide blur.
-            _clyde.BlurRenderTarget(viewport, _target, _blurTarget!, eye, 1f);
-
-            // Draw stencil (see roofoverlay).
-            args.WorldHandle.RenderInRenderTarget(viewport.LightRenderTarget,
-                () =>
-                {
-                    var invMatrix =
-                        viewport.LightRenderTarget.GetWorldToLocalMatrix(eye, scale);
-                    worldHandle.SetTransform(invMatrix);
-
-                    var maskShader = _protoManager.Index<ShaderPrototype>("Mix").Instance();
-                    worldHandle.UseShader(maskShader);
-
-                    worldHandle.DrawTextureRect(_target.Texture, worldBounds, Color.Black.WithAlpha(alpha));
-                }, null);
-        }
-    }
-}

Content.Client/Options/UI/Tabs/AccessibilityTab.xaml

@@ -4,8 +4,6 @@
     <BoxContainer Orientation="Vertical">
         <ScrollContainer VerticalExpand="True" HScrollEnabled="False">
             <BoxContainer Orientation="Vertical" Margin="8">
-                <Label Text="{Loc 'ui-options-accessability-header-visuals'}"
-                       StyleClasses="LabelKeyText"/>
                 <CheckBox Name="ReducedMotionCheckBox" Text="{Loc 'ui-options-reduced-motion'}" />
                 <CheckBox Name="EnableColorNameCheckBox" Text="{Loc 'ui-options-enable-color-name'}" />
                 <CheckBox Name="ColorblindFriendlyCheckBox" Text="{Loc 'ui-options-colorblind-friendly'}" />
@@ -14,9 +12,6 @@
                 <ui:OptionSlider Name="SpeechBubbleTextOpacitySlider" Title="{Loc 'ui-options-speech-bubble-text-opacity'}" />
                 <ui:OptionSlider Name="SpeechBubbleSpeakerOpacitySlider" Title="{Loc 'ui-options-speech-bubble-speaker-opacity'}" />
                 <ui:OptionSlider Name="SpeechBubbleBackgroundOpacitySlider" Title="{Loc 'ui-options-speech-bubble-background-opacity'}" />
-                <Label Text="{Loc 'ui-options-accessability-header-content'}"
-                       StyleClasses="LabelKeyText"/>
-                <CheckBox Name="CensorNudityCheckBox" Text="{Loc 'ui-options-censor-nudity'}" />
             </BoxContainer>
         </ScrollContainer>
         <ui:OptionsTabControlRow Name="Control" Access="Public" />

Content.Client/Options/UI/Tabs/AccessibilityTab.xaml.cs

@@ -21,8 +21,6 @@ public sealed partial class AccessibilityTab : Control
         Control.AddOptionPercentSlider(CCVars.SpeechBubbleSpeakerOpacity, SpeechBubbleSpeakerOpacitySlider);
         Control.AddOptionPercentSlider(CCVars.SpeechBubbleBackgroundOpacity, SpeechBubbleBackgroundOpacitySlider);
 
-        Control.AddOptionCheckBox(CCVars.AccessibilityClientCensorNudity, CensorNudityCheckBox);
-
         Control.Initialize();
     }
 }

Content.Client/Options/UI/Tabs/AdminOptionsTab.xaml

@@ -4,20 +4,7 @@
     <BoxContainer Orientation="Vertical">
         <ScrollContainer VerticalExpand="True" HScrollEnabled="False">
             <BoxContainer Orientation="Vertical" Margin="8">
-                <Label Text="{Loc 'ui-options-admin-player-panel'}"
-                       StyleClasses="LabelKeyText"/>
-                <CheckBox Name="PlayerlistSeparateSymbolsCheckBox" Text="{Loc 'ui-options-admin-playerlist-separate-symbols'}" />
-                <CheckBox Name="PlayerlistCharacterColorCheckBox" Text="{Loc 'ui-options-admin-playerlist-character-color'}" />
-                <CheckBox Name="PlayerlistRoleTypeColorCheckBox" Text="{Loc 'ui-options-admin-playerlist-roletype-color'}" />
-                <Label Text="{Loc 'ui-options-admin-overlay-title'}"
-                       StyleClasses="LabelKeyText"/>
                 <CheckBox Name="EnableClassicOverlayCheckBox" Text="{Loc 'ui-options-enable-classic-overlay'}" />
-                <CheckBox Name="EnableOverlaySymbolsCheckBox" Text="{Loc 'ui-options-enable-overlay-symbols'}" />
-                <CheckBox Name="EnableOverlayPlaytimeCheckBox" Text="{Loc 'ui-options-enable-overlay-playtime'}" />
-                <CheckBox Name="EnableOverlayStartingJobCheckBox" Text="{Loc 'ui-options-enable-overlay-starting-job'}" />
-                <ui:OptionSlider Name="OverlayMergeDistanceSlider"  Title="{Loc 'ui-options-overlay-merge-distance'}"/>
-                <ui:OptionSlider Name="OverlayGhostFadeSlider"  Title="{Loc 'ui-options-overlay-ghost-fade-distance'}"/>
-                <ui:OptionSlider Name="OverlayGhostHideSlider"  Title="{Loc 'ui-options-overlay-ghost-hide-distance'}"/>
             </BoxContainer>
         </ScrollContainer>
         <ui:OptionsTabControlRow Name="Control" Access="Public" />

Content.Client/Options/UI/Tabs/AdminOptionsTab.xaml.cs

@@ -8,45 +8,13 @@ namespace Content.Client.Options.UI.Tabs;
 [GenerateTypedNameReferences]
 public sealed partial class AdminOptionsTab : Control
 {
-    private const float OverlayMergeMin = 0.05f;
-    private const float OverlayMergeMax = 0.95f;
-    private const int OverlayGhostFadeMin = 0;
-    private const int OverlayGhostFadeMax = 10;
-    private const int OverlayGhostHideMin = 0;
-    private const int OverlayGhostHideMax = 5;
-
     public AdminOptionsTab()
     {
         RobustXamlLoader.Load(this);
 
-        Control.AddOptionCheckBox(CCVars.AdminPlayerlistSeparateSymbols, PlayerlistSeparateSymbolsCheckBox);
-        Control.AddOptionCheckBox(CCVars.AdminPlayerlistHighlightedCharacterColor, PlayerlistCharacterColorCheckBox);
-        Control.AddOptionCheckBox(CCVars.AdminPlayerlistRoleTypeColor, PlayerlistRoleTypeColorCheckBox);
-
         Control.AddOptionCheckBox(CCVars.AdminOverlayClassic, EnableClassicOverlayCheckBox);
-        Control.AddOptionCheckBox(CCVars.AdminOverlaySymbols, EnableOverlaySymbolsCheckBox);
-        Control.AddOptionCheckBox(CCVars.AdminOverlayPlaytime, EnableOverlayPlaytimeCheckBox);
-        Control.AddOptionCheckBox(CCVars.AdminOverlayStartingJob, EnableOverlayStartingJobCheckBox);
 
         Control.Initialize();
-
-        Control.AddOptionPercentSlider(
-            CCVars.AdminOverlayMergeDistance,
-            OverlayMergeDistanceSlider,
-            OverlayMergeMin,
-            OverlayMergeMax);
-
-        Control.AddOptionSlider(
-            CCVars.AdminOverlayGhostFadeDistance,
-            OverlayGhostFadeSlider,
-            OverlayGhostFadeMin,
-            OverlayGhostFadeMax);
-
-        Control.AddOptionSlider(
-            CCVars.AdminOverlayGhostHideDistance,
-            OverlayGhostHideSlider,
-            OverlayGhostHideMin,
-            OverlayGhostHideMax);
     }
 }
 

Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs

@@ -265,54 +265,9 @@ namespace Content.Client.Options.UI.Tabs
             AddButton(EngineKeyFunctions.HideUI);
             AddButton(ContentKeyFunctions.InspectEntity);
 
-            AddHeader("ui-options-header-text-cursor");
-            AddButton(EngineKeyFunctions.TextCursorLeft);
-            AddButton(EngineKeyFunctions.TextCursorRight);
-            AddButton(EngineKeyFunctions.TextCursorUp);
-            AddButton(EngineKeyFunctions.TextCursorDown);
-            AddButton(EngineKeyFunctions.TextCursorWordLeft);
-            AddButton(EngineKeyFunctions.TextCursorWordRight);
-            AddButton(EngineKeyFunctions.TextCursorBegin);
-            AddButton(EngineKeyFunctions.TextCursorEnd);
-
-            AddHeader("ui-options-header-text-cursor-select");
-            AddButton(EngineKeyFunctions.TextCursorSelect);
-            AddButton(EngineKeyFunctions.TextCursorSelectLeft);
-            AddButton(EngineKeyFunctions.TextCursorSelectRight);
-            AddButton(EngineKeyFunctions.TextCursorSelectUp);
-            AddButton(EngineKeyFunctions.TextCursorSelectDown);
-            AddButton(EngineKeyFunctions.TextCursorSelectWordLeft);
-            AddButton(EngineKeyFunctions.TextCursorSelectWordRight);
-            AddButton(EngineKeyFunctions.TextCursorSelectBegin);
-            AddButton(EngineKeyFunctions.TextCursorSelectEnd);
-
-            AddHeader("ui-options-header-text-edit");
-            AddButton(EngineKeyFunctions.TextBackspace);
-            AddButton(EngineKeyFunctions.TextDelete);
-            AddButton(EngineKeyFunctions.TextWordBackspace);
-            AddButton(EngineKeyFunctions.TextWordDelete);
-            AddButton(EngineKeyFunctions.TextNewline);
-            AddButton(EngineKeyFunctions.TextSubmit);
-            AddButton(EngineKeyFunctions.MultilineTextSubmit);
-            AddButton(EngineKeyFunctions.TextSelectAll);
-            AddButton(EngineKeyFunctions.TextCopy);
-            AddButton(EngineKeyFunctions.TextCut);
-            AddButton(EngineKeyFunctions.TextPaste);
-
-            AddHeader("ui-options-header-text-chat");
-            AddButton(EngineKeyFunctions.TextHistoryPrev);
-            AddButton(EngineKeyFunctions.TextHistoryNext);
-            AddButton(EngineKeyFunctions.TextReleaseFocus);
-            AddButton(EngineKeyFunctions.TextScrollToBottom);
-
-            AddHeader("ui-options-header-text-other");
-            AddButton(EngineKeyFunctions.TextTabComplete);
-            AddButton(EngineKeyFunctions.TextCompleteNext);
-            AddButton(EngineKeyFunctions.TextCompletePrev);
-
             //CP14
             AddHeader("ui-options-header-cp14");
-            AddButton(ContentKeyFunctions.CP14OpenSkillMenu);
+            AddButton(ContentKeyFunctions.CP14OpenKnowledgeMenu);
             //CP14 end
 
             foreach (var control in _keyControls.Values)

Content.Client/Overlays/StencilOverlay.cs

@@ -1,7 +1,7 @@
 using System.Numerics;
 using Content.Client.Parallax;
 using Content.Client.Weather;
-using Content.Shared._CP14.CloudShadow;
+using Content.Shared._CP14.DayCycle.Components;
 using Content.Shared.Salvage;
 using Content.Shared.Weather;
 using Robust.Client.GameObjects;
@@ -62,7 +62,7 @@ public sealed partial class StencilOverlay : Overlay
         {
             foreach (var (proto, weather) in comp.Weather)
             {
-                if (!_protoManager.TryIndex(proto, out var weatherProto))
+                if (!_protoManager.TryIndex<WeatherPrototype>(proto, out var weatherProto))
                     continue;
 
                 var alpha = _weather.GetPercent(weather, mapUid);

Content.Client/Paper/UI/PaperVisualizerSystem.cs

@@ -11,21 +11,13 @@ public sealed class PaperVisualizerSystem : VisualizerSystem<PaperVisualsCompone
         if (args.Sprite == null)
             return;
 
-        if (AppearanceSystem.TryGetData<PaperStatus>(uid, PaperVisuals.Status, out var writingStatus, args.Component))
+        if (AppearanceSystem.TryGetData<PaperStatus>(uid, PaperVisuals.Status , out var writingStatus, args.Component))
             args.Sprite.LayerSetVisible(PaperVisualLayers.Writing, writingStatus == PaperStatus.Written);
 
         if (AppearanceSystem.TryGetData<string>(uid, PaperVisuals.Stamp, out var stampState, args.Component))
         {
-            if (stampState != string.Empty)
-            {
-                args.Sprite.LayerSetState(PaperVisualLayers.Stamp, stampState);
-                args.Sprite.LayerSetVisible(PaperVisualLayers.Stamp, true);
-            }
-            else
-            {
-                args.Sprite.LayerSetVisible(PaperVisualLayers.Stamp, false);
-            }
-
+            args.Sprite.LayerSetState(PaperVisualLayers.Stamp, stampState);
+            args.Sprite.LayerSetVisible(PaperVisualLayers.Stamp, true);
         }
     }
 }

Content.Client/Parallax/Data/ParallaxPrototype.cs

@@ -5,7 +5,7 @@ namespace Content.Client.Parallax.Data;
 /// <summary>
 /// Prototype data for a parallax.
 /// </summary>
-[Prototype]
+[Prototype("parallax")]
 public sealed partial class ParallaxPrototype : IPrototype
 {
     /// <inheritdoc/>

Content.Client/Parallax/ParallaxControl.cs

@@ -1,9 +1,7 @@
-using System.Numerics;
-using Content.Client.Parallax.Data;
+using System.Numerics;
 using Content.Client.Parallax.Managers;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
@@ -19,50 +17,27 @@ public sealed class ParallaxControl : Control
     [Dependency] private readonly IParallaxManager _parallaxManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
 
-    private string _parallaxPrototype = "FastSpace";
-
     [ViewVariables(VVAccess.ReadWrite)] public Vector2 Offset { get; set; }
-    [ViewVariables(VVAccess.ReadWrite)] public float SpeedX { get; set; } = 0.0f;
-    [ViewVariables(VVAccess.ReadWrite)] public float SpeedY { get; set; } = 0.0f;
-    [ViewVariables(VVAccess.ReadWrite)] public float ScaleX { get; set; } = 1.0f;
-    [ViewVariables(VVAccess.ReadWrite)] public float ScaleY { get; set; } = 1.0f;
-    [ViewVariables(VVAccess.ReadWrite)] public string ParallaxPrototype
-    {
-        get => _parallaxPrototype;
-        set
-        {
-            _parallaxPrototype = value;
-            _parallaxManager.LoadParallaxByName(value);
-        }
-    }
 
     public ParallaxControl()
     {
         IoCManager.InjectDependencies(this);
 
         Offset = new Vector2(_random.Next(0, 1000), _random.Next(0, 1000));
-
         RectClipContent = true;
-        _parallaxManager.LoadParallaxByName(_parallaxPrototype);
+        _parallaxManager.LoadParallaxByName("FastSpace");
     }
 
     protected override void Draw(DrawingHandleScreen handle)
     {
-        var currentTime = (float) _timing.RealTime.TotalSeconds;
-        var offset = Offset + new Vector2(currentTime * SpeedX, currentTime * SpeedY);
-
-        foreach (var layer in _parallaxManager.GetParallaxLayers(_parallaxPrototype))
+        foreach (var layer in _parallaxManager.GetParallaxLayers("FastSpace"))
         {
             var tex = layer.Texture;
-            var texSize = new Vector2i(
-                (int)(tex.Size.X * Size.X * layer.Config.Scale.X / 1920 * ScaleX),
-                (int)(tex.Size.Y * Size.X * layer.Config.Scale.Y / 1920 * ScaleY)
-            );
+            var texSize = (tex.Size.X * (int) Size.X, tex.Size.Y * (int) Size.X) * layer.Config.Scale.Floored() / 1920;
             var ourSize = PixelSize;
 
-            //Protection from division by zero.
-            texSize.X = Math.Max(texSize.X, 1);
-            texSize.Y = Math.Max(texSize.Y, 1);
+            var currentTime = (float) _timing.RealTime.TotalSeconds;
+            var offset = Offset + new Vector2(currentTime * 100f, currentTime * 0f);
 
             if (layer.Config.Tiled)
             {

Content.Client/Popups/PopupSystem.cs

@@ -237,12 +237,6 @@ namespace Content.Client.Popups
                 PopupEntity(message, uid, recipient.Value, type);
         }
 
-        public override void PopupPredicted(string? message, EntityUid uid, EntityUid? recipient, Filter filter, bool recordReplay, PopupType type = PopupType.Small)
-        {
-            if (recipient != null && _timing.IsFirstTimePredicted)
-                PopupEntity(message, uid, recipient.Value, type);
-        }
-
         public override void PopupPredicted(string? recipientMessage, string? othersMessage, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small)
         {
             if (recipient != null && _timing.IsFirstTimePredicted)

Content.Client/Power/EntitySystems/PowerReceiverSystem.cs

@@ -27,8 +27,6 @@ public sealed class PowerReceiverSystem : SharedPowerReceiverSystem
             return;
 
         component.Powered = state.Powered;
-        component.NeedsPower = state.NeedsPower;
-        component.PowerDisabled = state.PowerDisabled;
     }
 
     public override bool ResolveApc(EntityUid entity, [NotNullWhen(true)] ref SharedApcPowerReceiverComponent? component)

Content.Client/SubFloor/SubFloorHideSystem.cs

@@ -1,15 +1,12 @@
-using Content.Client.UserInterface.Systems.Sandbox;
+using Content.Shared.DrawDepth;
 using Content.Shared.SubFloor;
 using Robust.Client.GameObjects;
-using Robust.Client.UserInterface;
-using Robust.Shared.Player;
 
 namespace Content.Client.SubFloor;
 
 public sealed class SubFloorHideSystem : SharedSubFloorHideSystem
 {
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly IUserInterfaceManager _ui = default!;
 
     private bool _showAll;
 
@@ -21,13 +18,8 @@ public sealed class SubFloorHideSystem : SharedSubFloorHideSystem
         {
             if (_showAll == value) return;
             _showAll = value;
-            _ui.GetUIController<SandboxUIController>().SetToggleSubfloors(value);
 
-            var ev = new ShowSubfloorRequestEvent()
-            {
-                Value = value,
-            };
-            RaiseNetworkEvent(ev);
+            UpdateAll();
         }
     }
 
@@ -36,20 +28,6 @@ public sealed class SubFloorHideSystem : SharedSubFloorHideSystem
         base.Initialize();
 
         SubscribeLocalEvent<SubFloorHideComponent, AppearanceChangeEvent>(OnAppearanceChanged);
-        SubscribeNetworkEvent<ShowSubfloorRequestEvent>(OnRequestReceived);
-        SubscribeLocalEvent<LocalPlayerDetachedEvent>(OnPlayerDetached);
-    }
-
-    private void OnPlayerDetached(LocalPlayerDetachedEvent ev)
-    {
-        // Vismask resets so need to reset this.
-        ShowAll = false;
-    }
-
-    private void OnRequestReceived(ShowSubfloorRequestEvent ev)
-    {
-        // When client receives request Queue an update on all vis.
-        UpdateAll();
     }
 
     private void OnAppearanceChanged(EntityUid uid, SubFloorHideComponent component, ref AppearanceChangeEvent args)
@@ -86,15 +64,9 @@ public sealed class SubFloorHideSystem : SharedSubFloorHideSystem
 
         args.Sprite.Visible = hasVisibleLayer || revealed;
 
-        if (ShowAll)
+        // allows a t-ray to show wires/pipes above carpets/puddles
+        if (scannerRevealed)
         {
-            // Allows sandbox mode to make wires visible over other stuff.
-            component.OriginalDrawDepth ??= args.Sprite.DrawDepth;
-            args.Sprite.DrawDepth = (int)Shared.DrawDepth.DrawDepth.Overdoors;
-        }
-        else if (scannerRevealed)
-        {
-            // Allows a t-ray to show wires/pipes above carpets/puddles.
             if (component.OriginalDrawDepth is not null)
                 return;
             component.OriginalDrawDepth = args.Sprite.DrawDepth;

Content.Client/UserInterface/Systems/Chat/ChatUIController.cs

@@ -467,9 +467,8 @@ public sealed class ChatUIController : UIController
 
         if (existing.Count > SpeechBubbleCap)
         {
-            // Get the next speech bubble to fade
-            // Any speech bubbles before it are already fading
-            var last = existing[^(SpeechBubbleCap + 1)];
+            // Get the oldest to start fading fast.
+            var last = existing[0];
             last.FadeNow();
         }
     }

Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs

@@ -67,7 +67,7 @@ public sealed class DamageOverlayUiController : UIController
     {
         _overlay.DeadLevel = 0f;
         _overlay.CritLevel = 0f;
-        _overlay.PainLevel = 0f;
+        _overlay.BruteLevel = 0f;
         _overlay.OxygenLevel = 0f;
     }
 
@@ -95,22 +95,13 @@ public sealed class DamageOverlayUiController : UIController
         {
             case MobState.Alive:
             {
-                FixedPoint2 painLevel = 0;
-                _overlay.PainLevel = 0;
-
-                if (!EntityManager.HasComponent<PainNumbnessComponent>(entity))
+                if (EntityManager.HasComponent<PainNumbnessComponent>(entity))
                 {
-                    foreach (var painDamageType in damageable.PainDamageGroups)
-                    {
-                        damageable.DamagePerGroup.TryGetValue(painDamageType, out var painDamage);
-                        painLevel += painDamage;
-                    }
-                    _overlay.PainLevel = FixedPoint2.Min(1f, painLevel / critThreshold).Float();
-
-                    if (_overlay.PainLevel < 0.05f) // Don't show damage overlay if they're near enough to max.
-                    {
-                        _overlay.PainLevel = 0;
-                    }
+                    _overlay.BruteLevel = 0;
+                }
+                else if (damageable.DamagePerGroup.TryGetValue("Brute", out var bruteDamage))
+                {
+                    _overlay.BruteLevel = FixedPoint2.Min(1f, bruteDamage / critThreshold).Float();
                 }
 
                 if (damageable.DamagePerGroup.TryGetValue("Airloss", out var oxyDamage))
@@ -118,6 +109,11 @@ public sealed class DamageOverlayUiController : UIController
                     _overlay.OxygenLevel = FixedPoint2.Min(1f, oxyDamage / critThreshold).Float();
                 }
 
+                if (_overlay.BruteLevel < 0.05f) // Don't show damage overlay if they're near enough to max.
+                {
+                    _overlay.BruteLevel = 0;
+                }
+
                 _overlay.CritLevel = 0;
                 _overlay.DeadLevel = 0;
                 break;
@@ -129,13 +125,13 @@ public sealed class DamageOverlayUiController : UIController
                     return;
                 _overlay.CritLevel = critLevel.Value.Float();
 
-                _overlay.PainLevel = 0;
+                _overlay.BruteLevel = 0;
                 _overlay.DeadLevel = 0;
                 break;
             }
             case MobState.Dead:
             {
-                _overlay.PainLevel = 0;
+                _overlay.BruteLevel = 0;
                 _overlay.CritLevel = 0;
                 break;
             }

Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs

@@ -25,9 +25,9 @@ public sealed class DamageOverlay : Overlay
     /// <summary>
     /// Handles the red pulsing overlay
     /// </summary>
-    public float PainLevel = 0f;
+    public float BruteLevel = 0f;
 
-    private float _oldPainLevel = 0f;
+    private float _oldBruteLevel = 0f;
 
     /// <summary>
     /// Handles the darkening overlay.
@@ -92,14 +92,14 @@ public sealed class DamageOverlay : Overlay
             DeadLevel = 0f;
         }
 
-        if (!MathHelper.CloseTo(_oldPainLevel, PainLevel, 0.001f))
+        if (!MathHelper.CloseTo(_oldBruteLevel, BruteLevel, 0.001f))
         {
-            var diff = PainLevel - _oldPainLevel;
-            _oldPainLevel += GetDiff(diff, lastFrameTime);
+            var diff = BruteLevel - _oldBruteLevel;
+            _oldBruteLevel += GetDiff(diff, lastFrameTime);
         }
         else
         {
-            _oldPainLevel = PainLevel;
+            _oldBruteLevel = BruteLevel;
         }
 
         if (!MathHelper.CloseTo(_oldOxygenLevel, OxygenLevel, 0.001f))
@@ -135,7 +135,7 @@ public sealed class DamageOverlay : Overlay
 
         // Makes debugging easier don't @ me
         float level = 0f;
-        level = _oldPainLevel;
+        level = _oldBruteLevel;
 
         // TODO: Lerping
         if (level > 0f && _oldCritLevel <= 0f)
@@ -165,7 +165,7 @@ public sealed class DamageOverlay : Overlay
         }
         else
         {
-            _oldPainLevel = PainLevel;
+            _oldBruteLevel = BruteLevel;
         }
 
         level = State != MobState.Critical ? _oldOxygenLevel : 1f;

Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs

@@ -14,7 +14,6 @@ public sealed partial class GhostGui : UIWidget
     public event Action? RequestWarpsPressed;
     public event Action? ReturnToBodyPressed;
     public event Action? GhostRolesPressed;
-    private int _prevNumberRoles;
 
     public GhostGui()
     {
@@ -27,7 +26,6 @@ public sealed partial class GhostGui : UIWidget
         GhostWarpButton.OnPressed += _ => RequestWarpsPressed?.Invoke();
         ReturnToBodyButton.OnPressed += _ => ReturnToBodyPressed?.Invoke();
         GhostRolesButton.OnPressed += _ => GhostRolesPressed?.Invoke();
-        GhostRolesButton.OnPressed += _ => GhostRolesButton.StyleClasses.Remove(StyleBase.ButtonCaution);
     }
 
     public void Hide()
@@ -43,13 +41,14 @@ public sealed partial class GhostGui : UIWidget
         if (roles != null)
         {
             GhostRolesButton.Text = Loc.GetString("ghost-gui-ghost-roles-button", ("count", roles));
-
-            if (roles > _prevNumberRoles)
+            if (roles > 0)
             {
                 GhostRolesButton.StyleClasses.Add(StyleBase.ButtonCaution);
             }
-
-            _prevNumberRoles = (int)roles;
+            else
+            {
+                GhostRolesButton.StyleClasses.Remove(StyleBase.ButtonCaution);
+            }
         }
 
         TargetWindow.Populate();

Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs

@@ -1,4 +1,3 @@
-using Content.Client._CP14.UserInterface.Systems.Skill;
 using Content.Client.UserInterface.Systems.Actions;
 using Content.Client.UserInterface.Systems.Admin;
 using Content.Client.UserInterface.Systems.Bwoink;
@@ -25,7 +24,7 @@ public sealed class GameTopMenuBarUIController : UIController
     [Dependency] private readonly SandboxUIController _sandbox = default!;
     [Dependency] private readonly GuidebookUIController _guidebook = default!;
     [Dependency] private readonly EmotesUIController _emotes = default!;
-    [Dependency] private readonly CP14SkillUIController _skill = default!; //CP14
+    [Dependency] private readonly CP14KnowledgeUIController _knowledge = default!; //CP14
 
     private GameTopMenuBar? GameTopMenuBar => UIManager.GetActiveUIWidgetOrNull<GameTopMenuBar>();
 
@@ -49,7 +48,7 @@ public sealed class GameTopMenuBarUIController : UIController
         _action.UnloadButton();
         _sandbox.UnloadButton();
         _emotes.UnloadButton();
-        _skill.UnloadButton(); //CP14
+        _knowledge.UnloadButton(); //CP14
     }
 
     public void LoadButtons()
@@ -63,6 +62,6 @@ public sealed class GameTopMenuBarUIController : UIController
         _action.LoadButton();
         _sandbox.LoadButton();
         _emotes.LoadButton();
-        _skill.LoadButton(); //CP14
+        _knowledge.LoadButton(); //CP14
     }
 }

Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml

@@ -35,11 +35,11 @@
         />
     <!-- CP14 UI part -->
     <ui:MenuButton
-        Name="CP14SkillButton"
+        Name="CP14KnowledgeButton"
         Access="Internal"
         Icon="{xe:Tex '/Textures/Interface/students-cap.svg.192dpi.png'}"
-        ToolTip="{Loc 'cp14-game-hud-open-skill-menu-button-tooltip'}"
-        BoundKey = "{x:Static is:ContentKeyFunctions.CP14OpenSkillMenu}"
+        ToolTip="{Loc 'cp14-game-hud-open-knowledge-menu-button-tooltip'}"
+        BoundKey = "{x:Static is:ContentKeyFunctions.CP14OpenKnowledgeMenu}"
         MinSize="42 64"
         HorizontalExpand="True"
         AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"

Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs

@@ -39,6 +39,7 @@ public sealed class SandboxUIController : UIController, IOnStateChanged<Gameplay
     [UISystemDependency] private readonly DebugPhysicsSystem _debugPhysics = default!;
     [UISystemDependency] private readonly MarkerSystem _marker = default!;
     [UISystemDependency] private readonly SandboxSystem _sandbox = default!;
+    [UISystemDependency] private readonly SubFloorHideSystem _subfloorHide = default!;
 
     private SandboxWindow? _window;
 
@@ -116,11 +117,10 @@ public sealed class SandboxUIController : UIController, IOnStateChanged<Gameplay
 
         _window.OnOpen += () => { SandboxButton!.Pressed = true; };
         _window.OnClose += () => { SandboxButton!.Pressed = false; };
-
-        // TODO: These need moving to opened so at least if they're not synced properly on open they work.
         _window.ToggleLightButton.Pressed = !_light.Enabled;
         _window.ToggleFovButton.Pressed = !_eye.CurrentEye.DrawFov;
         _window.ToggleShadowsButton.Pressed = !_light.DrawShadows;
+        _window.ToggleSubfloorButton.Pressed = _subfloorHide.ShowAll;
         _window.ShowMarkersButton.Pressed = _marker.MarkersVisible;
         _window.ShowBbButton.Pressed = (_debugPhysics.Flags & PhysicsDebugFlags.Shapes) != 0x0;
 
@@ -219,16 +219,4 @@ public sealed class SandboxUIController : UIController, IOnStateChanged<Gameplay
             _window.Close();
         }
     }
-
-    #region Buttons
-
-    public void SetToggleSubfloors(bool value)
-    {
-        if (_window == null)
-            return;
-
-        _window.ToggleSubfloorButton.Pressed = value;
-    }
-
-    #endregion
 }

Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml.cs

@@ -1,5 +1,4 @@
-using Content.Client.SubFloor;
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 
@@ -8,18 +7,8 @@ namespace Content.Client.UserInterface.Systems.Sandbox.Windows;
 [GenerateTypedNameReferences]
 public sealed partial class SandboxWindow : DefaultWindow
 {
-    [Dependency] private readonly IEntityManager _entManager = null!;
-
     public SandboxWindow()
     {
         RobustXamlLoader.Load(this);
-        IoCManager.InjectDependencies(this);
-    }
-
-    protected override void Opened()
-    {
-        base.Opened();
-        // Make sure state is up to date.
-        ToggleSubfloorButton.Pressed = _entManager.System<SubFloorHideSystem>().ShowAll;
     }
 }

Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs

@@ -42,9 +42,6 @@ public sealed class StorageWindow : BaseWindow
     private ValueList<EntityUid> _contained = new();
     private ValueList<EntityUid> _toRemove = new();
 
-    // Manually store this because you can't have a 0x0 GridContainer but we still need to add child controls for 1x1 containers.
-    private Vector2i _pieceGridSize;
-
     private TextureButton? _backButton;
 
     private bool _isDirty;
@@ -411,14 +408,11 @@ public sealed class StorageWindow : BaseWindow
         _contained.Clear();
         _contained.AddRange(storageComp.Container.ContainedEntities.Reverse());
 
-        var width = boundingGrid.Width + 1;
-        var height = boundingGrid.Height + 1;
-
         // Build the grid representation
-         if (_pieceGrid.Rows != _pieceGridSize.Y || _pieceGrid.Columns != _pieceGridSize.X)
+        if (_pieceGrid.Rows - 1 != boundingGrid.Height || _pieceGrid.Columns - 1 != boundingGrid.Width)
         {
-            _pieceGrid.Rows = height;
-            _pieceGrid.Columns = width;
+            _pieceGrid.Rows = boundingGrid.Height + 1;
+            _pieceGrid.Columns = boundingGrid.Width + 1;
             _controlGrid.Clear();
 
             for (var y = boundingGrid.Bottom; y <= boundingGrid.Top; y++)
@@ -436,7 +430,6 @@ public sealed class StorageWindow : BaseWindow
             }
         }
 
-        _pieceGridSize = new(width, height);
         _toRemove.Clear();
 
         // Remove entities no longer relevant / Update existing ones

Content.Client/Verbs/UI/VerbMenuElement.cs

@@ -3,12 +3,10 @@ using Content.Client.ContextMenu.UI;
 using Content.Shared.Verbs;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.Utility;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
-using Robust.Shared.Utility;
 
 namespace Content.Client.Verbs.UI
 {
@@ -29,17 +27,7 @@ namespace Content.Client.Verbs.UI
 
         public VerbMenuElement(Verb verb) : base(verb.Text)
         {
-            TooltipSupplier = sender =>
-            {
-                var label = new RichTextLabel();
-                label.SetMessage(FormattedMessage.FromMarkupOrThrow(verb.Message ?? verb.Text));
-
-                var tooltip = new Tooltip();
-                tooltip.GetChild(0).Children.Clear();
-                tooltip.GetChild(0).Children.Add(label);
-
-                return tooltip;
-            };
+            ToolTip = verb.Message;
             Disabled = verb.Disabled;
             Verb = verb;
 

Content.Client/Verbs/VerbSystem.cs

@@ -213,7 +213,7 @@ namespace Content.Client.Verbs
             {
                 // maybe send an informative pop-up message.
                 if (!string.IsNullOrWhiteSpace(verb.Message))
-                    _popupSystem.PopupEntity(FormattedMessage.RemoveMarkupOrThrow(verb.Message), user);
+                    _popupSystem.PopupEntity(verb.Message, user);
 
                 return;
             }

Content.Client/_CP14/Farming/ClientCP14FarmingSystem.cs

@@ -1,5 +1,4 @@
 using Content.Shared._CP14.Farming;
-using Content.Shared._CP14.Farming.Components;
 using Content.Shared.Rounding;
 using Robust.Client.GameObjects;
 
@@ -33,7 +32,7 @@ public sealed class ClientCP14FarmingSystem : CP14SharedFarmingSystem
         if (!TryComp<SpriteComponent>(visuals, out var sprite))
             return;
 
-        if (!PlantQuery.TryComp(visuals, out var plant))
+        if (!TryComp<CP14PlantComponent>(visuals, out var plant))
             return;
 
         var growthState = ContentHelpers.RoundToNearestLevels(plant.GrowthLevel, 1, visuals.Comp.GrowthSteps);

Content.Client/_CP14/Fishing/CP14FishingOverlay.cs

@@ -1,149 +0,0 @@
-using System.Numerics;
-using Content.Client.Resources;
-using Content.Shared._CP14.Fishing.Components;
-using Content.Shared._CP14.Fishing.Prototypes;
-using Content.Shared._CP14.Fishing.Systems;
-using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
-using Robust.Client.Player;
-using Robust.Client.ResourceManagement;
-using Robust.Shared.Enums;
-using Robust.Shared.Prototypes;
-
-namespace Content.Client._CP14.Fishing;
-
-public sealed class CP14FishingOverlay : Overlay
-{
-    [Dependency] private readonly IComponentFactory _factory = default!;
-    [Dependency] private readonly IEntityManager _entity = default!;
-    [Dependency] private readonly IPlayerManager _player = default!;
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
-    [Dependency] private readonly IResourceCache _resourceCache = default!;
-
-    private readonly SpriteSystem _sprite;
-    private readonly TransformSystem _transform;
-    private readonly CP14SharedFishingProcessSystem _sharedFishingProcess;
-
-    private Texture _backgroundTexture = default!;
-    private Texture _handleTopTexture = default!;
-    private Texture _handleMiddleTexture = default!;
-    private Texture _handleBottomTexture = default!;
-
-    private Texture _lootTexture = default!;
-
-    private Vector2 _backgroundOffset;
-    private Vector2 _backgroundHandleOffset;
-    private Vector2 _backgroundHandleSize;
-
-    private Vector2 _progressOffset;
-    private Vector2 _progressSize;
-
-    private EntityUid _process = EntityUid.Invalid;
-
-    public override OverlaySpace Space => OverlaySpace.WorldSpace;
-
-    public CP14FishingOverlay()
-    {
-        IoCManager.InjectDependencies(this);
-
-        _sprite = _entity.System<SpriteSystem>();
-        _transform = _entity.System<TransformSystem>();
-        _sharedFishingProcess = _entity.System<CP14SharedFishingProcessSystem>();
-    }
-
-    protected override void Draw(in OverlayDrawArgs args)
-    {
-        if (_player.LocalEntity is not { } localEntity)
-            return;
-
-        if (!_sharedFishingProcess.TryGetByUser(localEntity, out var fishingProcess))
-            return;
-
-        // Refresh the texture cache, with a new fishing process
-        if (_process != fishingProcess.Value.Owner)
-        {
-            _process = fishingProcess.Value.Owner;
-
-            UpdateCachedStyleSheet(_sharedFishingProcess.GetStyle(fishingProcess.Value));
-
-            var prototype = _prototype.Index(fishingProcess.Value.Comp.LootProtoId);
-            var iconPath = CP14FishingIconComponent.DefaultTexturePath;
-
-            if (prototype.Components.TryGetComponent(_factory.GetComponentName(typeof(CP14FishingIconComponent)), out var iconComponent))
-            {
-                var comp = (CP14FishingIconComponent) iconComponent;
-                iconPath = comp.TexturePath;
-            }
-
-            _lootTexture = _resourceCache.GetTexture(iconPath);
-        }
-
-        // Getting the position of the player we will be working from
-        var worldPosition = _transform.GetWorldPosition(localEntity);
-
-        // Calculate the shift of the player relative to the bottom of the coordinates
-        var playerOffset = fishingProcess.Value.Comp.PlayerPositionNormalized * _backgroundHandleSize;
-        var playerHalfSize = fishingProcess.Value.Comp.PlayerHalfSizeNormalized * _backgroundHandleSize;
-
-        var lootOffset = fishingProcess.Value.Comp.LootPositionNormalized * _backgroundHandleSize + Vector2.UnitX * _backgroundHandleSize.X / 2;
-
-        DrawBackground(args.WorldHandle, worldPosition - _backgroundOffset);
-        DrawProgress(args.WorldHandle, worldPosition - _backgroundOffset + _progressOffset, _progressSize, fishingProcess.Value.Comp.Progress);
-        DrawHandle(args.WorldHandle, worldPosition - _backgroundOffset + _backgroundHandleOffset + playerOffset, playerHalfSize);
-        DrawLoot(args.WorldHandle, worldPosition - _backgroundOffset + _backgroundHandleOffset + lootOffset);
-    }
-
-    private void DrawBackground(DrawingHandleWorld handle, Vector2 position)
-    {
-        handle.DrawTexture(_backgroundTexture, position);
-    }
-
-    private void DrawProgress(DrawingHandleWorld handle, Vector2 position, Vector2 size, float progress)
-    {
-        var vectorA = position;
-        var vectorB = position + new Vector2(size.X, size.Y * progress);
-        var box = new Box2(vectorA, vectorB);
-
-        handle.DrawRect(box, Color.Aqua);
-    }
-
-    private void DrawHandle(DrawingHandleWorld handle, Vector2 position, Vector2 halfSize)
-    {
-        var cursor = position - halfSize;
-
-        // Bottom
-        handle.DrawTexture(_handleBottomTexture, cursor);
-        cursor += new Vector2(0, _handleBottomTexture.Height / 32f);
-
-        // Middle
-        while (cursor.Y < position.Y + halfSize.Y - _handleTopTexture.Height / 32f)
-        {
-            handle.DrawTexture(_handleMiddleTexture, cursor);
-            cursor += new Vector2(0, _handleMiddleTexture.Height / 32f);
-        }
-
-        // Front
-        handle.DrawTexture(_handleTopTexture, cursor);
-    }
-
-    private void DrawLoot(DrawingHandleWorld handle, Vector2 position)
-    {
-        handle.DrawTexture(_lootTexture, position - _lootTexture.Size / 64f);
-    }
-
-    private void UpdateCachedStyleSheet(CP14FishingProcessStyleSheetPrototype styleSheet)
-    {
-        _backgroundTexture = _resourceCache.GetTexture(styleSheet.Background.Texture);
-        _handleTopTexture = _resourceCache.GetTexture(styleSheet.Handle.TopTexture);
-        _handleMiddleTexture = _resourceCache.GetTexture(styleSheet.Handle.MiddleTexture);
-        _handleBottomTexture = _resourceCache.GetTexture(styleSheet.Handle.BottomTexture);
-
-        _backgroundOffset = styleSheet.Background.Offset + Vector2.UnitX * _backgroundTexture.Width / 32f;
-
-        _backgroundHandleOffset = styleSheet.Background.HandleOffset;
-        _backgroundHandleSize = styleSheet.Background.HandleSize;
-
-        _progressOffset = styleSheet.Background.ProgressOffset;
-        _progressSize = styleSheet.Background.ProgressSize;
-    }
-}

Content.Client/_CP14/Fishing/CP14FishingOverlaySystem.cs

@@ -1,23 +0,0 @@
-using Content.Client.Overlays;
-using Robust.Client.Graphics;
-
-namespace Content.Client._CP14.Fishing;
-
-public sealed class CP14FishingOverlaySystem : EntitySystem
-{
-    [Dependency] private readonly IOverlayManager _overlay = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        _overlay.AddOverlay(new CP14FishingOverlay());
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-
-        _overlay.RemoveOverlay<StencilOverlay>();
-    }
-}

Content.Client/_CP14/Fishing/CP14FishingProcessSystem.cs

@@ -1,5 +0,0 @@
-using Content.Shared._CP14.Fishing.Systems;
-
-namespace Content.Client._CP14.Fishing;
-
-public sealed class CP14FishingProcessSystem : CP14SharedFishingProcessSystem;

Content.Client/_CP14/Fishing/CP14FishingRodSystem.cs

@@ -1,35 +0,0 @@
-using Content.Client.Hands.Systems;
-using Content.Shared._CP14.Fishing.Components;
-using Content.Shared._CP14.Fishing.Systems;
-using Robust.Client.GameObjects;
-using Robust.Shared.Input;
-using Robust.Shared.Timing;
-
-namespace Content.Client._CP14.Fishing;
-
-public sealed class CP14FishingRodSystem : CP14SharedFishingRodSystem
-{
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly InputSystem _input = default!;
-    [Dependency] private readonly HandsSystem _hands = default!;
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        if (!_timing.IsFirstTimePredicted)
-            return;
-
-        var handUid = _hands.GetActiveHandEntity();
-
-        if (!TryComp<CP14FishingRodComponent>(handUid, out var fishingRodComponent))
-            return;
-
-        var reelKey = _input.CmdStates.GetState(EngineKeyFunctions.UseSecondary) == BoundKeyState.Down;
-
-        if (fishingRodComponent.Reeling == reelKey)
-            return;
-
-        RaisePredictiveEvent(new RequestFishingRodReelMessage(reelKey));
-    }
-}

Content.Client/_CP14/Knowledge/ClientCP14KnowledgeSystem.cs

@@ -0,0 +1,42 @@
+using Content.Shared._CP14.Knowledge;
+using Content.Shared._CP14.Knowledge.Prototypes;
+using Robust.Client.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._CP14.Knowledge;
+
+public sealed partial class ClientCP14KnowledgeSystem : SharedCP14KnowledgeSystem
+{
+    [Dependency] private readonly IPlayerManager _players = default!;
+
+    public event Action<KnowledgeData>? OnKnowledgeUpdate;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeNetworkEvent<CP14KnowledgeInfoEvent>(OnCharacterKnowledgeEvent);
+    }
+
+    public void RequestKnowledgeInfo()
+    {
+        var entity = _players.LocalEntity;
+        if (entity is null)
+            return;
+
+        RaiseNetworkEvent(new RequestKnowledgeInfoEvent(GetNetEntity(entity.Value)));
+    }
+
+    private void OnCharacterKnowledgeEvent(CP14KnowledgeInfoEvent msg, EntitySessionEventArgs args)
+    {
+        var entity = GetEntity(msg.NetEntity);
+        var data = new KnowledgeData(entity, msg.AllKnowledge);
+
+        OnKnowledgeUpdate?.Invoke(data);
+    }
+
+    public readonly record struct KnowledgeData(
+        EntityUid Entity,
+        HashSet<ProtoId<CP14KnowledgePrototype>> AllKnowledges
+    );
+}

Content.Client/_CP14/NightVision/CP14ClientNightVisionSystem.cs

@@ -1,65 +0,0 @@
-using Content.Shared._CP14.NightVision;
-using Robust.Client.Player;
-using Robust.Shared.Player;
-
-namespace Content.Client._CP14.NightVision;
-
-public sealed class CP14ClientNightVisionSystem : CP14SharedNightVisionSystem
-{
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
-    [Dependency] private readonly IPlayerManager _playerManager = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<CP14NightVisionComponent, CP14ToggleNightVisionEvent>(OnToggleNightVision);
-        SubscribeLocalEvent<CP14NightVisionComponent, PlayerDetachedEvent>(OnPlayerDetached);
-    }
-
-    protected override void OnRemove(Entity<CP14NightVisionComponent> ent, ref ComponentRemove args)
-    {
-        base.OnRemove(ent, ref args);
-
-        NightVisionOff(ent);
-    }
-
-    private void OnPlayerDetached(Entity<CP14NightVisionComponent> ent, ref PlayerDetachedEvent args)
-    {
-        NightVisionOff(ent);
-    }
-
-    private void OnToggleNightVision(Entity<CP14NightVisionComponent> ent, ref CP14ToggleNightVisionEvent args)
-    {
-        NightVisionToggle(ent);
-    }
-
-    private void NightVisionOn(Entity<CP14NightVisionComponent> ent)
-    {
-        if (_playerManager.LocalSession?.AttachedEntity != ent)
-            return;
-
-        var nightVisionLight = Spawn(ent.Comp.LightPrototype, Transform(ent).Coordinates);
-        _transform.SetParent(nightVisionLight, ent);
-        _transform.SetWorldRotation(nightVisionLight, _transform.GetWorldRotation(ent));
-        ent.Comp.LocalLightEntity = nightVisionLight;
-    }
-
-    private void NightVisionOff(Entity<CP14NightVisionComponent> ent)
-    {
-        QueueDel(ent.Comp.LocalLightEntity);
-        ent.Comp.LocalLightEntity = null;
-    }
-
-    private void NightVisionToggle(Entity<CP14NightVisionComponent> ent)
-    {
-        if (ent.Comp.LocalLightEntity == null)
-        {
-            NightVisionOn(ent);
-        }
-        else
-        {
-            NightVisionOff(ent);
-        }
-    }
-}

Content.Client/_CP14/Options/CP14OptionsMenuMainTab.xaml.cs

@@ -1,4 +1,4 @@
-using Content.Shared.CCVar;
+using Content.Shared._CP14.Configuration;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
@@ -12,8 +12,8 @@ public sealed partial class CP14OptionsMenuMainTab : Control
     {
         RobustXamlLoader.Load(this);
 
-        Control.AddOptionCheckBox(CCVars.WaveShaderEnabled, WaveShaderEnabled);
-        Control.AddOptionCheckBox(CCVars.PostProcess, PostProcessCheckBox);
+        Control.AddOptionCheckBox(CP14ConfigVars.WaveShaderEnabled, WaveShaderEnabled);
+        Control.AddOptionCheckBox(CP14ConfigVars.PostProcess, PostProcessCheckBox);
 
         Control.Initialize();
     }

Content.Client/_CP14/Overlays/BasePostProcessOverlay.cs

@@ -1,5 +1,5 @@
+using Content.Shared._CP14.Configuration;
 using System.Numerics;
-using Content.Shared.CCVar;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Configuration;
@@ -32,7 +32,7 @@ public sealed class CP14BasePostProcessOverlay : Overlay
 
     protected override bool BeforeDraw(in OverlayDrawArgs args)
     {
-        if (!_configManager.GetCVar(CCVars.PostProcess))
+        if (!_configManager.GetCVar(CP14ConfigVars.PostProcess))
             return false;
 
         if (!_entityManager.TryGetComponent(_playerManager.LocalSession?.AttachedEntity, out EyeComponent? eyeComp))
@@ -74,4 +74,4 @@ public sealed class CP14BasePostProcessOverlay : Overlay
         worldHandle.DrawRect(viewport, Color.White);
         worldHandle.UseShader(null);
     }
-}
+}

Content.Client/_CP14/Overlays/StencilOverlay.CloudShadows.cs

@@ -1,5 +1,5 @@
 using System.Numerics;
-using Content.Shared._CP14.CloudShadow;
+using Content.Shared._CP14.DayCycle.Components;
 using Robust.Client.Graphics;
 using Robust.Shared.Utility;
 

Content.Client/_CP14/Skill/CP14ClientSkillSystem.cs

@@ -1,57 +0,0 @@
-using Content.Shared._CP14.Skill;
-using Content.Shared._CP14.Skill.Components;
-using Content.Shared._CP14.Skill.Prototypes;
-using Robust.Client.Player;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Client._CP14.Skill;
-
-public sealed partial class CP14ClientSkillSystem : CP14SharedSkillSystem
-{
-    [Dependency] private readonly IPlayerManager _playerManager = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-
-    public event Action<EntityUid>? OnSkillUpdate;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<CP14SkillStorageComponent, AfterAutoHandleStateEvent>(OnAfterAutoHandleState);
-    }
-
-    private void OnAfterAutoHandleState(Entity<CP14SkillStorageComponent> ent, ref AfterAutoHandleStateEvent args)
-    {
-        if (ent != _playerManager.LocalEntity)
-            return;
-
-        OnSkillUpdate?.Invoke(ent.Owner);
-    }
-
-    public void RequestSkillData()
-    {
-        var localPlayer = _playerManager.LocalEntity;
-
-        if (!HasComp<CP14SkillStorageComponent>(localPlayer))
-            return;
-
-        OnSkillUpdate?.Invoke(localPlayer.Value);
-    }
-
-    public void RequestLearnSkill(EntityUid? target, CP14SkillPrototype? skill)
-    {
-        if (skill == null || target == null)
-            return;
-
-        var netEv = new CP14TryLearnSkillMessage(GetNetEntity(target.Value), skill.ID);
-        RaiseNetworkEvent(netEv);
-
-        if (_proto.TryIndex(skill.Tree, out var indexedTree))
-        {
-            _audio.PlayGlobal(indexedTree.LearnSound, target.Value, AudioParams.Default.WithVolume(6f));
-        }
-    }
-}

Content.Client/_CP14/Skill/Ui/CP14SkillTreeButtonControl.xaml

@@ -1,24 +0,0 @@
-<Control xmlns="https://spacestation14.io" HorizontalExpand="True">
-    <BoxContainer Name="MainContainer"
-                  Orientation="Horizontal"
-                  HorizontalExpand="True">
-        <Button Name="MainButton"
-                HorizontalExpand="True"
-                VerticalExpand="True"
-                StyleClasses="OpenRight"
-                Margin="0 0 -1 0">
-            <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-                <BoxContainer Orientation="Vertical"
-                              VerticalExpand="True"
-                              HorizontalExpand="True"
-                              Margin="-5 0 0 0">
-                    <Label Name="SkillTreeLabel" />
-                </BoxContainer>
-            </BoxContainer>
-        </Button>
-        <PanelContainer Name="ColorPanel"
-                        VerticalExpand="True"
-                        SetWidth="7"
-                        Margin="0 1 0 0" />
-    </BoxContainer>
-</Control>

Content.Client/_CP14/Skill/Ui/CP14SkillTreeButtonControl.xaml.cs

@@ -1,22 +0,0 @@
-using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._CP14.Skill.Ui;
-
-[GenerateTypedNameReferences]
-public sealed partial class CP14SkillTreeButtonControl : Control
-{
-    public event Action? OnPressed;
-
-    public CP14SkillTreeButtonControl(Color color, string label)
-    {
-        RobustXamlLoader.Load(this);
-
-        ColorPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = color };
-        SkillTreeLabel.Text = label;
-
-        MainButton.OnPressed += args => OnPressed?.Invoke();
-    }
-}

Content.Client/_CP14/Skill/Ui/CP14SkillTreeGraphControl.xaml

@@ -1,7 +0,0 @@
-<ui:CP14SkillTreeGraphControl
-    xmlns="https://spacestation14.io"
-    xmlns:controls="clr-namespace:Content.Client._CP14.Skill.Ui"
-    xmlns:ui="clr-namespace:Content.Client._CP14.Skill.Ui"
-    HorizontalExpand="True"
-    VerticalExpand="True"
-    MouseFilter="Stop"/>

Content.Client/_CP14/Skill/Ui/CP14SkillTreeGraphControl.xaml.cs

@@ -1,227 +0,0 @@
-using System.Linq;
-using System.Numerics;
-using Content.Shared._CP14.Skill;
-using Content.Shared._CP14.Skill.Components;
-using Content.Shared._CP14.Skill.Prototypes;
-using Content.Shared._CP14.Skill.Restrictions;
-using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Client.Utility;
-using Robust.Shared.Input;
-using Robust.Shared.Prototypes;
-
-namespace Content.Client._CP14.Skill.Ui;
-
-[GenerateTypedNameReferences]
-public sealed partial class CP14SkillTreeGraphControl : BoxContainer
-{
-    [Dependency] private readonly IEntityManager _entManager = default!;
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-    private readonly CP14SharedSkillSystem _skillSystem;
-
-    private Entity<CP14SkillStorageComponent>? _player;
-
-    private IEnumerable<CP14SkillPrototype> _allSkills;
-
-    private CP14SkillPrototype? _hoveredNode;
-    private CP14SkillPrototype? _selectedNode;
-    public CP14SkillTreePrototype? Tree;
-
-    private bool dragging = false;
-    private Vector2 _previousMousePosition = Vector2.Zero;
-    private Vector2 _globalOffset = new (60,60);
-
-    private const float GridSize = 25f;
-
-    public event Action<CP14SkillPrototype?>? OnNodeSelected;
-    public event Action<Vector2>? OnOffsetChanged;
-
-    public CP14SkillTreeGraphControl()
-    {
-        IoCManager.InjectDependencies(this);
-        RobustXamlLoader.Load(this);
-
-        _skillSystem = _entManager.System<CP14SharedSkillSystem>();
-
-        _allSkills = _proto.EnumeratePrototypes<CP14SkillPrototype>();
-        _proto.PrototypesReloaded += _ => _allSkills = _proto.EnumeratePrototypes<CP14SkillPrototype>().OrderBy(skill => _skillSystem.GetSkillName(skill)).ToList();
-        OnOffsetChanged?.Invoke(_globalOffset);
-    }
-
-    public void UpdateState(Entity<CP14SkillStorageComponent>? player)
-    {
-        _player = player;
-        OnOffsetChanged?.Invoke(_globalOffset);
-    }
-
-    protected override void KeyBindDown(GUIBoundKeyEventArgs args)
-    {
-        base.KeyBindDown(args);
-
-        if (args.Handled)
-            return;
-
-        if (args.Function == EngineKeyFunctions.UIClick)
-        {
-            dragging = true;
-
-            if (_hoveredNode == null)
-                return;
-
-            OnNodeSelected?.Invoke(_hoveredNode);
-            UserInterfaceManager.ClickSound();
-            _selectedNode = _hoveredNode;
-        }
-
-        if (args.Function == EngineKeyFunctions.UIRightClick)
-        {
-            _globalOffset = new Vector2(60, 60); // Reset offset on right click
-            OnOffsetChanged?.Invoke(_globalOffset);
-        }
-    }
-
-    protected override void KeyBindUp(GUIBoundKeyEventArgs args)
-    {
-        base.KeyBindUp(args);
-
-        if (args.Handled || args.Function != EngineKeyFunctions.UIClick)
-            return;
-
-        dragging = false;
-    }
-
-    protected override void ExitedTree()
-    {
-        base.ExitedTree();
-
-        OnNodeSelected?.Invoke(null);
-    }
-
-    protected override void Draw(DrawingHandleScreen handle)
-    {
-        base.Draw(handle);
-
-        _hoveredNode = null;
-        if (_player == null || Tree == null)
-        {
-            return;
-        }
-
-        var cursor = (UserInterfaceManager.MousePositionScaled.Position * UIScale) - GlobalPixelPosition;
-
-        if (dragging)
-        {
-            var delta = cursor - _previousMousePosition;
-            _globalOffset += delta;
-            OnOffsetChanged?.Invoke(_globalOffset);
-        }
-
-        _previousMousePosition = cursor;
-
-        var playerSkills = _player.Value.Comp.LearnedSkills;
-
-        //Draw connection lines
-        foreach (var skill in _allSkills)
-        {
-            if (skill.Tree != Tree)
-                continue;
-
-            var fromPos = skill.SkillUiPosition * GridSize * UIScale + _globalOffset;
-
-            foreach (var req in skill.Restrictions)
-            {
-                switch (req)
-                {
-                    case NeedPrerequisite prerequisite:
-                        if (!_proto.TryIndex(prerequisite.Prerequisite, out var prerequisiteSkill))
-                            continue;
-
-                        if (prerequisiteSkill.Tree != Tree)
-                            continue;
-
-                        var learned = playerSkills.Contains(skill.ID);
-
-                        var toPos = prerequisiteSkill.SkillUiPosition * GridSize * UIScale + _globalOffset;
-                        var color = learned ? Color.White : Color.FromSrgb(new Color(0.7f, 0.7f, 0.7f));
-                        handle.DrawLine(fromPos, toPos, color);
-
-                        break;
-                }
-            }
-        }
-
-        //Draw skill icons over lines
-        foreach (var skill in _allSkills)
-        {
-            if (skill.Tree != Tree)
-                continue;
-
-            //TODO: Not optimized, recalculates every frame. Needs to be calculated on state update and cached.
-            var canBeLearned = _skillSystem.CanLearnSkill(_player.Value, skill, _player.Value.Comp);
-            var pos = skill.SkillUiPosition * GridSize * UIScale + _globalOffset;
-
-            // Base skill icon
-            var baseTexture = skill.Icon.Frame0();
-            var baseSize = new Vector2(baseTexture.Width, baseTexture.Height) * 2;
-            var baseQuad = new UIBox2(pos - baseSize / 2, pos + baseSize / 2);
-
-            var hovered = (cursor - pos).LengthSquared() <= (baseSize.X / 2) * (baseSize.X / 2);
-
-            // Frame
-            var frameTexture = Tree.FrameIcon.Frame0();
-            var frameSize = new Vector2(frameTexture.Width, frameTexture.Height) * 2;
-            var frameQuad = new UIBox2(pos - frameSize / 2, pos + frameSize / 2);
-            handle.DrawTextureRect(frameTexture, frameQuad, canBeLearned ? Color.White : Color.FromSrgb(new Color(0.7f, 0.7f, 0.7f)));
-
-            // Selected Skill
-            if (_selectedNode == skill)
-            {
-                var selectedTexture = Tree.SelectedIcon.Frame0();
-                var selectedSize = new Vector2(selectedTexture.Width, selectedTexture.Height) * 2;
-                var selectedQuad = new UIBox2(pos - selectedSize / 2, pos + selectedSize / 2);
-                handle.DrawTextureRect(selectedTexture, selectedQuad, Color.White);
-            }
-
-            // Hovered Skill
-            if (hovered)
-            {
-                _hoveredNode = skill;
-                var hoveredTexture = Tree.HoveredIcon.Frame0();
-                var hoveredSize = new Vector2(hoveredTexture.Width, hoveredTexture.Height) * 2;
-                var hoveredQuad = new UIBox2(pos - hoveredSize / 2, pos + hoveredSize / 2);
-                handle.DrawTextureRect(hoveredTexture, hoveredQuad, Color.White);
-            }
-
-            var learned = playerSkills.Contains(skill.ID);
-            var allowedToLearn = _skillSystem.AllowedToLearn(_player.Value, skill, _player.Value.Comp);
-
-            // Learned Skill
-            if (learned)
-            {
-                var learnedTexture = Tree.LearnedIcon.Frame0();
-                var learnedSize = new Vector2(learnedTexture.Width, learnedTexture.Height) * 2;
-                var learnedQuad = new UIBox2(pos - learnedSize / 2, pos + learnedSize / 2);
-                handle.DrawTextureRect(learnedTexture, learnedQuad, Color.White);
-            }
-            else if (canBeLearned)
-            {
-                var availableTexture = Tree.AvailableIcon.Frame0();
-                var availableSize = new Vector2(availableTexture.Width, availableTexture.Height) * 2;
-                var availableQuad = new UIBox2(pos - availableSize / 2, pos + availableSize / 2);
-                handle.DrawTextureRect(availableTexture, availableQuad, Color.White);
-            }
-
-            var iconColor = allowedToLearn switch
-            {
-                true when !learned => Color.FromSrgb(new Color(0.7f, 0.7f, 0.7f)),
-                false when !learned => Color.FromSrgb(new Color(0f, 0f, 0f)),
-                _ => Color.White
-            };
-
-            handle.DrawTextureRect(baseTexture, baseQuad, iconColor);
-        }
-    }
-}

Content.Client/_CP14/TravelingStoreShip/CP14StoreProductControl.xaml

@@ -1,19 +1,11 @@
 <Control xmlns="https://spacestation14.io">
     <Button Name="ProductButton" Access="Public">
         <BoxContainer Orientation="Horizontal">
-            <EntityPrototypeView Name="EntityView"
-                                 MinSize="48 48"
-                                 MaxSize="48 48"
-                                 Scale="2,2"
-                                 HorizontalAlignment="Left"
-                                 VerticalAlignment="Top"
-                                 Visible="False"/>
             <TextureRect Name="View"
                          MinSize="48 48"
                          HorizontalAlignment="Left"
                          VerticalAlignment="Top"
-                         Stretch="KeepAspectCentered"
-                         Visible="False"/>
+                         Stretch="KeepAspectCentered" />
             <BoxContainer Orientation="Vertical">
                 <RichTextLabel Name="SpecialLabel" Text="{Loc 'cp14-store-ui-tab-special'}" VerticalAlignment="Center" Access="Public" Visible="False" />
                 <RichTextLabel Name="ProductName" VerticalAlignment="Center" Access="Public" />

Content.Client/_CP14/TravelingStoreShip/CP14StoreProductControl.xaml.cs

@@ -3,6 +3,7 @@ using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Utility;
 
 namespace Content.Client._CP14.TravelingStoreShip;
 
@@ -25,16 +26,10 @@ public sealed partial class CP14StoreProductControl : Control
         ProductName.Text = $"[bold]{entry.Name}[/bold]";
 
         SpecialLabel.Visible = entry.Special;
+        View.Texture = _sprite.Frame0(entry.Icon);
+    }
 
-        if (entry.Icon is not null)
-        {
-            View.Visible = true;
-            View.Texture = _sprite.Frame0(entry.Icon);
-        }
-        else if (entry.EntityView is not null)
-        {
-            EntityView.Visible = true;
-            EntityView.SetPrototype(entry.EntityView);
-        }
+    private void UpdateView(SpriteSpecifier spriteSpecifier)
+    {
     }
 }

Content.Client/_CP14/TravelingStoreShip/CP14StoreWindow.xaml

@@ -1,7 +1,6 @@
 <DefaultWindow xmlns="https://spacestation14.io"
                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-               Name="Window"
-               Title=""
+               Title="{Loc 'cp14-store-ui-title'}"
                MinSize="800 600"
                SetSize="800 600">
     <BoxContainer Orientation="Horizontal">

Content.Client/_CP14/TravelingStoreShip/CP14StoreWindow.xaml.cs

@@ -11,6 +11,9 @@ public sealed partial class CP14StoreWindow : DefaultWindow
 {
     [Dependency] private readonly IGameTiming _timing = default!;
 
+    private TimeSpan? _nextTravelTime;
+    private bool _onStation;
+
     public CP14StoreWindow()
     {
         RobustXamlLoader.Load(this);
@@ -22,8 +25,24 @@ public sealed partial class CP14StoreWindow : DefaultWindow
 
     public void UpdateUI(CP14StoreUiState state)
     {
-        Window.Title = Loc.GetString("cp14-store-ui-title", ("name", state.ShopName));
         UpdateProducts(state);
+
+        _nextTravelTime = state.NextTravelTime;
+        _onStation = state.OnStation;
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        //Updating time
+        if (_nextTravelTime is not null)
+        {
+            var time = _nextTravelTime.Value - _timing.CurTime;
+
+            TravelTimeLabel.Text =
+                $"{Loc.GetString(_onStation ? "cp14-store-ui-next-travel-out" : "cp14-store-ui-next-travel-in")} {Math.Max(time.Minutes, 0):00}:{Math.Max(time.Seconds, 0):00}";
+        }
     }
 
     private void UpdateProducts(CP14StoreUiState state)

Content.Client/_CP14/UserInterface/Systems/Knowledge/CP14KnowledgeUIController.cs

@@ -0,0 +1,158 @@
+using Content.Client._CP14.Knowledge;
+using Content.Client._CP14.UserInterface.Systems.Knowledge.Windows;
+using Content.Client.Gameplay;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Input;
+using JetBrains.Annotations;
+using Robust.Client.Player;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controllers;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Client.UserInterface.Systems.Character;
+
+[UsedImplicitly]
+public sealed class CP14KnowledgeUIController : UIController, IOnStateEntered<GameplayState>, IOnStateExited<GameplayState>,
+    IOnSystemChanged<ClientCP14KnowledgeSystem>
+{
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [UISystemDependency] private readonly ClientCP14KnowledgeSystem _knowledge = default!;
+
+    private CP14KnowledgeWindow? _window;
+
+    private MenuButton? KnowledgeButton => UIManager.GetActiveUIWidgetOrNull<MenuBar.Widgets.GameTopMenuBar>()?.CP14KnowledgeButton;
+
+    public void OnStateEntered(GameplayState state)
+    {
+        DebugTools.Assert(_window == null);
+
+        _window = UIManager.CreateWindow<CP14KnowledgeWindow>();
+        LayoutContainer.SetAnchorPreset(_window, LayoutContainer.LayoutPreset.CenterTop);
+
+        CommandBinds.Builder
+            .Bind(ContentKeyFunctions.CP14OpenKnowledgeMenu,
+                InputCmdHandler.FromDelegate(_ => ToggleWindow()))
+            .Register<CP14KnowledgeUIController>();
+    }
+
+    public void OnStateExited(GameplayState state)
+    {
+        if (_window != null)
+        {
+            _window.Dispose();
+            _window = null;
+        }
+
+        CommandBinds.Unregister<CP14KnowledgeUIController>();
+    }
+
+    public void OnSystemLoaded(ClientCP14KnowledgeSystem system)
+    {
+        system.OnKnowledgeUpdate += KnowledgeUpdated;
+        _player.LocalPlayerDetached += CharacterDetached;
+    }
+
+    public void OnSystemUnloaded(ClientCP14KnowledgeSystem system)
+    {
+        system.OnKnowledgeUpdate -= KnowledgeUpdated;
+        _player.LocalPlayerDetached -= CharacterDetached;
+    }
+
+    public void UnloadButton()
+    {
+        if (KnowledgeButton is null)
+            return;
+
+        KnowledgeButton.OnPressed -= KnowledgeButtonPressed;
+    }
+
+    public void LoadButton()
+    {
+        if (KnowledgeButton is null)
+            return;
+
+        KnowledgeButton.OnPressed += KnowledgeButtonPressed;
+
+        if (_window is null)
+            return;
+
+        _window.OnClose += DeactivateButton;
+        _window.OnOpen += ActivateButton;
+    }
+
+    private void DeactivateButton()
+    {
+        KnowledgeButton!.Pressed = false;
+    }
+
+    private void ActivateButton()
+    {
+        KnowledgeButton!.Pressed = true;
+    }
+
+    private void KnowledgeUpdated(ClientCP14KnowledgeSystem.KnowledgeData data)
+    {
+        if (_window is null)
+            return;
+
+        _window.KnowledgeContent.RemoveAllChildren();
+
+        var (entity, allKnowledge) = data;
+
+        foreach (var knowledge in allKnowledge)
+        {
+            if (!_proto.TryIndex(knowledge, out var indexedKnowledge))
+                continue;
+
+            var knowledgeButton = new Button()
+            {
+                Access = AccessLevel.Public,
+                Text = Loc.GetString(indexedKnowledge.Name),
+                ToolTip = Loc.GetString(indexedKnowledge.Desc),
+                TextAlign = Label.AlignMode.Center,
+            };
+
+            _window.KnowledgeContent.AddChild(knowledgeButton);
+        }
+    }
+
+    private void CharacterDetached(EntityUid uid)
+    {
+        CloseWindow();
+    }
+
+    private void KnowledgeButtonPressed(BaseButton.ButtonEventArgs args)
+    {
+        ToggleWindow();
+    }
+
+    private void CloseWindow()
+    {
+        _window?.Close();
+    }
+
+    private void ToggleWindow()
+    {
+        if (_window == null)
+            return;
+
+        if (KnowledgeButton != null)
+        {
+            KnowledgeButton.SetClickPressed(!_window.IsOpen);
+        }
+
+        if (_window.IsOpen)
+        {
+            CloseWindow();
+        }
+        else
+        {
+            _knowledge.RequestKnowledgeInfo();
+            _window.Open();
+        }
+    }
+}