Update locale

# Conflicts:
#	Resources/Server Info/Guidebook/Science/Xenoarchaeology.xml
#	Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_security.png
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
#	Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json
#	Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/singularity_1.png
#	Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json
#	Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/singularity_2.png
#	Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json
#	Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/singularity_3.png
#	Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json
#	Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/singularity_4.png
#	Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json
#	Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/singularity_5.png
#	Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json
#	Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/singularity_6.png

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,7 +3,7 @@
 ## Описание PR
 <!-- Ниже опишите ваш Pull Request. Что он изменяет? На что еще это может повлиять? Постарайтесь описать все внесённые вами изменения! -->
 
-**Скриншоты**
+**Медиа**
 <!-- Если приемлемо, добавьте скриншоты для демонстрации вашего PR. Если ваш PR представляет собой визуальное изменение, добавьте
 скриншоты, иначе он может быть закрыт. -->
 
@@ -12,22 +12,25 @@
 - [ ] PR полностью завершён и мне не нужна помощь чтобы его закончить.
 - [ ] Я внимательно просмотрел все свои изменения и багов в них не нашёл.
 - [ ] Я запускал локальный сервер со своими изменениями и всё протестировал.
+- [ ] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует.
 
 **Изменения**
 <!--
-Здесь вы можете написать список изменений, который будет автоматически добавлен в игру, когда ваш PR будет принят
-Поддерживается 4 типа значков: add, remove, tweak, fix. Выбрать правильные не должно составить для вас труда.
+Здесь вы можете написать список изменений, который будет автоматически добавлен в игру, когда ваш PR будет принят.
 
-Вы можете указать своё имя после символа :cl: именно оно будет отображаться в журнале изменений (иначе будет использоваться ваше имя на GitHub)
-Например: :cl: Ian
-
-В журнал изменений следует помещать только то, что действительно важно игрокам. Вещи вроде "Рефакторинг системы X" не должны быть в журнале изменений.
+В журнал изменений следует помещать только то, что действительно важно игрокам.
 
 В списке изменений тип значка не является часть предложения, поэтому явно указывайте - Добавлен, Удалён, Изменён.
 плохо: - add: Новый инструмент для инженеров
 хорошо: - add: Добавлен новый инструмент для инженеров
+
+Вы можете указать своё имя после символа :cl: именно оно будет отображаться в журнале изменений (иначе будет использоваться ваше имя на GitHub)
+Например: :cl: Ian
+
 -->
 
 :cl:
 - add: Добавлено веселье!
 - remove: Убрано веселье!
+- tweak: Изменено веселье!
+- fix: Исправлено веселье!

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

@@ -2,31 +2,15 @@ name: Build & Test Debug
 
 on:
   push:
-    branches: [ master ]
-    paths:
-      - '**.cs'
-      - '**.csproj'
-      - '**.sln'
-      - '**.git**'
-      - '**.yml'
-      # no docs on which one of these is supposed to work, so
-      # why not just do both
-      - 'RobustToolbox'
-      - 'RobustToolbox/**'
+    branches: [ master, staging, trying ]
+  merge_group:
   pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
     branches: [ master ]
-    paths:
-      - '**.cs'
-      - '**.csproj'
-      - '**.sln'
-      - '**.git**'
-      - '**.yml'
-      - 'RobustToolbox'
-      - 'RobustToolbox/**'
 
 jobs:
   build:
-    if: github.actor != 'PJBot'
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
@@ -58,13 +42,21 @@ jobs:
       run: dotnet restore
 
     - name: Build Project
-      run: dotnet build --configuration Debug --no-restore /p:WarningsAsErrors=nullable /m
+      run: dotnet build --configuration DebugOpt --no-restore /p:WarningsAsErrors=nullable /m
 
     - name: Run Content.Tests
-      run: dotnet test --no-build Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0
+      run: dotnet test --no-build --configuration DebugOpt Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0
 
     - name: Run Content.IntegrationTests
       shell: pwsh
       run: |
         $env:DOTNET_gcServer=1
-        dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0
+        dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0
+  ci-success:
+    name: Build & Test Debug
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    steps:
+      - name: CI succeeded
+        run: exit 0

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

@@ -2,31 +2,15 @@ name: Build & Test Release
 
 on:
   push:
-    branches: [ master ]
-    paths:
-      - '**.cs'
-      - '**.csproj'
-      - '**.sln'
-      - '**.git**'
-      - '**.yml'
-      # no docs on which one of these is supposed to work, so
-      # why not just do both
-      - 'RobustToolbox'
-      - 'RobustToolbox/**'
+    branches: [ master, staging, trying ]
+  merge_group:
   pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
     branches: [ master ]
-    paths:
-      - '**.cs'
-      - '**.csproj'
-      - '**.sln'
-      - '**.git**'
-      - '**.yml'
-      - 'RobustToolbox'
-      - 'RobustToolbox/**'
 
 jobs:
   build:
-    if: github.actor != 'PJBot'
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
@@ -58,13 +42,21 @@ jobs:
       run: dotnet restore
 
     - name: Build Project
-      run: dotnet build --configuration Release --no-restore /p:WarningsAsErrors=nullable /m
+      run: dotnet build --configuration Tools --no-restore /p:WarningsAsErrors=nullable /m
 
     - name: Run Content.Tests
-      run: dotnet test --no-build Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0
+      run: dotnet test --configuration Tools --no-build Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0
 
     - name: Run Content.IntegrationTests
       shell: pwsh
       run: |
         $env:DOTNET_gcServer=1
-        dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0
+        dotnet test --configuration Tools --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0
+  ci-success:
+    name: Build & Test Release
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    steps:
+      - name: CI succeeded
+        run: exit 0

.github/workflows/publish.yml

@@ -16,6 +16,21 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: 'recursive'
+        
+    # Corvax-Secrets-Start
+    - name: Setup secrets
+      env:
+        SSH_KEY: ${{ secrets.SECRETS_PRIVATE_KEY }}
+      if: ${{ env.SSH_KEY != '' }}
+      run: |
+        mkdir ~/.ssh
+        echo "${{ secrets.SECRETS_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+        chmod 600 ~/.ssh/id_rsa
+        echo "HOST *" > ~/.ssh/config
+        echo "StrictHostKeyChecking no" >> ~/.ssh/config
+        git -c submodule.Secrets.update=checkout submodule update --init
+      # Corvax-Secrets-End
+        
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3
       with:
@@ -56,3 +71,10 @@ jobs:
         username: ${{ secrets.BUILDS_USERNAME }}
         key: ${{ secrets.BUILDS_SSH_KEY }}
         script: node ~/scripts/push_to_manifest.js -fork syndicate -id ${{ github.sha }}
+
+    - name: Publish changelog
+      run: Tools/actions_changelogs_since_last_run.py
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
+        TRANSLATION_API_URL: ${{ secrets.CHANGELOG_TRANSLATION_API_URL }}

.github/workflows/test-packaging.yml

@@ -2,7 +2,7 @@
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, staging, trying ]
     paths:
       - '**.cs'
       - '**.csproj'
@@ -13,7 +13,9 @@ on:
       # why not just do both
       - 'RobustToolbox'
       - 'RobustToolbox/**'
+  merge_group:
   pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
     branches: [ master ]
     paths:
       - '**.cs'
@@ -26,7 +28,8 @@ on:
 
 jobs:
   build:
-    if: github.actor != 'PJBot'
+    name: Test Packaging
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
 
     steps:
@@ -44,6 +47,20 @@ jobs:
         run: |
           cd RobustToolbox/
           git submodule update --init --recursive
+          
+      # Corvax-Secrets-Start
+      - name: Setup secrets
+        env:
+          SSH_KEY: ${{ secrets.SECRETS_PRIVATE_KEY }}
+        if: ${{ env.SSH_KEY != '' }}
+        run: |
+          mkdir ~/.ssh
+          echo "${{ secrets.SECRETS_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          echo "HOST *" > ~/.ssh/config
+          echo "StrictHostKeyChecking no" >> ~/.ssh/config
+          git -c submodule.Secrets.update=checkout submodule update --init
+      # Corvax-Secrets-End
 
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3

.github/workflows/validate-rgas.yml

@@ -1,14 +1,33 @@
-name: YAML schema validator
-on: [pull_request, push]
+name: RGA schema validator
+on:
+  push:
+    branches: [ master, staging, trying ]
+  merge_group:
+  pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
 
 jobs:
   yaml-schema-validation:
-    if: github.actor != 'PJBot'
+    name: YAML RGA schema validator
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Setup Submodule
       run: git submodule update --init
+    # Corvax-Secrets-Start
+    - name: Setup secrets
+      env:
+        SSH_KEY: ${{ secrets.SECRETS_PRIVATE_KEY }}
+      if: ${{ env.SSH_KEY != '' }}
+      run: |
+        mkdir ~/.ssh
+        echo "${{ secrets.SECRETS_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+        chmod 600 ~/.ssh/id_rsa
+        echo "HOST *" > ~/.ssh/config
+        echo "StrictHostKeyChecking no" >> ~/.ssh/config
+        git -c submodule.Secrets.update=checkout submodule update --init
+    # Corvax-Secrets-End
     - name: Pull engine updates
       uses: space-wizards/submodule-dependency@v0.1.5
     - uses: PaulRitter/yaml-schema-validator@v1

.github/workflows/validate-rsis.yml

@@ -1,6 +1,9 @@
 name: RSI Validator
 
 on:
+  push:
+    branches: [ staging, trying ]
+  merge_group:
   pull_request:
     paths:
       - '**.rsi/**'
@@ -13,6 +16,19 @@ jobs:
       - uses: actions/checkout@v2
       - name: Setup Submodule
         run: git submodule update --init
+      # Corvax-Secrets-Start
+      - name: Setup secrets
+        env:
+          SSH_KEY: ${{ secrets.SECRETS_PRIVATE_KEY }}
+        if: ${{ env.SSH_KEY != '' }}
+        run: |
+          mkdir ~/.ssh
+          echo "${{ secrets.SECRETS_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          echo "HOST *" > ~/.ssh/config
+          echo "StrictHostKeyChecking no" >> ~/.ssh/config
+          git -c submodule.Secrets.update=checkout submodule update --init
+      # Corvax-Secrets-End
       - name: Pull engine updates
         uses: space-wizards/submodule-dependency@v0.1.5
       - name: Install Python dependencies

.github/workflows/validate_mapfiles.yml

@@ -1,13 +1,33 @@
-name: YAML schema validator
-on: [pull_request, push]
+name: Map file schema validator
+on:
+  push:
+    branches: [ master, staging, trying ]
+  merge_group:
+  pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
 
 jobs:
   yaml-schema-validation:
+    name: YAML map schema validator
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Setup Submodule
       run: git submodule update --init
+    # Corvax-Secrets-Start
+    - name: Setup secrets
+      env:
+        SSH_KEY: ${{ secrets.SECRETS_PRIVATE_KEY }}
+      if: ${{ env.SSH_KEY != '' }}
+      run: |
+        mkdir ~/.ssh
+        echo "${{ secrets.SECRETS_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+        chmod 600 ~/.ssh/id_rsa
+        echo "HOST *" > ~/.ssh/config
+        echo "StrictHostKeyChecking no" >> ~/.ssh/config
+        git -c submodule.Secrets.update=checkout submodule update --init
+    # Corvax-Secrets-End
     - name: Pull engine updates
       uses: space-wizards/submodule-dependency@v0.1.5
     - uses: PaulRitter/yaml-schema-validator@v1

.github/workflows/yaml-linter.yml

@@ -1,10 +1,16 @@
 name: YAML Linter
 
-on: [pull_request, push]
+on:
+  push:
+    branches: [ master, staging, trying ]
+  merge_group:
+  pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
 
 jobs:
   build:
-    if: github.actor != 'PJBot'
+    name: YAML Linter
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

.gitignore

@@ -10,6 +10,10 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
+# Secret
+Resources/Prototypes/CorvaxSecrets
+Resources/Prototypes/CorvaxSecretsServer
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/

.gitmodules

@@ -1,4 +1,9 @@
 [submodule "RobustToolbox"]
 	path = RobustToolbox
 	url = https://github.com/space-wizards/RobustToolbox.git
-	branch = master
+	branch = master
+[submodule "Secrets"]
+	path = Secrets
+	url = git@gitlab.com:Morbo/corvax-secrets.git
+	branch = master
+	update = none

BuildChecker/BuildChecker.csproj

@@ -32,6 +32,12 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Tools|AnyCPU' ">
+    <OutputPath>bin\Tools\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugOpt|AnyCPU' ">
+    <OutputPath>bin\DebugOpt\</OutputPath>
+  </PropertyGroup>
   <Target Name="Build">
     <Exec Command="$(Python) git_helper.py" CustomErrorRegularExpression="^Error" />
   </Target>

Content.Benchmarks/Content.Benchmarks.csproj

@@ -25,5 +25,4 @@
     <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
     <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
   </ItemGroup>
-  <Import Project="..\RobustToolbox\MSBuild\Robust.Analyzers.targets" />
 </Project>

Content.Benchmarks/NetSerializerStringBenchmark.cs

@@ -377,7 +377,7 @@ namespace Content.Benchmarks
 					throw new EndOfStreamException();
 
 				streamBytesLeft -= bytesInBuffer;
-				bool flush = streamBytesLeft == 0 ? true : false;
+				bool flush = streamBytesLeft == 0;
 
 				bool completed = false;
 

Content.Client/AME/AMEControllerVisualizerSystem.cs

