Merge branch 'master' into ed-cla-test2

This reverts commit ca288f1288.

.editorconfig

@@ -344,9 +344,6 @@ resharper_keep_existing_attribute_arrangement = true
 resharper_wrap_chained_binary_patterns = chop_if_long
 resharper_wrap_chained_method_calls = chop_if_long
 resharper_csharp_trailing_comma_in_multiline_lists = true
-resharper_csharp_qualified_using_at_nested_scope = false
-resharper_csharp_prefer_qualified_reference = false
-resharper_csharp_allow_alias = false
 
 [*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}]
 indent_size = 2

.envrc

@@ -1,5 +1,4 @@
-set -e
-if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
-    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
+if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
 fi
 use flake

.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/cla.yml

@@ -5,7 +5,7 @@ on:
   pull_request_target:
     types: [opened,closed,synchronize]
     paths:
-      - '**CP14**'
+      - '**/*.cs' # Указываем, что триггер срабатывает только при изменении .cs файлов
 
 # explicitly configure permissions, in case your GITHUB_TOKEN workflow permissions are set to read-only in repository settings
 permissions:
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "CLA Assistant"
-        if: ((github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target') && github.actor != 'TheShuEd'
+        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
         uses: contributor-assistant/github-action@v2.6.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish-testing.yml

@@ -1,45 +0,0 @@
-name: Publish Testing
-
-concurrency:
-  group: publish-testing
-
-on:
-  workflow_dispatch:
-  schedule:
-  - cron: '0 10 * * *'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3.6.0
-      with:
-        submodules: 'recursive'
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3.2.0
-      with:
-        dotnet-version: 9.0.x
-
-    - name: Get Engine Tag
-      run: |
-        cd RobustToolbox
-        git fetch --depth=1
-
-    - name: Install dependencies
-      run: dotnet restore
-
-    - name: Build Packaging
-      run: dotnet build Content.Packaging --configuration Release --no-restore /m
-
-    - name: Package server
-      run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64
-
-    - name: Package client
-      run: dotnet run --project Content.Packaging client --no-wipe-release
-
-    - name: Publish version
-      run: Tools/publish_multi_request.py --fork-id wizards-testing
-      env:
-        PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
-        GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}

.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

BuildChecker/BuildChecker.csproj

@@ -12,12 +12,12 @@ You want to handle the Build, Clean and Rebuild tasks to prevent missing task er
 If you want to learn more about these kinds of things, check out Microsoft's official documentation about MSBuild:
 https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild
 -->
-<Project Sdk="Microsoft.NET.Sdk">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Python>python3</Python>
     <Python Condition="'$(OS)'=='Windows_NT' Or '$(OS)'=='Windows'">py -3</Python>
     <ProjectGuid>{C899FCA4-7037-4E49-ABC2-44DE72487110}</ProjectGuid>
-    <TargetFramework>net4.7.2</TargetFramework>
+    <TargetFrameworkMoniker>.NETFramework, Version=v4.7.2</TargetFrameworkMoniker>
     <RestorePackages>false</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>

Content.Benchmarks/ComponentQueryBenchmark.cs

@@ -9,14 +9,13 @@ using Content.IntegrationTests.Pair;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Doors.Components;
 using Content.Shared.Item;
+using Robust.Server.GameObjects;
 using Robust.Shared;
 using Robust.Shared.Analyzers;
-using Robust.Shared.EntitySerialization;
-using Robust.Shared.EntitySerialization.Systems;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Random;
-using Robust.Shared.Utility;
 
 namespace Content.Benchmarks;
 
@@ -33,6 +32,7 @@ public class ComponentQueryBenchmark
 
     private TestPair _pair = default!;
     private IEntityManager _entMan = default!;
+    private MapId _mapId = new(10);
     private EntityQuery<ItemComponent> _itemQuery;
     private EntityQuery<ClothingComponent> _clothingQuery;
     private EntityQuery<MapComponent> _mapQuery;
@@ -54,10 +54,10 @@ public class ComponentQueryBenchmark
         _pair.Server.ResolveDependency<IRobustRandom>().SetSeed(42);
         _pair.Server.WaitPost(() =>
         {
-            var map = new ResPath(Map);
-            var opts = DeserializationOptions.Default with {InitializeMaps = true};
-            if (!_entMan.System<MapLoaderSystem>().TryLoadMap(map, out _, out _, opts))
+            var success = _entMan.System<MapLoaderSystem>().TryLoad(_mapId, Map, out _);
+            if (!success)
                 throw new Exception("Map load failed");
+            _pair.Server.MapMan.DoMapInitialize(_mapId);
         }).GetAwaiter().GetResult();
 
         _items = new EntityUid[_entMan.Count<ItemComponent>()];

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.Benchmarks/MapLoadBenchmark.cs

@@ -6,13 +6,12 @@ using BenchmarkDotNet.Attributes;
 using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
 using Content.Server.Maps;
+using Robust.Server.GameObjects;
 using Robust.Shared;
 using Robust.Shared.Analyzers;
-using Robust.Shared.EntitySerialization.Systems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
 
 namespace Content.Benchmarks;
 
@@ -21,7 +20,7 @@ public class MapLoadBenchmark
 {
     private TestPair _pair = default!;
     private MapLoaderSystem _mapLoader = default!;
-    private SharedMapSystem _mapSys = default!;
+    private IMapManager _mapManager = default!;
 
     [GlobalSetup]
     public void Setup()
@@ -37,7 +36,7 @@ public class MapLoadBenchmark
             .ToDictionary(x => x.ID, x => x.MapPath.ToString());
 
         _mapLoader = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<MapLoaderSystem>();
-        _mapSys = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<SharedMapSystem>();
+        _mapManager = server.ResolveDependency<IMapManager>();
     }
 
     [GlobalCleanup]
@@ -47,25 +46,23 @@ public class MapLoadBenchmark
         PoolManager.Shutdown();
     }
 
-    public static readonly string[] MapsSource = { "Empty", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Reach", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Convex"};
+    public static readonly string[] MapsSource = { "Empty", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Reach", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Cog" };
 
     [ParamsSource(nameof(MapsSource))]
     public string Map;
 
     public Dictionary<string, string> Paths;
-    private MapId _mapId;
 
     [Benchmark]
     public async Task LoadMap()
     {
-        var mapPath = new ResPath(Paths[Map]);
+        var mapPath = Paths[Map];
         var server = _pair.Server;
         await server.WaitPost(() =>
         {
-            var success = _mapLoader.TryLoadMap(mapPath, out var map, out _);
+            var success = _mapLoader.TryLoad(new MapId(10), mapPath, out _);
             if (!success)
                 throw new Exception("Map load failed");
-            _mapId = map.Value.Comp.MapId;
         });
     }
 
@@ -73,7 +70,9 @@ public class MapLoadBenchmark
     public void IterationCleanup()
     {
         var server = _pair.Server;
-        server.WaitPost(() => _mapSys.DeleteMap(_mapId))
-            .Wait();
+        server.WaitPost(() =>
+        {
+            _mapManager.DeleteMap(new MapId(10));
+        }).Wait();
     }
 }

Content.Benchmarks/PvsBenchmark.cs

@@ -7,15 +7,13 @@ using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
 using Content.Server.Mind;
 using Content.Server.Warps;
+using Robust.Server.GameObjects;
 using Robust.Shared;
 using Robust.Shared.Analyzers;
-using Robust.Shared.EntitySerialization;
-using Robust.Shared.EntitySerialization.Systems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
-using Robust.Shared.Utility;
 
 namespace Content.Benchmarks;
 
@@ -36,6 +34,7 @@ public class PvsBenchmark
 
     private TestPair _pair = default!;
     private IEntityManager _entMan = default!;
+    private MapId _mapId = new(10);
     private ICommonSession[] _players = default!;
     private EntityCoordinates[] _spawns = default!;
     public int _cycleOffset = 0;
@@ -66,10 +65,10 @@ public class PvsBenchmark
         _pair.Server.ResolveDependency<IRobustRandom>().SetSeed(42);
         await _pair.Server.WaitPost(() =>
         {
-            var path = new ResPath(Map);
-            var opts = DeserializationOptions.Default with {InitializeMaps = true};
-            if (!_entMan.System<MapLoaderSystem>().TryLoadMap(path, out _, out _, opts))
+            var success = _entMan.System<MapLoaderSystem>().TryLoad(_mapId, Map, out _);
+            if (!success)
                 throw new Exception("Map load failed");
+            _pair.Server.MapMan.DoMapInitialize(_mapId);
         });
 
         // Get list of ghost warp positions

Content.Client/Actions/ActionsSystem.cs

@@ -88,7 +88,6 @@ namespace Content.Client.Actions
                 return;
 
             component.Whitelist = state.Whitelist;
-            component.Blacklist = state.Blacklist;
             component.CanTargetSelf = state.CanTargetSelf;
             BaseHandleState<EntityTargetActionComponent>(uid, component, state);
         }
@@ -138,7 +137,6 @@ namespace Content.Client.Actions
             component.Priority = state.Priority;
             component.AttachedEntity = EnsureEntity<T>(state.AttachedEntity, uid);
             component.RaiseOnUser = state.RaiseOnUser;
-            component.RaiseOnAction = state.RaiseOnAction;
             component.AutoPopulate = state.AutoPopulate;
             component.Temporary = state.Temporary;
             component.ItemIconStyle = state.ItemIconStyle;

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,54 @@ 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);
+
+        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();
-
-            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 uiScale = _userInterfaceManager.RootControl.UIScale;
+            var lineoffset = new Vector2(0f, 11f) * uiScale;
+            var screenCoordinates = _eyeManager.WorldToScreen(aabb.Center +
+                                                              new Angle(-_eyeManager.CurrentEye.Rotation).RotateVec(
+                                                                  aabb.TopRight - aabb.Center)) + new Vector2(1f, 7f);
 
-                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++;
-                }
+            if (classic && playerInfo.Antag)
+            {
+               args.ScreenHandle.DrawString(_font, screenCoordinates + (lineoffset * 2), _antagLabelClassic, uiScale, _antagColorClassic);
+            }
+            else if (!classic && _filter.Contains(playerInfo.RoleProto.ID))
+            {
+               var label = Loc.GetString(playerInfo.RoleProto.Name).ToUpper();
+               var color = playerInfo.RoleProto.Color;
+
+                args.ScreenHandle.DrawString(_font, screenCoordinates + (lineoffset * 2), label, uiScale, color);
             }
 
-            // Character name
-            var color = Color.Aquamarine;
-            color.A = alpha;
-            args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.CharacterName, uiScale, playerInfo.Connected ? color : colorDisconnected);
-            currentOffset += lineoffset;
-
-            // Username
-            color = Color.Yellow;
-            color.A = alpha;
-            args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.Username, uiScale, playerInfo.Connected ? color : colorDisconnected);
-            currentOffset += lineoffset;
-
-            // Playtime
-            if (!string.IsNullOrEmpty(playerInfo.PlaytimeString) && _overlayPlaytime)
-            {
-                color = Color.Orange;
-                color.A = alpha;
-                args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.PlaytimeString, uiScale, playerInfo.Connected ? color : colorDisconnected);
-                currentOffset += lineoffset;
-            }
-
-            // Job
-            if (!string.IsNullOrEmpty(playerInfo.StartingJob) && _overlayStartingJob)
-            {
-                color = Color.GreenYellow;
-                color.A = alpha;
-                args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, Loc.GetString(playerInfo.StartingJob), uiScale, playerInfo.Connected ? color : colorDisconnected);
-                currentOffset += lineoffset;
-            }
-
-            // Classic Antag Label
-            if (_overlayClassic && 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);
-                currentOffset += lineoffset;
-            }
-            // Role Type
-            else if (!_overlayClassic && _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;
-            }
-
-            //Save the coordinates and size of the text block, for stack merge check
-            drawnOverlays.Add((screenCoordinatesCenter, currentOffset));
+            args.ScreenHandle.DrawString(_font, screenCoordinates + lineoffset, playerInfo.Username, uiScale, playerInfo.Connected ? Color.Yellow : Color.White);
+            args.ScreenHandle.DrawString(_font, screenCoordinates, playerInfo.CharacterName, uiScale, playerInfo.Connected ? Color.Aquamarine : Color.White);
         }
     }
 }

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/Systems/BwoinkSystem.cs

