Live push 8 22 2025

.github/CODEOWNERS

@@ -9,6 +9,7 @@
 /Resources/ServerInfo/Guidebook/ServerRules/ @crazybrain23
 
 /Resources/Prototypes/Maps/** @Emisse @ArtisticRoomba
+/Resources/Maps/** @Emisse @ArtisticRoomba
 
 /Resources/Prototypes/Body/ @DrSmugleaf # suffering
 /Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
@@ -37,6 +38,8 @@
 /Content.*/Shuttles @metalgearsloth
 /Content.*/Weapons @metalgearsloth
 
+/Content.Server/Discord/ @Simyon264
+
 # STARLIGHT
 
 * @ss14-Starlight

.github/workflows/publish-testing.yml

@@ -61,3 +61,34 @@ jobs:
         FORK_ID: starlight-test
         PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
         GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
+
+  update-changelog:
+    name: Publish Changelogs
+#    needs: build
+    runs-on: ubuntu-latest
+    environment: prod
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up SSH
+        env:
+          ACTIONS_SSH_KEY: ${{ secrets.ACTIONS_SSH_KEY }}
+        run: |
+          mkdir -p ~/.ssh
+          echo "$ACTIONS_SSH_KEY" | tr -d '\r' > ~/.ssh/id_ed25519
+          chmod 600 ~/.ssh/id_ed25519
+          ssh-keyscan github.com >> ~/.ssh/known_hosts
+
+      - name: Test SSH Connection
+        run: ssh -T git@github.com || exit 0
+
+      - name: Publish changelog (Discord)
+        continue-on-error: true
+        run: Tools/actions_changelogs_since_last_run.py
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
+          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL_DELTA }}
+          DISCORD_CHANGELOG_ROLE_ID: "1408308518448267364"

.github/workflows/publish.yml

@@ -78,3 +78,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
           DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          DISCORD_CHANGELOG_ROLE_ID: "1308143973684088883"

Content.Benchmarks/PvsBenchmark.cs

@@ -6,7 +6,6 @@
 using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
 using Content.Server.Mind;