@@ -15,7 +15,7 @@ public sealed class AMEControllerVisualizerSystem : VisualizerSystem<AMEControll
 
     private void OnComponentInit(EntityUid uid, AMEControllerVisualsComponent component, ComponentInit args)
     {
-        if(TryComp<SpriteComponent>(uid, out var sprite))
+        if (TryComp<SpriteComponent>(uid, out var sprite))
         {
             sprite.LayerMapSet(AMEControllerVisualLayers.Display, sprite.AddLayerState("control_on"));
             sprite.LayerSetVisible(AMEControllerVisualLayers.Display, false);
@@ -26,30 +26,32 @@ public sealed class AMEControllerVisualizerSystem : VisualizerSystem<AMEControll
     {
         base.OnAppearanceChange(uid, component, ref args);
 
-        if(args.Sprite != null
-            && args.Component.TryGetData<string>(AMEControllerVisuals.DisplayState, out var state))
+        if (args.Sprite == null
+            || !AppearanceSystem.TryGetData<string>(uid, AMEControllerVisuals.DisplayState, out var state, args.Component))
         {
-            switch(state)
-            {
-                case "on":
-                    args.Sprite.LayerSetState(AMEControllerVisualLayers.Display, "control_on");
-                    args.Sprite.LayerSetVisible(AMEControllerVisualLayers.Display, true);
-                    break;
-                case "critical":
-                    args.Sprite.LayerSetState(AMEControllerVisualLayers.Display, "control_critical");
-                    args.Sprite.LayerSetVisible(AMEControllerVisualLayers.Display, true);
-                    break;
-                case "fuck":
-                    args.Sprite.LayerSetState(AMEControllerVisualLayers.Display, "control_fuck");
-                    args.Sprite.LayerSetVisible(AMEControllerVisualLayers.Display, true);
-                    break;
-                case "off":
-                    args.Sprite.LayerSetVisible(AMEControllerVisualLayers.Display, false);
-                    break;
-                default:
-                    args.Sprite.LayerSetVisible(AMEControllerVisualLayers.Display, false);
-                    break;
-            }
+            return;
+        }
+
+        switch (state)
+        {
+            case "on":
+                args.Sprite.LayerSetState(AMEControllerVisualLayers.Display, "control_on");
+                args.Sprite.LayerSetVisible(AMEControllerVisualLayers.Display, true);
+                break;
+            case "critical":
+                args.Sprite.LayerSetState(AMEControllerVisualLayers.Display, "control_critical");
+                args.Sprite.LayerSetVisible(AMEControllerVisualLayers.Display, true);
+                break;
+            case "fuck":
+                args.Sprite.LayerSetState(AMEControllerVisualLayers.Display, "control_fuck");
+                args.Sprite.LayerSetVisible(AMEControllerVisualLayers.Display, true);
+                break;
+            case "off":
+                args.Sprite.LayerSetVisible(AMEControllerVisualLayers.Display, false);
+                break;
+            default:
+                args.Sprite.LayerSetVisible(AMEControllerVisualLayers.Display, false);
+                break;
         }
     }
 }

Content.Client/AME/AMEShieldingVisualizerSystem.cs

@@ -15,7 +15,7 @@ public sealed class AMEShieldingVisualizerSystem : VisualizerSystem<AMEShielding
 
     private void OnComponentInit(EntityUid uid, AMEShieldingVisualsComponent component, ComponentInit args)
     {
-        if(TryComp<SpriteComponent>(uid, out var sprite))
+        if (TryComp<SpriteComponent>(uid, out var sprite))
         {
             sprite.LayerMapSet(AMEShieldingVisualsLayer.Core, sprite.AddLayerState("core"));
             sprite.LayerSetVisible(AMEShieldingVisualsLayer.Core, false);
@@ -26,10 +26,10 @@ public sealed class AMEShieldingVisualizerSystem : VisualizerSystem<AMEShielding
 
     protected override void OnAppearanceChange(EntityUid uid, AMEShieldingVisualsComponent component, ref AppearanceChangeEvent args)
     {
-        if(args.Sprite == null)
+        if (args.Sprite == null)
             return;
 
-        if(args.Component.TryGetData<string>(AMEShieldVisuals.Core, out var core))
+        if (AppearanceSystem.TryGetData<string>(uid, AMEShieldVisuals.Core, out var core, args.Component))
         {
             if (core == "isCore")
             {
@@ -43,9 +43,9 @@ public sealed class AMEShieldingVisualizerSystem : VisualizerSystem<AMEShielding
             }
         }
 
-        if(args.Component.TryGetData<string>(AMEShieldVisuals.CoreState, out var coreState))
+        if (AppearanceSystem.TryGetData<string>(uid, AMEShieldVisuals.CoreState, out var coreState, args.Component))
         {
-            switch(coreState)
+            switch (coreState)
             {
                 case "weak":
                     args.Sprite.LayerSetState(AMEShieldingVisualsLayer.CoreState, "core_weak");

Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs

@@ -5,7 +5,6 @@ using Content.Shared.CrewManifest;
 using Robust.Client.GameObjects;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Access.Components.SharedIdCardConsoleComponent;
-
 namespace Content.Client.Access.UI
 {
     public sealed class IdCardConsoleBoundUserInterface : BoundUserInterface
@@ -16,7 +15,6 @@ namespace Content.Client.Access.UI
         public IdCardConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
         }
-
         private IdCardConsoleWindow? _window;
 
         protected override void Open()

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

@@ -50,7 +50,8 @@ namespace Content.Client.Access.UI
             };
             JobTitleSaveButton.OnPressed += _ => SubmitData();
 
-            var jobs = _prototypeManager.EnumeratePrototypes<JobPrototype>();
+            var jobs = _prototypeManager.EnumeratePrototypes<JobPrototype>().ToList();
+            jobs.Sort((x, y) => string.Compare(x.LocalizedName, y.LocalizedName, StringComparison.CurrentCulture));
 
             foreach (var job in jobs)
             {

Content.Client/Administration/Managers/ClientAdminManager.cs

@@ -1,13 +1,16 @@
 using Content.Shared.Administration;
+using Content.Shared.Administration.Managers;
 using Robust.Client.Console;
+using Robust.Client.Player;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Network;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Administration.Managers
 {
-    public sealed class ClientAdminManager : IClientAdminManager, IClientConGroupImplementation, IPostInjectInit
+    public sealed class ClientAdminManager : IClientAdminManager, IClientConGroupImplementation, IPostInjectInit, ISharedAdminManager
     {
+        [Dependency] private readonly IPlayerManager _player = default!;
         [Dependency] private readonly IClientNetManager _netMgr = default!;
         [Dependency] private readonly IClientConGroupController _conGroup = default!;
         [Dependency] private readonly IResourceManager _res = default!;
@@ -81,7 +84,7 @@ namespace Content.Client.Administration.Managers
             var host = IoCManager.Resolve<IClientConsoleHost>();
 
             // Anything marked as Any we'll just add even if the server doesn't know about it.
-            foreach (var (command, instance) in host.RegisteredCommands)
+            foreach (var (command, instance) in host.AvailableCommands)
             {
                 if (Attribute.GetCustomAttribute(instance.GetType(), typeof(AnyCommandAttribute)) == null) continue;
                 _availableCommands.Add(command);
@@ -111,5 +114,12 @@ namespace Content.Client.Administration.Managers
         {
             _conGroup.Implementation = this;
         }
+
+        public AdminData? GetAdminData(EntityUid uid, bool includeDeAdmin = false)
+        {
+            return uid == _player.LocalPlayer?.ControlledEntity
+                ? _adminData
+                : null;
+        }
     }
 }

Content.Client/Administration/Systems/AdminVerbSystem.cs

@@ -1,5 +1,6 @@
 using Content.Shared.Verbs;
 using Robust.Client.Console;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Administration.Systems
 {
@@ -26,7 +27,7 @@ namespace Content.Client.Administration.Systems
                 Verb verb = new();
                 verb.Category = VerbCategory.Debug;
                 verb.Text = "View Variables";
-                verb.IconTexture = "/Textures/Interface/VerbIcons/vv.svg.192dpi.png";
+                verb.Icon = new SpriteSpecifier.Texture(new ResourcePath("/Textures/Interface/VerbIcons/vv.svg.192dpi.png"));
                 verb.Act = () => _clientConsoleHost.ExecuteCommand($"vv {args.Target}");
                 verb.ClientExclusive = true; // opening VV window is client-side. Don't ask server to run this verb.
                 args.Verbs.Add(verb);

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

@@ -0,0 +1,25 @@
+<Control
+    xmlns="https://spacestation14.io"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
+    <PanelContainer>
+         <PanelContainer.PanelOverride>
+            <gfx:StyleBoxFlat BackgroundColor="#25252A"/>
+         </PanelContainer.PanelOverride>
+        <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" HorizontalAlignment="Right">
+                    <Button Margin="0 0 10 0" Visible="True" Name="PopOut" Access="Public" Text="{Loc 'admin-logs-pop-out'}"/>
+                    <Button Visible="False" Name="Bans" Text="{Loc 'admin-player-actions-bans'}" />
+                    <Button Visible="False" Name="Notes" Text="{Loc 'admin-player-actions-notes'}" />
+                    <Button Visible="False" Name="Kick" Text="{Loc 'admin-player-actions-kick'}" />
+                    <Button Visible="False" Name="Ban" Text="{Loc 'admin-player-actions-ban'}" />
+                    <Button Visible="False" Name="Respawn" Text="{Loc 'admin-player-actions-respawn'}" />
+                    <Button Visible="False" Name="Teleport" Text="{Loc 'admin-player-actions-teleport'}" />
+                </BoxContainer>
+            </BoxContainer>
+        </SplitContainer>
+    </PanelContainer>
+</Control>

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

@@ -1,3 +1,4 @@
+using System.Linq;
 using System.Text;
 using System.Threading;
 using Content.Client.Administration.Managers;
@@ -5,6 +6,7 @@ using Content.Client.Administration.UI.CustomControls;
 using Content.Client.Administration.UI.Tabs.AdminTab;
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Systems.Bwoink;
+using Content.Client.UserInterface.Systems.Chat.Controls;
 using Content.Shared.Administration;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
@@ -16,27 +18,33 @@ using Robust.Shared.Network;
 using Robust.Shared.Utility;
 using Timer = Robust.Shared.Timing.Timer;
 
-namespace Content.Client.Administration.UI
+namespace Content.Client.Administration.UI.Bwoink
 {
     /// <summary>
     /// This window connects to a BwoinkSystem channel. BwoinkSystem manages the rest.
     /// </summary>
     [GenerateTypedNameReferences]
-    public sealed partial class BwoinkWindow : DefaultWindow
+    public sealed partial class BwoinkControl : Control
     {
         [Dependency] private readonly IClientAdminManager _adminManager = default!;
         [Dependency] private readonly IClientConsoleHost _console = default!;
-        private readonly AdminAHelpUIHandler _adminAHelpHelper;
+        [Dependency] private readonly IUserInterfaceManager _ui = default!;
+        public AdminAHelpUIHandler AHelpHelper = default!;
 
         //private readonly BwoinkSystem _bwoinkSystem;
         private PlayerInfo? _currentPlayer = default;
 
-        public BwoinkWindow(AdminAHelpUIHandler adminAHelpHelper)
+        public BwoinkControl()
         {
-            _adminAHelpHelper = adminAHelpHelper;
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
 
+            var uiController = _ui.GetUIController<AHelpUIController>();
+            if (uiController.UIHelper is not AdminAHelpUIHandler helper)
+                return;
+
+            AHelpHelper = helper;
+
             _adminManager.AdminStatusUpdated += FixButtons;
             FixButtons();
 
@@ -46,7 +54,6 @@ namespace Content.Client.Administration.UI
                 if (sel is not null)
                 {
                     SwitchToChannel(sel.SessionId);
-                    Title = $"{sel.CharacterName} / {sel.Username}";
                 }
 
                 ChannelSelector.PlayerListContainer.DirtyList();
@@ -62,7 +69,7 @@ namespace Content.Client.Administration.UI
                     sb.Append(info.ActiveThisRound ? '○' : '·');
 
                 sb.Append(' ');
-                if (_adminAHelpHelper.TryGetChannel(info.SessionId, out var panel) && panel.Unread > 0)
+                if (AHelpHelper.TryGetChannel(info.SessionId, out var panel) && panel.Unread > 0)
                 {
                     if (panel.Unread < 11)
                         sb.Append(new Rune('➀' + (panel.Unread-1)));
@@ -81,8 +88,8 @@ namespace Content.Client.Administration.UI
 
             ChannelSelector.Comparison = (a, b) =>
             {
-                var ach = _adminAHelpHelper.EnsurePanel(a.SessionId);
-                var bch = _adminAHelpHelper.EnsurePanel(b.SessionId);
+                var ach = AHelpHelper.EnsurePanel(a.SessionId);
+                var bch = AHelpHelper.EnsurePanel(b.SessionId);
 
                 // First, sort by unread. Any chat with unread messages appears first. We just sort based on unread
                 // status, not number of unread messages, so that more recent unread messages take priority.
@@ -101,7 +108,7 @@ namespace Content.Client.Administration.UI
                     return a.ActiveThisRound ? -1 : 1;
 
                 // Finally, sort by the most recent message.
-                return bch!.LastMessage.CompareTo(ach!.LastMessage);
+                return bch.LastMessage.CompareTo(ach.LastMessage);
             };
 
             Bans.OnPressed += _ =>
@@ -153,7 +160,10 @@ namespace Content.Client.Administration.UI
                     _console.ExecuteCommand($"respawn \"{_currentPlayer.Username}\"");
             };
 
-            OnOpen += () => ChannelSelector.PopulateList();
+            PopOut.OnPressed += _ =>
+            {
+                uiController.PopOut();
+            };
         }
 
         private Dictionary<Control, (CancellationTokenSource cancellation, string? originalText)> Confirmations { get; } = new();
@@ -163,13 +173,23 @@ namespace Content.Client.Administration.UI
             ChannelSelector.PopulateList();
         }
 
+
         public void SelectChannel(NetUserId channel)
         {
             if (!ChannelSelector.PlayerInfo.TryFirstOrDefault(
                 i => i.SessionId == channel, out var info))
                 return;
+
+            // clear filter if we're trying to select a channel for a player that isn't currently filtered
+            // i.e. through the message verb.
+            var data = new PlayerListData(info);
+            if (!ChannelSelector.PlayerListContainer.Data.Contains(data))
+            {
+                ChannelSelector.StopFiltering();
+            }
+
             ChannelSelector.PopulateList();
-            ChannelSelector.PlayerListContainer.Select(new PlayerListData(info));
+            ChannelSelector.PlayerListContainer.Select(data);
         }
 
         private void FixButtons()
@@ -199,7 +219,7 @@ namespace Content.Client.Administration.UI
             var sb = new StringBuilder();
             sb.Append(pl.Connected ? '●' : '○');
             sb.Append(' ');
-            if (_adminAHelpHelper.TryGetChannel(pl.SessionId, out var panel) && panel.Unread > 0)
+            if (AHelpHelper.TryGetChannel(pl.SessionId, out var panel) && panel.Unread > 0)
             {
                 if (panel.Unread < 11)
                     sb.Append(new Rune('➀' + (panel.Unread-1)));
@@ -225,7 +245,7 @@ namespace Content.Client.Administration.UI
         {
             foreach (var bw in BwoinkArea.Children)
                 bw.Visible = false;
-            var panel = _adminAHelpHelper.EnsurePanel(ch);
+            var panel = AHelpHelper.EnsurePanel(ch);
             panel.Visible = true;
         }
 

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

@@ -1,7 +1,9 @@
 <BoxContainer
     xmlns="https://spacestation14.io"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     Orientation="Vertical"
-    HorizontalExpand="true">
+    HorizontalExpand="True">
     <OutputPanel Name="TextOutput" VerticalExpand="true" />
     <HistoryLineEdit Name="SenderLineEdit" />
+    <RichTextLabel Name="RelayedToDiscordLabel" Access="Public" Visible="False" />
 </BoxContainer>

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

@@ -1,15 +1,10 @@
-#nullable enable
-using System;
-using Content.Client.Administration.Systems;
-using Content.Client.UserInterface.Systems.Bwoink;
 using Content.Shared.Administration;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Network;
 using Robust.Shared.Utility;
 
-namespace Content.Client.Administration.UI.CustomControls
+namespace Content.Client.Administration.UI.Bwoink
 {
     [GenerateTypedNameReferences]
     public sealed partial class BwoinkPanel : BoxContainer
@@ -22,6 +17,13 @@ namespace Content.Client.Administration.UI.CustomControls
         public BwoinkPanel(Action<string> messageSender)
         {
             RobustXamlLoader.Load(this);
+
+            var msg = new FormattedMessage();
+            msg.PushColor(Color.LightGray);
+            msg.AddText(Loc.GetString("bwoink-system-messages-being-relayed-to-discord"));
+            msg.Pop();
+            RelayedToDiscordLabel.SetMessage(msg);
+
             _messageSender = messageSender;
 
             OnVisibilityChanged += c =>

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

@@ -0,0 +1,8 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+            xmlns:cc="clr-namespace:Content.Client.Administration.UI.Bwoink"
+            SetSize="900 500"
+            HeaderClass="windowHeaderAlert"
+            TitleClass="windowTitleAlert"
+            Title="{Loc 'bwoink-user-title'}" >
+    <cc:BwoinkControl Name="Bwoink" Access="Public"/>
+</DefaultWindow>

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

@@ -0,0 +1,42 @@
+using System.Text;
+using System.Threading;
+using Content.Client.Administration.Managers;
+using Content.Client.Administration.UI.CustomControls;
+using Content.Client.Administration.UI.Tabs.AdminTab;
+using Content.Client.Stylesheets;
+using Content.Client.UserInterface.Systems.Bwoink;
+using Content.Shared.Administration;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Console;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Network;
+using Robust.Shared.Utility;
+using Timer = Robust.Shared.Timing.Timer;
+
+namespace Content.Client.Administration.UI.Bwoink
+{
+    /// <summary>
+    /// This window connects to a BwoinkSystem channel. BwoinkSystem manages the rest.
+    /// </summary>
+    [GenerateTypedNameReferences]
+    public sealed partial class BwoinkWindow : DefaultWindow
+    {
+        public BwoinkWindow()
+        {
+            RobustXamlLoader.Load(this);
+
+            Bwoink.ChannelSelector.OnSelectionChanged += sel =>
+            {
+                if (sel is not null)
+                {
+                    Title = $"{sel.CharacterName} / {sel.Username}";
+                }
+            };
+
+            OnOpen += () => Bwoink.ChannelSelector.PopulateList();
+        }
+    }
+}

Content.Client/Administration/UI/BwoinkWindow.xaml

@@ -1,22 +0,0 @@
-<DefaultWindow
-    xmlns="https://spacestation14.io"
-    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    SetSize="900 500"
-    HeaderClass="windowHeaderAlert"
-    TitleClass="windowTitleAlert"
-    Title="{Loc 'bwoink-user-title'}" >
-    <SplitContainer Orientation="Horizontal">
-        <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" HorizontalAlignment="Right">
-                <Button Visible="False" Name="Bans" Text="{Loc 'admin-player-actions-bans'}" />
-                <Button Visible="False" Name="Notes" Text="{Loc 'admin-player-actions-notes'}" />
-                <Button Visible="False" Name="Kick" Text="{Loc 'admin-player-actions-kick'}" />
-                <Button Visible="False" Name="Ban" Text="{Loc 'admin-player-actions-ban'}" />
-                <Button Visible="False" Name="Respawn" Text="{Loc 'admin-player-actions-respawn'}" />
-                <Button Visible="False" Name="Teleport" Text="{Loc 'admin-player-actions-teleport'}" />
-            </BoxContainer>
-        </BoxContainer>
-    </SplitContainer>
-</DefaultWindow>

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

@@ -1,11 +1,13 @@
-using Robust.Client.Console;
+using System.Diagnostics.CodeAnalysis;
+using Content.Client.Guidebook.Richtext;
+using Robust.Client.Console;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.IoC;
 
 namespace Content.Client.Administration.UI.CustomControls
 {
     [Virtual]
-    public class CommandButton : Button
+    public class CommandButton : Button, IDocumentTag
     {
         public string? Command { get; set; }
 
@@ -34,5 +36,20 @@ namespace Content.Client.Administration.UI.CustomControls
             if (!string.IsNullOrEmpty(Command))
                 IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(Command);
         }
+
+        public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out Control? control)
+        {
+            if (args.Count != 2 || !args.TryGetValue("Text", out var text) || !args.TryGetValue("Command", out var command))
+            {
+                Logger.Error($"Invalid arguments passed to {nameof(CommandButton)}");
+                control = null;
+                return false;
+            }
+
+            Command = command;
+            Text = Loc.GetString(text);
+            control = this;
+            return true;
+        }
     }
 }

Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs

@@ -2,10 +2,12 @@ using System.Linq;
 using Content.Client.Administration.Systems;
 using Content.Client.UserInterface.Controls;
 using Content.Client.Verbs;
+using Content.Client.Verbs.UI;
 using Content.Shared.Administration;
 using Content.Shared.Input;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Input;
@@ -56,10 +58,15 @@ namespace Content.Client.Administration.UI.CustomControls
             }
             else if (args.Event.Function == EngineKeyFunctions.UseSecondary && selectedPlayer.EntityUid != null)
             {
-                _verbSystem.VerbMenu.OpenVerbMenu(selectedPlayer.EntityUid.Value);
+                IoCManager.Resolve<IUserInterfaceManager>().GetUIController<VerbMenuUIController>().OpenVerbMenu(selectedPlayer.EntityUid.Value);
             }
         }
 
+        public void StopFiltering()
+        {
+            FilterLineEdit.Text = string.Empty;
+        }
+
         private void FilterList()
         {
             _sortedPlayerList.Clear();

Content.Client/Administration/UI/Logs/AdminLogsControl.xaml

@@ -32,6 +32,8 @@
                     <BoxContainer Orientation="Vertical" MinWidth="200">
                         <LineEdit Name="PlayerSearch" Access="Public" StyleClasses="actionSearchBox"
                                   HorizontalExpand="true" PlaceHolder="{Loc admin-logs-search-players-placeholder}"/>
+                        <Button Name="IncludeNonPlayersButton" Text="{Loc admin-logs-include-non-player}"
+                                MinWidth="100" StyleClasses="ButtonSquare" ToggleMode="True" />
                         <BoxContainer Orientation="Horizontal">
                             <Button Name="SelectAllPlayersButton" Text="{Loc admin-logs-select-all}"
                                     MinWidth="100" StyleClasses="ButtonSquare" />

Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs

@@ -34,6 +34,7 @@ public sealed partial class AdminLogsControl : Control
         SelectAllTypesButton.OnPressed += SelectAllTypes;
         SelectNoTypesButton.OnPressed += SelectNoTypes;
 
+        IncludeNonPlayersButton.OnPressed += IncludeNonPlayers;
         SelectAllPlayersButton.OnPressed += SelectAllPlayers;
         SelectNoPlayersButton.OnPressed += SelectNoPlayers;
 
@@ -53,6 +54,7 @@ public sealed partial class AdminLogsControl : Control
     public string Search => LogSearch.Text;
     private int ShownLogs { get; set; }
     private int TotalLogs { get; set; }
+    public bool IncludeNonPlayerLogs { get; set; }
 
     public HashSet<LogType> SelectedTypes { get; } = new();
 
@@ -73,7 +75,7 @@ public sealed partial class AdminLogsControl : Control
         UpdateResetButton();
     }
 
-    private void RoundSpinBoxChanged(object? sender, ValueChangedEventArgs args)
+    private void RoundSpinBoxChanged(ValueChangedEventArgs args)
     {
         UpdateResetButton();
     }
@@ -139,6 +141,13 @@ public sealed partial class AdminLogsControl : Control
         UpdateLogs();
     }
 
+    private void IncludeNonPlayers(ButtonEventArgs args)
+    {
+        IncludeNonPlayerLogs = args.Button.Pressed;
+
+        UpdateLogs();
+    }
+
     private void SelectAllPlayers(ButtonEventArgs args)
     {
         SelectedPlayers.Clear();
@@ -174,6 +183,32 @@ public sealed partial class AdminLogsControl : Control
         UpdateLogs();
     }
 
+    public void SetTypesSelection(HashSet<LogType> selectedTypes, bool invert = false)
+    {
+        SelectedTypes.Clear();
+
+        foreach (var control in TypesContainer.Children)
+        {
+            if (control is not AdminLogTypeButton type)
+            {
+                continue;
+            }
+
+            if (selectedTypes.Contains(type.Type) ^ invert)
+            {
+                type.Pressed = true;
+                SelectedTypes.Add(type.Type);
+            }
+            else
+            {
+                type.Pressed = false;
+                type.Visible = ShouldShowType(type);
+            }
+        }
+
+        UpdateLogs();
+    }
+
     public void UpdateTypes()
     {
         foreach (var control in TypesContainer.Children)
@@ -233,12 +268,33 @@ public sealed partial class AdminLogsControl : Control
                button.Text.Contains(PlayerSearch.Text, StringComparison.OrdinalIgnoreCase);
     }
 
+    private bool LogMatchesPlayerFilter(AdminLogLabel label)
+    {
+        if (label.Log.Players.Length == 0)
+            return SelectedPlayers.Count == 0 || IncludeNonPlayerLogs;
+
+        return SelectedPlayers.Overlaps(label.Log.Players);
+    }
+
     private bool ShouldShowLog(AdminLogLabel label)
     {
-        return SelectedTypes.Contains(label.Log.Type) &&
-               (SelectedPlayers.Count + label.Log.Players.Length == 0 || SelectedPlayers.Overlaps(label.Log.Players)) &&
-               SelectedImpacts.Contains(label.Log.Impact) &&
-               label.Log.Message.Contains(LogSearch.Text, StringComparison.OrdinalIgnoreCase);
+        // Check log type
+        if (!SelectedTypes.Contains(label.Log.Type))
+            return false;
+
+        // Check players
+        if (!LogMatchesPlayerFilter(label))
+            return false;
+
+        // Check impact
+        if (!SelectedImpacts.Contains(label.Log.Impact))
+            return false;
+
+        // Check search
+        if (!label.Log.Message.Contains(LogSearch.Text, StringComparison.OrdinalIgnoreCase))
+            return false;
+
+        return true;
     }
 
     private void TypeButtonPressed(ButtonEventArgs args)
@@ -455,6 +511,7 @@ public sealed partial class AdminLogsControl : Control
         SelectAllTypesButton.OnPressed -= SelectAllTypes;
         SelectNoTypesButton.OnPressed -= SelectNoTypes;
 
+        IncludeNonPlayersButton.OnPressed -= IncludeNonPlayers;
         SelectAllPlayersButton.OnPressed -= SelectAllPlayers;
         SelectNoPlayersButton.OnPressed -= SelectNoPlayers;
 

Content.Client/Administration/UI/Logs/AdminLogsEui.cs

@@ -51,8 +51,10 @@ public sealed class AdminLogsEui : BaseEui
             null,
             null,
             null,
+            LogsControl.SelectedPlayers.Count != 0,
             LogsControl.SelectedPlayers.ToArray(),
             null,
+            LogsControl.IncludeNonPlayerLogs,
             null,
             DateOrder.Descending);
 
@@ -137,6 +139,15 @@ public sealed class AdminLogsEui : BaseEui
 
                 LogsControl.NextButton.Disabled = !newLogs.HasNext;
                 break;
+
+            case SetLogFilter setLogFilter:
+                if (setLogFilter.Search != null)
+                    LogsControl.LogSearch.SetText(setLogFilter.Search);
+
+                if (setLogFilter.Types != null)
+                    LogsControl.SetTypesSelection(setLogFilter.Types, setLogFilter.InvertTypes);
+
+                break;
         }
     }
 

Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs

@@ -82,7 +82,7 @@ namespace Content.Client.Administration.UI.ManageSolutions
             volumeLabel.HorizontalExpand = true;
             volumeLabel.Margin = new Thickness(0, 4);
             volumeLabel.Text = Loc.GetString("admin-solutions-window-volume-label",
-                ("currentVolume", solution.CurrentVolume),
+                ("currentVolume", solution.Volume),
                 ("maxVolume", solution.MaxVolume));
 
             var capacityBox = new BoxContainer();
@@ -116,16 +116,16 @@ namespace Content.Client.Administration.UI.ManageSolutions
         private void UpdateThermalBox(Solution solution)
         {
             ThermalBox.DisposeAllChildren();
-
+            var heatCap = solution.GetHeatCapacity(null);
             var specificHeatLabel = new Label();
             specificHeatLabel.HorizontalExpand = true;
             specificHeatLabel.Margin = new Thickness(0, 1);
-            specificHeatLabel.Text = Loc.GetString("admin-solutions-window-specific-heat-label", ("specificHeat", solution.SpecificHeat.ToString("G3")));
+            specificHeatLabel.Text = Loc.GetString("admin-solutions-window-specific-heat-label", ("specificHeat", heatCap.ToString("G3")));
 
             var heatCapacityLabel = new Label();
             heatCapacityLabel.HorizontalExpand = true;
             heatCapacityLabel.Margin = new Thickness(0, 1);
-            heatCapacityLabel.Text = Loc.GetString("admin-solutions-window-heat-capacity-label", ("heatCapacity", solution.HeatCapacity.ToString("G3")));
+            heatCapacityLabel.Text = Loc.GetString("admin-solutions-window-heat-capacity-label", ("heatCapacity", (heatCap/solution.Volume.Float()).ToString("G3")));
 
             // Temperature entry:
             var temperatureBox = new BoxContainer();
@@ -161,7 +161,7 @@ namespace Content.Client.Administration.UI.ManageSolutions
             var thermalEnergySpin = new FloatSpinBox(1, 2);
             thermalEnergySpin.HorizontalExpand = true;
             thermalEnergySpin.Margin = new Thickness(0, 1);
-            thermalEnergySpin.Value = solution.ThermalEnergy;
+            thermalEnergySpin.Value = solution.Temperature * heatCap;
             thermalEnergySpin.OnValueChanged += SetThermalEnergy;
 
             thermalEnergyBox.AddChild(thermalEnergyLabel);

Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs

@@ -104,12 +104,12 @@ public sealed class ExplosionDebugOverlay : Overlay
 
                 var screenCenter = _eyeManager.WorldToScreen(worldCenter);
 
-                if (Intensity![i] > 9)
+                if (Intensity[i] > 9)
                     screenCenter += (-12, -8);
                 else
                     screenCenter += (-8, -8);
 
-                handle.DrawString(_font, screenCenter, Intensity![i].ToString("F2"));
+                handle.DrawString(_font, screenCenter, Intensity[i].ToString("F2"));
             }
         }
 
@@ -118,7 +118,7 @@ public sealed class ExplosionDebugOverlay : Overlay
             var epicenter = tileSets[0].First();
             var worldCenter = transform.Transform(((Vector2) epicenter + 0.5f) * tileSize);
             var screenCenter = _eyeManager.WorldToScreen(worldCenter) + (-24, -24);
-            var text = $"{Intensity![0]:F2}\nΣ={TotalIntensity:F1}\nΔ={Slope:F1}";
+            var text = $"{Intensity[0]:F2}\nΣ={TotalIntensity:F1}\nΔ={Slope:F1}";
             handle.DrawString(_font, screenCenter, text);
         }
     }
@@ -159,7 +159,7 @@ public sealed class ExplosionDebugOverlay : Overlay
     {
         for (var i = 0; i < Intensity.Count; i++)
         {
-            var color = ColorMap(Intensity![i]);
+            var color = ColorMap(Intensity[i]);
             var colorTransparent = color;
             colorTransparent.A = 0.2f;
 
@@ -183,7 +183,7 @@ public sealed class ExplosionDebugOverlay : Overlay
 
     private Color ColorMap(float intensity)
     {
-        var frac = 1 - intensity / Intensity![0];
+        var frac = 1 - intensity / Intensity[0];
         Color result;
         if (frac < 0.5f)
             result = Color.InterpolateBetween(Color.Red, Color.Orange, frac * 2);

Content.Client/Administration/UI/Tabs/AdminTab/AdminShuttleWindow.xaml

@@ -7,8 +7,9 @@
             <LineEdit Name="_callShuttleTime" Text="4:00" PlaceHolder="m:ss" HorizontalExpand="True" SizeFlagsStretchRatio="2"/>
             <Control HorizontalExpand="True" SizeFlagsStretchRatio="1"/>
             <cc:CommandButton Command="callshuttle 4:00" Name="_callShuttleButton" Text="{Loc 'comms-console-menu-call-shuttle'}" HorizontalExpand="True" SizeFlagsStretchRatio="2" />
+            <!-- Corvax: Move button -->
+            <cc:CommandButton Command="recallshuttle" Name="_recallShuttleButton" Text="{Loc 'comms-console-menu-recall-shuttle'}" HorizontalAlignment="Center" SizeFlagsStretchRatio="3" />
         </BoxContainer>
-        <cc:CommandButton Command="recallshuttle" Name="_recallShuttleButton" Text="{Loc 'comms-console-menu-recall-shuttle'}" HorizontalAlignment="Center"/>
     </BoxContainer>
 
 </DefaultWindow>

Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs

@@ -76,7 +76,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
             Reset();
         }
 
-        private void OnRotate(object? sender, ValueChangedEventArgs e)
+        private void OnRotate(ValueChangedEventArgs e)
         {
             var newValue = Wraparound(e.Value);
 

Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml

@@ -1,5 +1,4 @@
 <Control xmlns="https://spacestation14.io"
-         xmlns:pt="clr-namespace:Content.Client.Administration.UI.Tabs.PlayerTab"
          xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">

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

@@ -32,7 +32,7 @@ public sealed partial class ObjectsTab : Control
         foreach (var type in Enum.GetValues(typeof(ObjectsTabSelection)))
         {
             _selections.Add((ObjectsTabSelection)type!);
-            ObjectTypeOptions.AddItem(Enum.GetName((ObjectsTabSelection)type!)!);
+            ObjectTypeOptions.AddItem(Enum.GetName((ObjectsTabSelection)type)!);
         }
 
         RefreshObjectList(_selections[ObjectTypeOptions.SelectedId]);
@@ -43,9 +43,9 @@ public sealed partial class ObjectsTab : Control
         var entities = selection switch
         {
             ObjectsTabSelection.Stations => _entityManager.EntitySysManager.GetEntitySystem<StationSystem>().Stations.ToList(),
-            ObjectsTabSelection.Grids => _entityManager.EntityQuery<MapGridComponent>(true).Select(x => ((Component) x).Owner).ToList(),
+            ObjectsTabSelection.Grids => _entityManager.EntityQuery<MapGridComponent>(true).Select(x => x.Owner).ToList(),
             ObjectsTabSelection.Maps => _entityManager.EntityQuery<MapComponent>(true).Select(x => x.Owner).ToList(),
-            _ => throw new ArgumentOutOfRangeException(nameof(selection), selection, null)
+            _ => throw new ArgumentOutOfRangeException(nameof(selection), selection, null),
         };
 
         foreach (var control in _objects)

Content.Client/Administration/UI/Tabs/ServerTab.xaml

@@ -5,9 +5,9 @@
     MinSize="50 50">
     <GridContainer
         Columns="4" >
-        <cc:CommandButton Command="restart" Text="{Loc server-reboot}" />
         <cc:CommandButton Command="shutdown" Text="{Loc server-shutdown}" />
         <cc:CommandButton Name="SetOocButton" Command="setooc" Text="{Loc server-ooc-toggle}" ToggleMode="True" />
         <cc:CommandButton Name="SetLoocButton" Command="setlooc" Text="{Loc server-looc-toggle}" ToggleMode="True" />
+        <cc:CommandButton Name="SetPanicbunkerButton" Command="panicbunker" Text="{Loc server-panicbunker-toggle}" ToggleMode="True" />
     </GridContainer>
 </Control>

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

@@ -18,6 +18,7 @@ namespace Content.Client.Administration.UI.Tabs
 
             _config.OnValueChanged(CCVars.OocEnabled, OocEnabledChanged, true);
             _config.OnValueChanged(CCVars.LoocEnabled, LoocEnabledChanged, true);
+            _config.OnValueChanged(CCVars.PanicBunkerEnabled, BunkerEnabledChanged, true);
         }
 
         private void OocEnabledChanged(bool value)
@@ -30,6 +31,11 @@ namespace Content.Client.Administration.UI.Tabs
             SetLoocButton.Pressed = value;
         }
 
+        private void BunkerEnabledChanged(bool value)
+        {
+            SetPanicbunkerButton.Pressed = value;
+        }
+
         protected override void Dispose(bool disposing)
         {
             base.Dispose(disposing);
@@ -38,6 +44,7 @@ namespace Content.Client.Administration.UI.Tabs
             {
                 _config.UnsubValueChanged(CCVars.OocEnabled, OocEnabledChanged);
                 _config.UnsubValueChanged(CCVars.LoocEnabled, LoocEnabledChanged);
+                _config.UnsubValueChanged(CCVars.PanicBunkerEnabled, BunkerEnabledChanged);
             }
         }
     }

Content.Client/AirlockPainter/UI/AirlockPainterBoundUserInterface.cs

@@ -1,12 +1,15 @@
 using Content.Shared.AirlockPainter;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.AirlockPainter.UI
 {
     public sealed class AirlockPainterBoundUserInterface : BoundUserInterface
     {
         private AirlockPainterWindow? _window;
-        public List<string> Styles = new();
+        private AirlockPainterSystem? _painter;
+
+        [Dependency] private readonly IEntitySystemManager _entitySystems = default!;
 
         public AirlockPainterBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
@@ -17,22 +20,33 @@ namespace Content.Client.AirlockPainter.UI
             base.Open();
 
             _window = new AirlockPainterWindow();
-            if (State != null)
-                UpdateState(State);
 
-            // Add styles
-            var painterSystem = EntitySystem.Get<AirlockPainterSystem>();
-            _window.Populate(painterSystem.Entries);
+            _painter = _entitySystems.GetEntitySystem<AirlockPainterSystem>();
 
             _window.OpenCentered();
-
             _window.OnClose += Close;
-            _window.OnSpritePicked += OnSpritePicked;
+            _window.OnSpritePicked = OnSpritePicked;
         }
 
-        private void OnSpritePicked(int index)
+        protected override void UpdateState(BoundUserInterfaceState state)
         {
-            SendMessage(new AirlockPainterSpritePickedMessage(index));
+            base.UpdateState(state);
+
+            if (_window == null)
+                return;
+
+            if (_painter == null)
+                return;
+
+            if (state is not AirlockPainterBoundUserInterfaceState stateCast)
+                return;
+
+            _window.Populate(_painter.Entries, stateCast.SelectedStyle);
+        }
+
+        private void OnSpritePicked(ItemList.ItemListSelectedEventArgs args)
+        {
+            SendMessage(new AirlockPainterSpritePickedMessage(args.ItemIndex));
         }
     }
 }

