A Whole host of things

.github/CODEOWNERS

@@ -7,3 +7,5 @@
 /Resources/Maps/ @ss14Starlight/maintainer @ss14Starlight/mappers
 /Resources/Prototypes/ @ss14Starlight/maintainer @ss14Starlight/prototypers
 /Resources/ServerInfo/ @ss14Starlight/maintainer @ss14Starlight/wiki
+
+/Resources/Prototypes/_NullLink/ @StarlightHost

Content.Client/Info/PlaytimeStats/PlaytimeStatsWindow.cs

@@ -18,6 +18,8 @@ public sealed partial class PlaytimeStatsWindow : FancyWindow
     private ISawmill _sawmill = Logger.GetSawmill("PlaytimeStatsWindow");
     private readonly Color _altColor = Color.FromHex("#292B38");
     private readonly Color _defaultColor = Color.FromHex("#2F2F3B");
+    private readonly Color _antagColor = Color.FromHex("#fe7676");
+    private readonly Color _ghostColor = Color.FromHex("#c996e0");
     private bool _useAltColor;
 
     public PlaytimeStatsWindow()
@@ -109,11 +111,12 @@ private void PopulatePlaytimeData()
 
         OverallPlaytimeLabel.Text = Loc.GetString("ui-playtime-overall", ("time", overallPlaytime));
 
-        var rolePlaytimes = _jobRequirementsManager.FetchPlaytimeByRoles();
-
-        //starlight
+        // Starlight BEGIN
+        var rolePlaytimes = _jobRequirementsManager.FetchPlaytimeByRoles().ToList();
         var departmentPlaytimes = _jobRequirementsManager.FetchPlaytimeByDepartments();
-        //starlight end
+        var antagPlaytimes = _jobRequirementsManager.FetchPlaytimeByAntags();
+        var miscellaneousPlaytimes = _jobRequirementsManager.FetchPlaytimeMiscellaneous(rolePlaytimes, antagPlaytimes);
+        // Starlight END
 
         RolesPlaytimeList.RemoveAllChildren();
         PopulatePlaytimeHeader();
@@ -132,6 +135,16 @@ private void PopulatePlaytimeData()
             var playtime = departmentPlaytime.Value;
             AddRolePlaytimeEntryToTable(Loc.GetString(department.Name), playtime.ToString(), textColor: department.Color); //starlight edit
         }
+        foreach (var antagPlaytime in antagPlaytimes)
+        {
+            AddRolePlaytimeEntryToTable(Loc.GetString(antagPlaytime.Key.Name), antagPlaytime.Value.ToString(), textColor: _antagColor);
+        }
+        foreach (var miscellaneousPlaytime in miscellaneousPlaytimes)
+        {
+            var role = miscellaneousPlaytime.Key;
+            var playtime = miscellaneousPlaytime.Value;
+            AddRolePlaytimeEntryToTable(Loc.GetString(role.Name), playtime.ToString(), textColor: _ghostColor);
+        }
         //starlight end
     }
 

Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Content.Shared.CCVar;
 using Content.Shared.Players;
 using Content.Shared.Players.JobWhitelist;
@@ -375,6 +376,50 @@ public IEnumerable<KeyValuePair<DepartmentPrototype, TimeSpan>> FetchPlaytimeByD
             yield return new KeyValuePair<DepartmentPrototype, TimeSpan>(department, departmentTime);
         }
     }
