Revert "Upstream Merger Ig"

.envrc

@@ -1,5 +1,4 @@
-set -e
 if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
-    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
+  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
 fi
-use nix
+use nix

.github/CODEOWNERS

@@ -1,107 +1,3 @@
-# hasn't specified or all
-* @sleepyyapril @Remuchi
+# Last match in file takes precedence.
 
-/.* @DEATHB4DEFEAT
-*.sln @DEATHB4DEFEAT
-*.csproj @DEATHB4DEFEAT
-*.dotsettings @DEATHB4DEFEAT
-*.DotSettings @DEATHB4DEFEAT
-*.toml @DEATHB4DEFEAT
-/Content.*/IoC @DEATHB4DEFEAT
-
-
-# Nix
-*.nix @DEATHB4DEFEAT @stellar-novas
-/flake.lock @DEATHB4DEFEAT @stellar-novas
-/.envrc @DEATHB4DEFEAT @stellar-novas
-
-
-# UI
-*.xaml @DEATHB4DEFEAT
-*.xaml.cs @DEATHB4DEFEAT
-
-# Lobby
-/Content.Client/Lobby @DEATHB4DEFEAT
-/Content.Client/MainMenu @DEATHB4DEFEAT
-
-# Queue
-/Content.*/DiscordAuth @DEATHB4DEFEAT
-/Content.*/JoinQueue @DEATHB4DEFEAT
-
-
-# Writing
-*.xml @DEATHB4DEFEAT
-*.ftl @DEATHB4DEFEAT
-*.md @DEATHB4DEFEAT
-*.txt @DEATHB4DEFEAT
-
-# Shaders
-*.swsl @DEATHB4DEFEAT
-/Resources/Prototypes/Shaders @DEATHB4DEFEAT
-
-# Overlays
-/Content.Client/Overlays @DEATHB4DEFEAT
-
-# Paint
-/Content.*/Paint @DEATHB4DEFEAT
-
-
-# Parkstation/etc
-**/SimpleStation14 @DEATHB4DEFEAT
-**/Parkstation @DEATHB4DEFEAT
-
-# Announcer system
-/Content.*/Announcements @DEATHB4DEFEAT
-/Content.Server/StationEvents @DEATHB4DEFEAT
-
-# SSD
-/Content.*/SSDIndicator @DEATHB4DEFEAT
-
-# Station Goals
-/Content.Server/StationGoal @DEATHB4DEFEAT
-
-# Random Bark
-/Content.Server/Speech/Components/RandomBarkComponent.cs @DEATHB4DEFEAT
-/Content.Server/Speech/Systems/RandomBarkSystem.cs @DEATHB4DEFEAT
-/Resources/Locale/en-US/random-barks @DEATHB4DEFEAT
-
-# Punpun
-/Content.Server/Punpun @DEATHB4DEFEAT
-
-
-# Database
-/Content.*/Database @DEATHB4DEFEAT
-/Content.*/.Database @DEATHB4DEFEAT
-
-# Preferences
-/Content.*/Preferences @DEATHB4DEFEAT
-**/*CVar*/*.cs @DEATHB4DEFEAT
-
-# Discord
-/Content.*/Discord* @DEATHB4DEFEAT
-
-# Loadouts
-/Resources/Prototypes/Loadouts @angelofallars
-/Resources/Prototypes/CharacterItemGroups @angelofallars
-/Resources/Locale/en-US/loadouts @angelofallars
-
-# Traits
-/Resources/Prototypes/Traits @angelofallars
-/Resources/Locale/en-US/traits @angelofallars
-
-# Throwing
-/Content.*/DamageOtherOnHit @angelofallars
-/Content.*/Embed @angelofallars
-/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
+# TODO

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

@@ -7,7 +7,6 @@ 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:

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

@@ -31,6 +31,19 @@ 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);
@@ -147,12 +160,15 @@ 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)
                     {
-                        FixedPoint2 gasPercent = percent * 100f;
-                        var gasAbbreviation = Atmospherics.GasAbbreviations.GetValueOrDefault(gas, Loc.GetString("gas-unknown-abbreviation"));
+                        var gasPercent = (FixedPoint2)0f;
+                        gasPercent = percent * 100f;
+
+                        if (!_gasShorthands.TryGetValue(gas, out var gasShorthand))
+                            gasShorthand = "X";
 
                         var gasLabel = new Label()
                         {
-                            Text = Loc.GetString("atmos-alerts-window-other-gases-value", ("shorthand", gasAbbreviation), ("value", gasPercent)),
+                            Text = Loc.GetString("atmos-alerts-window-other-gases-value", ("shorthand", gasShorthand), ("value", gasPercent)),
                             FontOverride = normalFont,
                             FontColorOverride = GetAlarmStateColor(alert),
                             HorizontalAlignment = HAlignment.Center,