Content.Client/AirlockPainter/UI/AirlockPainterWindow.xaml

@@ -1,6 +1,6 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             MinSize="300 300"
-            SetSize="300 300"
+            SetSize="300 500"
             Title="{Loc 'airlock-painter-window-title'}">
     <BoxContainer Orientation="Vertical" SeparationOverride="4" MinWidth="150">
         <Label Name="SelectedSpriteLabel"

Content.Client/AirlockPainter/UI/AirlockPainterWindow.xaml.cs

@@ -1,4 +1,5 @@
 using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 
@@ -7,22 +8,32 @@ namespace Content.Client.AirlockPainter.UI
     [GenerateTypedNameReferences]
     public sealed partial class AirlockPainterWindow : DefaultWindow
     {
-        public event Action<int>? OnSpritePicked;
+        public Action<ItemList.ItemListSelectedEventArgs>? OnSpritePicked;
+
+        private List<AirlockPainterEntry> CurrentEntries = new List<AirlockPainterEntry>();
 
         public AirlockPainterWindow()
         {
             RobustXamlLoader.Load(this);
-
-            SpriteList.OnItemSelected += e => OnSpritePicked?.Invoke(e.ItemIndex);
         }
 
-        public void Populate(List<AirlockPainterEntry> entries)
+        public void Populate(List<AirlockPainterEntry> entries, int selected)
         {
-            SpriteList.Clear();
-            foreach (var entry in entries)
+            // Only clear if the entries change. Otherwise the list would "jump" after selecting an item
+            if (!CurrentEntries.Equals(entries))
             {
-                SpriteList.AddItem(entry.Name, entry.Icon);
+                CurrentEntries = entries;
+                SpriteList.Clear();
+                foreach (var entry in entries)
+                {
+                    SpriteList.AddItem(entry.Name, entry.Icon);
+                }
             }
+
+            // Disable event so we don't send a new event for pre-selected entry and end up in a loop
+            SpriteList.OnItemSelected -= OnSpritePicked;
+            SpriteList[selected].Selected = true;
+            SpriteList.OnItemSelected += OnSpritePicked;
         }
     }
 }

