Merge branch 'VMSolidus-Psionic-Power-Refactor'

.github/workflows/build-docfx.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.100
 
     - name: Install dependencies
       run: dotnet restore

Content.Client/Atmos/Overlays/GasTileOverlay.cs

@@ -8,7 +8,6 @@
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Enums;
-using Robust.Shared.Graphics;
 using Robust.Shared.Graphics.RSI;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
@@ -23,7 +22,7 @@ public sealed class GasTileOverlay : Overlay
         private readonly IEntityManager _entManager;
         private readonly IMapManager _mapManager;
 
-        public override OverlaySpace Space => OverlaySpace.WorldSpaceEntities;
+        public override OverlaySpace Space => OverlaySpace.WorldSpaceEntities | OverlaySpace.WorldSpaceBelowWorld;
         private readonly ShaderInstance _shader;
 
         // Gas overlays
@@ -79,7 +78,8 @@ public GasTileOverlay(GasTileOverlaySystem system, IEntityManager entManager, IR
                         var rsi = resourceCache.GetResource<RSIResource>(animated.RsiPath).RSI;
                         var stateId = animated.RsiState;
 
-                        if (!rsi.TryGetState(stateId, out var state)) continue;
+                        if (!rsi.TryGetState(stateId, out var state))
+                            continue;
 
                         _frames[i] = state.GetFrames(RsiDirection.South);
                         _frameDelays[i] = state.GetDelays();
@@ -111,7 +111,8 @@ protected override void FrameUpdate(FrameEventArgs args)
             for (var i = 0; i < _gasCount; i++)
             {
                 var delays = _frameDelays[i];
-                if (delays.Length == 0) continue;
+                if (delays.Length == 0)
+                    continue;
 
                 var frameCount = _frameCounter[i];
                 _timer[i] += args.DeltaSeconds;
@@ -127,7 +128,8 @@ protected override void FrameUpdate(FrameEventArgs args)
             for (var i = 0; i < FireStates; i++)
             {
                 var delays = _fireFrameDelays[i];
-                if (delays.Length == 0) continue;
+                if (delays.Length == 0)
+                    continue;
 
                 var frameCount = _fireFrameCounter[i];
                 _fireTimer[i] += args.DeltaSeconds;
@@ -161,26 +163,10 @@ protected override void Draw(in OverlayDrawArgs args)
             var mapUid = _mapManager.GetMapEntityId(args.MapId);
 
             if (_entManager.TryGetComponent<MapAtmosphereComponent>(mapUid, out var atmos))
-            {
-                var bottomLeft = args.WorldAABB.BottomLeft.Floored();
-                var topRight = args.WorldAABB.TopRight.Ceiled();
-
-                for (var x = bottomLeft.X; x <= topRight.X; x++)
-                {
-                    for (var y = bottomLeft.Y; y <= topRight.Y; y++)
-                    {
-                        var tilePosition = new Vector2(x, y);
-
-                        for (var i = 0; i < atmos.OverlayData.Opacity.Length; i++)
-                        {
-                            var opacity = atmos.OverlayData.Opacity[i];
+                DrawMapOverlay(drawHandle, args, mapUid, atmos);
 
-                            if (opacity > 0)
-                                args.WorldHandle.DrawTexture(_frames[i][_frameCounter[i]], tilePosition, Color.White.WithAlpha(opacity));
-                        }
-                    }
-                }
-            }
+            if (args.Space != OverlaySpace.WorldSpaceEntities)
+                return;
 
             // TODO: WorldBounds callback.
             _mapManager.FindGridsIntersecting(args.MapId, args.WorldAABB, ref gridState,
@@ -265,5 +251,41 @@ protected override void Draw(in OverlayDrawArgs args)
             drawHandle.UseShader(null);
             drawHandle.SetTransform(Matrix3.Identity);
         }
+
+        private void DrawMapOverlay(
+            DrawingHandleWorld handle,
+            OverlayDrawArgs args,
+            EntityUid map,
+            MapAtmosphereComponent atmos)
+        {
+            var mapGrid = _entManager.HasComponent<MapGridComponent>(map);
+
+            // map-grid atmospheres get drawn above grids
+            if (mapGrid && args.Space != OverlaySpace.WorldSpaceEntities)
+                return;
+
+            // Normal map atmospheres get drawn below grids
+            if (!mapGrid && args.Space != OverlaySpace.WorldSpaceBelowWorld)
+                return;
+
+            var bottomLeft = args.WorldAABB.BottomLeft.Floored();
+            var topRight = args.WorldAABB.TopRight.Ceiled();
+
+            for (var x = bottomLeft.X; x <= topRight.X; x++)
+            {
+                for (var y = bottomLeft.Y; y <= topRight.Y; y++)
+                {
+                    var tilePosition = new Vector2(x, y);
+
+                    for (var i = 0; i < atmos.OverlayData.Opacity.Length; i++)
+                    {
+                        var opacity = atmos.OverlayData.Opacity[i];
+
+                        if (opacity > 0)
+                            handle.DrawTexture(_frames[i][_frameCounter[i]], tilePosition, Color.White.WithAlpha(opacity));
+                    }
+                }
+            }
+        }
     }
 }

Content.Client/Mapping/MappingSystem.cs

@@ -83,7 +83,7 @@ private void OnFillActionSlot(FillActionSlotEvent ev)
             if (tileDef is not ContentTileDefinition contentTileDef)
                 return;
 
-            var tileIcon = contentTileDef.IsSpace
+            var tileIcon = contentTileDef.MapAtmosphere
                 ? _spaceIcon
                 : new Texture(contentTileDef.Sprite!.Value);
 

Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs

@@ -403,7 +403,7 @@ private void InputManagerOnFirstChanceOnKeyEvent(KeyEventArgs keyEvent, KeyEvent
                 Mod1 = mods[0],
                 Mod2 = mods[1],
                 Mod3 = mods[2],
-                Priority = 0,
+                Priority = _currentlyRebinding.Binding?.Priority ?? 0,
                 Type = bindType,
                 CanFocus = key == Keyboard.Key.MouseLeft
                            || key == Keyboard.Key.MouseRight

Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs → Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs

@@ -1,10 +1,11 @@
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
+using Content.Client.Psionics.UI;
 using Content.Client.UserInterface.Fragments;
 using Content.Shared.CartridgeLoader.Cartridges;
 using Content.Shared.CartridgeLoader;
 
-namespace Content.Client.Nyanotrasen.CartridgeLoader.Cartridges;
+namespace Content.Client.Psionics.GlimmerMonitor;
 
 public sealed partial class GlimmerMonitorUi : UIFragment
 {

Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml → Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml

@@ -1,4 +1,4 @@
-<cartridges:GlimmerMonitorUiFragment xmlns:cartridges="clr-namespace:Content.Client.Nyanotrasen.CartridgeLoader.Cartridges"
+<cartridges:GlimmerMonitorUiFragment xmlns:cartridges="clr-namespace:Content.Client.Psionics.GlimmerMonitor"
                                  xmlns="https://spacestation14.io" Margin="1 0 2 0">
     <PanelContainer StyleClasses="BackgroundDark"></PanelContainer>
     <BoxContainer Name="SettingsBox" Orientation="Horizontal" HorizontalExpand="True" VerticalExpand="False">

Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs → Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs

@@ -1,12 +1,12 @@
 using System.Linq;
 using System.Numerics;
-using Content.Client.Nyanotrasen.UserInterface;
+using Content.Client.Psionics.UI;
 using Robust.Client.AutoGenerated;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Nyanotrasen.CartridgeLoader.Cartridges;
+namespace Content.Client.Psionics.GlimmerMonitor;
 
 [GenerateTypedNameReferences]
 public sealed partial class GlimmerMonitorUiFragment : BoxContainer

Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs → Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs

@@ -1,8 +1,8 @@
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Client.Chat.Managers;
 using Robust.Client.Player;
 
-namespace Content.Client.Nyanotrasen.Chat
+namespace Content.Client.Psionics.Chat
 {
     public sealed class PsionicChatUpdateSystem : EntitySystem
     {

Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs → Content.Client/Psionics/UserInterface/GlimmerGraph.cs

@@ -4,7 +4,7 @@
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 
-namespace Content.Client.Nyanotrasen.UserInterface;
+namespace Content.Client.Psionics.UI;
 
 public sealed class GlimmerGraph : Control
 {

Content.Client/UserInterface/Systems/Chat/ChatUIController.cs

@@ -20,7 +20,6 @@
 using Content.Shared.Examine;
 using Content.Shared.Input;
 using Content.Shared.Radio;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Player;
@@ -37,7 +36,7 @@
 using Robust.Shared.Replays;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Content.Client.Nyanotrasen.Chat; //Nyano - Summary: chat namespace.
+using Content.Client.Psionics.Chat;
 
 namespace Content.Client.UserInterface.Systems.Chat;
 
@@ -61,7 +60,7 @@ public sealed class ChatUIController : UIController
     [UISystemDependency] private readonly GhostSystem? _ghost = default;
     [UISystemDependency] private readonly TypingIndicatorSystem? _typingIndicator = default;
     [UISystemDependency] private readonly ChatSystem? _chatSys = default;
-    [UISystemDependency] private readonly PsionicChatUpdateSystem? _psionic = default!; //Nyano - Summary: makes the psionic chat available.
+    [UISystemDependency] private readonly PsionicChatUpdateSystem? _psionic = default!; //EE - Summary: makes the psionic chat available.
 
     [ValidatePrototypeId<ColorPalettePrototype>]
     private const string ChatNamePalette = "ChatNames";
@@ -82,7 +81,7 @@ public sealed class ChatUIController : UIController
         {SharedChatSystem.AdminPrefix, ChatSelectChannel.Admin},
         {SharedChatSystem.RadioCommonPrefix, ChatSelectChannel.Radio},
         {SharedChatSystem.DeadPrefix, ChatSelectChannel.Dead},
-        {SharedChatSystem.TelepathicPrefix, ChatSelectChannel.Telepathic} //Nyano - Summary: adds the telepathic prefix =.
+        {SharedChatSystem.TelepathicPrefix, ChatSelectChannel.Telepathic} //EE - Summary: adds the telepathic prefix =.
     };
 
     public static readonly Dictionary<ChatSelectChannel, char> ChannelPrefixes = new()
@@ -96,7 +95,7 @@ public sealed class ChatUIController : UIController
         {ChatSelectChannel.Admin, SharedChatSystem.AdminPrefix},
         {ChatSelectChannel.Radio, SharedChatSystem.RadioCommonPrefix},
         {ChatSelectChannel.Dead, SharedChatSystem.DeadPrefix},
-        {ChatSelectChannel.Telepathic, SharedChatSystem.TelepathicPrefix } //Nyano - Summary: associates telepathic with =.
+        {ChatSelectChannel.Telepathic, SharedChatSystem.TelepathicPrefix } //EE - Summary: associates telepathic with =.
     };
 
     /// <summary>

Content.IntegrationTests/Tests/Body/LungTest.cs

@@ -128,7 +128,7 @@ await server.WaitAssertion(() =>
                     metaSys.Update(1.0f);
                     metaSys.Update(1.0f);
                     respSys.Update(2.0f);
-                    Assert.That(GetMapMoles(), Is.EqualTo(startingMoles).Within(0.0001));
+                    Assert.That(GetMapMoles(), Is.EqualTo(startingMoles).Within(0.0002));
                 });
             }
 

Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs

@@ -1006,15 +1006,10 @@ protected async Task AddAtmosphere(EntityUid? uid = null)
         await Server.WaitPost(() =>
         {
             var atmosSystem = SEntMan.System<AtmosphereSystem>();
-            var atmos = SEntMan.EnsureComponent<MapAtmosphereComponent>(target);
             var moles = new float[Atmospherics.AdjustedNumberOfGases];
             moles[(int) Gas.Oxygen] = 21.824779f;
             moles[(int) Gas.Nitrogen] = 82.10312f;
-            atmosSystem.SetMapAtmosphere(target, false, new GasMixture(2500)
-            {
-                Temperature = 293.15f,
-                Moles = moles,
-            }, atmos);
+            atmosSystem.SetMapAtmosphere(target, false, new GasMixture(moles, Atmospherics.T20C));
         });
     }
 

Content.Server/Abilities/Mime/MimePowersSystem.cs

@@ -10,7 +10,7 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
-using Content.Shared.Abilities.Psionics; //Nyano - Summary: Makes Mime psionic.
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Speech.Muting;
 
 namespace Content.Server.Abilities.Mime

Content.Server/Administration/Managers/AdminManager.Metrics.cs

@@ -0,0 +1,98 @@
+using System.Diagnostics.Metrics;
+using System.Runtime.InteropServices;
+using Content.Server.Afk;
+using Robust.Server.DataMetrics;
+
+namespace Content.Server.Administration.Managers;
+
+// Handles metrics reporting for active admin count and such.
+
+public sealed partial class AdminManager
+{
+    private Dictionary<int, (int active, int afk, int deadminned)>? _adminOnlineCounts;
+
+    private const int SentinelRankId = -1;
+
+    [Dependency] private readonly IMetricsManager _metrics = default!;
+    [Dependency] private readonly IAfkManager _afkManager = default!;
+    [Dependency] private readonly IMeterFactory _meterFactory = default!;
+
+    private void InitializeMetrics()
+    {
+        _metrics.UpdateMetrics += MetricsOnUpdateMetrics;
+
+        var meter = _meterFactory.Create("SS14.AdminManager");
+
+        meter.CreateObservableGauge(
+            "admins_online_count",
+            MeasureAdminCount,
+            null,
+            "The count of online admins");
+    }
+
+    private void MetricsOnUpdateMetrics()
+    {
+        _sawmill.Verbose("Updating metrics");
+
+        var dict = new Dictionary<int, (int active, int afk, int deadminned)>();
+
+        foreach (var (session, reg) in _admins)
+        {
+            var rankId = reg.RankId ?? SentinelRankId;
+
+            ref var counts = ref CollectionsMarshal.GetValueRefOrAddDefault(dict, rankId, out _);
+
+            if (reg.Data.Active)
+            {
+                if (_afkManager.IsAfk(session))
+                    counts.afk += 1;
+                else
+                    counts.active += 1;
+            }
+            else
+            {
+                counts.deadminned += 1;
+            }
+        }
+
+        // Neither prometheus-net nor dotnet-counters seem to handle stuff well if we STOP returning measurements.
+        // i.e. if the last admin with a rank disconnects.
+        // So if we have EVER reported a rank, always keep reporting it.
+        if (_adminOnlineCounts != null)
+        {
+            foreach (var rank in _adminOnlineCounts.Keys)
+            {
+                CollectionsMarshal.GetValueRefOrAddDefault(dict, rank, out _);
+            }
+        }
+
+        // Make sure "no rank" is always available. Avoid "no data".
+        CollectionsMarshal.GetValueRefOrAddDefault(dict, SentinelRankId, out _);
+
+        _adminOnlineCounts = dict;
+    }
+
+    private IEnumerable<Measurement<int>> MeasureAdminCount()
+    {
+        if (_adminOnlineCounts == null)
+            yield break;
+
+        foreach (var (rank, (active, afk, deadminned)) in _adminOnlineCounts)
+        {
+            yield return new Measurement<int>(
+                active,
+                new KeyValuePair<string, object?>("state", "active"),
+                new KeyValuePair<string, object?>("rank", rank == SentinelRankId ? "none" : rank.ToString()));
+
+            yield return new Measurement<int>(
+                afk,
+                new KeyValuePair<string, object?>("state", "afk"),
+                new KeyValuePair<string, object?>("rank", rank == SentinelRankId ? "none" : rank.ToString()));
+
+            yield return new Measurement<int>(
+                deadminned,
+                new KeyValuePair<string, object?>("state", "deadminned"),
+                new KeyValuePair<string, object?>("rank", rank == SentinelRankId ? "none" : rank.ToString()));
+        }
+    }
+}