+
+    /// <summary>
+    /// Fetches playtime per antag prototype.
+    /// </summary>b
+    public IEnumerable<KeyValuePair<AntagPrototype, TimeSpan>> FetchPlaytimeByAntags()
+    {
+        var antagsToMap = _prototypes.EnumeratePrototypes<AntagPrototype>();
+        foreach (var antag in antagsToMap)
+        {
+            if (antag.PlayTimeTracker == null)
+                continue;
+
+            if (_mergedRoles.TryGetValue(antag.PlayTimeTracker, out var time))
+                yield return new KeyValuePair<AntagPrototype, TimeSpan>(antag, time);
+        }
+    }
+
+    /// <summary>
+    /// Fetches playtime for all PlayTimeTracker prototypes that we don't see in any job or antag.
+    /// This covers ghost roles and various admin spawns.
+    /// </summary>
+    public IEnumerable<KeyValuePair<PlayTimeTrackerPrototype, TimeSpan>> FetchPlaytimeMiscellaneous(
+        IEnumerable<KeyValuePair<JobPrototype, TimeSpan>> jobPlaytimes,
+        IEnumerable<KeyValuePair<AntagPrototype, TimeSpan>> antagPlaytimes)
+    {
+        var trackers = _prototypes.EnumeratePrototypes<PlayTimeTrackerPrototype>();
+        var exclude = new HashSet<string> { "Overall" };
+        foreach (var jobPlaytime in jobPlaytimes)
+            exclude.Add(jobPlaytime.Key.PlayTimeTracker);
+        foreach (var antagPlaytime in antagPlaytimes)
+            if (antagPlaytime.Key.PlayTimeTracker != null)
+                exclude.Add(antagPlaytime.Key.PlayTimeTracker);
+
+        foreach (var tracker in trackers)
+        {
+            if (exclude.Contains(tracker.ID))
+                continue;
+
+            if (!_mergedRoles.TryGetValue(tracker.ID, out var rolePlaytime))
+                continue;
+
+            yield return new KeyValuePair<PlayTimeTrackerPrototype, TimeSpan>(tracker, rolePlaytime);
+        }
+    }
     //starlight end
 
     public IReadOnlyDictionary<string, TimeSpan> GetPlayTimes(ICommonSession session)

Content.Client/Silicons/StationAi/StationAiOverlay.cs

@@ -36,9 +36,17 @@ public sealed class StationAiOverlay : Overlay
     private readonly NavMapControl _navMap = new(); // Carpmosia-edit - AI Navmap
 
     private readonly OverlayResourceCache<CachedResources> _resources = new();
-    private Dictionary<Color, Color> _sRGBLookUp = new(); // Carpmosia-edit - AI Navmap
 
-    private float _updateRate = 1f / 30f;
+    // Carpmosia-start - AI Navmap
+    private readonly Dictionary<Color, Color> _sRgbLookUp = new();
+    private static readonly RenderTargetFormatParameters RenderTargetFormatParameters = new(RenderTargetColorFormat.Rgba8Srgb);
+
+    private static readonly List<Vector2> TileLinesToDraw = [];
+    private static readonly List<Vector2> TileRectsToDraw = [];
+
+    private const float UpdateRate = 1f / 30f;
+    // Carpmosia-end - AI Navmap
+
     private float _accumulator;
 
     public StationAiOverlay()
@@ -59,30 +67,32 @@ protected override void Draw(in OverlayDrawArgs args)
         {
             res.StaticTexture?.Dispose();
             res.StencilTexture?.Dispose();
-            res.StencilTexture = _clyde.CreateRenderTarget(args.Viewport.Size, new RenderTargetFormatParameters(RenderTargetColorFormat.Rgba8Srgb), name: "station-ai-stencil");
+
+            // Carpmosia-start - AI Navmap
+            res.StencilTexture = _clyde.CreateRenderTarget(args.Viewport.Size, RenderTargetFormatParameters, name: "station-ai-stencil");
             res.StaticTexture = _clyde.CreateRenderTarget(args.Viewport.Size,
-                new RenderTargetFormatParameters(RenderTargetColorFormat.Rgba8Srgb),
+                RenderTargetFormatParameters,
                 name: "station-ai-static");
+            // Carpmosia-end - AI Navmap
         }
 
         var worldHandle = args.WorldHandle;
 
         var worldBounds = args.WorldBounds;
-        // var playerEnt = _player.LocalEntity;
 
-         // Starlight-start: moved to be after new playerEnt definition with edit
-         var playerEnt = _player.LocalEntity;
+        // Starlight-start: moved to be after new playerEnt definition with edit
+        var playerEnt = _player.LocalEntity;
 
         // Check for cross-grid viewing (e.g., Abductor remote eye) BEFORE getting gridUid