Content.Client/AlertLevel/AlertLevelDisplaySystem.cs

@@ -15,32 +15,32 @@ public sealed class AlertLevelDisplaySystem : EntitySystem
         SubscribeLocalEvent<AlertLevelDisplayComponent, AppearanceChangeEvent>(OnAppearanceChange);
     }
 
-    private void OnAppearanceChange(EntityUid uid, AlertLevelDisplayComponent component, ref AppearanceChangeEvent args)
+    private void OnAppearanceChange(EntityUid uid, AlertLevelDisplayComponent alertLevelDisplay, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
         {
             return;
         }
+        var layer = args.Sprite.LayerMapReserveBlank(AlertLevelDisplay.Layer);
 
-        if (!args.Sprite.LayerMapTryGet(AlertLevelDisplay.Layer, out _))
+        if (args.AppearanceData.TryGetValue(AlertLevelDisplay.Powered, out var poweredObject))
         {
-            var layer = args.Sprite.AddLayer(new RSI.StateId(component.AlertVisuals.Values.First()));
-            args.Sprite.LayerMapSet(AlertLevelDisplay.Layer, layer);
+            args.Sprite.LayerSetVisible(layer, poweredObject is true);
         }
 
         if (!args.AppearanceData.TryGetValue(AlertLevelDisplay.CurrentLevel, out var level))
         {
-            args.Sprite.LayerSetState(AlertLevelDisplay.Layer, new RSI.StateId(component.AlertVisuals.Values.First()));
+            args.Sprite.LayerSetState(layer, alertLevelDisplay.AlertVisuals.Values.First());
             return;
         }
 
-        if (component.AlertVisuals.TryGetValue((string) level, out var visual))
+        if (alertLevelDisplay.AlertVisuals.TryGetValue((string) level, out var visual))
         {
-            args.Sprite.LayerSetState(AlertLevelDisplay.Layer, new RSI.StateId(visual));
+            args.Sprite.LayerSetState(layer, visual);
         }
         else
         {
-            args.Sprite.LayerSetState(AlertLevelDisplay.Layer, new RSI.StateId(component.AlertVisuals.Values.First()));
+            args.Sprite.LayerSetState(layer, alertLevelDisplay.AlertVisuals.Values.First());
         }
     }
 }

Content.Client/Animations/AnimationsTestComponent.cs

@@ -34,7 +34,7 @@ namespace Content.Client.Animations
                     },
                     new AnimationTrackComponentProperty
                     {
-                        ComponentType = typeof(ISpriteComponent),
+                        ComponentType = typeof(SpriteComponent),
                         Property = "layer/0/texture",
                         KeyFrames =
                         {

Content.Client/Anomaly/AnomalySystem.cs

@@ -0,0 +1,75 @@
+using Content.Client.Gravity;
+using Content.Shared.Anomaly;
+using Content.Shared.Anomaly.Components;
+using Robust.Client.GameObjects;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Anomaly;
+
+public sealed class AnomalySystem : SharedAnomalySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly FloatingVisualizerSystem _floating = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AnomalyComponent, AppearanceChangeEvent>(OnAppearanceChanged);
+        SubscribeLocalEvent<AnomalyComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<AnomalyComponent, AnimationCompletedEvent>(OnAnimationComplete);
+    }
+
+    private void OnStartup(EntityUid uid, AnomalyComponent component, ComponentStartup args)
+    {
+        _floating.FloatAnimation(uid, component.FloatingOffset, component.AnimationKey, component.AnimationTime);
+    }
+
+    private void OnAnimationComplete(EntityUid uid, AnomalyComponent component, AnimationCompletedEvent args)
+    {
+        if (args.Key != component.AnimationKey)
+            return;
+        _floating.FloatAnimation(uid, component.FloatingOffset, component.AnimationKey, component.AnimationTime);
+    }
+
+    private void OnAppearanceChanged(EntityUid uid, AnomalyComponent component, ref AppearanceChangeEvent args)
+    {
+        if (args.Sprite is not { } sprite)
+            return;
+
+        if (!Appearance.TryGetData<bool>(uid, AnomalyVisuals.IsPulsing, out var pulsing, args.Component))
+            pulsing = false;
+
+        if (Appearance.TryGetData<bool>(uid, AnomalyVisuals.Supercritical, out var super, args.Component) && super)
+            pulsing = super;
+
+        if (HasComp<AnomalySupercriticalComponent>(uid))
+            pulsing = true;
+
+        if (!sprite.LayerMapTryGet(AnomalyVisualLayers.Base, out var layer) ||
+            !sprite.LayerMapTryGet(AnomalyVisualLayers.Animated, out var animatedLayer))
+            return;
+
+        sprite.LayerSetVisible(layer, !pulsing);
+        sprite.LayerSetVisible(animatedLayer, pulsing);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        foreach (var (super, sprite) in EntityQuery<AnomalySupercriticalComponent, SpriteComponent>())
+        {
+            var completion = 1f - (float) ((super.EndTime - _timing.CurTime) / super.SupercriticalDuration);
+            var scale = completion * (super.MaxScaleAmount - 1f) + 1f;
+            sprite.Scale = new Vector2(scale, scale);
+
+            var transparency = (byte) (65 * (1f - completion) + 190);
+            if (transparency < sprite.Color.AByte)
+            {
+                sprite.Color = sprite.Color.WithAlpha(transparency);
+            }
+        }
+    }
+}