@@ -19,11 +19,11 @@ namespace Content.Client.Administration.Systems
             OnBwoinkTextMessageRecieved?.Invoke(this, message);
         }
 
-        public void Send(NetUserId channelId, string text, bool playSound, bool adminOnly)
+        public void Send(NetUserId channelId, string text, bool playSound)
         {
             // Reuse the channel ID as the 'true sender'.
             // Server will ignore this and if someone makes it not ignore this (which is bad, allows impersonation!!!), that will help.
-            RaiseNetworkEvent(new BwoinkTextMessage(channelId, channelId, text, playSound: playSound, adminOnly: adminOnly));
+            RaiseNetworkEvent(new BwoinkTextMessage(channelId, channelId, text, playSound: playSound));
             SendInputTextUpdated(channelId, false);
         }
 

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

@@ -2,26 +2,22 @@
     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 Visible="True" 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;
@@ -48,8 +45,6 @@ namespace Content.Client.Administration.UI.Bwoink
             _adminManager.AdminStatusUpdated += UpdateButtons;
             UpdateButtons();
 
-            AdminOnly.OnToggled += args => PlaySound.Disabled = args.Pressed;
-
             ChannelSelector.OnSelectionChanged += sel =>
             {
                 _currentPlayer = sel;
@@ -62,9 +57,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 +71,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 +82,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 +91,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/Advertise/Systems/SpeakOnUIClosedSystem.cs

@@ -1,5 +0,0 @@
-using Content.Shared.Advertise.Systems;
-
-namespace Content.Client.Advertise.Systems;
-
-public sealed class SpeakOnUIClosedSystem : SharedSpeakOnUIClosedSystem;

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/Atmos/Consoles/AtmosAlertsComputerBoundUserInterface.cs

@@ -11,8 +11,6 @@ public sealed class AtmosAlertsComputerBoundUserInterface : BoundUserInterface
 
     protected override void Open()
     {
-        base.Open();
-
         _menu = new AtmosAlertsComputerWindow(this, Owner);
         _menu.OpenCentered();
         _menu.OnClose += Close;

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

@@ -512,15 +512,39 @@ public sealed partial class AtmosAlertsComputerWindow : FancyWindow
         if (scroll == null)
             return;
 
+        if (!TryGetVerticalScrollbar(scroll, out var vScrollbar))
+            return;
+
         if (!TryGetNextScrollPosition(out float? nextScrollPosition))
             return;
 
-        scroll.VScrollTarget = nextScrollPosition.Value;
+        vScrollbar.ValueTarget = nextScrollPosition.Value;
 
-        if (MathHelper.CloseToPercent(scroll.VScroll, scroll.VScrollTarget))
+        if (MathHelper.CloseToPercent(vScrollbar.Value, vScrollbar.ValueTarget))
             _autoScrollActive = false;
     }
 
+    private bool TryGetVerticalScrollbar(ScrollContainer scroll, [NotNullWhen(true)] out VScrollBar? vScrollBar)
+    {
+        vScrollBar = null;
+
+        foreach (var child in scroll.Children)
+        {
+            if (child is not VScrollBar)
+                continue;
+
+            var castChild = child as VScrollBar;
+
+            if (castChild != null)
+            {
+                vScrollBar = castChild;
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     private bool TryGetNextScrollPosition([NotNullWhen(true)] out float? nextScrollPosition)
     {
         nextScrollPosition = null;

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

@@ -350,15 +350,35 @@ public sealed partial class AtmosMonitoringConsoleWindow : FancyWindow
         if (scroll == null)
             return;
 
+        if (!TryGetVerticalScrollbar(scroll, out var vScrollbar))
+            return;
+
         if (!TryGetNextScrollPosition(out float? nextScrollPosition))
             return;
 
-        scroll.VScrollTarget = nextScrollPosition.Value;
+        vScrollbar.ValueTarget = nextScrollPosition.Value;
 
-        if (MathHelper.CloseToPercent(scroll.VScroll, scroll.VScrollTarget))
+        if (MathHelper.CloseToPercent(vScrollbar.Value, vScrollbar.ValueTarget))
             _autoScrollActive = false;
     }
 
+    private bool TryGetVerticalScrollbar(ScrollContainer scroll, [NotNullWhen(true)] out VScrollBar? vScrollBar)
+    {
+        vScrollBar = null;
+
+        foreach (var control in scroll.Children)
+        {
+            if (control is not VScrollBar)
+                continue;
+
+            vScrollBar = (VScrollBar)control;
+
+            return true;
+        }
+
+        return false;
+    }
+
     private bool TryGetNextScrollPosition([NotNullWhen(true)] out float? nextScrollPosition)
     {
         nextScrollPosition = null;

Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs

@@ -16,7 +16,6 @@ namespace Content.Client.Atmos.EntitySystems
         [Dependency] private readonly IResourceCache _resourceCache = default!;
         [Dependency] private readonly IOverlayManager _overlayMan = default!;
         [Dependency] private readonly SpriteSystem _spriteSys = default!;
-        [Dependency] private readonly SharedTransformSystem _xformSys = default!;
 
         private GasTileOverlay _overlay = default!;
 
@@ -26,7 +25,7 @@ namespace Content.Client.Atmos.EntitySystems
             SubscribeNetworkEvent<GasOverlayUpdateEvent>(HandleGasOverlayUpdate);
             SubscribeLocalEvent<GasTileOverlayComponent, ComponentHandleState>(OnHandleState);
 
-            _overlay = new GasTileOverlay(this, EntityManager, _resourceCache, ProtoMan, _spriteSys, _xformSys);
+            _overlay = new GasTileOverlay(this, EntityManager, _resourceCache, ProtoMan, _spriteSys);
             _overlayMan.AddOverlay(_overlay);
         }
 

Content.Client/Atmos/Overlays/GasTileOverlay.cs

@@ -21,7 +21,6 @@ namespace Content.Client.Atmos.Overlays
     {
         private readonly IEntityManager _entManager;
         private readonly IMapManager _mapManager;
-        private readonly SharedTransformSystem _xformSys;
 
         public override OverlaySpace Space => OverlaySpace.WorldSpaceEntities | OverlaySpace.WorldSpaceBelowWorld;
         private readonly ShaderInstance _shader;
@@ -47,11 +46,10 @@ namespace Content.Client.Atmos.Overlays
 
         public const int GasOverlayZIndex = (int) Shared.DrawDepth.DrawDepth.Effects; // Under ghosts, above mostly everything else
 
-        public GasTileOverlay(GasTileOverlaySystem system, IEntityManager entManager, IResourceCache resourceCache, IPrototypeManager protoMan, SpriteSystem spriteSys, SharedTransformSystem xformSys)
+        public GasTileOverlay(GasTileOverlaySystem system, IEntityManager entManager, IResourceCache resourceCache, IPrototypeManager protoMan, SpriteSystem spriteSys)
         {
             _entManager = entManager;
             _mapManager = IoCManager.Resolve<IMapManager>();
-            _xformSys = xformSys;
             _shader = protoMan.Index<ShaderPrototype>("unshaded").Instance();
             ZIndex = GasOverlayZIndex;
 
@@ -160,8 +158,7 @@ namespace Content.Client.Atmos.Overlays
                 _fireFrameCounter,
                 _shader,
                 overlayQuery,
-                xformQuery,
-                _xformSys);
+                xformQuery);
 
             var mapUid = _mapManager.GetMapEntityId(args.MapId);
 
@@ -183,8 +180,7 @@ namespace Content.Client.Atmos.Overlays
                         int[] fireFrameCounter,
                         ShaderInstance shader,
                         EntityQuery<GasTileOverlayComponent> overlayQuery,
-                        EntityQuery<TransformComponent> xformQuery,
-                        SharedTransformSystem xformSys) state) =>
+                        EntityQuery<TransformComponent> xformQuery) state) =>
                 {
                     if (!state.overlayQuery.TryGetComponent(uid, out var comp) ||
                         !state.xformQuery.TryGetComponent(uid, out var gridXform))
@@ -192,7 +188,7 @@ namespace Content.Client.Atmos.Overlays
                             return true;
                         }
 
