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

# Conflicts: # .github/workflows/publish.yml # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Server/Zombies/ZombieSystem.Transform.cs # Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Maps/box.yml # Resources/Prototypes/Maps/fland.yml # Resources/Prototypes/Maps/marathon.yml # Resources/Prototypes/Maps/meta.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Textures/Tiles/attributions.yml
space-syndicate · Aug 29, 2023 · 1b513f0 · 1b513f0
2 parents 2540079 + 7dd3d01
commit 1b513f0
Show file tree

Hide file tree

Showing 562 changed files with 241,533 additions and 237,803 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -11,7 +11,7 @@ jobs:
     name: Run Benchmarks
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3.6.0
       with:
         submodules: 'recursive'
     - name: Get Engine version

diff --git a/.github/workflows/build-docfx.yml b/.github/workflows/build-docfx.yml
@@ -8,7 +8,7 @@ jobs:
   docfx:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3.6.0
     - name: Setup submodule
       run: |
         git submodule update --init --recursive
@@ -19,9 +19,9 @@ jobs:
         cd RobustToolbox/
         git submodule update --init --recursive
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Install dependencies
       run: dotnet restore

diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml
@@ -0,0 +1,57 @@
+name: Build & Test Map Renderer
+
+on:
+  push:
+    branches: [ master, staging, trying ]
+  merge_group:
+  pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
+    branches: [ master ]
+
+jobs:
+  build:
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout Master
+        uses: actions/[email protected]
+
+      - name: Setup Submodule
+        run: |
+          git submodule update --init --recursive
+
+      - name: Pull engine updates
+        uses: space-wizards/[email protected]
+
+      - name: Update Engine Submodules
+        run: |
+          cd RobustToolbox/
+          git submodule update --init --recursive
+
+      - name: Setup .NET Core
+        uses: actions/[email protected]
+        with:
+          dotnet-version: 7.0.x
+
+      - name: Install dependencies
+        run: dotnet restore
+
+      - name: Build Project
+        run: dotnet build Content.MapRenderer --configuration Release --no-restore /p:WarningsAsErrors=nullable /m
+
+      - name: Run Map Renderer
+        run: dotnet run --project Content.MapRenderer Dev
+
+  ci-success:
+    name: Build & Test Debug
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    steps:
+      - name: CI succeeded
+        run: exit 0
diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
     - name: Checkout Master
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3.6.0
 
     - name: Setup Submodule
       run: |
@@ -34,9 +34,9 @@ jobs:
         git submodule update --init --recursive
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Install dependencies
       run: dotnet restore

diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
     - name: Checkout Master
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3.6.0
 
     - name: Setup Submodule
       run: |
@@ -34,9 +34,9 @@ jobs:
         git submodule update --init --recursive
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Install dependencies
       run: dotnet restore

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -15,8 +15,8 @@ jobs:
     steps:
 #    - name: Install dependencies
 #      run: sudo apt-get install -y python3-paramiko
-#
-    - uses: actions/checkout@v2
+
+    - uses: actions/checkout@v3.6.0
       with:
         submodules: 'recursive'
 
@@ -37,9 +37,9 @@ jobs:
     # Corvax-Secrets-End
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 7.0.x
 
     - name: Get Engine Tag
       run: |

diff --git a/.github/workflows/rsi-diff.yml b/.github/workflows/rsi-diff.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.6.0
 
       - name: Get changed files
         id: files

diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml
@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Checkout Master
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.6.0
 
       - name: Setup Submodule
         run: |
@@ -63,9 +63,9 @@ jobs:
       # Corvax-Secrets-End
 
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 7.0.x
 
       - name: Install dependencies
         run: dotnet restore

diff --git a/.github/workflows/update-wiki.yml b/.github/workflows/update-wiki.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
     - name: Checkout Master
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3.6.0
 
     - name: Setup Submodule
       run: |
@@ -36,9 +36,9 @@ jobs:
         git submodule update --init --recursive
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 7.0.x
 
     - name: Install Dependencies
       run: dotnet restore