Content.Client/Anomaly/Effects/GravityAnomalySystem.cs

@@ -0,0 +1,8 @@
+using Content.Shared.Anomaly.Effects;
+
+namespace Content.Client.Anomaly.Effects;
+
+public sealed class GravityAnomalySystem : SharedGravityAnomalySystem
+{
+    // this is not the system you are looking for
+}

Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs

@@ -0,0 +1,54 @@
+using Content.Shared.Anomaly;
+using Content.Shared.Gravity;
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+
+namespace Content.Client. Anomaly.Ui;
+
+[UsedImplicitly]
+public sealed class AnomalyGeneratorBoundUserInterface : BoundUserInterface
+{
+    private AnomalyGeneratorWindow? _window;
+
+    public AnomalyGeneratorBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base (owner, uiKey)
+    {
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _window = new (Owner.Owner);
+
+        _window.OpenCentered();
+        _window.OnClose += Close;
+
+        _window.OnGenerateButtonPressed += () =>
+        {
+            SendMessage(new AnomalyGeneratorGenerateButtonPressedEvent());
+        };
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        if (state is not AnomalyGeneratorUserInterfaceState msg)
+            return;
+        _window?.UpdateState(msg);
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (!disposing) return;
+
+        _window?.Dispose();
+    }
+
+    public void SetPowerSwitch(bool on)
+    {
+        SendMessage(new SharedGravityGeneratorComponent.SwitchGeneratorMessage(on));
+    }
+}
+

Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml

@@ -0,0 +1,48 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                Title="{Loc 'anomaly-generator-ui-title'}"
+                MinSize="270 180"
+                SetSize="360 180">
+    <BoxContainer Margin="10 0 10 0"
+                  Orientation="Vertical"
+                  HorizontalExpand="True"
+                  VerticalExpand="True">
+        <BoxContainer Orientation="Horizontal">
+            <BoxContainer Orientation="Vertical" HorizontalExpand="True">
+                <BoxContainer Orientation="Horizontal"
+                              HorizontalExpand="True"
+                              VerticalExpand="True"
+                              Margin="0 0 0 0"
+                              VerticalAlignment="Center">
+                    <Label Text="{Loc 'anomaly-generator-fuel-display'}" StyleClasses="StatusFieldTitle" />
+                    <ProgressBar Name="FuelBar"
+                                 HorizontalExpand="True"
+                                 MaxValue="1"
+                                 MinValue="0"
+                                 SetHeight="25"
+                                 Margin="10 0 10 0"
+                                 VerticalAlignment="Center">
+                        <Label Name="FuelText"
+                               Margin="4 0"
+                               Text="0 %" />
+                    </ProgressBar>
+                </BoxContainer>
+                <RichTextLabel Name="CooldownLabel" StyleClasses="StatusFieldTitle" />
+                <RichTextLabel Name="ReadyLabel" StyleClasses="StatusFieldTitle" />
+            </BoxContainer>
+            <PanelContainer Margin="12 0 0 0"
+                            StyleClasses="Inset"
+                            VerticalAlignment="Center">
+                <SpriteView Name="EntityView"
+                            SetSize="96 96"
+                            OverrideDirection="South" />
+            </PanelContainer>
+        </BoxContainer>
+        <BoxContainer VerticalExpand="True"
+                      HorizontalAlignment="Center"
+                      VerticalAlignment="Center">
+            <Button Name="GenerateButton"
+                    Text="{Loc 'anomaly-generator-generate'}"></Button>
+        </BoxContainer>
+    </BoxContainer>
+</controls:FancyWindow>

Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs

@@ -0,0 +1,82 @@
+using Content.Client.Message;
+using Content.Shared.Anomaly;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Timing;
+using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow;
+
+namespace Content.Client.Anomaly.Ui;
+
+[GenerateTypedNameReferences]
+public sealed partial class AnomalyGeneratorWindow : FancyWindow
+{
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    private TimeSpan _cooldownEnd = TimeSpan.Zero;
+    private bool _hasEnoughFuel;
+
+    public Action? OnGenerateButtonPressed;
+
+    public AnomalyGeneratorWindow(EntityUid gen)
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        EntityView.Sprite = _entityManager.GetComponent<SpriteComponent>(gen);
+
+        GenerateButton.OnPressed += _ => OnGenerateButtonPressed?.Invoke();
+    }
+
+    public void UpdateState(AnomalyGeneratorUserInterfaceState state)
+    {
+        _cooldownEnd = state.CooldownEndTime;
+        _hasEnoughFuel = state.FuelCost <= state.FuelAmount;
+
+        var fuelCompletion = Math.Clamp((float) state.FuelAmount / state.FuelCost, 0f, 1f);
+
+        FuelBar.Value = fuelCompletion;
+
+        var charges = state.FuelAmount / state.FuelCost;
+        FuelText.Text = Loc.GetString("anomaly-generator-charges", ("charges", charges));
+
+        UpdateTimer();
+        UpdateReady(); // yes this can trigger twice. no i don't care
+    }
+
+    public void UpdateTimer()
+    {
+        if (_timing.CurTime > _cooldownEnd)
+        {
+            CooldownLabel.SetMarkup(Loc.GetString("anomaly-generator-no-cooldown"));
+        }
+        else
+        {
+            var timeLeft = _cooldownEnd - _timing.CurTime;
+            var timeString = $"{timeLeft.Minutes:0}:{timeLeft.Seconds:00}";
+            CooldownLabel.SetMarkup(Loc.GetString("anomaly-generator-cooldown", ("time", timeString)));
+            UpdateReady();
+        }
+    }
+
+    public void UpdateReady()
+    {
+        var ready = _hasEnoughFuel && _timing.CurTime > _cooldownEnd;
+
+        var msg = ready
+            ? Loc.GetString("anomaly-generator-yes-fire")
+            : Loc.GetString("anomaly-generator-no-fire");
+        ReadyLabel.SetMarkup(msg);
+
+        GenerateButton.Disabled = !ready;
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        UpdateTimer();
+    }
+}
+

Content.Client/Anomaly/Ui/AnomalyScannerBoundUserInterface.cs

@@ -0,0 +1,48 @@
+using Content.Shared.Anomaly;
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Anomaly.Ui;
+
+[UsedImplicitly]
+public sealed class AnomalyScannerBoundUserInterface : BoundUserInterface
+{
+    private AnomalyScannerMenu? _menu;
+
+    public AnomalyScannerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
+    {
+
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _menu = new AnomalyScannerMenu();
+        _menu.OpenCentered();
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        if (state is not AnomalyScannerUserInterfaceState msg)
+            return;
+
+        if (_menu == null)
+            return;
+
+        _menu.LastMessage = msg.Message;
+        _menu.NextPulseTime = msg.NextPulseTime;
+        _menu.UpdateMenu();
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (!disposing)
+            return;
+        _menu?.Dispose();
+    }
+}
+

Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml

@@ -0,0 +1,12 @@
+<controls:FancyWindow
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    Title="{Loc 'anomaly-scanner-ui-title'}"
+    MinSize="350 260"
+    SetSize="350 260">
+    <BoxContainer Orientation="Vertical" VerticalExpand="True" Margin="10 0 10 10">
+        <RichTextLabel Name="TextDisplay"></RichTextLabel>
+    </BoxContainer>
+</controls:FancyWindow>
+
+

Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml.cs

@@ -0,0 +1,47 @@
+using Content.Client.Message;
+using Content.Client.UserInterface.Controls;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Anomaly.Ui;
+
+[GenerateTypedNameReferences]
+public sealed partial class AnomalyScannerMenu : FancyWindow
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public FormattedMessage LastMessage = new();
+    public TimeSpan? NextPulseTime;
+
+    public AnomalyScannerMenu()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+    }
+
+    public void UpdateMenu()
+    {
+        var msg = new FormattedMessage(LastMessage);
+
+        if (NextPulseTime != null)
+        {
+            msg.PushNewline();
+            msg.PushNewline();
+            var time = NextPulseTime.Value - _timing.CurTime;
+            var timestring = $"{time.Minutes:00}:{time.Seconds:00}";
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-pulse-timer", ("time", timestring)));
+        }
+
+        TextDisplay.SetMarkup(msg.ToMarkup());
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        if (NextPulseTime != null)
+            UpdateMenu();
+    }
+}

Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs

@@ -2,7 +2,6 @@ using Content.Client.SubFloor;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.Piping;
-using Content.Shared.SubFloor;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.ResourceManagement;
@@ -13,6 +12,7 @@ namespace Content.Client.Atmos.EntitySystems;
 public sealed class AtmosPipeAppearanceSystem : EntitySystem
 {
     [Dependency] private readonly IResourceCache _resCache = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
 
     public override void Initialize()
     {
@@ -44,6 +44,18 @@ public sealed class AtmosPipeAppearanceSystem : EntitySystem
         }
     }
 
+    private void HideAllPipeConnection(SpriteComponent sprite)
+    {
+        foreach (PipeConnectionLayer layerKey in Enum.GetValues(typeof(PipeConnectionLayer)))
+        {
+            if (!sprite.LayerMapTryGet(layerKey, out var key))
+                continue;
+
+            var layer = sprite[key];
+            layer.Visible = false;
+        }
+    }
+
     private void OnAppearanceChanged(EntityUid uid, PipeAppearanceComponent component, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
@@ -56,11 +68,14 @@ public sealed class AtmosPipeAppearanceSystem : EntitySystem
             return;
         }
 
-        if (!args.Component.TryGetData(PipeColorVisuals.Color, out Color color))
-            color = Color.White;
-
-        if (!args.Component.TryGetData(PipeVisuals.VisualState, out PipeDirection worldConnectedDirections))
+        if (!_appearance.TryGetData<PipeDirection>(uid, PipeVisuals.VisualState, out var worldConnectedDirections, args.Component))
+        {
+            HideAllPipeConnection(args.Sprite);
             return;
+        }
+
+        if (!_appearance.TryGetData<Color>(uid, PipeColorVisuals.Color, out var color, args.Component))
+            color = Color.White;
 
         // transform connected directions to local-coordinates
         var connectedDirections = worldConnectedDirections.RotatePipeDirection(-Transform(uid).LocalRotation);

Content.Client/Atmos/EntitySystems/FireVisualizerSystem.cs

@@ -27,8 +27,13 @@ public sealed class FireVisualizerSystem : VisualizerSystem<FireVisualsComponent
             component.LightEntity = null;
         }
 
-        if (TryComp<SpriteComponent>(uid, out var sprite))
-            sprite.RemoveLayer(FireVisualLayers.Fire);
+        // Need LayerMapTryGet because Init fails if there's no existing sprite / appearancecomp
+        // which means in some setups (most frequently no AppearanceComp) the layer never exists.
+        if (TryComp<SpriteComponent>(uid, out var sprite) &&
+            sprite.LayerMapTryGet(FireVisualLayers.Fire, out var layer))
+        {
+            sprite.RemoveLayer(layer);
+        }
     }
 
     private void OnComponentInit(EntityUid uid, FireVisualsComponent component, ComponentInit args)
@@ -56,8 +61,8 @@ public sealed class FireVisualizerSystem : VisualizerSystem<FireVisualsComponent
         if (!sprite.LayerMapTryGet(FireVisualLayers.Fire, out var index))
             return;
 
-        appearance.TryGetData(FireVisuals.OnFire, out bool onFire);
-        appearance.TryGetData(FireVisuals.FireStacks, out float fireStacks);
+        AppearanceSystem.TryGetData<bool>(uid, FireVisuals.OnFire, out var onFire, appearance);
+        AppearanceSystem.TryGetData<float>(uid, FireVisuals.FireStacks, out var fireStacks, appearance);
         sprite.LayerSetVisible(index, onFire);
 
         if (!onFire)

Content.Client/Atmos/EntitySystems/PipeColorVisualizerSystem.cs