-using Content.Server.Warps;
 using Content.Shared.Warps;
 using Robust.Shared;
 using Robust.Shared.Analyzers;

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, FormattedMessage? charges = null)
+        public ActionAlertTooltip(FormattedMessage name, FormattedMessage? desc, string? requires = null)
         {
             _gameTiming = IoCManager.Resolve<IGameTiming>();
 
@@ -52,17 +52,6 @@ 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,

Content.Client/Administration/Systems/HeadstandSystem.cs

@@ -1,4 +1,4 @@
-using Content.Client.Administration.Components;
+using Content.Shared.Administration.Components;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Administration.Systems;

Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs

@@ -76,7 +76,7 @@ private void RefreshObjectList(ObjectsTabSelection selection)
         switch (selection)
         {
             case ObjectsTabSelection.Stations:
-                entities.AddRange(_entityManager.EntitySysManager.GetEntitySystem<StationSystem>().Stations);
+                entities.AddRange(_entityManager.EntitySysManager.GetEntitySystem<StationSystem>().GetStationNames());
                 break;
             case ObjectsTabSelection.Grids:
             {

Content.Client/Animals/Systems/ParrotMemorySystem.cs

@@ -0,0 +1,5 @@
+using Content.Shared.Animals.Systems;
+
+namespace Content.Client.Animals.Systems;
+
+public sealed class ParrotMemorySystem : SharedParrotMemorySystem;

Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs

@@ -1,6 +1,6 @@
 using Content.Shared.Anomaly.Components;
 using Content.Shared.Anomaly.Effects;
-using Content.Shared.Body.Components;
+using Content.Shared.Humanoid;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Anomaly.Effects;
@@ -25,9 +25,8 @@ private void OnAfterHandleState(Entity<InnerBodyAnomalyComponent> ent, ref After
 
         var index = _sprite.LayerMapReserve((ent.Owner, sprite), ent.Comp.LayerMap);
 
-        if (TryComp<BodyComponent>(ent, out var body) &&
-            body.Prototype is not null &&
-            ent.Comp.SpeciesSprites.TryGetValue(body.Prototype.Value, out var speciesSprite))
+        if (TryComp<HumanoidAppearanceComponent>(ent, out var humanoidAppearance) &&
+            ent.Comp.SpeciesSprites.TryGetValue(humanoidAppearance.Species, out var speciesSprite))
         {
             _sprite.LayerSetSprite((ent.Owner, sprite), index, speciesSprite);
         }

Content.Client/Atmos/EntitySystems/PipeColorVisualizerSystem.cs

@@ -1,46 +1,11 @@
 using Content.Client.Atmos.Components;
 using Robust.Client.GameObjects;
-using Content.Client.UserInterface.Systems.Storage.Controls;
 using Content.Shared.Atmos.Piping;
-using Content.Shared.Hands;
-using Content.Shared.Atmos.Components;
-using Content.Shared.Item;
 
 namespace Content.Client.Atmos.EntitySystems;
 
 public sealed class PipeColorVisualizerSystem : VisualizerSystem<PipeColorVisualsComponent>
 {
-    [Dependency] private readonly SharedItemSystem _itemSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<PipeColorVisualsComponent, GetInhandVisualsEvent>(OnGetVisuals);
-        SubscribeLocalEvent<PipeColorVisualsComponent, BeforeRenderInGridEvent>(OnDrawInGrid);
-    }
-
-    /// <summary>
-    ///     This method is used to display the color changes of the pipe on the screen..
-    /// </summary>
-    private void OnGetVisuals(Entity<PipeColorVisualsComponent> item, ref GetInhandVisualsEvent args)
-    {
-        foreach (var (_, layerData) in args.Layers)
-        {
-            if (TryComp(item.Owner, out AtmosPipeColorComponent? pipeColor))
-                layerData.Color = pipeColor.Color;
-        }
-    }
-
-    /// <summary>
-    ///     This method is used to change the pipe's color in a container grid.
-    /// </summary>
-    private void OnDrawInGrid(Entity<PipeColorVisualsComponent> item, ref BeforeRenderInGridEvent args)
-    {
-        if (TryComp(item.Owner, out AtmosPipeColorComponent? pipeColor))
-            args.Color = pipeColor.Color;
-    }
-
     protected override void OnAppearanceChange(EntityUid uid, PipeColorVisualsComponent component, ref AppearanceChangeEvent args)
     {
         if (TryComp<SpriteComponent>(uid, out var sprite)
@@ -50,8 +15,6 @@ protected override void OnAppearanceChange(EntityUid uid, PipeColorVisualsCompon
             var layer = sprite[PipeVisualLayers.Pipe];
             layer.Color = color.WithAlpha(layer.Color.A);
         }
-
-        _itemSystem.VisualsChanged(uid);
     }
 }
 

Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs

@@ -59,7 +59,7 @@ public PumpControl(GasVentPumpData data, string address)
 
         foreach (var value in Enum.GetValues<VentPumpDirection>())
         {
-            _pumpDirection.AddItem(Loc.GetString($"{value}"), (int) value);
+            _pumpDirection.AddItem(Loc.GetString($"air-alarm-ui-pump-direction-{value.ToString().ToLower()}"), (int) value);
         }
 
         _pumpDirection.SelectId((int) _data.PumpDirection);
@@ -72,7 +72,7 @@ public PumpControl(GasVentPumpData data, string address)
 
         foreach (var value in Enum.GetValues<VentPressureBound>())
         {
-            _pressureCheck.AddItem(Loc.GetString($"{value}"), (int) value);
+            _pressureCheck.AddItem(Loc.GetString($"air-alarm-ui-pressure-bound-{value.ToString().ToLower()}"), (int) value);
         }
 
         _pressureCheck.SelectId((int) _data.PressureChecks);

Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml

@@ -27,9 +27,15 @@
                 </BoxContainer>
                 <!-- Lower row: every single gas -->
                 <Collapsible Margin="2 2 2 2">
-                    <CollapsibleHeading Title="Gas filters" />
+                    <CollapsibleHeading Title="{Loc 'air-alarm-ui-widget-gas-filters'}" />
                     <CollapsibleBody Margin="20 0 0 0">
-                        <GridContainer HorizontalExpand="True" Name="CGasContainer" Columns="3" />
+                        <BoxContainer Orientation="Vertical">
+                            <BoxContainer Margin="2">
+                                <Button Name="CSelectAll" Text="{Loc 'air-alarm-ui-scrubber-select-all-gases-label'}" />
+                                <Button Name="CDeselectAll" Text="{Loc 'air-alarm-ui-scrubber-deselect-all-gases-label'}" />
+                            </BoxContainer>
+                            <GridContainer Name="CGasContainer" Columns="3" />
+                        </BoxContainer>
                     </CollapsibleBody>
                 </Collapsible>
             </BoxContainer>

Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs

@@ -1,15 +1,21 @@
 using Content.Shared.Atmos;
+using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.Atmos.Monitor.Components;
 using Content.Shared.Atmos.Piping.Unary.Components;
+using Content.Shared.Atmos.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Atmos.Monitor.UI.Widgets;
 
 [GenerateTypedNameReferences]
 public sealed partial class ScrubberControl : BoxContainer
 {
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IEntityManager _entMan = default!;
+
     private GasVentScrubberData _data;
     private string _address;
 
@@ -22,12 +28,18 @@ public sealed partial class ScrubberControl : BoxContainer
     private FloatSpinBox _volumeRate => CVolumeRate;
     private CheckBox _wideNet => CWideNet;
     private Button _copySettings => CCopySettings;
+    private Button _selectAll => CSelectAll;
+    private Button _deselectAll => CDeselectAll;
 
     private GridContainer _gases => CGasContainer;
     private Dictionary<Gas, Button> _gasControls = new();
 
     public ScrubberControl(GasVentScrubberData data, string address)
     {
+
+        IoCManager.InjectDependencies(this);
+        var atmosphereSystem = _entMan.System<SharedAtmosphereSystem>();
+
         RobustXamlLoader.Load(this);
 
         Name = address;
@@ -61,7 +73,7 @@ public ScrubberControl(GasVentScrubberData data, string address)
 
         foreach (var value in Enum.GetValues<ScrubberPumpDirection>())
         {
-            _pumpDirection.AddItem(Loc.GetString($"{value}"), (int) value);
+            _pumpDirection.AddItem(Loc.GetString($"air-alarm-ui-pump-direction-{value.ToString().ToLower()}"), (int) value);
         }
 
         _pumpDirection.SelectId((int) _data.PumpDirection);
@@ -78,12 +90,28 @@ public ScrubberControl(GasVentScrubberData data, string address)
             ScrubberDataCopied?.Invoke(_data);
         };
 
-        foreach (var value in Enum.GetValues<Gas>())
+        var allGases = Enum.GetValues<Gas>();
+        _selectAll.OnPressed += _ =>
         {
+            _data.FilterGases = new HashSet<Gas>(allGases);
+            ScrubberDataChanged?.Invoke(_address, _data);
+        };
+
+        _deselectAll.OnPressed += _ =>
+        {
+            _data.FilterGases = [];
+            ScrubberDataChanged?.Invoke(_address, _data);
+        };
+
+        foreach (var value in allGases)
+        {
+            ProtoId<GasPrototype> gasProtoId = atmosphereSystem.GetGas(value);
+            var gasName = _prototypeManager.Index(gasProtoId).Name;
+
             var gasButton = new Button
             {
                 Name = value.ToString(),
-                Text = Loc.GetString($"{value}"),
+                Text = Loc.GetString(gasName),
                 ToggleMode = true,
                 HorizontalExpand = true,
                 Pressed = _data.FilterGases.Contains(value)

Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs

@@ -1,16 +1,22 @@
 using Content.Client.Message;
 using Content.Shared.Atmos;
+using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.Atmos.Monitor;
+using Content.Shared.Atmos.Prototypes;
 using Content.Shared.Temperature;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Atmos.Monitor.UI.Widgets;
 
 [GenerateTypedNameReferences]
 public sealed partial class SensorInfo : BoxContainer
 {
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IEntityManager _entMan = default!;
+
     public Action<string, AtmosMonitorThresholdType, AtmosAlarmThreshold, Gas?>? OnThresholdUpdate;
     public event Action<AtmosSensorData>? SensorDataCopied;
     private string _address;
@@ -23,6 +29,9 @@ public sealed partial class SensorInfo : BoxContainer
 
     public SensorInfo(AtmosSensorData data, string address)
     {
+        IoCManager.InjectDependencies(this);
+        var atmosphereSystem = _entMan.System<SharedAtmosphereSystem>();
+
         RobustXamlLoader.Load(this);
 
         _address = address;
@@ -45,16 +54,20 @@ public SensorInfo(AtmosSensorData data, string address)
             var label = new RichTextLabel();
 
             var fractionGas = amount / data.TotalMoles;
+
+            ProtoId<GasPrototype> gasProtoId = atmosphereSystem.GetGas(gas);
+            var gasName = _prototypeManager.Index(gasProtoId).Name;
+
             label.SetMarkup(Loc.GetString("air-alarm-ui-gases-indicator",
-                ("gas", $"{gas}"),
+                ("gas", Loc.GetString(gasName)),
                 ("color", AirAlarmWindow.ColorForThreshold(fractionGas, data.GasThresholds[gas])),
                 ("amount", $"{amount:0.####}"),
                 ("percentage", $"{(100 * fractionGas):0.##}")));
             GasContainer.AddChild(label);
             _gasLabels.Add(gas, label);
 
             var threshold = data.GasThresholds[gas];
-            var gasThresholdControl = new ThresholdControl(Loc.GetString($"air-alarm-ui-thresholds-gas-title", ("gas", $"{gas}")), threshold, AtmosMonitorThresholdType.Gas, gas, 100);
+            var gasThresholdControl = new ThresholdControl(Loc.GetString($"air-alarm-ui-thresholds-gas-title"), threshold, AtmosMonitorThresholdType.Gas, gas, 100);
             gasThresholdControl.Margin = new Thickness(20, 2, 2, 2);
             gasThresholdControl.ThresholdDataChanged += (type, alarmThreshold, arg3) =>
             {
@@ -90,6 +103,9 @@ public SensorInfo(AtmosSensorData data, string address)
 
     public void ChangeData(AtmosSensorData data)
     {
+        IoCManager.InjectDependencies(this);
+        var atmosphereSystem = _entMan.System<SharedAtmosphereSystem>();
+
         SensorAddress.Title = Loc.GetString("air-alarm-ui-window-listing-title", ("address", _address), ("state", data.AlarmState));
 
         AlarmStateLabel.SetMarkup(Loc.GetString("air-alarm-ui-window-alarm-state-indicator",
@@ -112,8 +128,12 @@ public void ChangeData(AtmosSensorData data)
             }
 
             var fractionGas = amount / data.TotalMoles;
+
+            ProtoId<GasPrototype> gasProtoId = atmosphereSystem.GetGas(gas);
+            var gasName = _prototypeManager.Index(gasProtoId).Name;
+
             label.SetMarkup(Loc.GetString("air-alarm-ui-gases-indicator",
-                ("gas", $"{gas}"),
+                ("gas", Loc.GetString(gasName)),
                 ("color", AirAlarmWindow.ColorForThreshold(fractionGas, data.GasThresholds[gas])),
                 ("amount", $"{amount:0.####}"),
                 ("percentage", $"{(100 * fractionGas):0.##}")));