-                    var (_, _, worldMatrix, invMatrix) = state.xformSys.GetWorldPositionRotationMatrixWithInv(gridXform);
+                    var (_, _, worldMatrix, invMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv();
                     state.drawHandle.SetTransform(worldMatrix);
                     var floatBounds = invMatrix.TransformBox(state.WorldBounds).Enlarged(grid.TileSize);
                     var localBounds = new Box2i(

Content.Client/Atmos/UI/GasAnalyzerBoundUserInterface.cs

@@ -1,5 +1,4 @@
 using Robust.Client.GameObjects;
-using Robust.Client.UserInterface;
 using static Content.Shared.Atmos.Components.GasAnalyzerComponent;
 
 namespace Content.Client.Atmos.UI
@@ -17,7 +16,9 @@ namespace Content.Client.Atmos.UI
         {
             base.Open();
 
-            _window = this.CreateWindowCenteredLeft<GasAnalyzerWindow>();
+            _window = new GasAnalyzerWindow();
+            _window.OnClose += OnClose;
+            _window.OpenCenteredLeft();
         }
 
         protected override void ReceiveMessage(BoundUserInterfaceMessage message)

Content.Client/Atmos/UI/SpaceHeaterWindow.xaml

@@ -1,6 +1,6 @@
 <DefaultWindow xmlns="https://spacestation14.io"
                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-               MinSize="280 160" Title="{Loc comp-space-heater-ui-title}">
+               MinSize="280 160" Title="Temperature Control Unit">
 
     <BoxContainer Name="VboxContainer" Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
 

Content.Client/Audio/ClientGlobalSoundSystem.cs

@@ -66,7 +66,7 @@ public sealed class ClientGlobalSoundSystem : SharedGlobalSoundSystem
     {
         if(!_adminAudioEnabled) return;
 
-        var stream = _audio.PlayGlobal(soundEvent.Specifier, Filter.Local(), false, soundEvent.AudioParams);
+        var stream = _audio.PlayGlobal(soundEvent.Filename, Filter.Local(), false, soundEvent.AudioParams);
         _adminAudio.Add(stream?.Entity);
     }
 
@@ -75,13 +75,13 @@ public sealed class ClientGlobalSoundSystem : SharedGlobalSoundSystem
         // Either the cvar is disabled or it's already playing
         if(!_eventAudioEnabled || _eventAudio.ContainsKey(soundEvent.Type)) return;
 
-        var stream = _audio.PlayGlobal(soundEvent.Specifier, Filter.Local(), false, soundEvent.AudioParams);
+        var stream = _audio.PlayGlobal(soundEvent.Filename, Filter.Local(), false, soundEvent.AudioParams);
         _eventAudio.Add(soundEvent.Type, stream?.Entity);
     }
 
     private void PlayGameSound(GameGlobalSoundEvent soundEvent)
     {
-        _audio.PlayGlobal(soundEvent.Specifier, Filter.Local(), false, soundEvent.AudioParams);
+        _audio.PlayGlobal(soundEvent.Filename, Filter.Local(), false, soundEvent.AudioParams);
     }
 
     private void StopStationEventMusic(StopStationEventMusic soundEvent)

Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs

@@ -218,7 +218,7 @@ public sealed partial class ContentAudioSystem
             return;
 
         var file = _gameTicker.RestartSound;
-        if (ResolvedSoundSpecifier.IsNullOrEmpty(file))
+        if (string.IsNullOrEmpty(file))
         {
             return;
         }

Content.Client/Buckle/BuckleSystem.cs

@@ -3,15 +3,13 @@ using Content.Shared.Buckle;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Rotation;
 using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
+using Robust.Shared.GameStates;
 
 namespace Content.Client.Buckle;
 
 internal sealed class BuckleSystem : SharedBuckleSystem
 {
     [Dependency] private readonly RotationVisualizerSystem _rotationVisualizerSystem = default!;
-    [Dependency] private readonly IEyeManager _eye = default!;
-    [Dependency] private readonly SharedTransformSystem _xformSystem = default!;
 
     public override void Initialize()
     {
@@ -19,8 +17,6 @@ internal sealed class BuckleSystem : SharedBuckleSystem
 
         SubscribeLocalEvent<BuckleComponent, AppearanceChangeEvent>(OnAppearanceChange);
         SubscribeLocalEvent<StrapComponent, MoveEvent>(OnStrapMoveEvent);
-        SubscribeLocalEvent<BuckleComponent, BuckledEvent>(OnBuckledEvent);
-        SubscribeLocalEvent<BuckleComponent, UnbuckledEvent>(OnUnbuckledEvent);
     }
 
     private void OnStrapMoveEvent(EntityUid uid, StrapComponent component, ref MoveEvent args)
@@ -32,21 +28,13 @@ internal sealed class BuckleSystem : SharedBuckleSystem
         // This code is garbage, it doesn't work with rotated viewports. I need to finally get around to reworking
         // sprite rendering for entity layers & direction dependent sorting.
 
-        // Future notes:
-        // Right now this doesn't handle: other grids, other grids rotating, the camera rotation changing, and many other fun rotation specific things
-        // The entire thing should be a concern of the engine, or something engine helps to implement properly.
-        // Give some of the sprite rotations their own drawdepth, maybe as an offset within the rsi, or something like this
-        // And we won't ever need to set the draw depth manually
-
         if (args.NewRotation == args.OldRotation)
             return;
 
         if (!TryComp<SpriteComponent>(uid, out var strapSprite))
             return;
 
-        var angle = _xformSystem.GetWorldRotation(uid) + _eye.CurrentEye.Rotation; // Get true screen position, or close enough
-
-        var isNorth = angle.GetCardinalDir() == Direction.North;
+        var isNorth = Transform(uid).LocalRotation.GetCardinalDir() == Direction.North;
         foreach (var buckledEntity in component.BuckledEntities)
         {
             if (!TryComp<BuckleComponent>(buckledEntity, out var buckle))
@@ -57,7 +45,6 @@ internal sealed class BuckleSystem : SharedBuckleSystem
 
             if (isNorth)
             {
-                // This will only assign if empty, it won't get overwritten by new depth on multiple calls, which do happen easily
                 buckle.OriginalDrawDepth ??= buckledSprite.DrawDepth;
                 buckledSprite.DrawDepth = strapSprite.DrawDepth - 1;
             }
@@ -69,42 +56,6 @@ internal sealed class BuckleSystem : SharedBuckleSystem
         }
     }
 
-    /// <summary>
-    /// Lower the draw depth of the buckled entity without needing for the strap entity to rotate/move.
-    /// Only do so when the entity is facing screen-local north
-    /// </summary>
-    private void OnBuckledEvent(Entity<BuckleComponent> ent, ref BuckledEvent args)
-    {
-        if (!TryComp<SpriteComponent>(args.Strap, out var strapSprite))
-            return;
-
-        if (!TryComp<SpriteComponent>(ent.Owner, out var buckledSprite))
-            return;
-
-        var angle = _xformSystem.GetWorldRotation(args.Strap) + _eye.CurrentEye.Rotation; // Get true screen position, or close enough
-
-        if (angle.GetCardinalDir() != Direction.North)
-            return;
-
-        ent.Comp.OriginalDrawDepth ??= buckledSprite.DrawDepth;
-        buckledSprite.DrawDepth = strapSprite.DrawDepth - 1;
-    }
-
-    /// <summary>
-    /// Was the draw depth of the buckled entity lowered? Reset it upon unbuckling.
-    /// </summary>
-    private void OnUnbuckledEvent(Entity<BuckleComponent> ent, ref UnbuckledEvent args)
-    {
-        if (!TryComp<SpriteComponent>(ent.Owner, out var buckledSprite))
-            return;
-
-        if (!ent.Comp.OriginalDrawDepth.HasValue)
-            return;
-
-        buckledSprite.DrawDepth = ent.Comp.OriginalDrawDepth.Value;
-        ent.Comp.OriginalDrawDepth = null;
-    }
-
     private void OnAppearanceChange(EntityUid uid, BuckleComponent component, ref AppearanceChangeEvent args)
     {
         if (!TryComp<RotationVisualsComponent>(uid, out var rotVisuals))

Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs

@@ -39,6 +39,6 @@ public sealed class CargoBountyConsoleBoundUserInterface : BoundUserInterface
         if (message is not CargoBountyConsoleState state)
             return;
 
-        _menu?.UpdateEntries(state.Bounties, state.History, state.UntilNextSkip);
+        _menu?.UpdateEntries(state.Bounties, state.UntilNextSkip);
     }
 }

Content.Client/Cargo/UI/BountyHistoryEntry.xaml

@@ -1,22 +0,0 @@
-<BoxContainer xmlns="https://spacestation14.io"
-                xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
-                Margin="10 10 10 0"
-                HorizontalExpand="True">
-    <PanelContainer StyleClasses="AngleRect" HorizontalExpand="True">
-        <BoxContainer Orientation="Vertical"
-                      HorizontalExpand="True">
-            <BoxContainer Orientation="Horizontal">
-                <BoxContainer Orientation="Vertical" HorizontalExpand="True">
-                    <RichTextLabel Name="RewardLabel"/>
-                    <RichTextLabel Name="ManifestLabel"/>
-                </BoxContainer>
-                <BoxContainer Orientation="Vertical" MinWidth="120" Margin="0 0 10 0">
-                    <RichTextLabel Name="TimestampLabel" HorizontalAlignment="Right" />
-                    <RichTextLabel Name="IdLabel" HorizontalAlignment="Right" />
-                </BoxContainer>
-            </BoxContainer>
-            <customControls:HSeparator Margin="5 10 5 10"/>
-            <RichTextLabel Name="NoticeLabel" />
-        </BoxContainer>
-    </PanelContainer>
-</BoxContainer>

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

@@ -1,49 +0,0 @@
-using Content.Client.Message;
-using Content.Shared.Cargo;
-using Content.Shared.Cargo.Prototypes;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-
-namespace Content.Client.Cargo.UI;
-
-[GenerateTypedNameReferences]
-public sealed partial class BountyHistoryEntry : BoxContainer
-{
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
-
-    public BountyHistoryEntry(CargoBountyHistoryData bounty)
-    {
-        RobustXamlLoader.Load(this);
-        IoCManager.InjectDependencies(this);
-
-        if (!_prototype.TryIndex(bounty.Bounty, out var bountyPrototype))
-            return;
-
-        var items = new List<string>();
-        foreach (var entry in bountyPrototype.Entries)
-        {
-            items.Add(Loc.GetString("bounty-console-manifest-entry",
-                ("amount", entry.Amount),
-                ("item", Loc.GetString(entry.Name))));
-        }
-
-        ManifestLabel.SetMarkup(Loc.GetString("bounty-console-manifest-label", ("item", string.Join(", ", items))));
-        RewardLabel.SetMarkup(Loc.GetString("bounty-console-reward-label", ("reward", bountyPrototype.Reward)));
-        IdLabel.SetMarkup(Loc.GetString("bounty-console-id-label", ("id", bounty.Id)));
-
-        TimestampLabel.SetMarkup(bounty.Timestamp.ToString(@"hh\:mm\:ss"));
-
-        if (bounty.Result == CargoBountyHistoryData.BountyResult.Completed)
-        {
-            NoticeLabel.SetMarkup(Loc.GetString("bounty-console-history-notice-completed-label"));
-        }
-        else
-        {
-            NoticeLabel.SetMarkup(Loc.GetString("bounty-console-history-notice-skipped-label",
-                ("id", bounty.ActorName ?? "")));
-        }
-    }
-}

Content.Client/Cargo/UI/CargoBountyMenu.xaml

@@ -11,28 +11,15 @@
             <PanelContainer.PanelOverride>
                 <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
             </PanelContainer.PanelOverride>
-            <TabContainer Name="MasterTabContainer" VerticalExpand="True" HorizontalExpand="True">
-                <ScrollContainer HScrollEnabled="False"
-                                 HorizontalExpand="True"
-                                 VerticalExpand="True">
-                    <BoxContainer Name="BountyEntriesContainer"
-                                  Orientation="Vertical"
-                                  VerticalExpand="True"
-                                  HorizontalExpand="True" />
-                </ScrollContainer>
-                <ScrollContainer HScrollEnabled="False"
-                                 HorizontalExpand="True"
-                                 VerticalExpand="True">
-                    <Label Name="NoHistoryLabel"
-                           Text="{Loc 'bounty-console-history-empty-label'}"
-                           Visible="False"
-                           Align="Center" />
-                    <BoxContainer Name="BountyHistoryContainer"
-                                  Orientation="Vertical"
-                                  VerticalExpand="True"
-                                  HorizontalExpand="True" />
-                </ScrollContainer>
-            </TabContainer>
+            <ScrollContainer HScrollEnabled="False"
+                             HorizontalExpand="True"
+                             VerticalExpand="True">
+                <BoxContainer Name="BountyEntriesContainer"
+                              Orientation="Vertical"
+                              VerticalExpand="True"
+                              HorizontalExpand="True">
+                </BoxContainer>
+            </ScrollContainer>
         </PanelContainer>
         <!-- Footer -->
         <BoxContainer Orientation="Vertical">

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

@@ -15,12 +15,9 @@ public sealed partial class CargoBountyMenu : FancyWindow
     public CargoBountyMenu()
     {
         RobustXamlLoader.Load(this);
-
-        MasterTabContainer.SetTabTitle(0, Loc.GetString("bounty-console-tab-available-label"));
-        MasterTabContainer.SetTabTitle(1, Loc.GetString("bounty-console-tab-history-label"));
     }
 
-    public void UpdateEntries(List<CargoBountyData> bounties, List<CargoBountyHistoryData> history, TimeSpan untilNextSkip)
+    public void UpdateEntries(List<CargoBountyData> bounties, TimeSpan untilNextSkip)
     {
         BountyEntriesContainer.Children.Clear();
         foreach (var b in bounties)
@@ -35,21 +32,5 @@ public sealed partial class CargoBountyMenu : FancyWindow
         {
             MinHeight = 10
         });
-
-        BountyHistoryContainer.Children.Clear();
-        if (history.Count == 0)
-        {
-            NoHistoryLabel.Visible = true;
-        }
-        else
-        {
-            NoHistoryLabel.Visible = false;
-
-            // Show the history in reverse, so last entry is first in the list
-            for (var i = history.Count - 1; i >= 0; i--)
-            {
-                BountyHistoryContainer.AddChild(new BountyHistoryEntry(history[i]));
-            }
-        }
     }
 }

Content.Client/CartridgeLoader/Cartridges/LogProbeUi.cs

@@ -1,5 +1,4 @@
 using Content.Client.UserInterface.Fragments;
-using Content.Shared.CartridgeLoader;
 using Content.Shared.CartridgeLoader.Cartridges;
 using Robust.Client.UserInterface;
 
@@ -14,23 +13,16 @@ public sealed partial class LogProbeUi : UIFragment
         return _fragment!;
     }
 
-    public override void Setup(BoundUserInterface ui, EntityUid? fragmentOwner)
+    public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner)
     {
         _fragment = new LogProbeUiFragment();
-
-        _fragment.OnPrintPressed += () =>
-        {
-            var ev = new LogProbePrintMessage();
-            var message = new CartridgeUiMessage(ev);
-            ui.SendMessage(message);
-        };
     }
 
     public override void UpdateState(BoundUserInterfaceState state)
     {
-        if (state is not LogProbeUiState cast)
+        if (state is not LogProbeUiState logProbeUiState)
             return;
 
-        _fragment?.UpdateState(cast.EntityName, cast.PulledLogs);
+        _fragment?.UpdateState(logProbeUiState.PulledLogs);
     }
 }

Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml

@@ -18,9 +18,4 @@
     <ScrollContainer VerticalExpand="True" HScrollEnabled="True">
         <BoxContainer Orientation="Vertical" Name="ProbedDeviceContainer"/>
     </ScrollContainer>