@@ -8,8 +8,8 @@ public sealed class PipeColorVisualizerSystem : VisualizerSystem<PipeColorVisual
 {
     protected override void OnAppearanceChange(EntityUid uid, PipeColorVisualsComponent component, ref AppearanceChangeEvent args)
     {
-        if(TryComp<SpriteComponent>(uid, out var sprite)
-            && args.Component.TryGetData<Color>(PipeColorVisuals.Color, out var color))
+        if (TryComp<SpriteComponent>(uid, out var sprite)
+            && AppearanceSystem.TryGetData<Color>(uid, PipeColorVisuals.Color, out var color, args.Component))
         {
             // T-ray scanner / sub floor runs after this visualizer. Lets not bulldoze transparency.
             var layer = sprite[PipeVisualLayers.Pipe];

Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs

@@ -43,7 +43,7 @@ public sealed partial class PumpControl : BoxContainer
             PumpDataChanged?.Invoke(_address, _data);
         };
 
-        _internalBound.Value = (float) _data.InternalPressureBound;
+        _internalBound.Value = _data.InternalPressureBound;
         _internalBound.OnValueChanged += _ =>
         {
             _data.InternalPressureBound = _internalBound.Value;
@@ -51,7 +51,7 @@ public sealed partial class PumpControl : BoxContainer
         };
         _internalBound.IsValid += value => value >= 0;
 
-        _externalBound.Value = (float) _data.ExternalPressureBound;
+        _externalBound.Value = _data.ExternalPressureBound;
         _externalBound.OnValueChanged += _ =>
         {
             _data.ExternalPressureBound = _externalBound.Value;

Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs

@@ -33,7 +33,7 @@ public sealed partial class ThresholdBoundControl : BoxContainer
     public void SetValue(float value)
     {
         _value = value;
-        CSpinner.Value = (float) ScaledValue!;
+        CSpinner.Value = ScaledValue;
     }
 
     public void SetEnabled(bool enabled)

Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs

@@ -55,7 +55,7 @@ namespace Content.Client.Atmos.Overlays
                         var dataMaybeNull = _atmosDebugOverlaySystem.GetData(mapGrid.Owner, tile.GridIndices);
                         if (dataMaybeNull != null)
                         {
-                            var data = (SharedAtmosDebugOverlaySystem.AtmosDebugOverlayData) dataMaybeNull!;
+                            var data = (SharedAtmosDebugOverlaySystem.AtmosDebugOverlayData) dataMaybeNull;
                             if (pass == 0)
                             {
                                 // -- Mole Count --

Content.Client/Atmos/Overlays/GasTileOverlay.cs

@@ -40,7 +40,7 @@ namespace Content.Client.Atmos.Overlays
 
         private int _gasCount;
 
-        public const int GasOverlayZIndex = (int) Content.Shared.DrawDepth.DrawDepth.Effects; // Under ghosts, above mostly everything else
+        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)
         {

Content.Client/Atmos/UI/GasFilterWindow.xaml

@@ -1,6 +1,5 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:s="clr-namespace:Content.Client.Stylesheets"
             MinSize="480 400" Title="Filter">
     <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">

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

@@ -37,7 +37,7 @@ namespace Content.Client.Atmos.UI
             FilterTransferRateInput.OnTextChanged += _ => SetFilterRate.Disabled = false;
             SetFilterRate.OnPressed += _ =>
             {
-                FilterTransferRateChanged?.Invoke(FilterTransferRateInput.Text ??= "");
+                FilterTransferRateChanged?.Invoke(FilterTransferRateInput.Text);
                 SetFilterRate.Disabled = true;
             };
 

Content.Client/Atmos/UI/GasMixerWindow.xaml

@@ -1,6 +1,5 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:s="clr-namespace:Content.Client.Stylesheets"
             MinSize="200 200" Title="Gas Mixer">
     <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">

Content.Client/Atmos/UI/GasPressurePumpWindow.xaml

@@ -1,6 +1,5 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:s="clr-namespace:Content.Client.Stylesheets"
             MinSize="200 120" Title="Pressure Pump">
     <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">

Content.Client/Atmos/UI/GasVolumePumpWindow.xaml

@@ -1,6 +1,5 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:s="clr-namespace:Content.Client.Stylesheets"
             MinSize="200 120" Title="Volume Pump">
     <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">

Content.Client/Atmos/Visualizers/PortableScrubberVisualsSystem.cs

@@ -14,8 +14,8 @@ namespace Content.Client.Atmos.Visualizers
             if (args.Sprite == null)
                 return;
 
-            if (args.Component.TryGetData(PortableScrubberVisuals.IsFull, out bool isFull)
-                && args.Component.TryGetData(PortableScrubberVisuals.IsRunning, out bool isRunning))
+            if (AppearanceSystem.TryGetData<bool>(uid, PortableScrubberVisuals.IsFull, out var isFull, args.Component)
+                && AppearanceSystem.TryGetData<bool>(uid, PortableScrubberVisuals.IsRunning, out var isRunning, args.Component))
             {
                 var runningState = isRunning ? component.RunningState : component.IdleState;
                 args.Sprite.LayerSetState(PortableScrubberVisualLayers.IsRunning, runningState);
@@ -24,7 +24,7 @@ namespace Content.Client.Atmos.Visualizers
                 args.Sprite.LayerSetState(PowerDeviceVisualLayers.Powered, fullState);
             }
 
-            if (args.Component.TryGetData(PortableScrubberVisuals.IsDraining, out bool isDraining))
+            if (AppearanceSystem.TryGetData<bool>(uid, PortableScrubberVisuals.IsDraining, out var isDraining, args.Component))
             {
                 args.Sprite.LayerSetVisible(PortableScrubberVisualLayers.IsDraining, isDraining);
             }

Content.Client/Audio/AmbientSoundSystem.cs

@@ -41,7 +41,7 @@ namespace Content.Client.Audio
         private float _ambienceVolume = 0.0f;
 
         private static AudioParams _params = AudioParams.Default.WithVariation(0.01f).WithLoop(true).WithAttenuation(Attenuation.LinearDistance);
-            
+
         /// <summary>
         /// How many times we can be playing 1 particular sound at once.
         /// </summary>
@@ -221,13 +221,18 @@ namespace Content.Client.Audio
         private void ProcessNearbyAmbience(TransformComponent playerXform)
         {
             var query = GetEntityQuery<TransformComponent>();
+            var metaQuery = GetEntityQuery<MetaDataComponent>();
             var mapPos = playerXform.MapPosition;
 
             // Remove out-of-range ambiences
             foreach (var (comp, sound) in _playingSounds)
             {
                 var entity = comp.Owner;
-                if (comp.Enabled && query.TryGetComponent(entity, out var xform) && xform.MapID == playerXform.MapID)
+
+                if (comp.Enabled &&
+                    query.TryGetComponent(entity, out var xform) &&
+                    xform.MapID == playerXform.MapID &&
+                    !metaQuery.GetComponent(entity).EntityPaused)
                 {
                     var distance = (xform.ParentUid == playerXform.ParentUid)
                         ? xform.LocalPosition - playerXform.LocalPosition
@@ -265,7 +270,10 @@ namespace Content.Client.Audio
 
                 foreach (var (_, comp) in sources)
                 {
-                    if (_playingSounds.ContainsKey(comp))
+                    var uid = comp.Owner;
+
+                    if (_playingSounds.ContainsKey(comp) ||
+                        metaQuery.GetComponent(uid).EntityPaused)
                         continue;
 
                     var audioParams = _params
@@ -274,7 +282,7 @@ namespace Content.Client.Audio
                         .WithPlayOffset(_random.NextFloat(0.0f, 100.0f))
                         .WithMaxDistance(comp.Range);
 
-                    var stream = _audio.PlayPvs(comp.Sound, comp.Owner, audioParams);
+                    var stream = _audio.PlayPvs(comp.Sound, uid, audioParams);
                     if (stream == null)
                         continue;
 

Content.Client/Audio/BackgroundAudioSystem.cs

@@ -203,7 +203,7 @@ public sealed class BackgroundAudioSystem : EntitySystem
             _ambientParams.WithVolume(_ambientParams.Volume + _configManager.GetCVar(CCVars.AmbienceVolume)));
     }
 
-    private void EndAmbience()
+    public void EndAmbience()
     {
         _playingCollection = null;
         _ambientStream?.Stop();

Content.Client/BarSign/BarSignSystem.cs

@@ -35,7 +35,7 @@ public sealed class BarSignSystem : VisualizerSystem<BarSignComponent>
         if (!Resolve(sign.Owner, ref appearance, ref sprite))
             return;
 
-        appearance.TryGetData(PowerDeviceVisuals.Powered, out bool powered);
+        AppearanceSystem.TryGetData<bool>(sign.Owner, PowerDeviceVisuals.Powered, out var powered, appearance);
 
         if (powered
             && sign.CurrentSign != null

Content.Client/Bed/SleepingSystem.cs

@@ -0,0 +1,8 @@
+using Content.Server.Bed.Sleep;
+
+namespace Content.Client.Bed;
+
+public sealed class SleepingSystem : SharedSleepingSystem
+{
+
+}

Content.Client/Bed/StasisBedSystem.cs

@@ -1,22 +1,21 @@
 using Content.Shared.Bed;
 using Robust.Client.GameObjects;
 
-namespace Content.Client.Bed
+namespace Content.Client.Bed;
+
+public sealed class StasisBedSystem : VisualizerSystem<StasisBedVisualsComponent>
 {
-    public sealed class StasisBedSystem : VisualizerSystem<StasisBedVisualsComponent>
+    protected override void OnAppearanceChange(EntityUid uid, StasisBedVisualsComponent component, ref AppearanceChangeEvent args)
     {
-        protected override void OnAppearanceChange(EntityUid uid, StasisBedVisualsComponent component, ref AppearanceChangeEvent args)
+        if (args.Sprite != null
+            && AppearanceSystem.TryGetData<bool>(uid, StasisBedVisuals.IsOn, out var isOn, args.Component))
         {
-            if (args.Sprite != null
-                && args.Component.TryGetData(StasisBedVisuals.IsOn, out bool isOn))
-            {
-                args.Sprite.LayerSetVisible(StasisBedVisualLayers.IsOn, isOn);
-            }
+            args.Sprite.LayerSetVisible(StasisBedVisualLayers.IsOn, isOn);
         }
     }
-
-    public enum StasisBedVisualLayers : byte
-    {
-        IsOn,
-    }
+}
+
+public enum StasisBedVisualLayers : byte
+{
+    IsOn,
 }

Content.Client/Body/UI/BodyScannerDisplay.cs

@@ -109,11 +109,12 @@ namespace Content.Client.Body.UI
             _bodyPartsList.Clear();
 
             var bodySystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<SharedBodySystem>();
+            var factory = IoCManager.Resolve<IComponentFactory>();
             var i = 0;
             foreach (var part in bodySystem.GetBodyChildren(_currentEntity))
             {
                 _bodyPartsList[i++] = part.Component.ParentSlot!;
-                BodyPartList.AddItem(Loc.GetString(part.Component.Name));
+                BodyPartList.AddItem(Loc.GetString(factory.GetComponentName(part.Component.GetType())));
             }
         }
 

Content.Client/Botany/PlantHolderVisualizerSystem.cs

@@ -26,8 +26,8 @@ public sealed class PlantHolderVisualizerSystem : VisualizerSystem<PlantHolderVi
         if (args.Sprite == null)
             return;
 
-        if (args.Component.TryGetData<string>(PlantHolderVisuals.PlantRsi, out var rsi)
-            && args.Component.TryGetData<string>(PlantHolderVisuals.PlantState, out var state))
+        if (AppearanceSystem.TryGetData<string>(uid, PlantHolderVisuals.PlantRsi, out var rsi, args.Component)
+            && AppearanceSystem.TryGetData<string>(uid, PlantHolderVisuals.PlantState, out var state, args.Component))
         {
             var valid = !string.IsNullOrWhiteSpace(state);
 

Content.Client/Botany/PotencyVisualsSystem.cs

@@ -11,7 +11,7 @@ public sealed class PotencyVisualsSystem : VisualizerSystem<PotencyVisualsCompon
         if (args.Sprite == null)
             return;
 
-        if (args.Component.TryGetData(ProduceVisuals.Potency, out float potency))
+        if (AppearanceSystem.TryGetData<float>(uid, ProduceVisuals.Potency, out var potency, args.Component))
         {
             var scale = MathHelper.Lerp(component.MinimumScale, component.MaximumScale, potency / 100);
             args.Sprite.Scale = new Vector2(scale, scale);

Content.Client/Buckle/BuckleSystem.cs

@@ -65,16 +65,22 @@ namespace Content.Client.Buckle
 
         private void OnAppearanceChange(EntityUid uid, BuckleComponent component, ref AppearanceChangeEvent args)
         {
+            if (!TryComp<RotationVisualsComponent>(uid, out var rotVisuals))
+                return;
+
             if (!_appearanceSystem.TryGetData<int>(uid, StrapVisuals.RotationAngle, out var angle, args.Component) ||
                 !_appearanceSystem.TryGetData<bool>(uid, BuckleVisuals.Buckled, out var buckled, args.Component) ||
                 !buckled ||
                 args.Sprite == null)
             {
+                _rotationVisualizerSystem.SetHorizontalAngle(uid, RotationVisualsComponent.DefaultRotation, rotVisuals);
                 return;
             }
 
             // Animate strapping yourself to something at a given angle
-            _rotationVisualizerSystem.AnimateSpriteRotation(args.Sprite, Angle.FromDegrees(angle), 0.125f);
+            _rotationVisualizerSystem.SetHorizontalAngle(uid, Angle.FromDegrees(angle), rotVisuals);
+            // TODO: Dump this when buckle is better
+            _rotationVisualizerSystem.AnimateSpriteRotation(uid, args.Sprite, rotVisuals.HorizontalRotation, 0.125f);
         }
     }
 }

Content.Client/Cabinet/ItemCabinetSystem.cs

@@ -3,20 +3,20 @@ using Robust.Client.GameObjects;
 
 namespace Content.Client.Cabinet;
 
-public sealed class ItemCabinetSystem : VisualizerSystem<ItemCabinetVisualsComponent>
+public sealed class ItemCabinetSystem : SharedItemCabinetSystem
 {
-    protected override void OnAppearanceChange(EntityUid uid, ItemCabinetVisualsComponent component, ref AppearanceChangeEvent args)
+    protected override void UpdateAppearance(EntityUid uid, ItemCabinetComponent? cabinet = null)
     {
-        if (args.Sprite == null)
+        if (!Resolve(uid, ref cabinet))
             return;
 
-        if (args.Component.TryGetData(ItemCabinetVisuals.IsOpen, out bool isOpen)
-            && args.Component.TryGetData(ItemCabinetVisuals.ContainsItem, out bool contains))
-        {
-            var state = isOpen ? component.OpenState : component.ClosedState;
-            args.Sprite.LayerSetState(ItemCabinetVisualLayers.Door, state);
-            args.Sprite.LayerSetVisible(ItemCabinetVisualLayers.ContainsItem, contains);
-        }
+        if (!TryComp<SpriteComponent>(uid, out var sprite))
+            return;
+
+        var state = cabinet.Opened ? cabinet.OpenState : cabinet.ClosedState;
+        if (state != null)
+            sprite.LayerSetState(ItemCabinetVisualLayers.Door, state);
+        sprite.LayerSetVisible(ItemCabinetVisualLayers.ContainsItem, cabinet.CabinetSlot.HasItem);
     }
 }
 

Content.Client/Cabinet/ItemCabinetVisualsComponent.cs

@@ -1,11 +0,0 @@
-namespace Content.Client.Cabinet;
-
-[RegisterComponent]
-public sealed class ItemCabinetVisualsComponent : Component
-{
-    [DataField("openState", required: true)]
-    public string OpenState = default!;
-
-    [DataField("closedState", required: true)]
-    public string ClosedState = default!;
-}

Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs

@@ -75,8 +75,8 @@ namespace Content.Client.Cargo.BUI
                 description.PushColor(Color.White); // Rich text default color is grey
                 if (row.MainButton.ToolTip != null)
                     description.AddText(row.MainButton.ToolTip);
-                    _orderMenu.Description.SetMessage(description);
 
+                _orderMenu.Description.SetMessage(description);
                 _product = row.Product;
                 _orderMenu.ProductName.Text = row.ProductName.Text;
                 _orderMenu.PointCost.Text = row.PointCost.Text;
@@ -158,7 +158,7 @@ namespace Content.Client.Cargo.BUI
             if (args.Button.Parent?.Parent is not CargoOrderRow row || row.Order == null)
                 return;
 
-            SendMessage(new CargoConsoleRemoveOrderMessage(row.Order.OrderNumber));
+            SendMessage(new CargoConsoleRemoveOrderMessage(row.Order.OrderId));
         }
 
         private void ApproveOrder(ButtonEventArgs args)
@@ -169,7 +169,7 @@ namespace Content.Client.Cargo.BUI
             if (OrderCount >= OrderCapacity)
                 return;
 
-            SendMessage(new CargoConsoleApproveOrderMessage(row.Order.OrderNumber));
+            SendMessage(new CargoConsoleApproveOrderMessage(row.Order.OrderId));
             // Most of the UI isn't predicted anyway so.
             // _menu?.UpdateCargoCapacity(OrderCount + row.Order.Amount, OrderCapacity);
         }

Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs

@@ -0,0 +1,56 @@
+using Content.Client.Cargo.UI;
+using Content.Shared.Cargo.BUI;
+using Content.Shared.Cargo.Events;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Cargo.BUI;
+
+public sealed class CargoPalletConsoleBoundUserInterface : BoundUserInterface
+{
+    private CargoPalletMenu? _menu;
+
+    public CargoPalletConsoleBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey) {}
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _menu = new CargoPalletMenu();
+        _menu.AppraiseRequested += OnAppraisal;
+        _menu.SellRequested += OnSell;
+        _menu.OnClose += Close;
+
+        _menu.OpenCentered();
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (disposing)
+        {
+            _menu?.Dispose();
+        }
+    }
+
+    private void OnAppraisal()
+    {
+        SendMessage(new CargoPalletAppraiseMessage());
+    }
+
+    private void OnSell()
+    {
+        SendMessage(new CargoPalletSellMessage());
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        if (state is not CargoPalletConsoleInterfaceState palletState)
+            return;
+
+        _menu?.SetEnabled(palletState.Enabled);
+        _menu?.SetAppraisal(palletState.Appraisal);
+        _menu?.SetCount(palletState.Count);
+    }
+}

Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs

@@ -1,12 +1,12 @@
 using Content.Client.Cargo.UI;
 using Content.Shared.Cargo.BUI;
-using Content.Shared.Cargo.Events;
+using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 
 namespace Content.Client.Cargo.BUI;
 
+[UsedImplicitly]
 public sealed class CargoShuttleConsoleBoundUserInterface : BoundUserInterface
 {
     private CargoShuttleMenu? _menu;
@@ -21,9 +21,7 @@ public sealed class CargoShuttleConsoleBoundUserInterface : BoundUserInterface
         if (collection == null)
             return;
 
-        _menu = new CargoShuttleMenu(collection.Resolve<IGameTiming>(), collection.Resolve<IPrototypeManager>(), collection.Resolve<IEntitySystemManager>().GetEntitySystem<SpriteSystem>());
-        _menu.ShuttleCallRequested += OnShuttleCall;
-        _menu.ShuttleRecallRequested += OnShuttleRecall;
+        _menu = new CargoShuttleMenu(collection.Resolve<IPrototypeManager>(), collection.Resolve<IEntitySystemManager>().GetEntitySystem<SpriteSystem>());
         _menu.OnClose += Close;
 
         _menu.OpenCentered();
@@ -38,24 +36,12 @@ public sealed class CargoShuttleConsoleBoundUserInterface : BoundUserInterface
         }
     }
 
-    private void OnShuttleRecall()
-    {
-        SendMessage(new CargoRecallShuttleMessage());
-    }
-
-    private void OnShuttleCall()
-    {
-        SendMessage(new CargoCallShuttleMessage());
-    }
-
     protected override void UpdateState(BoundUserInterfaceState state)
     {
         base.UpdateState(state);
         if (state is not CargoShuttleConsoleBoundUserInterfaceState cargoState) return;
         _menu?.SetAccountName(cargoState.AccountName);
         _menu?.SetShuttleName(cargoState.ShuttleName);
-        _menu?.SetShuttleETA(cargoState.ShuttleETA);
         _menu?.SetOrders(cargoState.Orders);
-        _menu?.SetCanRecall(cargoState.CanRecall);
     }
 }

Content.Client/Cargo/Systems/CargoSystem.Telepad.cs

@@ -7,6 +7,8 @@ namespace Content.Client.Cargo.Systems;
 
 public sealed partial class CargoSystem
 {
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+
     private static readonly Animation CargoTelepadBeamAnimation = new()
     {
         Length = TimeSpan.FromSeconds(0.5),
@@ -65,7 +67,7 @@ public sealed partial class CargoSystem
         if (!Resolve(component.Owner, ref sprite))
             return;
 
-        component.TryGetData(CargoTelepadVisuals.State, out CargoTelepadState? state);
+        _appearance.TryGetData<CargoTelepadState?>(component.Owner, CargoTelepadVisuals.State, out var state);
         AnimationPlayerComponent? player = null;
 
         switch (state)

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

@@ -141,7 +141,7 @@ namespace Content.Client.Cargo.UI
                         Text = Loc.GetString(
                             "cargo-console-menu-populate-orders-cargo-order-row-product-name-text",
                             ("productName", productName),
-                            ("orderAmount", order.Amount),
+                            ("orderAmount", order.OrderQuantity),
                             ("orderRequester", order.Requester))
                     },
                     Description = {Text = Loc.GetString("cargo-console-menu-order-reason-description",

Content.Client/Cargo/UI/CargoPalletMenu.xaml

@@ -0,0 +1,25 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+            xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+            xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+            SetSize="300 150"
+            MinSize="300 150">
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal">
+            <Label Text="{Loc 'cargo-pallet-menu-appraisal-label'}"
+                   StyleClasses="LabelKeyText" />
+            <Label Name="AppraisalLabel"
+                   Text="{Loc 'cargo-pallet-menu-no-goods-text'}" />
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
+            <Label Text="{Loc 'cargo-pallet-menu-count-label'}"
+                   StyleClasses="LabelKeyText" />
+            <Label Name="CountLabel"
+                   Text="{Loc 'cargo-pallet-menu-no-goods-text'}" />
+        </BoxContainer>
+        <Button Name="AppraiseButton"
+                Text="{Loc 'cargo-pallet-appraise-button'}"/>
+        <Button Name="SellButton"
+                Text="{Loc 'cargo-pallet-sell-button'}"/>
+        <TextureButton VerticalExpand="True" />
+    </BoxContainer>
+</controls:FancyWindow>

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

@@ -0,0 +1,47 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Cargo;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Cargo.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class CargoPalletMenu : FancyWindow
+{
+    public Action? SellRequested;
+    public Action? AppraiseRequested;
+
+    public CargoPalletMenu()
+    {
+        RobustXamlLoader.Load(this);
+        SellButton.OnPressed += OnSellPressed;
+        AppraiseButton.OnPressed += OnAppraisePressed;
+        Title = Loc.GetString("cargo-pallet-console-menu-title");
+    }
+
+    public void SetAppraisal(int amount)
+    {
+        AppraisalLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", amount.ToString()));
+    }
+
+    public void SetCount(int count)
+    {
+        CountLabel.Text = count.ToString();
+    }
+    public void SetEnabled(bool enabled)
+    {
+        AppraiseButton.Disabled = !enabled;
+        SellButton.Disabled = !enabled;
+    }
+
+    private void OnSellPressed(BaseButton.ButtonEventArgs obj)
+    {
+        SellRequested?.Invoke();
+    }
+
+    private void OnAppraisePressed(BaseButton.ButtonEventArgs obj)
+    {
+        AppraiseRequested?.Invoke();
+    }
+}

Content.Client/Cargo/UI/CargoShuttleMenu.xaml

@@ -22,12 +22,6 @@
             <Label Name="ShuttleStatusLabel"
                    Text="{Loc 'cargo-console-menu-shuttle-status-away-text'}" />
         </BoxContainer>
-        <Button Name="ShuttleCallButton"
-                Text="Call Shuttle"/>
-        <Button Name="ShuttleRecallButton"
-                Text="Recall Shuttle"
-                ToolTip="Needs to be out of range to recall."
-                Visible="False"/>
         <Label Text="{Loc 'cargo-console-menu-orders-label'}" />
         <PanelContainer VerticalExpand="True"
                         SizeFlagsStretchRatio="6">

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

@@ -3,8 +3,6 @@ using Content.Shared.Cargo;
 using Content.Shared.Cargo.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -14,23 +12,14 @@ namespace Content.Client.Cargo.UI
     [GenerateTypedNameReferences]
     public sealed partial class CargoShuttleMenu : FancyWindow
     {
-        private readonly IGameTiming _timing;
         private readonly IPrototypeManager _protoManager;
         private readonly SpriteSystem _spriteSystem;
 
-        public Action? ShuttleCallRequested;
-        public Action? ShuttleRecallRequested;
-
-        private TimeSpan? _shuttleEta;
-
-        public CargoShuttleMenu(IGameTiming timing, IPrototypeManager protoManager, SpriteSystem spriteSystem)
+        public CargoShuttleMenu(IPrototypeManager protoManager, SpriteSystem spriteSystem)
         {
             RobustXamlLoader.Load(this);
-            _timing = timing;
             _protoManager = protoManager;
             _spriteSystem = spriteSystem;
-            ShuttleCallButton.OnPressed += OnCallPressed;
-            ShuttleRecallButton.OnPressed += OnRecallPressed;
             Title = Loc.GetString("cargo-shuttle-console-menu-title");
         }
 
@@ -44,33 +33,6 @@ namespace Content.Client.Cargo.UI
             ShuttleNameLabel.Text = name;
         }
 
-        public void SetShuttleETA(TimeSpan? eta)
-        {
-            _shuttleEta = eta;
-
-            if (eta == null)
-            {
-                ShuttleCallButton.Visible = false;
-                ShuttleRecallButton.Visible = true;
-            }
-            else
-            {
-                ShuttleRecallButton.Visible = false;
-                ShuttleCallButton.Visible = true;
-                ShuttleCallButton.Disabled = true;
-            }
-        }
-
-        private void OnRecallPressed(BaseButton.ButtonEventArgs obj)
-        {
-            ShuttleRecallRequested?.Invoke();
-        }
-
-        private void OnCallPressed(BaseButton.ButtonEventArgs obj)
-        {
-            ShuttleCallRequested?.Invoke();
-        }
-
         public void SetOrders(List<CargoOrderData> orders)
         {
             Orders.DisposeAllChildren();
@@ -89,7 +51,7 @@ namespace Content.Client.Cargo.UI
                          Text = Loc.GetString(
                              "cargo-console-menu-populate-orders-cargo-order-row-product-name-text",
                              ("productName", productName),
-                             ("orderAmount", order.Amount),
+                             ("orderAmount", order.OrderQuantity - order.NumDispatched),
                              ("orderRequester", order.Requester))
                      },
                      Description = {Text = Loc.GetString("cargo-console-menu-order-reason-description",
@@ -102,27 +64,5 @@ namespace Content.Client.Cargo.UI
                  Orders.AddChild(row);
             }
         }
-
-        public void SetCanRecall(bool canRecall)
-        {
-            ShuttleRecallButton.Disabled = !canRecall;
-        }
-
-        protected override void Draw(DrawingHandleScreen handle)
-        {
-            base.Draw(handle);
-
-            var remaining = _shuttleEta - _timing.CurTime;
-
-            if (remaining == null || remaining <= TimeSpan.Zero)
-            {
-                ShuttleStatusLabel.Text = $"Available";
-                ShuttleCallButton.Disabled = false;
-            }
-            else
-            {
-                ShuttleStatusLabel.Text = $"Available in: {remaining.Value.TotalSeconds:0.0}";
-            }
-        }
     }
 }

Content.Client/Changelog/ChangelogManager.cs

@@ -71,6 +71,7 @@ namespace Content.Client.Changelog
             NewChangelogEntriesChanged?.Invoke();
         }
 
+        // Corvax-MultiChangelog-Start
         public async Task<List<ChangelogEntry>> LoadChangelog()
         {
             var paths = _resource.ContentFindFiles("/Changelog/")
@@ -85,6 +86,7 @@ namespace Content.Client.Changelog
             }
             return result.OrderBy(x => x.Time).ToList();
         }
+        // Corvax-MultiChangelog-End
 
         private Task<List<ChangelogEntry>> LoadChangelogFile(ResourcePath path)
         {

Content.Client/CharacterInfo/CharacterInfoSystem.cs

@@ -42,7 +42,7 @@ public sealed class CharacterInfoSystem : EntitySystem
 
     private void OnCharacterInfoEvent(CharacterInfoEvent msg, EntitySessionEventArgs args)
     {
-        var sprite = CompOrNull<ISpriteComponent>(msg.EntityUid);
+        var sprite = CompOrNull<SpriteComponent>(msg.EntityUid);
         var data = new CharacterData(msg.JobTitle, msg.Objectives, msg.Briefing, sprite, Name(msg.EntityUid));
 
         OnCharacterUpdate?.Invoke(data);
@@ -52,7 +52,7 @@ public sealed class CharacterInfoSystem : EntitySystem
         string Job,
         Dictionary<string, List<ConditionInfo>> Objectives,
         string Briefing,
-        ISpriteComponent? Sprite,
+        SpriteComponent? Sprite,
         string EntityName
     );
 }

Content.Client/Chat/Managers/ChatManager.cs

@@ -21,14 +21,14 @@ namespace Content.Client.Chat.Managers
             _sawmill.Level = LogLevel.Info;
         }
 
