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

# Conflicts: # .github/CODEOWNERS # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
space-syndicate · Dec 16, 2023 · 7d4b894 · 7d4b894
2 parents d8cab95 + 33b007c
commit 7d4b894
Show file tree

Hide file tree

Showing 342 changed files with 75,514 additions and 47,113 deletions.
diff --git a/.github/workflows/build-docfx.yml b/.github/workflows/build-docfx.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Install dependencies
       run: dotnet restore

diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Install dependencies
         run: dotnet restore

diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml
@@ -36,7 +36,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Install dependencies
       run: dotnet restore

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -41,7 +41,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Get Engine Tag
       run: |

diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml
@@ -65,7 +65,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Install dependencies
         run: dotnet restore
@@ -78,7 +78,7 @@ jobs:
 
       - name: Package client
         run: dotnet run --project Content.Packaging client --no-wipe-release
-      
+
       - name: Update Build Info
         env:
           FORK_ID: ${{ vars.FORK_ID }}

diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build

diff --git a/Content.Benchmarks/Content.Benchmarks.csproj b/Content.Benchmarks/Content.Benchmarks.csproj
@@ -8,7 +8,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>11</LangVersion>
+    <LangVersion>12</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />

diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs
@@ -87,6 +87,8 @@ private void BaseHandleState<T>(EntityUid uid, BaseActionComponent component, Ba
             component.Cooldown = state.Cooldown;
             component.UseDelay = state.UseDelay;
             component.Charges = state.Charges;
+            component.MaxCharges = state.MaxCharges;
+            component.RenewCharges = state.RenewCharges;
             component.Container = EnsureEntity<T>(state.Container, uid);
             component.EntityIcon = EnsureEntity<T>(state.EntityIcon, uid);
             component.CheckCanInteract = state.CheckCanInteract;

diff --git a/Content.Client/Actions/UI/ActionAlertTooltip.cs b/Content.Client/Actions/UI/ActionAlertTooltip.cs
@@ -21,7 +21,7 @@ public sealed class ActionAlertTooltip : PanelContainer
         /// </summary>
         public (TimeSpan Start, TimeSpan End)? Cooldown { get; set; }
 
-        public ActionAlertTooltip(FormattedMessage name, FormattedMessage? desc, string? requires = null)
+        public ActionAlertTooltip(FormattedMessage name, FormattedMessage? desc, string? requires = null, FormattedMessage? charges = null)
         {
             _gameTiming = IoCManager.Resolve<IGameTiming>();
 
@@ -52,6 +52,17 @@ public ActionAlertTooltip(FormattedMessage name, FormattedMessage? desc, string?
                 vbox.AddChild(description);
             }
 
+            if (charges != null && !string.IsNullOrWhiteSpace(charges.ToString()))
+            {
+                var chargesLabel = new RichTextLabel
+                {
+                    MaxWidth = TooltipTextMaxWidth,
+                    StyleClasses = { StyleNano.StyleClassTooltipActionCharges }
+                };
+                chargesLabel.SetMessage(charges);
+                vbox.AddChild(chargesLabel);
+            }
+
             vbox.AddChild(_cooldownLabel = new RichTextLabel
             {
                 MaxWidth = TooltipTextMaxWidth,

diff --git a/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs b/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs
@@ -1,22 +1,16 @@
-using System.Collections.Generic;
 using Content.Client.Atmos.Overlays;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.GameTicking;
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
-using Robust.Shared.IoC;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
 
 namespace Content.Client.Atmos.EntitySystems
 {
     [UsedImplicitly]
     internal sealed class AtmosDebugOverlaySystem : SharedAtmosDebugOverlaySystem
     {
-
-        private readonly Dictionary<EntityUid, AtmosDebugOverlayMessage> _tileData =
-            new();
+        public readonly Dictionary<EntityUid, AtmosDebugOverlayMessage> TileData = new();
 
         // Configuration set by debug commands and used by AtmosDebugOverlay {
         /// <summary>Value source for display</summary>
@@ -48,20 +42,20 @@ public override void Initialize()
 
         private void OnGridRemoved(GridRemovalEvent ev)
         {
-            if (_tileData.ContainsKey(ev.EntityUid))
+            if (TileData.ContainsKey(ev.EntityUid))
             {
-                _tileData.Remove(ev.EntityUid);
+                TileData.Remove(ev.EntityUid);
             }
         }
 
         private void HandleAtmosDebugOverlayMessage(AtmosDebugOverlayMessage message)
         {
-            _tileData[GetEntity(message.GridId)] = message;
+            TileData[GetEntity(message.GridId)] = message;
         }
 
         private void HandleAtmosDebugOverlayDisableMessage(AtmosDebugOverlayDisableMessage ev)
         {
-            _tileData.Clear();
+            TileData.Clear();
         }
 
         public override void Shutdown()
@@ -74,24 +68,12 @@ public override void Shutdown()
 
         public void Reset(RoundRestartCleanupEvent ev)
         {
-            _tileData.Clear();
+            TileData.Clear();
         }
 
         public bool HasData(EntityUid gridId)
         {
-            return _tileData.ContainsKey(gridId);
-        }
-
-        public AtmosDebugOverlayData? GetData(EntityUid gridIndex, Vector2i indices)
-        {
-            if (!_tileData.TryGetValue(gridIndex, out var srcMsg))
-                return null;
-
-            var relative = indices - srcMsg.BaseIdx;
-            if (relative.X < 0 || relative.Y < 0 || relative.X >= LocalViewRange || relative.Y >= LocalViewRange)
-                return null;
-
-            return srcMsg.OverlayData[relative.X + relative.Y * LocalViewRange];
+            return TileData.ContainsKey(gridId);
         }
     }