-    <BoxContainer Orientation="Horizontal" Margin="4 8">
-        <Button Name="PrintButton" HorizontalAlignment="Left" Text="{Loc 'log-probe-print-button'}" Disabled="True"/>
-        <BoxContainer HorizontalExpand="True"/>
-        <Label Name="EntityName" Align="Right"/>
-    </BoxContainer>
 </cartridges:LogProbeUiFragment>

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

@@ -8,25 +8,18 @@ namespace Content.Client.CartridgeLoader.Cartridges;
 [GenerateTypedNameReferences]
 public sealed partial class LogProbeUiFragment : BoxContainer
 {
-    /// <summary>
-    /// Action invoked when the print button gets pressed.
-    /// </summary>
-    public Action? OnPrintPressed;
-
     public LogProbeUiFragment()
     {
         RobustXamlLoader.Load(this);
-
-        PrintButton.OnPressed += _ => OnPrintPressed?.Invoke();
     }
 
-    public void UpdateState(string name, List<PulledAccessLog> logs)
+    public void UpdateState(List<PulledAccessLog> logs)
     {
-        EntityName.Text = name;
-        PrintButton.Disabled = string.IsNullOrEmpty(name);
-
         ProbedDeviceContainer.RemoveAllChildren();
 
+        //Reverse the list so the oldest entries appear at the bottom
+        logs.Reverse();
+
         var count =  1;
         foreach (var log in logs)
         {

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/ChangelogManager.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Shared.CCVar;
-using Robust.Shared;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Serialization.Manager;
@@ -126,27 +125,6 @@ namespace Content.Client.Changelog
             _sawmill = _logManager.GetSawmill(SawmillName);
         }
 
-        /// <summary>
-        ///     Tries to return a human-readable version number from the build.json file
-        /// </summary>
-        public string GetClientVersion()
-        {
-            var fork = _configManager.GetCVar(CVars.BuildForkId);
-            var version = _configManager.GetCVar(CVars.BuildVersion);
-
-            // This trimming might become annoying if down the line some codebases want to switch to a real
-            // version format like "104.11.3" while others are still using the git hashes
-            if (version.Length > 7)
-                version = version[..7];
-
-            if (string.IsNullOrEmpty(version) || string.IsNullOrEmpty(fork))
-                return Loc.GetString("changelog-version-unknown");
-
-            return Loc.GetString("changelog-version-tag",
-                ("fork", fork),
-                ("version", version));
-        }
-
         [DataDefinition]
         public sealed partial class Changelog
         {

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/Changelog/ChangelogWindow.xaml.cs

@@ -8,8 +8,6 @@ using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared;
-using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 
 namespace Content.Client.Changelog
@@ -17,9 +15,8 @@ namespace Content.Client.Changelog
     [GenerateTypedNameReferences]
     public sealed partial class ChangelogWindow : FancyWindow
     {
-        [Dependency] private readonly ChangelogManager _changelog = default!;
         [Dependency] private readonly IClientAdminManager _adminManager = default!;
-        [Dependency] private readonly IConfigurationManager _cfg = default!;
+        [Dependency] private readonly ChangelogManager _changelog = default!;
 
         public ChangelogWindow()
         {
@@ -70,7 +67,8 @@ namespace Content.Client.Changelog
                 Tabs.SetTabTitle(i++, Loc.GetString($"changelog-tab-title-{changelog.Name}"));
             }
 
-            VersionLabel.Text = _changelog.GetClientVersion();
+            var version = typeof(ChangelogWindow).Assembly.GetName().Version ?? new Version(1, 0);
+            VersionLabel.Text = Loc.GetString("changelog-version-tag", ("version", version.ToString()));
 
             TabsUpdated();
         }

Content.Client/Chat/UI/EmotesMenu.xaml

@@ -1,4 +1,4 @@
-<ui:RadialMenu xmlns="https://spacestation14.io"
+<ui:RadialMenu xmlns="https://spacestation14.io"
                 xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
                 BackButtonStyleClass="RadialMenuBackButton"
                 CloseButtonStyleClass="RadialMenuCloseButton"
@@ -7,25 +7,25 @@
                 MinSize="450 450">
 
     <!-- Main -->
-    <ui:RadialContainer Name="Main" VerticalExpand="True" HorizontalExpand="True" InitialRadius="100" ReserveSpaceForHiddenChildren="False">
-        <ui:RadialMenuTextureButtonWithSector SetSize="64 64" ToolTip="{Loc 'emote-menu-category-general'}" TargetLayer="General" Visible="False">
+    <ui:RadialContainer Name="Main" VerticalExpand="True" HorizontalExpand="True" Radius="64" ReserveSpaceForHiddenChildren="False">
+        <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'emote-menu-category-general'}" TargetLayer="General" Visible="False">
             <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Clothing/Head/Soft/mimesoft.rsi/icon.png"/>
-        </ui:RadialMenuTextureButtonWithSector>
-        <ui:RadialMenuTextureButtonWithSector SetSize="64 64" ToolTip="{Loc 'emote-menu-category-vocal'}" TargetLayer="Vocal" Visible="False">
+        </ui:RadialMenuTextureButton>
+        <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'emote-menu-category-vocal'}" TargetLayer="Vocal" Visible="False">
             <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Emotes/vocal.png"/>
-        </ui:RadialMenuTextureButtonWithSector>
-        <ui:RadialMenuTextureButtonWithSector SetSize="64 64" ToolTip="{Loc 'emote-menu-category-hands'}" TargetLayer="Hands" Visible="False">
+        </ui:RadialMenuTextureButton>
+        <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'emote-menu-category-hands'}" TargetLayer="Hands" Visible="False">
             <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png"/>
-        </ui:RadialMenuTextureButtonWithSector>
+        </ui:RadialMenuTextureButton>
     </ui:RadialContainer>
 
     <!-- General -->
-    <ui:RadialContainer Name="General"  VerticalExpand="True" HorizontalExpand="True" InitialRadius="100"/>
+    <ui:RadialContainer Name="General"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
 
     <!-- Vocal -->
-    <ui:RadialContainer Name="Vocal"  VerticalExpand="True" HorizontalExpand="True" InitialRadius="100"/>
+    <ui:RadialContainer Name="Vocal"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
 
     <!-- Hands -->
-    <ui:RadialContainer Name="Hands"  VerticalExpand="True" HorizontalExpand="True" InitialRadius="100"/>
+    <ui:RadialContainer Name="Hands"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
 
 </ui:RadialMenu>

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

@@ -50,6 +50,7 @@ public sealed partial class EmotesMenu : RadialMenu
 
             var button = new EmoteMenuButton
             {
+                StyleClasses = { "RadialMenuButton" },
                 SetSize = new Vector2(64f, 64f),
                 ToolTip = Loc.GetString(emote.Name),
                 ProtoId = emote.ID,
@@ -105,7 +106,7 @@ public sealed partial class EmotesMenu : RadialMenu
 }
 
 
-public sealed class EmoteMenuButton : RadialMenuTextureButtonWithSector
+public sealed class EmoteMenuButton : RadialMenuTextureButton
 {
     public ProtoId<EmotePrototype> ProtoId { get; set; }
 }

Content.Client/Chat/UI/SpeechBubble.cs

@@ -217,7 +217,7 @@ namespace Content.Client.Chat.UI
             {
                 StyleClasses = { "speechBox", speechStyleClass },
                 Children = { label },
-                ModulateSelfOverride = Color.White.WithAlpha(ConfigManager.GetCVar(CCVars.SpeechBubbleBackgroundOpacity))
+                ModulateSelfOverride = Color.White.WithAlpha(0.75f)
             };
 
             return panel;
@@ -247,23 +247,21 @@ namespace Content.Client.Chat.UI
                 {
                     StyleClasses = { "speechBox", speechStyleClass },
                     Children = { label },
-                    ModulateSelfOverride = Color.White.WithAlpha(ConfigManager.GetCVar(CCVars.SpeechBubbleBackgroundOpacity)),
+                    ModulateSelfOverride = Color.White.WithAlpha(0.75f)
                 };
                 return unfanciedPanel;
             }
 
             var bubbleHeader = new RichTextLabel
             {
-                ModulateSelfOverride = Color.White.WithAlpha(ConfigManager.GetCVar(CCVars.SpeechBubbleSpeakerOpacity)),
-                Margin = new Thickness(1, 1, 1, 1),
+                Margin = new Thickness(1, 1, 1, 1)
             };
 
             var bubbleContent = new RichTextLabel
             {
-                ModulateSelfOverride = Color.White.WithAlpha(ConfigManager.GetCVar(CCVars.SpeechBubbleTextOpacity)),
                 MaxWidth = SpeechMaxWidth,
                 Margin = new Thickness(2, 6, 2, 2),
-                StyleClasses = { "bubbleContent" },
+                StyleClasses = { "bubbleContent" }
             };
 
             //We'll be honest. *Yes* this is hacky. Doing this in a cleaner way would require a bottom-up refactor of how saycode handles sending chat messages. -Myr