-        public void SendMessage(ReadOnlyMemory<char> text, ChatSelectChannel channel)
+        public void SendMessage(string text, ChatSelectChannel channel)
         {
             var str = text.ToString();
             switch (channel)
             {
                 case ChatSelectChannel.Console:
                     // run locally
-                    _consoleHost.ExecuteCommand(text.ToString());
+                    _consoleHost.ExecuteCommand(text);
                     break;
 
                 case ChatSelectChannel.LOOC:
@@ -57,10 +57,8 @@ namespace Content.Client.Chat.Managers
                         _sawmill.Warning("Tried to speak on deadchat without being ghost or admin.");
                     break;
 
+                // TODO sepearate radio and say into separate commands.
                 case ChatSelectChannel.Radio:
-                    _consoleHost.ExecuteCommand($"say \";{CommandParsing.Escape(str)}\"");
-                    break;
-
                 case ChatSelectChannel.Local:
                     _consoleHost.ExecuteCommand($"say \"{CommandParsing.Escape(str)}\"");
                     break;

Content.Client/Chat/Managers/IChatManager.cs

@@ -6,6 +6,6 @@ namespace Content.Client.Chat.Managers
     {
         void Initialize();
 
-        public void SendMessage(ReadOnlyMemory<char> text, ChatSelectChannel channel);
+        public void SendMessage(string text, ChatSelectChannel channel);
     }
 }

Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs

@@ -16,6 +16,7 @@ public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem
     private readonly TimeSpan _typingTimeout = TimeSpan.FromSeconds(2);
     private TimeSpan _lastTextChange;
     private bool _isClientTyping;
+    private bool _isClientChatFocused; // Corvax-TypingIndicator
 
     public override void Initialize()
     {
@@ -30,7 +31,10 @@ public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem
             return;
 
         // client typed something - show typing indicator
-        ClientUpdateTyping(true);
+        // Corvax-TypingIndicator-Start
+        _isClientTyping = true;
+        ClientUpdateTyping();
+        // Corvax-TypingIndicator-End
         _lastTextChange = _time.CurTime;
     }
 
@@ -41,9 +45,26 @@ public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem
             return;
 
         // client submitted text - hide typing indicator
-        ClientUpdateTyping(false);
+        // Corvax-TypingIndicator-Start
+        _isClientTyping = false;
+        _isClientChatFocused = false;
+        ClientUpdateTyping();
+        // Corvax-TypingIndicator-End
     }
 
+    // Corvax-TypingIndicator-Start
+    public void ClientChangedChatFocus(bool isFocused)
+    {
+        // don't update it if player don't want to show typing
+        if (!_cfg.GetCVar(CCVars.ChatShowTypingIndicator))
+            return;
+
+        // client submitted text - hide typing indicator
+        _isClientChatFocused = isFocused;
+        ClientUpdateTyping();
+    }
+    // Corvax-TypingIndicator-End
+
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -55,23 +76,34 @@ public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem
             if (dif > _typingTimeout)
             {
                 // client didn't typed anything for a long time - hide indicator
-                ClientUpdateTyping(false);
+                // Corvax-TypingIndicator-Start
+                _isClientTyping = false;
+                ClientUpdateTyping();
+                // Corvax-TypingIndicator-End
             }
         }
     }
 