diff --git a/.github/workflows/validate-rgas.yml b/.github/workflows/validate-rgas.yml
@@ -12,7 +12,7 @@ jobs:
     if: github.actor != 'IanComradeBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3.6.0
     - name: Setup Submodule
       run: git submodule update --init
     # Corvax-Secrets-Start

diff --git a/.github/workflows/validate-rsis.yml b/.github/workflows/validate-rsis.yml
@@ -13,7 +13,7 @@ jobs:
     name: Validate RSIs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3.6.0
       - name: Setup Submodule
         run: git submodule update --init
       # Corvax-Secrets-Start

diff --git a/.github/workflows/validate_mapfiles.yml b/.github/workflows/validate_mapfiles.yml
@@ -12,7 +12,7 @@ jobs:
     if: github.actor != 'IanComradeBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3.6.0
     - name: Setup Submodule
       run: git submodule update --init
     # Corvax-Secrets-Start

diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml
@@ -13,7 +13,7 @@ jobs:
     if: github.actor != 'IanComradeBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3.6.0
       - name: Setup submodule
         run: |
           git submodule update --init --recursive
@@ -24,9 +24,9 @@ jobs:
           cd RobustToolbox/
           git submodule update --init --recursive
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 6.0.100
+          dotnet-version: 7.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build