@@ -275,7 +273,7 @@ namespace Content.Client.Chat.UI
             {
                 StyleClasses = { "speechBox", speechStyleClass },
                 Children = { bubbleContent },
-                ModulateSelfOverride = Color.White.WithAlpha(ConfigManager.GetCVar(CCVars.SpeechBubbleBackgroundOpacity)),
+                ModulateSelfOverride = Color.White.WithAlpha(0.75f),
                 HorizontalAlignment = HAlignment.Center,
                 VerticalAlignment = VAlignment.Bottom,
                 Margin = new Thickness(4, 14, 4, 2)
@@ -285,7 +283,7 @@ namespace Content.Client.Chat.UI
             {
                 StyleClasses = { "speechBox", speechStyleClass },
                 Children = { bubbleHeader },
-                ModulateSelfOverride = Color.White.WithAlpha(ConfigManager.GetCVar(CCVars.ChatFancyNameBackground) ? ConfigManager.GetCVar(CCVars.SpeechBubbleBackgroundOpacity) : 0f),
+                ModulateSelfOverride = Color.White.WithAlpha(ConfigManager.GetCVar(CCVars.ChatFancyNameBackground) ? 0.75f : 0f),
                 HorizontalAlignment = HAlignment.Center,
                 VerticalAlignment = VAlignment.Top
             };

Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs

@@ -94,7 +94,7 @@ public sealed class ChemistryGuideDataSystem : SharedChemistryGuideDataSystem
             if (entProto.Abstract || usedNames.Contains(entProto.Name))
                 continue;
 
-            if (!entProto.TryGetComponent<ExtractableComponent>(out var extractableComponent, EntityManager.ComponentFactory))
+            if (!entProto.TryGetComponent<ExtractableComponent>(out var extractableComponent))
                 continue;
 
             //these bloat the hell out of blood/fat
@@ -121,7 +121,7 @@ public sealed class ChemistryGuideDataSystem : SharedChemistryGuideDataSystem
 
 
             if (extractableComponent.GrindableSolution is { } grindableSolutionId &&
-                entProto.TryGetComponent<SolutionContainerManagerComponent>(out var manager, EntityManager.ComponentFactory) &&
+                entProto.TryGetComponent<SolutionContainerManagerComponent>(out var manager) &&
                 _solutionContainer.TryGetSolution(manager, grindableSolutionId, out var grindableSolution))
             {
                 var data = new ReagentEntitySourceData(
@@ -141,11 +141,6 @@ public sealed class ChemistryGuideDataSystem : SharedChemistryGuideDataSystem
     {
         return _reagentSources.GetValueOrDefault(id) ?? new List<ReagentSourceData>();
     }
-
-    // Is handled on server and updated on client via ReagentGuideRegistryChangedEvent
-    public override void ReloadAllReagentPrototypes()
-    {
-    }
 }
 
 /// <summary>

Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs

@@ -46,8 +46,6 @@ namespace Content.Client.Chemistry.UI
             _window.CreateBottleButton.OnPressed += _ => SendMessage(
                 new ChemMasterOutputToBottleMessage(
                     (uint) _window.BottleDosage.Value, _window.LabelLine));
-            _window.BufferSortButton.OnPressed += _ => SendMessage(
-                    new ChemMasterSortingTypeCycleMessage());
 
             for (uint i = 0; i < _window.PillTypeButtons.Length; i++)
             {

Content.Client/Chemistry/UI/ChemMasterWindow.xaml

@@ -34,7 +34,6 @@
                 <Label Text="{Loc 'chem-master-window-buffer-text'}" />
                 <Control HorizontalExpand="True" />
                 <Button MinSize="80 0" Name="BufferTransferButton" Access="Public" Text="{Loc 'chem-master-window-transfer-button'}" ToggleMode="True" StyleClasses="OpenRight" />
-                <Button MinSize="80 0" Name="BufferSortButton" Access="Public" Text="{Loc 'chem-master-window-sort-type-none'}" StyleClasses="OpenBoth" />
                 <Button MinSize="80 0" Name="BufferDiscardButton" Access="Public" Text="{Loc 'chem-master-window-discard-button'}" ToggleMode="True" StyleClasses="OpenLeft" />
             </BoxContainer>
 

Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs

@@ -140,17 +140,17 @@ namespace Content.Client.Chemistry.UI
 
             // Ensure the Panel Info is updated, including UI elements for Buffer Volume, Output Container and so on
             UpdatePanelInfo(castState);
-
+    
             BufferCurrentVolume.Text = $" {castState.BufferCurrentVolume?.Int() ?? 0}u";
-
+    
             InputEjectButton.Disabled = castState.InputContainerInfo is null;
             OutputEjectButton.Disabled = castState.OutputContainerInfo is null;
             CreateBottleButton.Disabled = castState.OutputContainerInfo?.Reagents == null;
             CreatePillButton.Disabled = castState.OutputContainerInfo?.Entities == null;
-
+            
             UpdateDosageFields(castState);
         }
-
+        
         //assign default values for pill and bottle fields.
         private void UpdateDosageFields(ChemMasterBoundUserInterfaceState castState)
         {
@@ -162,9 +162,8 @@ namespace Content.Client.Chemistry.UI
             var bufferVolume = castState.BufferCurrentVolume?.Int() ?? 0;
 
             PillDosage.Value = (int)Math.Min(bufferVolume, castState.PillDosageLimit);
-
+            
             PillTypeButtons[castState.SelectedPillType].Pressed = true;
-
             PillNumber.IsValid = x => x >= 0 && x <= pillNumberMax;
             PillDosage.IsValid = x => x > 0 && x <= castState.PillDosageLimit;
             BottleDosage.IsValid = x => x >= 0 && x <= bottleAmountMax;
@@ -214,17 +213,6 @@ namespace Content.Client.Chemistry.UI
 
             BufferInfo.Children.Clear();
 
-            // This has to happen here due to people possibly
-            // setting sorting before putting any chemicals
-            BufferSortButton.Text = state.SortingType switch
-            {
-                ChemMasterSortingType.Alphabetical => Loc.GetString("chem-master-window-sort-type-alphabetical"),
-                ChemMasterSortingType.Quantity => Loc.GetString("chem-master-window-sort-type-quantity"),
-                ChemMasterSortingType.Latest => Loc.GetString("chem-master-window-sort-type-latest"),
-                _ => Loc.GetString("chem-master-window-sort-type-none")
-            };
-
-
             if (!state.BufferReagents.Any())
             {
                 BufferInfo.Children.Add(new Label { Text = Loc.GetString("chem-master-window-buffer-empty-text") });
@@ -247,48 +235,19 @@ namespace Content.Client.Chemistry.UI
             };
             bufferHBox.AddChild(bufferVol);
 
-            // This sets up the needed data for sorting later in a list
-            // Its done this way to not repeat having to use same code twice (once for sorting
-            // and once for displaying)
-            var reagentList = new List<(ReagentId reagentId, string name, Color color, FixedPoint2 quantity)>();
+            // initialises rowCount to allow for striped rows
+
+            var rowCount = 0;
             foreach (var (reagent, quantity) in state.BufferReagents)
             {
                 var reagentId = reagent;
                 _prototypeManager.TryIndex(reagentId.Prototype, out ReagentPrototype? proto);
                 var name = proto?.LocalizedName ?? Loc.GetString("chem-master-window-unknown-reagent-text");
                 var reagentColor = proto?.SubstanceColor ?? default(Color);
-                reagentList.Add(new (reagentId, name, reagentColor, quantity));
-            }
-
-            // We sort here since we need sorted list to be filled first.
-            // You can easily add any new params you need to it.
-            switch (state.SortingType)
-            {
-                case ChemMasterSortingType.Alphabetical:
-                    reagentList = reagentList.OrderBy(x => x.name).ToList();
-                    break;
-
-                case ChemMasterSortingType.Quantity:
-                    reagentList = reagentList.OrderByDescending(x => x.quantity).ToList();
-                    break;
-                case ChemMasterSortingType.Latest:
-                    reagentList = Enumerable.Reverse(reagentList).ToList();
-                    break;
-
-                case ChemMasterSortingType.None:
-                default:
-                    // This case is pointless but it is there for readability
-                    break;
-            }
-
-            // initialises rowCount to allow for striped rows
-            var rowCount = 0;
-            foreach (var reagent in reagentList)
-            {
-                BufferInfo.Children.Add(BuildReagentRow(reagent.color, rowCount++, reagent.name, reagent.reagentId, reagent.quantity, true, true));
+                BufferInfo.Children.Add(BuildReagentRow(reagentColor, rowCount++, name, reagentId, quantity, true, true));
             }
         }
-
+        
         private void BuildContainerUI(Control control, ContainerInfo? info, bool addReagentButtons)
         {
             control.Children.Clear();
@@ -336,7 +295,7 @@ namespace Content.Client.Chemistry.UI
                     _prototypeManager.TryIndex(reagent.Reagent.Prototype, out ReagentPrototype? proto);
                     var name = proto?.LocalizedName ?? Loc.GetString("chem-master-window-unknown-reagent-text");
                     var reagentColor = proto?.SubstanceColor ?? default(Color);
-
+        
                     control.Children.Add(BuildReagentRow(reagentColor, rowCount++, name, reagent.Reagent, reagent.Quantity, false, addReagentButtons));
                 }
             }
@@ -356,7 +315,7 @@ namespace Content.Client.Chemistry.UI
             }
             //this calls the separated button builder, and stores the return to render after labels
             var reagentButtonConstructors = CreateReagentTransferButtons(reagent, isBuffer, addReagentButtons);
-
+            
             // Create the row layout with the color panel
             var rowContainer = new BoxContainer
             {
@@ -399,7 +358,7 @@ namespace Content.Client.Chemistry.UI
                 Children = { rowContainer }
             };
         }
-
+        
         public string LabelLine
         {
             get => LabelLineEdit.Text;

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/Clickable/ClickMapManager.cs

@@ -20,7 +20,7 @@ namespace Content.Client.Clickable
             "/Textures/Logo",
         };
 
-        private const float Threshold = 0.1f;
+        private const float Threshold = 0.25f;
         private const int ClickRadius = 2;
 
         [Dependency] private readonly IResourceCache _resourceCache = default!;

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/Construction/ConstructionGhostComponent.cs

@@ -7,7 +7,6 @@ namespace Content.Client.Construction
     [RegisterComponent]
     public sealed partial class ConstructionGhostComponent : Component
     {
-        public int GhostId { get; set; }
         [ViewVariables] public ConstructionPrototype? Prototype { get; set; }
     }
 }

Content.Client/Construction/ConstructionSystem.cs

@@ -55,12 +55,6 @@ namespace Content.Client.Construction
                 .Register<ConstructionSystem>();
 
             SubscribeLocalEvent<ConstructionGhostComponent, ExaminedEvent>(HandleConstructionGhostExamined);
-            SubscribeLocalEvent<ConstructionGhostComponent, ComponentShutdown>(HandleGhostComponentShutdown);
-        }
-
-        private void HandleGhostComponentShutdown(EntityUid uid, ConstructionGhostComponent component, ComponentShutdown args)
-        {
-            ClearGhost(component.GhostId);
         }
 
         private void OnConstructionGuideReceived(ResponseConstructionGuide ev)
@@ -211,9 +205,8 @@ namespace Content.Client.Construction
             ghost = EntityManager.SpawnEntity("constructionghost", loc);
             var comp = EntityManager.GetComponent<ConstructionGhostComponent>(ghost.Value);
             comp.Prototype = prototype;
-            comp.GhostId = ghost.GetHashCode();
             EntityManager.GetComponent<TransformComponent>(ghost.Value).LocalRotation = dir.ToAngle();
-            _ghosts.Add(comp.GhostId, ghost.Value);
+            _ghosts.Add(ghost.GetHashCode(), ghost.Value);
             var sprite = EntityManager.GetComponent<SpriteComponent>(ghost.Value);
             sprite.Color = new Color(48, 255, 48, 128);
 

Content.Client/Construction/FlatpackSystem.cs

@@ -27,7 +27,7 @@ public sealed class FlatpackSystem : SharedFlatpackSystem
         if (!PrototypeManager.TryIndex<EntityPrototype>(machineBoardId, out var machineBoardPrototype))
             return;
 
-        if (!machineBoardPrototype.TryGetComponent<SpriteComponent>(out var sprite, EntityManager.ComponentFactory))
+        if (!machineBoardPrototype.TryGetComponent<SpriteComponent>(out var sprite))
             return;
 
         Color? color = null;

Content.Client/Crayon/UI/CrayonBoundUserInterface.cs

@@ -21,15 +21,16 @@ namespace Content.Client.Crayon.UI
         protected override void Open()
         {
             base.Open();
-            _menu = this.CreateWindowCenteredLeft<CrayonWindow>();
+            _menu = this.CreateWindow<CrayonWindow>();
             _menu.OnColorSelected += SelectColor;
             _menu.OnSelected += Select;
             PopulateCrayons();
+            _menu.OpenCenteredLeft();
         }
 
         private void PopulateCrayons()
         {
-            var crayonDecals = _protoManager.EnumeratePrototypes<DecalPrototype>().Where(x => x.Tags.Contains("CP14crayon")); //CP14 crayon
+            var crayonDecals = _protoManager.EnumeratePrototypes<DecalPrototype>().Where(x => x.Tags.Contains("crayon"));
             _menu?.Populate(crayonDecals.ToList());
         }
 

Content.Client/CrewManifest/UI/CrewManifestSection.cs

@@ -22,7 +22,7 @@ public sealed class CrewManifestSection : BoxContainer
         AddChild(new Label()
         {
             StyleClasses = { "LabelBig" },
-            Text = Loc.GetString(section.Name)
+            Text = Loc.GetString($"department-{section.ID}")
         });
 
         var gridContainer = new GridContainer()

Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs

@@ -39,8 +39,6 @@ public sealed class CriminalRecordsConsoleBoundUserInterface : BoundUserInterfac
             SendMessage(new CriminalRecordChangeStatus(status, null));
         _window.OnDialogConfirmed += (status, reason) =>
             SendMessage(new CriminalRecordChangeStatus(status, reason));
-        _window.OnStatusFilterPressed += (statusFilter) =>
-            SendMessage(new CriminalRecordSetStatusFilter(statusFilter));
         _window.OnHistoryUpdated += UpdateHistory;
         _window.OnHistoryClosed += () => _historyWindow?.Close();
         _window.OnClose += Close;

Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml

@@ -1,140 +1,36 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
-                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                      Title="{Loc 'criminal-records-console-window-title'}"
-                      MinSize="695 440">
+               xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+               Title="{Loc 'criminal-records-console-window-title'}"
+               MinSize="660 400">
     <BoxContainer Orientation="Vertical">
