Merge remote-tracking branch 'EE-Master/master' into update-2-2-2025

.github/CODEOWNERS

@@ -1,10 +1,13 @@
+# hasn't specified or all
+* @sleepyyapril @Remuchi
+
 /.* @DEATHB4DEFEAT
 *.sln @DEATHB4DEFEAT
 *.csproj @DEATHB4DEFEAT
 *.dotsettings @DEATHB4DEFEAT
 *.DotSettings @DEATHB4DEFEAT
 *.toml @DEATHB4DEFEAT
-/Content.*/IoC @sleepyyapril @DEATHB4DEFEAT
+/Content.*/IoC @DEATHB4DEFEAT
 
 
 # Nix
@@ -14,8 +17,8 @@
 
 
 # UI
-*.xaml @sleepyyapril @DEATHB4DEFEAT
-*.xaml.cs @sleepyyapril @DEATHB4DEFEAT
+*.xaml @DEATHB4DEFEAT
+*.xaml.cs @DEATHB4DEFEAT
 
 # Lobby
 /Content.Client/Lobby @DEATHB4DEFEAT
@@ -28,7 +31,7 @@
 
 # Writing
 *.xml @DEATHB4DEFEAT
-*.ftl @DEATHB4DEFEAT @sleepyyapril
+*.ftl @DEATHB4DEFEAT
 *.md @DEATHB4DEFEAT
 *.txt @DEATHB4DEFEAT
 
@@ -67,15 +70,15 @@
 
 
 # Database
-/Content.*/Database @sleepyyapril @DEATHB4DEFEAT
-/Content.*/.Database @sleepyyapril @DEATHB4DEFEAT
+/Content.*/Database @DEATHB4DEFEAT
+/Content.*/.Database @DEATHB4DEFEAT
 
 # Preferences
 /Content.*/Preferences @DEATHB4DEFEAT
-**/*CVar*/*.cs @sleepyyapril @DEATHB4DEFEAT
+**/*CVar*/*.cs @DEATHB4DEFEAT
 
 # Discord
-/Content.*/Discord* @sleepyyapril @DEATHB4DEFEAT
+/Content.*/Discord* @DEATHB4DEFEAT
 
 # Loadouts
 /Resources/Prototypes/Loadouts @angelofallars
@@ -92,3 +95,13 @@
 /Content.*/ProjectileSystem @angelofallars
 /Content.*/ThrownItem @angelofallars
 /Content.*/ThrowEvent @angelofallars
+
+# Nyano Systems
+/Content.*/Weapons @VMSolidus
+/Content.*/Abilities/Psionics @VMSolidus
+/Content.*/Psionics @VMSolidus
+/Content.*/Contests @VMSolidus
+/Content.*/Carrying @VMSolidus
+
+# Physics Stuff
+/Content.*/Atmos @VMSolidus

.github/workflows/no-submodule-update.yml

@@ -7,6 +7,7 @@ on:
 
 jobs:
   this_aint_right:
+    if: github.actor != 'sleepyyapril' && github.actor != 'VMSolidus' && github.actor != 'DEATHB4DEFEAT'
     name: Submodule update in pr found
     runs-on: ubuntu-latest
     steps:

.github/workflows/rsi-diff.yml

@@ -15,9 +15,12 @@ jobs:
 
       - name: Get changed files
         id: files
-        uses: Ana06/get-changed-files@v1.2
+        uses: Ana06/get-changed-files@v2.3.0
         with:
           format: 'space-delimited'
+          filter: | 
+            **.rsi
+            **.png
 
       - name: Diff changed RSIs
         id: diff

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

@@ -31,19 +31,6 @@ public sealed partial class AtmosAlarmEntryContainer : BoxContainer
         [AtmosAlarmType.Danger] = "atmos-alerts-window-danger-state",
     };
 
-    private Dictionary<Gas, string> _gasShorthands = new Dictionary<Gas, string>()
-    {
-        [Gas.Ammonia] = "NH₃",
-        [Gas.CarbonDioxide] = "CO₂",
-        [Gas.Frezon] = "F",
-        [Gas.Nitrogen] = "N₂",
-        [Gas.NitrousOxide] = "N₂O",
-        [Gas.Oxygen] = "O₂",
-        [Gas.Plasma] = "P",
-        [Gas.Tritium] = "T",
-        [Gas.WaterVapor] = "H₂O",
-    };
-
     public AtmosAlarmEntryContainer(NetEntity uid, EntityCoordinates? coordinates)
     {
         RobustXamlLoader.Load(this);
@@ -160,15 +147,12 @@ public void UpdateEntry(AtmosAlertsComputerEntry entry, bool isFocus, AtmosAlert
                     // Add an entry for each gas
                     foreach ((var gas, (var mol, var percent, var alert)) in gasData)
                     {
-                        var gasPercent = (FixedPoint2)0f;
-                        gasPercent = percent * 100f;
-
-                        if (!_gasShorthands.TryGetValue(gas, out var gasShorthand))
-                            gasShorthand = "X";
+                        FixedPoint2 gasPercent = percent * 100f;
+                        var gasAbbreviation = Atmospherics.GasAbbreviations.GetValueOrDefault(gas, Loc.GetString("gas-unknown-abbreviation"));
 
                         var gasLabel = new Label()
                         {
-                            Text = Loc.GetString("atmos-alerts-window-other-gases-value", ("shorthand", gasShorthand), ("value", gasPercent)),
+                            Text = Loc.GetString("atmos-alerts-window-other-gases-value", ("shorthand", gasAbbreviation), ("value", gasPercent)),
                             FontOverride = normalFont,
                             FontColorOverride = GetAlarmStateColor(alert),
                             HorizontalAlignment = HAlignment.Center,

Content.Client/Atmos/Consoles/AtmosMonitoringConsoleBoundUserInterface.cs

@@ -0,0 +1,40 @@
+using Content.Shared.Atmos.Components;
+
+namespace Content.Client.Atmos.Consoles;
+
+public sealed class AtmosMonitoringConsoleBoundUserInterface : BoundUserInterface
+{
+    [ViewVariables]
+    private AtmosMonitoringConsoleWindow? _menu;
+
+    public AtmosMonitoringConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _menu = new AtmosMonitoringConsoleWindow(this, Owner);
+        _menu.OpenCentered();
+        _menu.OnClose += Close;
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        if (state is not AtmosMonitoringConsoleBoundInterfaceState castState)
+            return;
+
+        EntMan.TryGetComponent<TransformComponent>(Owner, out var xform);
+        _menu?.UpdateUI(xform?.Coordinates, castState.AtmosNetworks);
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (!disposing)
+            return;
+
+        _menu?.Dispose();
+    }
+}