-        if (_entManager.TryGetComponent(playerEnt, out StationAiOverlayComponent? stationAiOverlay) 
-            && stationAiOverlay.AllowCrossGrid 
+        if (_entManager.TryGetComponent(playerEnt, out StationAiOverlayComponent? stationAiOverlay)
+            && stationAiOverlay.AllowCrossGrid
             && _entManager.TryGetComponent(playerEnt, out RelayInputMoverComponent? relay))
             playerEnt = relay.RelayEntity;
 
         // Starlight - start
         _entManager.TryGetComponent(playerEnt, out StationAiOverlayComponent? relayStationAiOverlay);
         // Starlight - end
-    
+
         _entManager.TryGetComponent(playerEnt, out TransformComponent? playerXform);
         var gridUid = playerXform?.GridUid ?? EntityUid.Invalid;
         _entManager.TryGetComponent(gridUid, out MapGridComponent? grid);
@@ -101,10 +111,10 @@ protected override void Draw(in OverlayDrawArgs args)
             if (stationAiOverlay is not null) // 🌟Starlight🌟
                 color = color.WithAlpha(stationAiOverlay.Alfa); // 🌟Starlight🌟
 
-            _navMap.AiFrameUpdate((float) _timing.FrameTime.TotalSeconds, gridUid); // Carpmosia-edit - AI Navmap
+            _navMap.AiFrameUpdate((float)_timing.FrameTime.TotalSeconds, gridUid); // Carpmosia-edit - AI Navmap
             if (_accumulator <= 0f)
             {
-                _accumulator = MathF.Max(0f, _accumulator + _updateRate);
+                _accumulator = MathF.Max(0f, _accumulator + UpdateRate); // Carpmosia-edit - AI Navmap
                 _visibleTiles.Clear();
                 // Starlight - start
                 _visibleTileTags.Clear();
@@ -212,65 +222,67 @@ public void Dispose()
     // Carpmosia-start - AI Navmap
     protected void DrawNavMap(DrawingHandleWorld handle, MapGridComponent grid)
     {
-        if (!_sRGBLookUp.TryGetValue(_navMap.WallColor, out var wallsRGB))
+        if (!_sRgbLookUp.TryGetValue(_navMap.WallColor, out var wallsRgb))
         {
-            wallsRGB = Color.ToSrgb(_navMap.WallColor);
-            _sRGBLookUp[_navMap.WallColor] = wallsRGB;
+            wallsRgb = Color.ToSrgb(_navMap.WallColor);
+            _sRgbLookUp[_navMap.WallColor] = wallsRgb;
         }
 
         // Draw floor tiles
-        if (_navMap.TilePolygons.Any())
+        if (_navMap.TilePolygons.Count != 0)
         {
             foreach (var (polygonVerts, polygonColor) in _navMap.TilePolygons)
             {
-                handle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, polygonVerts[..polygonVerts.Length], polygonColor);
+                handle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, polygonVerts.AsSpan()[..], polygonColor);
             }
         }
 
         // Draw map lines
-        if (_navMap.TileLines.Any())
+        if (_navMap.TileLines.Count != 0)
         {
-            var lines = new ValueList<Vector2>(_navMap.TileLines.Count * 2);
+            TileLinesToDraw.Clear();
+            TileLinesToDraw.EnsureCapacity(_navMap.TileLines.Count * 2);
 
             foreach (var (o, t) in _navMap.TileLines)
             {
-                var origin = new Vector2(o.X, -o.Y);
-                var terminus = new Vector2(t.X, -t.Y);
+                var origin = o with { Y = -o.Y };
+                var terminus = t with { Y = -t.Y };
 
-                lines.Add(origin);
-                lines.Add(terminus);
+                TileLinesToDraw.Add(origin);
+                TileLinesToDraw.Add(terminus);
             }
 
-            if (lines.Count > 0)
-                handle.DrawPrimitives(DrawPrimitiveTopology.LineList, lines.Span, wallsRGB);
+            if (TileLinesToDraw.Count > 0)
+                handle.DrawPrimitives(DrawPrimitiveTopology.LineList, TileLinesToDraw, wallsRgb);
         }
 
         // Draw map rects
-        if (_navMap.TileRects.Any())
+        if (_navMap.TileRects.Count != 0)
         {
-            var rects = new ValueList<Vector2>(_navMap.TileRects.Count * 8);
+            TileRectsToDraw.Clear();
+            TileRectsToDraw.EnsureCapacity(_navMap.TileRects.Count * 8);
 
             foreach (var (lt, rb) in _navMap.TileRects)
             {
-                var leftTop = new Vector2(lt.X, -lt.Y);
-                var rightBottom = new Vector2(rb.X, -rb.Y);
+                var leftTop = lt with { Y = -lt.Y };
+                var rightBottom = rb with { Y = -rb.Y };
 
                 var rightTop = new Vector2(rightBottom.X, leftTop.Y);
                 var leftBottom = new Vector2(leftTop.X, rightBottom.Y);
 
-                rects.Add(leftTop);
-                rects.Add(rightTop);
-                rects.Add(rightTop);
-                rects.Add(rightBottom);
-                rects.Add(rightBottom);
-                rects.Add(leftBottom);
-                rects.Add(leftBottom);
-                rects.Add(leftTop);
+                TileRectsToDraw.Add(leftTop);
+                TileRectsToDraw.Add(rightTop);
+                TileRectsToDraw.Add(rightTop);
+                TileRectsToDraw.Add(rightBottom);
+                TileRectsToDraw.Add(rightBottom);
+                TileRectsToDraw.Add(leftBottom);
+                TileRectsToDraw.Add(leftBottom);
+                TileRectsToDraw.Add(leftTop);
             }
 
-            if (rects.Count > 0)
-                handle.DrawPrimitives(DrawPrimitiveTopology.LineList, rects.Span, wallsRGB);
+            if (TileRectsToDraw.Count > 0)
+                handle.DrawPrimitives(DrawPrimitiveTopology.LineList, TileRectsToDraw, wallsRgb);
         }
     }
     // Carpmosia-end - AI Navmap