-        <BoxContainer Name="AllList"
-                      Orientation="Vertical"
-                      VerticalExpand="True"
-                      HorizontalExpand="True"
-                      Margin="8">
-            <!-- Record search bar -->
-            <BoxContainer Margin="5 5 5 10"
-                          HorizontalExpand="true"
-                          VerticalAlignment="Center">
-                <OptionButton Name="FilterType"
-                              MinWidth="250"
-                              Margin="0 0 10 0" />
-                <!-- Populated in constructor -->
-                <LineEdit Name="FilterText"
-                          PlaceHolder="{Loc 'criminal-records-filter-placeholder'}"
-                          HorizontalExpand="True" />
-            </BoxContainer>
-            <BoxContainer Orientation="Horizontal"
-                          VerticalExpand="True">
-                <!-- Record listing -->
-                <BoxContainer Orientation="Vertical"
-                              Margin="10 10"
-                              MinWidth="250"
-                              MaxWidth="250">
-                    <Label Name="RecordListingTitle"
-                           Text="{Loc 'criminal-records-console-records-list-title'}"
-                           HorizontalExpand="True"
-                           Align="Center" />
-                    <Label Name="NoRecords"
-                           Text="{Loc 'criminal-records-console-no-records'}"
-                           HorizontalExpand="True"
-                           Align="Center"
-                           FontColorOverride="DarkGray" />
-                    <ScrollContainer VerticalExpand="True">
-                        <ItemList Name="RecordListing" />
-                        <!-- Populated when loading state -->
-                    </ScrollContainer>
-                </BoxContainer>
-                <Label Name="RecordUnselected"
-                       Text="{Loc 'criminal-records-console-select-record-info'}"
-                       HorizontalExpand="True"
-                       Align="Center"
-                       FontColorOverride="DarkGray" />
-                <!-- Selected record info -->
-                <BoxContainer Name="PersonContainer"
-                        Orientation="Vertical"
-                        VerticalExpand="True"
-                        HorizontalExpand="True"
-                        Margin="5"
-                        Visible="False">
-                    <Label Name="PersonName"
-                           Margin="0 0 0 5"
-                           StyleClasses="LabelBig" />
-                    <BoxContainer Orientation="Horizontal"
-                                  Margin="0 0 0 5">
-                        <Label Text="{Loc 'crew-monitoring-user-interface-job'}"
-                               FontColorOverride="DarkGray" />
-                        <TextureRect Name="PersonJobIcon"
-                                     TextureScale="2 2"
-                                     Margin="6 0"
-                                     VerticalAlignment="Center" />
-                        <Label Name="PersonJob" />
-                    </BoxContainer>
-                    <BoxContainer Orientation="Horizontal"
-                                  Margin="0 0 0 5">
-                        <Label Text="{Loc 'general-station-record-prints-filter'}"
-                               FontColorOverride="DarkGray" />
-                        <Label Text=":"
-                               Margin="0 0 6 0"
-                               FontColorOverride="DarkGray" />
-                        <Label Name="PersonPrints" />
-                    </BoxContainer>
-                    <BoxContainer Orientation="Horizontal"
-                                  Margin="0 0 0 5">
-                        <Label Text="{Loc 'general-station-record-dna-filter'}"
-                               FontColorOverride="DarkGray" />
-                        <Label Text=":"
-                               Margin="0 0 6 0"
-                               FontColorOverride="DarkGray" />
-                        <Label Name="PersonDna" />
-                    </BoxContainer>
-                    <PanelContainer StyleClasses="LowDivider"
-                                    Margin="0 5 0 5" />
-                    <BoxContainer Orientation="Horizontal"
-                                  Margin="0 5 0 5">
-                        <Label Name="StatusLabel"
-                               Text="{Loc 'criminal-records-console-status'}"
-                               FontColorOverride="DarkGray" />
-                        <Label Text=":"
-                               FontColorOverride="DarkGray" />
-                        <Label Name="PersonStatus"
-                               FontColorOverride="DarkGray" />
-                        <AnimatedTextureRect Name="PersonStatusTX"
-                                             Margin="8 0" />
-                        <OptionButton Name="StatusOptionButton"
-                                      MinWidth="130" />
-                        <!-- Populated in constructor -->
-                    </BoxContainer>
-                    <RichTextLabel Name="WantedReason"
-                                   Visible="False"
-                                   MaxWidth="425" />
-                    <Button Name="HistoryButton"
-                            Text="{Loc 'criminal-records-console-crime-history'}"
-                            Margin="0 5" />
-                </BoxContainer>
-            </BoxContainer>
-            <BoxContainer Orientation="Horizontal"
-                          Margin="0 0 0 5">
-                <OptionButton
-                    Name="CrewListFilter"
-                    MinWidth="250"
-                    Margin="10 0 10 0" />
-            </BoxContainer>
+        <!-- Record search bar
+             TODO: make this into a control shared with general records -->
+        <BoxContainer Margin="5 5 5 10" HorizontalExpand="true" VerticalAlignment="Center">
+            <OptionButton Name="FilterType" MinWidth="200" Margin="0 0 10 0"/> <!-- Populated in constructor -->
+            <LineEdit Name="FilterText" PlaceHolder="{Loc 'criminal-records-filter-placeholder'}" HorizontalExpand="True"/>
         </BoxContainer>
-        <!-- Footer -->
-        <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
-            <BoxContainer Orientation="Horizontal"
-                          Margin="10 2 5 0"
-                          VerticalAlignment="Bottom">
-                <Label Text="{Loc 'criminal-records-console-flavor-left'}"
-                       StyleClasses="WindowFooterText" />
-                <Label Text="{Loc 'criminal-records-console-flavor-right'}"
-                       StyleClasses="WindowFooterText"
-                       HorizontalAlignment="Right"
-                       HorizontalExpand="True"
-                       Margin="0 0 5 0" />
-                <TextureRect StyleClasses="NTLogoDark"
-                             Stretch="KeepAspectCentered"
-                             VerticalAlignment="Center"
-                             HorizontalAlignment="Right"
-                             SetSize="19 19" />
+        <BoxContainer Orientation="Horizontal" VerticalExpand="True">
+            <!-- Record listing -->
+            <BoxContainer Orientation="Vertical" Margin="5" MinWidth="250" MaxWidth="250">
+                <Label Name="RecordListingTitle" Text="{Loc 'criminal-records-console-records-list-title'}" HorizontalExpand="True" Align="Center"/>
+                <Label Name="NoRecords" Text="{Loc 'criminal-records-console-no-records'}" HorizontalExpand="True" Align="Center" FontColorOverride="DarkGray"/>
+                <ScrollContainer VerticalExpand="True">
+                    <ItemList Name="RecordListing"/> <!-- Populated when loading state -->
+                </ScrollContainer>
+            </BoxContainer>
+            <Label Name="RecordUnselected" Text="{Loc 'criminal-records-console-select-record-info'}" HorizontalExpand="True" Align="Center" FontColorOverride="DarkGray"/>
+            <!-- Selected record info -->
+            <BoxContainer Name="PersonContainer" Orientation="Vertical" Margin="5" Visible="False">
+                <Label Name="PersonName" StyleClasses="LabelBig"/>
+                <Label Name="PersonPrints"/>
+                <Label Name="PersonDna"/>
+                <PanelContainer StyleClasses="LowDivider" Margin="0 5 0 5" />
+                <BoxContainer Orientation="Horizontal" Margin="5 5 5 5">
+                    <Label Name="StatusLabel" Text="{Loc 'criminal-records-console-status'}" FontColorOverride="DarkGray"/>
+                    <OptionButton Name="StatusOptionButton"/> <!-- Populated in constructor -->
+                </BoxContainer>
+                <RichTextLabel Name="WantedReason" Visible="False"/>
+                <Button Name="HistoryButton" Text="{Loc 'criminal-records-console-crime-history'}"/>
             </BoxContainer>
         </BoxContainer>
     </BoxContainer>

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;
@@ -14,9 +13,6 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using System.Linq;
-using System.Numerics;
-using Content.Shared.StatusIcon;
-using Robust.Client.GameObjects;
 
 namespace Content.Client.CriminalRecords;
 
@@ -28,23 +24,19 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
     private readonly IPrototypeManager _proto;
     private readonly IRobustRandom _random;
     private readonly AccessReaderSystem _accessReader;
-    [Dependency] private readonly IEntityManager _entManager = default!;
-    private readonly SpriteSystem _spriteSystem;
 
     public readonly EntityUid Console;
 
-    [ValidatePrototypeId<LocalizedDatasetPrototype>]
+    [ValidatePrototypeId<DatasetPrototype>]
     private const string ReasonPlaceholders = "CriminalRecordsWantedReasonPlaceholders";
 
     public Action<uint?>? OnKeySelected;
     public Action<StationRecordFilterType, string>? OnFiltersChanged;
     public Action<SecurityStatus>? OnStatusSelected;
-    public Action<uint>? OnCheckStatus;
     public Action<CriminalRecord, bool, bool>? OnHistoryUpdated;
     public Action? OnHistoryClosed;
     public Action<SecurityStatus, string>? OnDialogConfirmed;
 
-    public Action<SecurityStatus>? OnStatusFilterPressed;
     private uint _maxLength;
     private bool _access;
     private uint? _selectedKey;
@@ -54,8 +46,6 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
 
     private StationRecordFilterType _currentFilterType;
 
-    private SecurityStatus _currentCrewListFilter;
-
     public CriminalRecordsConsoleWindow(EntityUid console, uint maxLength, IPlayerManager playerManager, IPrototypeManager prototypeManager, IRobustRandom robustRandom, AccessReaderSystem accessReader)
     {
         RobustXamlLoader.Load(this);
@@ -65,14 +55,10 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
         _proto = prototypeManager;
         _random = robustRandom;
         _accessReader = accessReader;
-        IoCManager.InjectDependencies(this);
-        _spriteSystem = _entManager.System<SpriteSystem>();
 
         _maxLength = maxLength;
         _currentFilterType = StationRecordFilterType.Name;
 
-        _currentCrewListFilter = SecurityStatus.None;
-
         OpenCentered();
 
         foreach (var item in Enum.GetValues<StationRecordFilterType>())
@@ -85,12 +71,6 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
             AddStatusSelect(status);
         }
 
-        //Populate status to filter crew list
-        foreach (var item in Enum.GetValues<SecurityStatus>())
-        {
-            CrewListFilter.AddItem(GetCrewListFilterLocals(item), (int)item);
-        }
-
         OnClose += () => _reasonDialog?.Close();
 
         RecordListing.OnItemSelected += args =>
@@ -117,20 +97,6 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
             }
         };
 
-        //Select Status to filter crew
-        CrewListFilter.OnItemSelected += eventArgs =>
-        {
-            var type = (SecurityStatus)eventArgs.Id;
-
-            if (_currentCrewListFilter != type)
-            {
-                _currentCrewListFilter = type;
-
-                StatusFilterPressed(type);
-
-            }
-        };
-
         FilterText.OnTextEntered += args =>
         {
             FilterListingOfRecords(args.Text);
@@ -138,21 +104,16 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
 
         StatusOptionButton.OnItemSelected += args =>
         {
-            SetStatus((SecurityStatus)args.Id);
+            SetStatus((SecurityStatus) args.Id);
         };
 
         HistoryButton.OnPressed += _ =>
         {
-            if (_selectedRecord is { } record)
+            if (_selectedRecord is {} record)
                 OnHistoryUpdated?.Invoke(record, _access, true);
         };
     }
 
-    public void StatusFilterPressed(SecurityStatus statusSelected)
-    {
-        OnStatusFilterPressed?.Invoke(statusSelected);
-    }
-
     public void UpdateState(CriminalRecordsConsoleState state)
     {
         if (state.Filter != null)
@@ -168,14 +129,10 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
             }
         }
 
-        if (state.FilterStatus != _currentCrewListFilter)
-        {
-            _currentCrewListFilter = state.FilterStatus;
-        }
-
         _selectedKey = state.SelectedKey;
+
         FilterType.SelectId((int)_currentFilterType);
-        CrewListFilter.SelectId((int)_currentCrewListFilter);
+
         NoRecords.Visible = state.RecordListing == null || state.RecordListing.Count == 0;
         PopulateRecordListing(state.RecordListing);
 
@@ -222,7 +179,7 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
         // in parallel to synchronize the items in RecordListing with `entries`.
         int i = RecordListing.Count - 1;
         int j = entries.Count - 1;