diff --git a/Content.Benchmarks/DeviceNetworkingBenchmark.cs b/Content.Benchmarks/DeviceNetworkingBenchmark.cs
@@ -60,7 +60,7 @@ public async Task SetupAsync()
     {
         ProgramShared.PathOffset = "../../../../";
         _pair = await PoolManager.GetServerClient();
-        var server = _pair.Pair.Server;
+        var server = _pair.Server;
 
         await server.WaitPost(() =>
         {
@@ -96,9 +96,9 @@ public async Task Cleanup()
     [Benchmark(Baseline = true, Description = "Entity Events")]
     public async Task EventSentBaseline()
     {
-        var server = _pair.Pair.Server;
+        var server = _pair.Server;
 
-        _pair.Pair.Server.Post(() =>
+        _pair.Server.Post(() =>
         {
             foreach (var entity in _targetEntities)
             {
@@ -113,9 +113,9 @@ public async Task EventSentBaseline()
     [Benchmark(Description = "Device Net Broadcast No Connection Checks")]
     public async Task DeviceNetworkBroadcastNoConnectionChecks()
     {
-        var server = _pair.Pair.Server;
+        var server = _pair.Server;
 
-        _pair.Pair.Server.Post(() =>
+        _pair.Server.Post(() =>
         {
             _deviceNetworkSystem.QueuePacket(_sourceEntity, null, _payload, 100);
         });
@@ -127,9 +127,9 @@ public async Task DeviceNetworkBroadcastNoConnectionChecks()
     [Benchmark(Description = "Device Net Broadcast Wireless Connection Checks")]
     public async Task DeviceNetworkBroadcastWirelessConnectionChecks()
     {
-        var server = _pair.Pair.Server;
+        var server = _pair.Server;
 
-        _pair.Pair.Server.Post(() =>
+        _pair.Server.Post(() =>
         {
             _deviceNetworkSystem.QueuePacket(_sourceWirelessEntity, null, _payload, 100);
         });

diff --git a/Content.Benchmarks/MapLoadBenchmark.cs b/Content.Benchmarks/MapLoadBenchmark.cs
@@ -28,7 +28,7 @@ public void Setup()
         ProgramShared.PathOffset = "../../../../";
 
         _pair = PoolManager.GetServerClient().GetAwaiter().GetResult();
-        var server = _pair.Pair.Server;
+        var server = _pair.Server;
 
         Paths = server.ResolveDependency<IPrototypeManager>()
             .EnumeratePrototypes<GameMapPrototype>()
@@ -55,7 +55,7 @@ public async Task Cleanup()
     public async Task LoadMap()
     {
         var mapPath = Paths[Map];
-        var server = _pair.Pair.Server;
+        var server = _pair.Server;
         await server.WaitPost(() =>
         {
             var success = _mapLoader.TryLoad(new MapId(10), mapPath, out _);
@@ -67,7 +67,7 @@ await server.WaitPost(() =>
     [IterationCleanup]
     public void IterationCleanup()
     {
-        var server = _pair.Pair.Server;
+        var server = _pair.Server;
         server.WaitPost(() =>
         {
             _mapManager.DeleteMap(new MapId(10));

diff --git a/Content.Benchmarks/Program.cs b/Content.Benchmarks/Program.cs
@@ -22,7 +22,7 @@ public static async Task MainAsync(string[] args)
         {
             PoolManager.Startup(typeof(Program).Assembly);
             var pair = await PoolManager.GetServerClient();
-            var gameMaps = pair.Pair.Server.ResolveDependency<IPrototypeManager>().EnumeratePrototypes<GameMapPrototype>().ToList();
+            var gameMaps = pair.Server.ResolveDependency<IPrototypeManager>().EnumeratePrototypes<GameMapPrototype>().ToList();
             MapLoadBenchmark.MapsSource = gameMaps.Select(x => x.ID);
             await pair.CleanReturnAsync();
 

diff --git a/Content.Client/Animations/ReusableAnimations.cs b/Content.Client/Animations/ReusableAnimations.cs
@@ -23,7 +23,7 @@ public static void AnimateEntityPickup(EntityUid entity, EntityCoordinates initi
 
             var animatableClone = entMan.SpawnEntity("clientsideclone", initialPosition);
             string val = entMan.GetComponent<MetaDataComponent>(entity).EntityName;
-            entMan.GetComponent<MetaDataComponent>(animatableClone).EntityName = val;
+            entMan.System<MetaDataSystem>().SetEntityName(animatableClone, val);
 
             if (!entMan.TryGetComponent(entity, out SpriteComponent? sprite0))
             {

diff --git a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs
@@ -24,7 +24,7 @@ public AnomalyGeneratorWindow(EntityUid gen)
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
-        EntityView.Sprite = _entityManager.GetComponent<SpriteComponent>(gen);
+        EntityView.SetEntity(gen);
         EntityView.SpriteOffset = false;
 
         GenerateButton.OnPressed += _ => OnGenerateButtonPressed?.Invoke();

diff --git a/Content.Client/CharacterInfo/CharacterInfoSystem.cs b/Content.Client/CharacterInfo/CharacterInfoSystem.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Objectives;
 using Robust.Client.GameObjects;
 using Robust.Client.Player;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.CharacterInfo;
 
@@ -42,17 +43,33 @@ private void OnPlayerAttached(PlayerAttachSysMessage msg)
 
     private void OnCharacterInfoEvent(CharacterInfoEvent msg, EntitySessionEventArgs args)
     {
-        var sprite = CompOrNull<SpriteComponent>(msg.EntityUid);
-        var data = new CharacterData(msg.JobTitle, msg.Objectives, msg.Briefing, sprite, Name(msg.EntityUid));
-
+        var data = new CharacterData(msg.EntityUid, msg.JobTitle, msg.Objectives, msg.Briefing, Name(msg.EntityUid));
         OnCharacterUpdate?.Invoke(data);
     }
 
+    public List<Control> GetCharacterInfoControls(EntityUid uid)
+    {
+        var ev = new GetCharacterInfoControlsEvent(uid);
+        RaiseLocalEvent(uid, ref ev, true);
+        return ev.Controls;
+    }
+
     public readonly record struct CharacterData(
+        EntityUid Entity,
         string Job,
         Dictionary<string, List<ConditionInfo>> Objectives,
         string Briefing,
-        SpriteComponent? Sprite,
         string EntityName
     );
+
+    /// <summary>
+    /// Event raised to get additional controls to display in the character info menu.
+    /// </summary>
+    [ByRefEvent]
+    public readonly record struct GetCharacterInfoControlsEvent(EntityUid Entity)
+    {
+        public readonly List<Control> Controls = new();
+
+        public readonly EntityUid Entity = Entity;
+    }
 }