-}
+}

Content.Client/Store/Ui/StoreListingControl.xaml.cs

@@ -103,7 +103,7 @@ private void UpdateBuyButtonText()
                 var m = _priceNumberRegex.Match(_price);
                 if (m.Success)
                 {
-                    StoreItemBuyButton.Text = $"{m.Groups[1].Value}¢";
+                    StoreItemBuyButton.Text = $"{m.Groups[1].Value}¢";
                 }
                 else
                 {

Content.Client/_NullLink/UI/Hub.cs

@@ -23,8 +23,8 @@
 
 namespace Content.Client._NullLink.UI;
 
-// It’s not finished, still needs a lot of info displayed, scroll support once more servers show up, max hub width, a hide button, etc.
-// But I’m rushing it for the upstream, will finish it properly someday.
+// It’s not finished, still needs a lot of info displayed, scroll support once more servers show up, max hub width, a hide button, etc.
+// But I’m rushing it for the upstream, will finish it properly someday.
 internal sealed class Hub : PanelContainer, IDisposable
 {
     [Dependency] private readonly ILogManager _logs = default!;
@@ -59,8 +59,8 @@ public Hub()
         };
         AddChild(_gridContainer);
 
-        // This crap throws a NullRef exception—what the hell, the Try method doesn’t even check for null,
-        // and Init is private, so there’s no way to figure out what’s going on in there.
+        // This crap throws a NullRef exception—what the hell, the Try method doesn’t even check for null,
+        // and Init is private, so there’s no way to figure out what’s going on in there.
         //try
         //{
         //    if (_systemManager.TryGetEntitySystem<HubSystem>(out var hub))

Content.Client/_Starlight/Commands/OpenLogLevelsCommand.cs

@@ -0,0 +1,18 @@
+using Content.Client._Starlight.Logs;
+using Robust.Client.UserInterface;
+using Robust.Shared.Console;
+
+namespace Content.Client._Starlight.Commands;
+
+public sealed class OpenLogLevelsCommand : IConsoleCommand
+{
+    public string Command => "logs";
+    public string Description => "Open the sawmill log level configuration window.";
+    public string Help => "logs";
+
+    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        var window = new LogLevelsWindow();
+        window.OpenCentered();
+    }
+}

Content.Client/_Starlight/Logs/LogLevelSystem.cs

@@ -0,0 +1,43 @@
+using Content.Shared.Starlight.CCVar;
+using Robust.Shared.Configuration;
+using Robust.Shared.Log;
+
+namespace Content.Client._Starlight.Logs;
+
+/// <summary>
+/// Restores persisted sawmill log levels from CVar on startup.
+/// </summary>
+public sealed class LogLevelSystem : EntitySystem
+{
+    [Dependency] private readonly ILogManager _logManager = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        ApplySavedLevels();
+    }
+
+    private void ApplySavedLevels()
+    {
+        var raw = _cfg.GetCVar(StarlightCCVars.LogSawmillLevels);
+        if (string.IsNullOrEmpty(raw))
+            return;
+
+        foreach (var entry in raw.Split(';', StringSplitOptions.RemoveEmptyEntries))
+        {
+            var sep = entry.IndexOf('=');
+            if (sep <= 0)
+                continue;
+
+            var name = entry[..sep];
+            var levelStr = entry[(sep + 1)..];
+
+            if (!Enum.TryParse<LogLevel>(levelStr, out var level))
+                continue;
+
+            var sawmill = _logManager.GetSawmill(name);
+            sawmill.Level = level;
+        }
+    }
+}