-        while (i >= 0 && j >= 0)
+        while(i >= 0 && j >= 0)
         {
             var strcmp = string.Compare(RecordListing[i].Text, entries[j].Value, StringComparison.Ordinal);
             if (strcmp == 0)
@@ -255,44 +212,23 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
         // And finally, any remaining items in `entries`, don't exist in RecordListing. Create them.
         while (j >= 0)
         {
-            RecordListing.Insert(0, new ItemList.Item(RecordListing){ Text = entries[j].Value, Metadata = entries[j].Key });
+            RecordListing.Insert(0, new ItemList.Item(RecordListing){Text = entries[j].Value, Metadata = entries[j].Key});
             j--;
         }
     }
+
     private void PopulateRecordContainer(GeneralStationRecord stationRecord, CriminalRecord criminalRecord)
     {
-        var specifier = new SpriteSpecifier.Rsi(new ResPath("Interface/Misc/job_icons.rsi"), "Unknown");
         var na = Loc.GetString("generic-not-available-shorthand");
         PersonName.Text = stationRecord.Name;
-        PersonJob.Text = stationRecord.JobTitle ?? na;
+        PersonPrints.Text = Loc.GetString("general-station-record-console-record-fingerprint", ("fingerprint", stationRecord.Fingerprint ?? na));
+        PersonDna.Text = Loc.GetString("general-station-record-console-record-dna", ("dna", stationRecord.DNA ?? na));
 
-        // Job icon
-        if (_proto.TryIndex<JobIconPrototype>(stationRecord.JobIcon, out var proto))
-        {
-            PersonJobIcon.Texture = _spriteSystem.Frame0(proto.Icon);
-        }
-
-        PersonPrints.Text = stationRecord.Fingerprint ??  Loc.GetString("generic-not-available-shorthand");
-        PersonDna.Text = stationRecord.DNA ??  Loc.GetString("generic-not-available-shorthand");
-
-        if (criminalRecord.Status != SecurityStatus.None)
-        {
-            specifier = new SpriteSpecifier.Rsi(new ResPath("Interface/Misc/security_icons.rsi"),  GetStatusIcon(criminalRecord.Status));
-        }
-        PersonStatusTX.SetFromSpriteSpecifier(specifier);
-        PersonStatusTX.DisplayRect.TextureScale = new Vector2(3f, 3f);
-
-        StatusOptionButton.SelectId((int)criminalRecord.Status);
-        if (criminalRecord.Reason is { } reason)
+        StatusOptionButton.SelectId((int) criminalRecord.Status);
+        if (criminalRecord.Reason is {} reason)
         {
             var message = FormattedMessage.FromMarkupOrThrow(Loc.GetString("criminal-records-console-wanted-reason"));
-
-            if (criminalRecord.Status == SecurityStatus.Suspected)
-            {
-                message = FormattedMessage.FromMarkupOrThrow(Loc.GetString("criminal-records-console-suspected-reason"));
-            }
             message.AddText($": {reason}");
-
             WantedReason.SetMessage(message);
             WantedReason.Visible = true;
         }
@@ -334,8 +270,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 };
@@ -352,37 +288,9 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
 
         _reasonDialog.OnClose += () => { _reasonDialog = null; };
     }
-    private string GetStatusIcon(SecurityStatus status)
-    {
-        return status switch
-        {
-            SecurityStatus.Paroled => "hud_paroled",
-            SecurityStatus.Wanted => "hud_wanted",
-            SecurityStatus.Detained => "hud_incarcerated",
-            SecurityStatus.Discharged => "hud_discharged",
-            SecurityStatus.Suspected => "hud_suspected",
-            _ => "SecurityIconNone"
-        };
-    }
+
     private string GetTypeFilterLocals(StationRecordFilterType type)
     {
         return Loc.GetString($"criminal-records-{type.ToString().ToLower()}-filter");
     }
-
-    private string GetCrewListFilterLocals(SecurityStatus type)
-    {
-        string result;
-
-        // If "NONE" override to "show all"
-        if (type == SecurityStatus.None)
-        {
-            result = Loc.GetString("criminal-records-console-show-all");
-        }
-        else
-        {
-            result = Loc.GetString($"criminal-records-status-{type.ToString().ToLower()}");
-        }
-
-        return result;
-    }
 }

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/Dice/DiceSystem.cs

@@ -5,24 +5,17 @@ namespace Content.Client.Dice;
 
 public sealed class DiceSystem : SharedDiceSystem
 {
-    public override void Initialize()
+    protected override void UpdateVisuals(EntityUid uid, DiceComponent? die = null)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<DiceComponent, AfterAutoHandleStateEvent>(OnDiceAfterHandleState);
-    }
-
-    private void OnDiceAfterHandleState(Entity<DiceComponent> entity, ref AfterAutoHandleStateEvent args)
-    {
-        if (!TryComp<SpriteComponent>(entity, out var sprite))
+        if (!Resolve(uid, ref die) || !TryComp(uid, out SpriteComponent? sprite))
             return;
 
-        // TODO maybe just move each die to its own RSI?
+        // TODO maybe just move each diue to its own RSI?
         var state = sprite.LayerGetState(0).Name;
         if (state == null)
             return;
 
         var prefix = state.Substring(0, state.IndexOf('_'));
-        sprite.LayerSetState(0, $"{prefix}_{entity.Comp.CurrentValue}");
+        sprite.LayerSetState(0, $"{prefix}_{die.CurrentValue}");
     }
 }

Content.Client/Disposal/Systems/DisposalUnitSystem.cs

@@ -144,7 +144,7 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
                         {
                             KeyFrames =
                             {
-                                new AnimationTrackPlaySound.KeyFrame(_audioSystem.ResolveSound(unit.FlushSound), 0)
+                                new AnimationTrackPlaySound.KeyFrame(_audioSystem.GetSound(unit.FlushSound), 0)
                             }
                         });
                 }

Content.Client/DoAfter/DoAfterSystem.cs

@@ -30,9 +30,7 @@ public sealed class DoAfterSystem : SharedDoAfterSystem
         _overlay.RemoveOverlay<DoAfterOverlay>();
     }
 
-#pragma warning disable RA0028 // No base call in overriden function
     public override void Update(float frameTime)
-#pragma warning restore RA0028 // No base call in overriden function
     {
         // Currently this only predicts do afters initiated by the player.
 

Content.Client/Doors/AirlockSystem.cs

@@ -1,7 +1,6 @@
 using Content.Client.Wires.Visualizers;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
-using Content.Shared.Power;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 
@@ -85,8 +84,7 @@ public sealed class AirlockSystem : SharedAirlockSystem
         if (!_appearanceSystem.TryGetData<DoorState>(uid, DoorVisuals.State, out var state, args.Component))
             state = DoorState.Closed;
 
-        if (_appearanceSystem.TryGetData<bool>(uid, PowerDeviceVisuals.Powered, out var powered, args.Component)
-            && powered)
+        if (_appearanceSystem.TryGetData<bool>(uid, DoorVisuals.Powered, out var powered, args.Component) && powered)
         {
             boltedVisible = _appearanceSystem.TryGetData<bool>(uid, DoorVisuals.BoltLights, out var lights, args.Component)
                             && lights && (state == DoorState.Closed || state == DoorState.Welded);

Content.Client/Doors/DoorSystem.cs

@@ -21,131 +21,112 @@ public sealed class DoorSystem : SharedDoorSystem
     protected override void OnComponentInit(Entity<DoorComponent> ent, ref ComponentInit args)
     {
         var comp = ent.Comp;
-        comp.OpenSpriteStates = new List<(DoorVisualLayers, string)>(2);
-        comp.ClosedSpriteStates = new List<(DoorVisualLayers, string)>(2);
+        comp.OpenSpriteStates = new(2);
+        comp.ClosedSpriteStates = new(2);
 
         comp.OpenSpriteStates.Add((DoorVisualLayers.Base, comp.OpenSpriteState));
         comp.ClosedSpriteStates.Add((DoorVisualLayers.Base, comp.ClosedSpriteState));
 
-        comp.OpeningAnimation = new Animation
+        comp.OpeningAnimation = new Animation()
         {
             Length = TimeSpan.FromSeconds(comp.OpeningAnimationTime),
             AnimationTracks =
             {
-                new AnimationTrackSpriteFlick
+                new AnimationTrackSpriteFlick()
                 {
                     LayerKey = DoorVisualLayers.Base,
-                    KeyFrames =
-                    {
-                        new AnimationTrackSpriteFlick.KeyFrame(comp.OpeningSpriteState, 0f),
-                    },
-                },
+                    KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.OpeningSpriteState, 0f) }
+                }
             },
         };
 
-        comp.ClosingAnimation = new Animation
+        comp.ClosingAnimation = new Animation()
         {
             Length = TimeSpan.FromSeconds(comp.ClosingAnimationTime),
             AnimationTracks =
             {
-                new AnimationTrackSpriteFlick
+                new AnimationTrackSpriteFlick()
                 {
                     LayerKey = DoorVisualLayers.Base,
-                    KeyFrames =
-                    {
-                        new AnimationTrackSpriteFlick.KeyFrame(comp.ClosingSpriteState, 0f),
-                    },
-                },
+                    KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.ClosingSpriteState, 0f) }
+                }
             },
         };
 
-        comp.EmaggingAnimation = new Animation
+        comp.EmaggingAnimation = new Animation ()
         {
             Length = TimeSpan.FromSeconds(comp.EmaggingAnimationTime),
             AnimationTracks =
             {
-                new AnimationTrackSpriteFlick
+                new AnimationTrackSpriteFlick()
                 {
                     LayerKey = DoorVisualLayers.BaseUnlit,
-                    KeyFrames =
-                    {
-                        new AnimationTrackSpriteFlick.KeyFrame(comp.EmaggingSpriteState, 0f),
-                    },
-                },
+                    KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.EmaggingSpriteState, 0f) }
+                }
             },
         };
     }
 
