Upstream

.github/CODEOWNERS

@@ -8,4 +8,4 @@
 /Resources/Maps/** @Morb0 @DIMMoon1 @kvant8
 
 # Sprites
-/Resources/Textures/** @Morb0 @DIMMoon1 @SonicHDC
+/Resources/Textures/** @Morb0 @DIMMoon1 @MureixloI

.github/workflows/update-wiki.yml

@@ -33,13 +33,21 @@ jobs:
               - 'Content.Shared/**'
               - 'Content.Server/**'
               - 'Content.Client/**'
-              - 'Resources/**'
+              - 'Resources/Prototypes/**'
               - 'RobustToolbox/**'
 
             prototypes:
               - '.github/workflows/update-wiki.yml'
               - 'Resources/Prototypes/**'
 
+            textures:
+              - '.github/workflows/update-wiki.yml'
+              - 'Resources/Textures/**'
+
+            locale:
+              - '.github/workflows/update-wiki.yml'
+              - 'Resources/Locale/**'
+
       - name: Setup Submodule
         run: |
           git submodule update --init --recursive
@@ -67,6 +75,30 @@ jobs:
         run: dotnet ./bin/Content.Server/Content.Server.dll --cvar autogen.destination_file=prototypes.json
         continue-on-error: true
 
+      - name: Upload loc to wiki
+        if: ${{ github.event_name == 'workflow_dispatch' || steps.changes.outputs.locale == 'true' }}
+        continue-on-error: true
+        uses: jtmullen/mediawiki-edit-action@v0.1.1
+        with:
+          wiki_text_file: ./bin/Content.Server/data/loc.json
+          edit_summary: Update loc.json via GitHub Actions
+          page_name: "${{ secrets.WIKI_PAGE_ROOT }}/loc.json"
+          api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
+          username: ${{ secrets.WIKI_BOT_USER }}
+          password: ${{ secrets.WIKI_BOT_PASS }}
+
+      - name: Update meta license
+        if: ${{ github.event_name == 'workflow_dispatch' || steps.changes.outputs.textures == 'true' }}
+        continue-on-error: true
+        uses: jtmullen/mediawiki-edit-action@v0.1.1
+        with:
+          wiki_text_file: ./bin/Content.Server/data/meta_license.json
+          edit_summary: Update meta_license.json via GitHub Actions
+          page_name: "${{ secrets.WIKI_PAGE_ROOT }}/meta_license.json"
+          api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
+          username: ${{ secrets.WIKI_BOT_USER }}
+          password: ${{ secrets.WIKI_BOT_PASS }}
+
       # Проходит по всем JSON-файлам в директории BASE и загружает каждый файл как страницу в MediaWiki.
       # Имя страницы формируется из относительного пути к файлу.
       - name: Upload JSON files to wiki
@@ -98,18 +130,28 @@ jobs:
           cookiejar="$(mktemp)"
           trap 'rm -f "$cookiejar"' EXIT
 
-          login_token=$(curl -sS -c "$cookiejar" \
+          curl_api() {
+            curl --silent --show-error \
+              --retry 3 \
+              --retry-delay 5 \
+              --retry-all-errors \
+              --connect-timeout 20 \
+              --max-time 180 \
+              "$@"
+          }
+
+          login_token=$(curl_api -c "$cookiejar" \
             --data "action=query&meta=tokens&type=login&format=json" "$API" | jq -r '.query.tokens.logintoken')
 
-          curl -sS -c "$cookiejar" -b "$cookiejar" \
+          curl_api -c "$cookiejar" -b "$cookiejar" \
             --data-urlencode "action=login" \
             --data-urlencode "lgname=$USER" \
             --data-urlencode "lgpassword=$PASS" \
             --data-urlencode "lgtoken=$login_token" \
             --data-urlencode "format=json" \
             "$API" > /dev/null
 
-          token=$(curl -sS -b "$cookiejar" \
+          token=$(curl_api -b "$cookiejar" \
             --data "action=query&meta=tokens&format=json" "$API" | jq -r '.query.tokens.csrftoken')
 
           edit_page_file() {
@@ -118,7 +160,7 @@ jobs:
             local textfile="$3"
             local token="$4"
 
-            curl -sS -b "$cookiejar" \
+            curl_api -b "$cookiejar" \
               --data-urlencode "action=edit" \
               --data-urlencode "title=$title" \
               --data-urlencode "summary=$summary" \
@@ -136,7 +178,7 @@ jobs:
             local text="$3"
             local token="$4"
 
-            curl -sS -b "$cookiejar" \
+            curl_api -b "$cookiejar" \
               --data-urlencode "action=edit" \
               --data-urlencode "title=$title" \
               --data-urlencode "summary=$summary" \
@@ -160,7 +202,7 @@ jobs:
             titles="${titles%|}"
 
             local resp
-            resp=$(curl -sS -b "$cookiejar" \
+            resp=$(curl_api -b "$cookiejar" \
               --data-urlencode "action=query" \
               --data-urlencode "format=json" \
               --data-urlencode "formatversion=2" \
@@ -183,16 +225,12 @@ jobs:
             )
           }
 
-          count_lines() {
-            awk 'END { print NR }'
-          }
-
           files=()
           while IFS= read -r -d '' file; do
             files+=("$file")
           done < <(find "$BASE" -type f -name '*.json' -print0)
 
-          batch_size=50
+          batch_size=25
 
           for ((i=0; i<${#files[@]}; i+=batch_size)); do
             batch_files=("${files[@]:i:batch_size}")

Content.Benchmarks/ComponentQueryBenchmark.cs

@@ -1,5 +1,6 @@
 #nullable enable
 using System;
+using System.IO;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
@@ -44,7 +45,7 @@ public void Setup()
         ProgramShared.PathOffset = "../../../../";
         PoolManager.Startup(typeof(QueryBenchSystem).Assembly);
 
-        _pair = PoolManager.GetServerClient().GetAwaiter().GetResult();
+        _pair = PoolManager.GetServerClient(testContext: new ExternalTestContext("Benchmark", StreamWriter.Null)).GetAwaiter().GetResult();
         _entMan = _pair.Server.ResolveDependency<IEntityManager>();
 
         _itemQuery = _entMan.GetEntityQuery<ItemComponent>();

Content.Benchmarks/DeltaPressureBenchmark.cs

@@ -1,3 +1,4 @@
+using System.IO;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using Content.IntegrationTests;
@@ -68,7 +69,7 @@ public async Task SetupAsync()
     {
         ProgramShared.PathOffset = "../../../../";
         PoolManager.Startup();
-        _pair = await PoolManager.GetServerClient();
+        _pair = await PoolManager.GetServerClient(testContext: new ExternalTestContext("Benchmark", StreamWriter.Null));
         var server = _pair.Server;
 
         var mapdata = await _pair.CreateTestMap();

Content.Benchmarks/DestructibleBenchmark.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using Content.IntegrationTests;
@@ -69,7 +70,7 @@ public async Task SetupAsync()
     {
         ProgramShared.PathOffset = "../../../../";
         PoolManager.Startup();
-        _pair = await PoolManager.GetServerClient();
+        _pair = await PoolManager.GetServerClient(testContext: new ExternalTestContext("Benchmark", StreamWriter.Null));
         var server = _pair.Server;
 
         _entMan = server.ResolveDependency<IEntityManager>();

Content.Benchmarks/DeviceNetworkingBenchmark.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using Content.IntegrationTests;
@@ -60,7 +61,7 @@ public async Task SetupAsync()
     {
         ProgramShared.PathOffset = "../../../../";
         PoolManager.Startup(typeof(DeviceNetworkingBenchmark).Assembly);
-        _pair = await PoolManager.GetServerClient();
+        _pair = await PoolManager.GetServerClient(testContext: new ExternalTestContext("Benchmark", StreamWriter.Null));
         var server = _pair.Server;
 
         await server.WaitPost(() =>

Content.Benchmarks/GasReactionBenchmark.cs

@@ -1,3 +1,4 @@
+using System.IO;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using Content.IntegrationTests;
@@ -51,7 +52,7 @@ public async Task SetupAsync()
     {
         ProgramShared.PathOffset = "../../../../";
         PoolManager.Startup();
-        _pair = await PoolManager.GetServerClient();
+        _pair = await PoolManager.GetServerClient(testContext: new ExternalTestContext("Benchmark", StreamWriter.Null));
         var server = _pair.Server;
 
         // Create test map and grid

Content.Benchmarks/HeatCapacityBenchmark.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.IO;
+using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
@@ -27,7 +28,7 @@ public async Task SetupAsync()
     {
         ProgramShared.PathOffset = "../../../../";
         PoolManager.Startup();
-        _pair = await PoolManager.GetServerClient();
+        _pair = await PoolManager.GetServerClient(testContext: new ExternalTestContext("Benchmark", StreamWriter.Null));
         await _pair.Connect();
         _cEntMan = _pair.Client.ResolveDependency<IEntityManager>();
         _sEntMan = _pair.Server.ResolveDependency<IEntityManager>();

Content.Benchmarks/MapLoadBenchmark.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
@@ -29,7 +30,7 @@ public void Setup()
         ProgramShared.PathOffset = "../../../../";
         PoolManager.Startup();
 
-        _pair = PoolManager.GetServerClient().GetAwaiter().GetResult();
+        _pair = PoolManager.GetServerClient(testContext: new ExternalTestContext("Benchmark", StreamWriter.Null)).GetAwaiter().GetResult();
         var server = _pair.Server;
 
         Paths = server.ResolveDependency<IPrototypeManager>()

Content.Benchmarks/PvsBenchmark.cs

@@ -1,5 +1,6 @@
 #nullable enable
 using System;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
@@ -50,7 +51,7 @@ public void Setup()
 #endif
         PoolManager.Startup();
 
-        _pair = PoolManager.GetServerClient().GetAwaiter().GetResult();
+        _pair = PoolManager.GetServerClient(testContext: new ExternalTestContext("Benchmark", StreamWriter.Null)).GetAwaiter().GetResult();
         _entMan = _pair.Server.ResolveDependency<IEntityManager>();
         _pair.Server.CfgMan.SetCVar(CVars.NetPVS, true);
         _pair.Server.CfgMan.SetCVar(CVars.ThreadParallelCount, 0);

Content.Benchmarks/RaiseEventBenchmark.cs

@@ -1,4 +1,5 @@
 #nullable enable
+using System.IO;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
@@ -21,7 +22,7 @@ public void Setup()
     {
         ProgramShared.PathOffset = "../../../../";
         PoolManager.Startup(typeof(BenchSystem).Assembly);
-        _pair = PoolManager.GetServerClient().GetAwaiter().GetResult();
+        _pair = PoolManager.GetServerClient(testContext: new ExternalTestContext("Benchmark", StreamWriter.Null)).GetAwaiter().GetResult();
         var entMan = _pair.Server.EntMan;
         var fact = _pair.Server.ResolveDependency<IComponentFactory>();
         var bus = (EntityEventBus)entMan.EventBus;

Content.Benchmarks/SpawnEquipDeleteBenchmark.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.IO;
+using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
@@ -36,7 +37,7 @@ public async Task SetupAsync()
     {
         ProgramShared.PathOffset = "../../../../";
         PoolManager.Startup();
-        _pair = await PoolManager.GetServerClient();
+        _pair = await PoolManager.GetServerClient(testContext: new ExternalTestContext("Benchmark", StreamWriter.Null));
         var server = _pair.Server;
 
         var mapData = await _pair.CreateTestMap();

Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs

@@ -65,7 +65,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window?.UpdateState(castState);
         }
 
-        public void SubmitData(string newFullName, string newJobTitle, List<ProtoId<AccessLevelPrototype>> newAccessList, ProtoId<JobPrototype> newJobPrototype)
+        public void SubmitData(string newFullName, string newJobTitle, List<ProtoId<AccessLevelPrototype>> newAccessList, ProtoId<JobPrototype>? newJobPrototype)
         {
             SendMessage(new WriteToTargetIdMessage(
                 newFullName,

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

@@ -216,7 +216,7 @@ private void SubmitData()
                 JobTitleLineEdit.Text,
                 // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair
                 _accessButtons.ButtonsList.Where(x => x.Value.Pressed).Select(x => x.Key).ToList(),
-                jobProtoDirty ? _jobPrototypeIds[JobPresetOptionButton.SelectedId] : string.Empty);
+                jobProtoDirty ? _jobPrototypeIds[JobPresetOptionButton.SelectedId] : null);
         }
     }
 }

Content.Client/Atmos/Components/MaxPressureVisualsComponent.cs

@@ -0,0 +1,36 @@
+using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.EntitySystems;
+
+namespace Content.Client.Atmos.Components;
+
+/// <summary>
+/// This listens to appearance changes from <see cref="GasMaxPressureSystem{T}"/>
+/// and applies sprite changes to a gas holder currently experiencing <see cref="IGasMaxPressureHolder.Integrity"/> loss.
+/// </summary>
+[RegisterComponent]
+public sealed partial class MaxPressureVisualsComponent : Component
+{
+    /// <summary>
+    /// What RsiState we use for our integrity visuals.
+    /// </summary>
+    [DataField]
+    public string? IntegrityState = "integrity";
+
+    /// <summary>
+    /// What RsiState we use for the mask that goes over integrity visuals.
+    /// </summary>
+    [DataField]
+    public string? IntegrityMask = "mask";
+
+    /// <summary>
+    /// How many steps there are
+    /// </summary>
+    [DataField("steps")]
+    public int IntegritySteps = 5;
+}
+
+public enum MaxPressureVisualLayers : byte
+{
+    Base,
+    BaseUnshaded,
+}

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

@@ -1,6 +1,7 @@
 using Content.Client.Stylesheets;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.Atmos.Monitor;
 using Content.Shared.FixedPoint;
 using Content.Shared.Temperature;
@@ -22,6 +23,7 @@ public sealed partial class AtmosAlarmEntryContainer : BoxContainer
 
     private readonly IEntityManager _entManager;
     private readonly IResourceCache _cache;
+    private readonly SharedAtmosphereSystem _atmosphere;
 
     private Dictionary<AtmosAlarmType, string> _alarmStrings = new Dictionary<AtmosAlarmType, string>()
     {
@@ -37,6 +39,7 @@ public AtmosAlarmEntryContainer(NetEntity uid, EntityCoordinates? coordinates)
 
         _entManager = IoCManager.Resolve<IEntityManager>();
         _cache = IoCManager.Resolve<IResourceCache>();
+        _atmosphere = _entManager.System<SharedAtmosphereSystem>();
 
         NetEntity = uid;
         Coordinates = coordinates;
@@ -149,7 +152,7 @@ public void UpdateEntry(AtmosAlertsComputerEntry entry, bool isFocus, AtmosAlert
                     foreach ((var gas, (var mol, var percent, var alert)) in keyValuePairs)
                     {
                         FixedPoint2 gasPercent = percent * 100f;
-                        var gasAbbreviation = Atmospherics.GasAbbreviations.GetValueOrDefault(gas, Loc.GetString("gas-unknown-abbreviation"));
+                        var gasAbbreviation = Loc.GetString(_atmosphere.GetGas(gas).Abbreviation);
 
                         var gasLabel = new Label()
                         {