-    private void ClientUpdateTyping(bool isClientTyping)
+    private void ClientUpdateTyping() // Corvax-TypingIndicator
     {
-        if (_isClientTyping == isClientTyping)
-            return;
-        _isClientTyping = isClientTyping;
+        // Corvax-TypingIndicator-Start
+        // if (_isClientTyping == isClientTyping)
+        //     return;
+        // _isClientTyping = isClientTyping;
+        // Corvax-TypingIndicator-End
 
         // check if player controls any pawn
         if (_playerManager.LocalPlayer?.ControlledEntity == null)
             return;
 
+        // Corvax-TypingIndicator-Start
+        var state = TypingIndicatorState.None;
+        if (_isClientChatFocused)
+            state = _isClientTyping ? TypingIndicatorState.Typing : TypingIndicatorState.Idle;
+        // Corvax-TypingIndicator-End
+
         // send a networked event to server
-        RaiseNetworkEvent(new TypingChangedEvent(isClientTyping));
+        RaiseNetworkEvent(new TypingChangedEvent(state)); // Corvax-TypingIndicator
     }
 
     private void OnShowTypingChanged(bool showTyping)
@@ -79,7 +111,10 @@ public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem
         // hide typing indicator immediately if player don't want to show it anymore
         if (!showTyping)
         {
-            ClientUpdateTyping(false);
+            // Corvax-TypingIndicator-Start
+            _isClientTyping = false;
+            ClientUpdateTyping();
+            // Corvax-TypingIndicator-End
         }
     }
 }

Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs

@@ -9,15 +9,9 @@ public sealed class TypingIndicatorVisualizerSystem : VisualizerSystem<TypingInd
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
-    public override void Initialize()
+    protected override void OnAppearanceChange(EntityUid uid, TypingIndicatorComponent component, ref AppearanceChangeEvent args)
     {
-        base.Initialize();
-        SubscribeLocalEvent<TypingIndicatorComponent, ComponentInit>(OnInit);
-    }
-
-    private void OnInit(EntityUid uid, TypingIndicatorComponent component, ComponentInit args)
-    {
-        if (!TryComp(uid, out SpriteComponent? sprite))
+        if (args.Sprite == null)
             return;
 
         if (!_prototypeManager.TryIndex<TypingIndicatorPrototype>(component.Prototype, out var proto))
@@ -26,25 +20,28 @@ public sealed class TypingIndicatorVisualizerSystem : VisualizerSystem<TypingInd
             return;
         }
 
-        var layer = sprite.LayerMapReserveBlank(TypingIndicatorLayers.Base);
-        sprite.LayerSetRSI(layer, proto.SpritePath);
-        sprite.LayerSetState(layer, proto.TypingState);
-        sprite.LayerSetShader(layer, proto.Shader);
-        sprite.LayerSetOffset(layer, proto.Offset);
-        sprite.LayerSetVisible(layer, false);
-    }
+        //AppearanceSystem.TryGetData<bool>(uid, TypingIndicatorVisuals.IsTyping, out var isTyping, args.Component); // Corvax-TypingIndicator
+        var layerExists = args.Sprite.LayerMapTryGet(TypingIndicatorLayers.Base, out var layer);
+        if (!layerExists)
+            layer = args.Sprite.LayerMapReserveBlank(TypingIndicatorLayers.Base);
 
-    protected override void OnAppearanceChange(EntityUid uid, TypingIndicatorComponent component, ref AppearanceChangeEvent args)
-    {
-        base.OnAppearanceChange(uid, component, ref args);
-
-        if (!TryComp(uid, out SpriteComponent? sprite))
-            return;
-
-        args.Component.TryGetData(TypingIndicatorVisuals.IsTyping, out bool isTyping);
-        if (sprite.LayerMapTryGet(TypingIndicatorLayers.Base, out var layer))
+        args.Sprite.LayerSetRSI(layer, proto.SpritePath);
+        args.Sprite.LayerSetState(layer, proto.TypingState);
+        args.Sprite.LayerSetShader(layer, proto.Shader);
+        args.Sprite.LayerSetOffset(layer, proto.Offset);
+        // args.Sprite.LayerSetVisible(layer, isTyping); // Corvax-TypingIndicator
+        // Corvax-TypingIndicator-Start
+        AppearanceSystem.TryGetData<TypingIndicatorState>(uid, TypingIndicatorVisuals.State, out var state);
+        args.Sprite.LayerSetVisible(layer, state != TypingIndicatorState.None);
+        switch (state)
         {
-            sprite.LayerSetVisible(layer, isTyping);
+            case TypingIndicatorState.Idle:
+                args.Sprite.LayerSetState(layer, proto.IdleState);
+                break;
+            case TypingIndicatorState.Typing:
+                args.Sprite.LayerSetState(layer, proto.TypingState);
+                break;
         }
+        // Corvax-TypingIndicator-End
     }
 }

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

@@ -153,8 +153,8 @@ namespace Content.Client.Chemistry.UI
         /// <param name="state">State data for the dispenser.</param>
         private void UpdatePanelInfo(ChemMasterBoundUserInterfaceState state)
         {
-            BufferTransferButton.Pressed = state.Mode == Shared.Chemistry.ChemMasterMode.Transfer;
-            BufferDiscardButton.Pressed = state.Mode == Shared.Chemistry.ChemMasterMode.Discard;
+            BufferTransferButton.Pressed = state.Mode == ChemMasterMode.Transfer;
+            BufferDiscardButton.Pressed = state.Mode == ChemMasterMode.Discard;
 
             BuildContainerUI(InputContainerInfo, state.InputContainerInfo, true);
             BuildContainerUI(OutputContainerInfo, state.OutputContainerInfo, false);

Content.Client/Chemistry/Visualizers/FoamVisualizer.cs

@@ -1,68 +0,0 @@
-using System;
-using Content.Shared.Foam;
-using JetBrains.Annotations;
-using Robust.Client.Animations;
-using Robust.Client.GameObjects;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Maths;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.Manager.Attributes;
-
-namespace Content.Client.Chemistry.Visualizers
-{
-    [UsedImplicitly]
-    public sealed class FoamVisualizer : AppearanceVisualizer, ISerializationHooks
-    {
-        private const string AnimationKey = "foamdissolve_animation";
-
-        [DataField("animationTime")]
-        private float _delay = 0.6f;
-
-        [DataField("animationState")]
-        private string _state = "foam-dissolve";
-
-        private Animation _foamDissolve = new();
-
-        void ISerializationHooks.AfterDeserialization()
-        {
-            _foamDissolve = new Animation {Length = TimeSpan.FromSeconds(_delay)};
-            var flick = new AnimationTrackSpriteFlick();
-            _foamDissolve.AnimationTracks.Add(flick);
-            flick.LayerKey = FoamVisualLayers.Base;
-            flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame(_state, 0f));
-        }
-
-        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
-        public override void OnChangeData(AppearanceComponent component)
-        {
-            base.OnChangeData(component);
-
-            var entities = IoCManager.Resolve<IEntityManager>();
-            if (component.TryGetData<bool>(FoamVisuals.State, out var state))
-            {
-                if (state)
-                {
-                    if (entities.TryGetComponent(component.Owner, out AnimationPlayerComponent? animPlayer))
-                    {
-                        if (!animPlayer.HasRunningAnimation(AnimationKey))
-                            animPlayer.Play(_foamDissolve, AnimationKey);
-                    }
-                }
-            }
-
-            if (component.TryGetData<Color>(FoamVisuals.Color, out var color))
-            {
-                if (entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite))
-                {
-                    sprite.Color = color;
-                }
-            }
-        }
-    }
-
-    public enum FoamVisualLayers : byte
-    {
-        Base
-    }
-}

Content.Client/Chemistry/Visualizers/FoamVisualizerSystem.cs

@@ -0,0 +1,63 @@
+using Content.Shared.Foam;
+using Robust.Client.Animations;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Chemistry.Visualizers;
+
+/// <summary>
+/// The system responsible for ensuring <see cref="FoamVisualsComponent"/> plays the animation it's meant to when the foam dissolves.
+/// </summary>
+public sealed class FoamVisualizerSystem : VisualizerSystem<FoamVisualsComponent>
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<FoamVisualsComponent, ComponentInit>(OnComponentInit);
+    }
+
+    /// <summary>
+    /// Generates the animation used by foam visuals when the foam dissolves.
+    /// </summary>
+    private void OnComponentInit(EntityUid uid, FoamVisualsComponent comp, ComponentInit args)
+    {
+        comp.Animation = new Animation()
+        {
+            Length = TimeSpan.FromSeconds(comp.AnimationTime),
+            AnimationTracks =
+            {
+                new AnimationTrackSpriteFlick()
+                {
+                    LayerKey = FoamVisualLayers.Base,
+                    KeyFrames =
+                    {
+                        new AnimationTrackSpriteFlick.KeyFrame(comp.State, 0f)
+                    }
+                }
+            }
+        };
+    }
+
+    /// <summary>
+    /// Plays the animation used by foam visuals when the foam dissolves.
+    /// </summary>
+    protected override void OnAppearanceChange(EntityUid uid, FoamVisualsComponent comp, ref AppearanceChangeEvent args)
+    {
+        if (AppearanceSystem.TryGetData<bool>(uid, FoamVisuals.State, out var state, args.Component) && state)
+        {
+            if (TryComp(uid, out AnimationPlayerComponent? animPlayer)
+            && !AnimationSystem.HasRunningAnimation(uid, animPlayer, FoamVisualsComponent.AnimationKey))
+                AnimationSystem.Play(uid, animPlayer, comp.Animation, FoamVisualsComponent.AnimationKey);
+        }
+
+        if (AppearanceSystem.TryGetData<Color>(uid, FoamVisuals.Color, out var color, args.Component))
+        {
+            if (args.Sprite != null)
+                args.Sprite.Color = color;
+        }
+    }
+}
+
+public enum FoamVisualLayers : byte
+{
+    Base
+}

Content.Client/Chemistry/Visualizers/FoamVisualsComponent.cs

@@ -0,0 +1,36 @@
+using Robust.Client.Animations;
+
+namespace Content.Client.Chemistry.Visualizers;
+
+/// <summary>
+/// A component that makes foam play an animation when it dissolves.
+/// </summary>
+[RegisterComponent]
+[Access(typeof(FoamVisualizerSystem))]
+public sealed class FoamVisualsComponent : Component
+{
+    /// <summary>
+    /// The id of the animation used when the foam dissolves.
+    /// </summary>
+    public const string AnimationKey = "foamdissolve_animation";
+
+    /// <summary>
+    /// How long the foam visually dissolves for.
+    /// </summary>
+    [DataField("animationTime")]
+    public float AnimationTime = 0.6f;
+
+    /// <summary>
+    /// The state of the entities base sprite RSI that is displayed when the foam dissolves.
+    /// Cannot use <see cref="Robust.Graphics.RSI.StateKey"/> because it does not have <see cref="DataDefinitionAttribute"/> and I am not making an engine PR at this time.
+    /// </summary>
+    [DataField("animationState")]
+    public string State = "foam-dissolve";
+
+    /// <summary>
+    /// The animation used while the foam dissolves.
+    /// Generated by <see cref="FoamVisualizerSystem.OnComponentInit"/>.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public Animation Animation = default!;
+}

Content.Client/Chemistry/Visualizers/SmokeVisualizer.cs

@@ -1,28 +0,0 @@
-using Content.Shared.Smoking;
-using JetBrains.Annotations;
-using Robust.Client.GameObjects;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Maths;
-
-namespace Content.Client.Chemistry.Visualizers
-{
-    [UsedImplicitly]
-    public sealed class SmokeVisualizer : AppearanceVisualizer
-    {
-        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
-        public override void OnChangeData(AppearanceComponent component)
-        {
-            base.OnChangeData(component);
-
-            var entities = IoCManager.Resolve<IEntityManager>();
-            if (component.TryGetData<Color>(SmokeVisuals.Color, out var color))
-            {
-                if (entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite))
-                {
-                    sprite.Color = color;
-                }
-            }
-        }
-    }
-}

Content.Client/Chemistry/Visualizers/SmokeVisualizerSystem.cs

@@ -0,0 +1,22 @@
+using Content.Shared.Smoking;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Chemistry.Visualizers;
+
+/// <summary>
+/// Ensures entities with <see cref="SmokeVisualsComponent"/> have a color corresponding with their contained reagents.
+/// </summary>
+public sealed class SmokeVisualizerSystem : VisualizerSystem<SmokeVisualsComponent>
+{
+    /// <summary>
+    /// Syncs the color of the smoke with the color of its contained reagents.
+    /// </summary>
+    protected override void OnAppearanceChange(EntityUid uid, SmokeVisualsComponent comp, ref AppearanceChangeEvent args)
+    {
+        if (args.Sprite == null)
+            return;
+        if(!AppearanceSystem.TryGetData<Color>(uid, SmokeVisuals.Color, out var color))
+            return;
+        args.Sprite.Color = color;
+    }
+}

Content.Client/Chemistry/Visualizers/SmokeVisualsComponent.cs

@@ -0,0 +1,10 @@
+namespace Content.Client.Chemistry.Visualizers;
+
+/// <summary>
+/// A component that changes color to match its contained reagents.
+/// Managed by <see cref="SmokeVisualizerSystem"/>.
+/// Only functions with smoke at the moment.
+/// </summary>
+[RegisterComponent]
+[Access(typeof(SmokeVisualizerSystem))]
+public sealed class SmokeVisualsComponent : Component {}

Content.Client/Chemistry/Visualizers/SolutionContainerVisualsComponent.cs

@@ -6,6 +6,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Chemistry.Visualizers
 {
@@ -17,12 +18,25 @@ namespace Content.Client.Chemistry.Visualizers
         [DataField("fillBaseName")]
         public string? FillBaseName = null;
         [DataField("layer")]
-        public SolutionContainerLayers Layer = SolutionContainerLayers.Fill;
+        public SolutionContainerLayers FillLayer = SolutionContainerLayers.Fill;
+        [DataField("baseLayer")]
+        public SolutionContainerLayers BaseLayer = SolutionContainerLayers.Base;
+        [DataField("overlayLayer")]
+        public SolutionContainerLayers OverlayLayer = SolutionContainerLayers.Overlay;
         [DataField("changeColor")]
         public bool ChangeColor = true;
         [DataField("emptySpriteName")]
         public string? EmptySpriteName = null;
         [DataField("emptySpriteColor")]
         public Color EmptySpriteColor = Color.White;
+        [DataField("metamorphic")]
+        public bool Metamorphic = false;
+        [DataField("metamorphicDefaultSprite")]
+        public SpriteSpecifier MetamorphicDefaultSprite = SpriteSpecifier.Invalid;
+        [DataField("metamorphicNameFull")]
+        public string MetamorphicNameFull = "transformable-container-component-glass";
+
+        public string InitialName = string.Empty;
+        public string InitialDescription = string.Empty;
     }
 }