-    private void OnAppearanceChange(Entity<DoorComponent> entity, ref AppearanceChangeEvent args)
+    private void OnAppearanceChange(EntityUid uid, DoorComponent comp, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
 
-        if (!AppearanceSystem.TryGetData<DoorState>(entity, DoorVisuals.State, out var state, args.Component))
+        if(!AppearanceSystem.TryGetData<DoorState>(uid, DoorVisuals.State, out var state, args.Component))
             state = DoorState.Closed;
 
-        if (AppearanceSystem.TryGetData<string>(entity, DoorVisuals.BaseRSI, out var baseRsi, args.Component))
-            UpdateSpriteLayers(args.Sprite, baseRsi);
+        if (AppearanceSystem.TryGetData<string>(uid, DoorVisuals.BaseRSI, out var baseRsi, args.Component))
+        {
+            if (!_resourceCache.TryGetResource<RSIResource>(SpriteSpecifierSerializer.TextureRoot / baseRsi, out var res))
+            {
+                Log.Error("Unable to load RSI '{0}'. Trace:\n{1}", baseRsi, Environment.StackTrace);
+            }
+            foreach (var layer in args.Sprite.AllLayers)
+            {
+                layer.Rsi = res?.RSI;
+            }
+        }
 
-        if (_animationSystem.HasRunningAnimation(entity, DoorComponent.AnimationKey))
-            _animationSystem.Stop(entity.Owner, DoorComponent.AnimationKey);
+        TryComp<AnimationPlayerComponent>(uid, out var animPlayer);
+        if (_animationSystem.HasRunningAnimation(uid, animPlayer, DoorComponent.AnimationKey))
+            _animationSystem.Stop(uid, animPlayer, DoorComponent.AnimationKey); // Halt all running anomations.
 
-        UpdateAppearanceForDoorState(entity, args.Sprite, state);
-    }
-
-    private void UpdateAppearanceForDoorState(Entity<DoorComponent> entity, SpriteComponent sprite, DoorState state)
-    {
-        sprite.DrawDepth = state is DoorState.Open ? entity.Comp.OpenDrawDepth : entity.Comp.ClosedDrawDepth;
-
-        switch (state)
+        args.Sprite.DrawDepth = comp.ClosedDrawDepth;
+        switch(state)
         {
             case DoorState.Open:
-                foreach (var (layer, layerState) in entity.Comp.OpenSpriteStates)
+                args.Sprite.DrawDepth = comp.OpenDrawDepth;
+                foreach(var (layer, layerState) in comp.OpenSpriteStates)
                 {
-                    sprite.LayerSetState(layer, layerState);
+                    args.Sprite.LayerSetState(layer, layerState);
                 }
-
-                return;
+                break;
             case DoorState.Closed:
-                foreach (var (layer, layerState) in entity.Comp.ClosedSpriteStates)
+                foreach(var (layer, layerState) in comp.ClosedSpriteStates)
                 {
-                    sprite.LayerSetState(layer, layerState);
+                    args.Sprite.LayerSetState(layer, layerState);
                 }
-
-                return;
+                break;
             case DoorState.Opening:
-                if (entity.Comp.OpeningAnimationTime == 0.0)
-                    return;
-
-                _animationSystem.Play(entity, (Animation)entity.Comp.OpeningAnimation, DoorComponent.AnimationKey);
-
-                return;
+                if (animPlayer != null && comp.OpeningAnimationTime != 0.0)
+                    _animationSystem.Play((uid, animPlayer), (Animation)comp.OpeningAnimation, DoorComponent.AnimationKey);
+                break;
             case DoorState.Closing:
-                if (entity.Comp.ClosingAnimationTime == 0.0 || entity.Comp.CurrentlyCrushing.Count != 0)
-                    return;
-
-                _animationSystem.Play(entity, (Animation)entity.Comp.ClosingAnimation, DoorComponent.AnimationKey);
-
-                return;
+                if (animPlayer != null && comp.ClosingAnimationTime != 0.0 && comp.CurrentlyCrushing.Count == 0)
+                    _animationSystem.Play((uid, animPlayer), (Animation)comp.ClosingAnimation, DoorComponent.AnimationKey);
+                break;
             case DoorState.Denying:
-                _animationSystem.Play(entity, (Animation)entity.Comp.DenyingAnimation, DoorComponent.AnimationKey);
-
-                return;
+                if (animPlayer != null)
+                    _animationSystem.Play((uid, animPlayer), (Animation)comp.DenyingAnimation, DoorComponent.AnimationKey);
+                break;
+            case DoorState.Welded:
+                break;
             case DoorState.Emagging:
-                _animationSystem.Play(entity, (Animation)entity.Comp.EmaggingAnimation, DoorComponent.AnimationKey);
-
-                return;
+                if (animPlayer != null)
+                    _animationSystem.Play((uid, animPlayer), (Animation)comp.EmaggingAnimation, DoorComponent.AnimationKey);
+                break;
+            default:
+                throw new ArgumentOutOfRangeException($"Invalid door visual state {state}");
         }
     }
-
-    private void UpdateSpriteLayers(SpriteComponent sprite, string baseRsi)
-    {
-        if (!_resourceCache.TryGetResource<RSIResource>(SpriteSpecifierSerializer.TextureRoot / baseRsi, out var res))
-        {
-            Log.Error("Unable to load RSI '{0}'. Trace:\n{1}", baseRsi, Environment.StackTrace);
-            return;
-        }
-
-        sprite.BaseRSI = res.RSI;
-    }
 }

Content.Client/Entry/EntryPoint.cs

@@ -1,5 +1,3 @@
-using Content.Client._CP14.Discord;
-using Content.Client._CP14.JoinQueue;
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
@@ -45,10 +43,6 @@ namespace Content.Client.Entry
 {
     public sealed class EntryPoint : GameClient
     {
-        //CP14
-        [Dependency] private readonly DiscordAuthManager _discordAuth = default!;
-        [Dependency] private readonly JoinQueueManager _joinQueueManager = default!;
-        //CP14 end
         [Dependency] private readonly IBaseClient _baseClient = default!;
         [Dependency] private readonly IGameController _gameController = default!;
         [Dependency] private readonly IStateManager _stateManager = default!;
@@ -166,11 +160,7 @@ namespace Content.Client.Entry
 
             _parallaxManager.LoadDefaultParallax();
 
-            //CP14
-            _overlayManager.AddOverlay(new CP14BasePostProcessOverlay());
-            _discordAuth.Initialize();
-            _joinQueueManager.Initialize();
-            //CP14 end
+            _overlayManager.AddOverlay(new CP14BasePostProcessOverlay()); // CP14-PostProcess
             _overlayManager.AddOverlay(new SingularityOverlay());
             _overlayManager.AddOverlay(new RadiationPulseOverlay());
             _chatManager.Initialize();

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/GameTicking/Managers/ClientGameTicker.cs

@@ -10,7 +10,6 @@ using Robust.Client.Graphics;
 using Robust.Client.State;
 using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Audio;
 
 namespace Content.Client.GameTicking.Managers
 {
@@ -27,7 +26,7 @@ namespace Content.Client.GameTicking.Managers
 
         [ViewVariables] public bool AreWeReady { get; private set; }
         [ViewVariables] public bool IsGameStarted { get; private set; }
-        [ViewVariables] public ResolvedSoundSpecifier? RestartSound { get; private set; }
+        [ViewVariables] public string? RestartSound { get; private set; }
         [ViewVariables] public string? LobbyBackground { get; private set; }
         [ViewVariables] public bool DisallowedLateJoin { get; private set; }
         [ViewVariables] public string? ServerInfoBlob { get; private set; }
@@ -44,8 +43,6 @@ namespace Content.Client.GameTicking.Managers
 
         public override void Initialize()
         {
-            base.Initialize();
-
             SubscribeNetworkEvent<TickerJoinLobbyEvent>(JoinLobby);
             SubscribeNetworkEvent<TickerJoinGameEvent>(JoinGame);
             SubscribeNetworkEvent<TickerConnectionStatusEvent>(ConnectionStatus);

Content.Client/Gameplay/GameplayState.cs

@@ -1,5 +1,3 @@
-using System.Numerics;
-using Content.Client.Changelog;
 using Content.Client.Hands;
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Screens;
@@ -9,7 +7,6 @@ using Content.Shared.CCVar;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Configuration;
 using Robust.Shared.Timing;
@@ -23,11 +20,9 @@ namespace Content.Client.Gameplay
         [Dependency] private readonly IOverlayManager _overlayManager = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
-        [Dependency] private readonly ChangelogManager _changelog = default!;
         [Dependency] private readonly IConfigurationManager _configurationManager = default!;
 
         private FpsCounter _fpsCounter = default!;
-        private Label _version = default!;
 
         public MainViewport Viewport => _uiManager.ActiveScreen!.GetWidget<MainViewport>()!;
 
@@ -45,7 +40,6 @@ namespace Content.Client.Gameplay
             base.Startup();
 
             LoadMainScreen();
-            _configurationManager.OnValueChanged(CCVars.UILayout, ReloadMainScreenValueChange);
 
             // Add the hand-item overlay.
             _overlayManager.AddOverlay(new ShowHandItemOverlay());
@@ -56,24 +50,7 @@ namespace Content.Client.Gameplay
             UserInterfaceManager.PopupRoot.AddChild(_fpsCounter);
             _fpsCounter.Visible = _configurationManager.GetCVar(CCVars.HudFpsCounterVisible);
             _configurationManager.OnValueChanged(CCVars.HudFpsCounterVisible, (show) => { _fpsCounter.Visible = show; });
-
-            // Version number watermark.
-            _version = new Label();
-            _version.FontColorOverride = Color.FromHex("#FFFFFF20");
-            _version.Text = _changelog.GetClientVersion();
-            UserInterfaceManager.PopupRoot.AddChild(_version);
-            _configurationManager.OnValueChanged(CCVars.HudVersionWatermark, (show) => { _version.Visible = VersionVisible(); }, true);
-            _configurationManager.OnValueChanged(CCVars.ForceClientHudVersionWatermark, (show) => { _version.Visible = VersionVisible(); }, true);
-            // TODO make this centered or something
-            LayoutContainer.SetPosition(_version, new Vector2(70, 0));
-        }
-
-        // This allows servers to force the watermark on clients
-        private bool VersionVisible()
-        {
-            var client = _configurationManager.GetCVar(CCVars.HudVersionWatermark);
-            var server = _configurationManager.GetCVar(CCVars.ForceClientHudVersionWatermark);
-            return client || server;
+            _configurationManager.OnValueChanged(CCVars.UILayout, ReloadMainScreenValueChange);
         }
 
         protected override void Shutdown()

Content.Client/Gameplay/GameplayStateBase.cs

@@ -219,12 +219,10 @@ namespace Content.Client.Gameplay
                 {
                     entityToClick = GetClickedEntity(mousePosWorld);
                 }
-                var transformSystem = _entitySystemManager.GetEntitySystem<SharedTransformSystem>();
-                var mapSystem = _entitySystemManager.GetEntitySystem<MapSystem>();
 
-                coordinates = _mapManager.TryFindGridAt(mousePosWorld, out var uid, out _) ?
-                    mapSystem.MapToGrid(uid, mousePosWorld) :
-                    transformSystem.ToCoordinates(mousePosWorld);
+                coordinates = _mapManager.TryFindGridAt(mousePosWorld, out _, out var grid) ?
+                    grid.MapToGrid(mousePosWorld) :
+                    EntityCoordinates.FromMap(_mapManager, mousePosWorld);
             }
             else
             {

Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs

@@ -51,6 +51,7 @@ public sealed partial class GhostRoleRadioMenu : RadialMenu
 
             var button = new GhostRoleRadioMenuButton()
             {
+                StyleClasses = { "RadialMenuButton" },
                 SetSize = new Vector2(64, 64),
                 ToolTip = Loc.GetString(ghostRoleProto.Name),
                 ProtoId = ghostRoleProto.ID,
@@ -99,7 +100,7 @@ public sealed partial class GhostRoleRadioMenu : RadialMenu
     }
 }
 
-public sealed class GhostRoleRadioMenuButton : RadialMenuTextureButtonWithSector
+public sealed class GhostRoleRadioMenuButton : RadialMenuTextureButton
 {
     public ProtoId<GhostRolePrototype> ProtoId { get; set; }
 }

Content.Client/Ghost/GhostSystem.cs

@@ -13,7 +13,6 @@ namespace Content.Client.Ghost
         [Dependency] private readonly IClientConsoleHost _console = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
-        [Dependency] private readonly PointLightSystem _pointLightSystem = default!;
         [Dependency] private readonly ContentEyeSystem _contentEye = default!;
 
         public int AvailableGhostRoleCount { get; private set; }
@@ -80,27 +79,8 @@ namespace Content.Client.Ghost
             if (args.Handled)
                 return;
 
-            TryComp<PointLightComponent>(uid, out var light);
-
-            if (!component.DrawLight)
-            {
-                // normal lighting
-                Popup.PopupEntity(Loc.GetString("ghost-gui-toggle-lighting-manager-popup-normal"), args.Performer);
-                _contentEye.RequestEye(component.DrawFov, true);
-            }
-            else if (!light?.Enabled ?? false) // skip this option if we have no PointLightComponent
-            {
-                // enable personal light
-                Popup.PopupEntity(Loc.GetString("ghost-gui-toggle-lighting-manager-popup-personal-light"), args.Performer);
-                _pointLightSystem.SetEnabled(uid, true, light);
-            }
-            else
-            {
-                // fullbright mode
-                Popup.PopupEntity(Loc.GetString("ghost-gui-toggle-lighting-manager-popup-fullbright"), args.Performer);
-                _contentEye.RequestEye(component.DrawFov, false);
-                _pointLightSystem.SetEnabled(uid, false, light);
-            }
+            Popup.PopupEntity(Loc.GetString("ghost-gui-toggle-lighting-manager-popup"), args.Performer);
+            _contentEye.RequestToggleLight(uid, component);
             args.Handled = true;
         }
 
@@ -155,7 +135,7 @@ namespace Content.Client.Ghost
         private void OnGhostState(EntityUid uid, GhostComponent component, ref AfterAutoHandleStateEvent args)
         {
             if (TryComp<SpriteComponent>(uid, out var sprite))
-                sprite.LayerSetColor(0, component.Color);
+                sprite.LayerSetColor(0, component.color);
 
             if (uid != _playerManager.LocalEntity)
                 return;