Grok generate me working code

.github/workflows/test-packaging.yml

@@ -53,10 +53,11 @@ jobs:
           cd RobustToolbox/
           git submodule update --init --recursive
 
-      - name: Setup .NET Core
+      # ubuntu-latest has .NET 10
+      - name: Setup .NET Core # Starlight start
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 10.0.x
+          dotnet-version: 10.0.x # Starlight end
 
       - name: Install dependencies
         run: dotnet restore
@@ -65,7 +66,13 @@ jobs:
         run: dotnet build Content.Packaging --configuration Release --no-restore /m
 
       - name: Package server
-        run: dotnet run --project Content.Packaging server --platform win-x64 --platform win-arm64 --platform linux-x64 --platform linux-arm64 --platform osx-x64 --platform osx-arm64
+        run: dotnet run --project Content.Packaging server --log-build --platform win-x64 --platform win-arm64 --platform linux-x64 --platform linux-arm64 --platform osx-x64 --platform osx-arm64
 
       - name: Package client
-        run: dotnet run --project Content.Packaging client --no-wipe-release
+        run: dotnet run --project Content.Packaging client --log-build --no-wipe-release
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: binlogs
+          path: release/*.binlog
+          retention-days: 7

Content.Client/Access/Systems/JobStatusSystem.Starlight.cs

@@ -0,0 +1,28 @@
+using Content.Shared.Access.Systems;
+using Content.Shared.Medical.SuitSensor;
+using Content.Shared.Medical.SuitSensors;
+using Content.Shared.Silicons.StationAi;
+
+namespace Content.Client.Access.Systems;
+
+public sealed partial class JobStatusSystem : SharedJobStatusSystem
+{
+    // Show job icons if entity is in camera view (only relevant for AI viewers) OR they have active suit sensors.
+    private bool CanSeeJobStatus(EntityUid uid)
+    {
+        if (_player.LocalEntity is not { } localEnt
+            || !HasComp<StationAiOverlayComponent>(localEnt)
+            || !_vision.IsOutsideCameraViewCached(uid))
+        {
+            return true;
+        }
+
+        foreach (var sensor in EntityQuery<SuitSensorComponent>(true))
+        {
+            if (sensor.User == uid && sensor.Mode == SuitSensorMode.SensorCords)
+                return true;
+        }
+
+        return false;
+    }
+}

Content.Client/Access/Systems/JobStatusSystem.cs

@@ -0,0 +1,45 @@
+using Content.Client.Overlays;
+using Content.Shared.Access.Systems;
+using Content.Shared.Silicons.StationAi;
+using Content.Shared.StatusIcon;
+using Content.Shared.StatusIcon.Components;
+using Robust.Client.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Access.Systems;
+
+public sealed partial class JobStatusSystem : SharedJobStatusSystem
+{
+    [Dependency] private ShowJobIconsSystem _showJobIcons = default!;
+    [Dependency] private ShowCrewIconsSystem _showCrewIcons = default!;
+    [Dependency] private IPrototypeManager _prototype = default!;
+    [Dependency] private StationAiVisionSystem _vision = default!;
+    [Dependency] private IPlayerManager _player = default!;
+
+    private static readonly ProtoId<SecurityIconPrototype> CrewBorderIcon = "CrewBorderIcon";
+    private static readonly ProtoId<SecurityIconPrototype> CrewUncertainBorderIcon = "CrewUncertainBorderIcon";
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<JobStatusComponent, GetStatusIconsEvent>(OnGetStatusIconsEvent);
+    }
+
+    // show the status icons if the player has the correponding HUDs
+    private void OnGetStatusIconsEvent(Entity<JobStatusComponent> ent, ref GetStatusIconsEvent ev)
+    {
+        var canSeeJobStatus = CanSeeJobStatus(ent); // Starlight
+
+        if (_showJobIcons.IsActive && canSeeJobStatus && ent.Comp.JobStatusIcon != null) // Starlight
+            ev.StatusIcons.Add(_prototype.Index(ent.Comp.JobStatusIcon));
+
+        if (_showCrewIcons.IsActive && canSeeJobStatus) // Starlight
+        {
+            if (_showCrewIcons.UncertainCrewBorder)
+                ev.StatusIcons.Add(_prototype.Index(CrewUncertainBorderIcon));
+            else if (ent.Comp.IsCrew)
+                ev.StatusIcons.Add(_prototype.Index(CrewBorderIcon));
+        }
+    }
+}

Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Client.SubFloor;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
@@ -30,7 +31,11 @@ private void OnInit(EntityUid uid, PipeAppearanceComponent component, ComponentI
         var numberOfPipeLayers = GetNumberOfPipeLayers(uid, out _);
 
         // Starlight START
-        _sprite.LayerMapTryGet((uid, sprite), PipeVisualLayers.Pipe, out var pipeIndex, false);
+        // Prefer inserting the generated connections directly after the main pipe layer. If a prototype does not
+        // have one, fall back to appending them like LayerMapReserve would instead of using an invalid layer index.
+        var insertionIndex = sprite.AllLayers.Count();
+        if (_sprite.LayerMapTryGet((uid, sprite), PipeVisualLayers.Pipe, out var pipeIndex, false))
+            insertionIndex = pipeIndex + 1;
         // Starlight END
 
         foreach (var layerKey in Enum.GetValues<PipeConnectionLayer>())
@@ -40,10 +45,10 @@ private void OnInit(EntityUid uid, PipeAppearanceComponent component, ComponentI
                 var layerName = layerKey.ToString() + i.ToString();
 
                 // Starlight START
-                // The generated layer should go directly after the main pipe layer, not at the end, hence the pipeIndex+1.
+                // The generated layer should go directly after the main pipe layer when it exists, not at the end.
                 if (!_sprite.LayerMapTryGet((uid, sprite), layerName, out var layer, false))
                 {
-                    layer = pipeIndex + 1;
+                    layer = insertionIndex;
                     _sprite.AddBlankLayer((uid, sprite), layer);
                     _sprite.LayerMapSet((uid, sprite), layerName, layer);
                 }

Content.Client/Lobby/ClientPreferencesManager.cs

@@ -58,7 +58,7 @@ public void SetCharacterEnable(int slot, bool enable = true)
             if (characterProfile is not HumanoidCharacterProfile profile)
                 return;
 
-            var characters = new Dictionary<int, ICharacterProfile>(Preferences.Characters)
+            var characters = new Dictionary<int, HumanoidCharacterProfile>(Preferences.Characters)
             {
                 [slot] = new HumanoidCharacterProfile(profile) {Enabled = enable},
             };
@@ -72,11 +72,11 @@ public void SetCharacterEnable(int slot, bool enable = true)
             _netManager.ClientSendMessage(msg);
         }
 
-        public void UpdateCharacter(ICharacterProfile profile, int slot)
+        public void UpdateCharacter(HumanoidCharacterProfile profile, int slot)
         {
             var collection = IoCManager.Instance!;
             profile.EnsureValid(_playerManager.LocalSession!, collection);
-            var characters = new Dictionary<int, ICharacterProfile>(Preferences.Characters) {[slot] = profile};
+            var characters = new Dictionary<int, HumanoidCharacterProfile>(Preferences.Characters) {[slot] = profile};
             Preferences = new PlayerPreferences(characters, Preferences.AdminOOCColor, Preferences.ConstructionFavorites, Preferences.JobPriorities);
             var msg = new MsgUpdateCharacter
             {
@@ -86,9 +86,9 @@ public void UpdateCharacter(ICharacterProfile profile, int slot)
             _netManager.ClientSendMessage(msg);
         }
 
-        public void CreateCharacter(ICharacterProfile profile)
+        public void CreateCharacter(HumanoidCharacterProfile profile)
         {
-            var characters = new Dictionary<int, ICharacterProfile>(Preferences.Characters);
+            var characters = new Dictionary<int, HumanoidCharacterProfile>(Preferences.Characters);
             var lowest = Enumerable.Range(0, Settings.MaxCharacterSlots)
                 .Except(characters.Keys)
                 .FirstOrNull();
@@ -105,7 +105,7 @@ public void CreateCharacter(ICharacterProfile profile)
             UpdateCharacter(profile, l);
         }
 
-        public void DeleteCharacter(ICharacterProfile profile)
+        public void DeleteCharacter(HumanoidCharacterProfile profile)
         {
             DeleteCharacter(Preferences.IndexOfCharacter(profile));
         }

Content.Client/Lobby/IClientPreferencesManager.cs

@@ -15,9 +15,9 @@ public interface IClientPreferencesManager
         PlayerPreferences? Preferences { get; }
         void Initialize();
         void SetCharacterEnable(int slot, bool enable);
-        void UpdateCharacter(ICharacterProfile profile, int slot);
-        void CreateCharacter(ICharacterProfile profile);
-        void DeleteCharacter(ICharacterProfile profile);
+        void UpdateCharacter(HumanoidCharacterProfile profile, int slot);
+        void CreateCharacter(HumanoidCharacterProfile profile);
+        void DeleteCharacter(HumanoidCharacterProfile profile);
         void DeleteCharacter(int slot);
         void UpdateConstructionFavorites(List<ProtoId<ConstructionPrototype>> favorites);
         void UpdateJobPriorities(Dictionary<ProtoId<JobPrototype>, JobPriority> jobPriorities);

Content.Client/Lobby/UI/ProfileEditorControls/ProfilePreviewSpriteView.cs

@@ -74,19 +74,12 @@
     /// <param name="showClothes">If false, render the dummy without clothes</param>
     /// <param name="antagOverride"> Starlight: Optional antag prototype override to preview</param>
     /// <exception cref="ArgumentException">Throws if something other than <see cref="HumanoidCharacterProfile"/> is passed in</exception>
-    public void LoadPreview(ICharacterProfile profile, JobPrototype? jobOverride = null, bool showClothes = true, ProtoId<AntagPrototype>? antagOverride = null) // Starlight edit: Antag Loadouts
+    public void LoadPreview(HumanoidCharacterProfile profile, JobPrototype? jobOverride = null, bool showClothes = true, ProtoId<AntagPrototype>? antagOverride = null) // Starlight edit: Antag Loadouts
     {
         EntMan.DeleteEntity(PreviewDummy);
         PreviewDummy = EntityUid.Invalid;
 
-        switch (profile)
-        {
-            case HumanoidCharacterProfile humanoid:
-                LoadHumanoidEntity(humanoid, jobOverride, showClothes, antagOverride); // Starlight edit: Antag Loadouts
-                break;
-            default:
-                throw new ArgumentException("Only humanoid profiles are implemented in ProfilePreviewSpriteView");
-        }
+        LoadHumanoidEntity(profile, jobOverride, showClothes, antagOverride); // Starlight edit: Antag Loadouts
 
         FullDescription = ConstructFullDescription();
 
@@ -101,16 +94,9 @@
     /// </summary>
     /// <param name="profile"></param>
     /// <exception cref="ArgumentException"></exception>
-    public void ReloadProfilePreview(ICharacterProfile profile)
+    public void ReloadProfilePreview(HumanoidCharacterProfile profile)
     {
-        switch (profile)
-        {
-            case HumanoidCharacterProfile humanoid:
-                ReloadHumanoidEntity(humanoid);
-                break;
-            default:
-                throw new ArgumentException("Only humanoid profiles are implemented in ProfilePreviewSpriteView");
-        }
+        ReloadHumanoidEntity(profile);
     }
 
     private string ConstructFullDescription()

Content.Client/Overlays/EquipmentHudSystem.cs

@@ -15,7 +15,7 @@ public abstract partial class EquipmentHudSystem<T> : EntitySystem where T : ICo
     [Dependency] private IPlayerManager _player = default!;
 
     [ViewVariables]
-    protected bool IsActive;
+    public bool IsActive { get; private set; }
     protected virtual SlotFlags TargetSlots => ~SlotFlags.POCKET;
 
     public override void Initialize()

Content.Client/Overlays/ShowCrewIconsSystem.cs

@@ -0,0 +1,34 @@
+using Content.Shared.Inventory.Events;
+using Content.Shared.Overlays;
+
+namespace Content.Client.Overlays;
+
+// The GetStatusIconsEvent subscription is handled in JobStatusSystem
+public sealed class ShowCrewIconsSystem : EquipmentHudSystem<ShowCrewIconsComponent>
+{
+    public bool UncertainCrewBorder = false;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ShowCrewIconsComponent, AfterAutoHandleStateEvent>(OnHandleState);
+    }
+
+    protected override void UpdateInternal(RefreshEquipmentHudEvent<ShowCrewIconsComponent> component)
+    {
+        base.UpdateInternal(component);
+
+        UncertainCrewBorder = false;
+        foreach (var comp in component.Components)
+        {
+            if (comp.UncertainCrewBorder)
+                UncertainCrewBorder = true;
+        }
+    }
+
+    private void OnHandleState(Entity<ShowCrewIconsComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        RefreshOverlay();
+    }
+}

Content.Client/Overlays/ShowJobIconsSystem.cs

@@ -1,98 +1,6 @@
-using Content.Shared._Starlight.StatusIcon;
-using Content.Shared.Access.Components;
-using Content.Shared.Access.Systems;
 using Content.Shared.Overlays;
-using Content.Shared.PDA;
-using Content.Shared.StatusIcon;
-using Content.Shared.StatusIcon.Components;
-using Robust.Shared.Prototypes;
-using Robust.Client.Player;
-using Content.Shared.Silicons.StationAi;
-using Content.Shared.Medical.SuitSensors;
-using Content.Shared.Medical.SuitSensor;
 
 namespace Content.Client.Overlays;
 
-public sealed partial class ShowJobIconsSystem : EquipmentHudSystem<ShowJobIconsComponent>
-{
-    [Dependency] private IPrototypeManager _prototype = default!;
-    [Dependency] private AccessReaderSystem _accessReader = default!;
-
-    #region Starlight
-    [Dependency] private StationAiVisionSystem _vision = default!;
-    [Dependency] private IPlayerManager _player = default!;
-    #endregion
-
-    private static readonly ProtoId<JobIconPrototype> JobIconForNoId = "JobIconNoId";
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<StatusIconComponent, GetStatusIconsEvent>(OnGetStatusIconsEvent);
-    }
-
-    private void OnGetStatusIconsEvent(EntityUid uid, StatusIconComponent _, ref GetStatusIconsEvent ev)
-    {
-        if (!IsActive)
-            return;
-
-        var iconId = JobIconForNoId;
-
-        // Starlight Start
-        if (TryComp<FixedJobIconComponent>(uid, out var fixedIcon) && _prototype.Resolve(fixedIcon.Job, out var job))
-        {
-            iconId = job.Icon;
-        }
-        else if (_accessReader.FindAccessItemsInventory(uid, out var items))
-        // Starlight End
-        {
-            foreach (var item in items)
-            {
-                // ID Card
-                if (TryComp<IdCardComponent>(item, out var id))
-                {
-                    iconId = id.JobIcon;
-                    break;
-                }
-
-                // PDA
-                if (TryComp<PdaComponent>(item, out var pda)
-                    && pda.ContainedId != null
-                    && TryComp(pda.ContainedId, out id))
-                {
-                    iconId = id.JobIcon;
-                    break;
-                }
-            }
-        }
-
-        // Starlight - start
-        // Show job icons if entity is in camera view (only relevant for AI viewers) OR they have active suit sensors.
-
-        // First, determine if the local viewer is an AI-style viewer. Only then consult the AI vision system.
-        if (_player.LocalEntity is EntityUid localEnt
-            && TryComp(localEnt, out StationAiOverlayComponent? _)
-            && _vision.IsOutsideCameraViewCached(uid))
-        {
-            var suitSensorsActive = false;
-            // Iterate all suit sensors and check if any are assigned to this user and active.
-            foreach (var sensor in EntityQuery<SuitSensorComponent>(true))
-            {
-                if (sensor.User == uid && sensor.Mode == SuitSensorMode.SensorCords)
-                {
-                    suitSensorsActive = true;
-                    break;
-                }
-            }
-
-            if(!suitSensorsActive) return;
-        }
-        // Starlight - end
-
-        if (_prototype.Resolve(iconId, out var iconPrototype))
-            ev.StatusIcons.Add(iconPrototype);
-        else
-            Log.Error($"Invalid job icon prototype: {iconPrototype}");
-    }
-}
+// The GetStatusIconsEvent subscription is handled in JobStatusSystem
+public sealed class ShowJobIconsSystem : EquipmentHudSystem<ShowJobIconsComponent>;

Content.Client/StatusIcon/StatusIconOverlay.cs

@@ -101,7 +101,7 @@
                         countL++;
                     }
                     yOffset = (bounds.Height + sprite.Offset.Y) / 2f - (float)(accOffsetL - proto.Offset) / EyeManager.PixelsPerMeter;
-                    xOffset = -(bounds.Width + sprite.Offset.X) / 2f;
+                    xOffset = -(bounds.Width + sprite.Offset.X) / 2f + (float)proto.OffsetHorizontal / EyeManager.PixelsPerMeter;
 
                 }
                 else
@@ -114,7 +114,7 @@
                         countR++;
                     }
                     yOffset = (bounds.Height + sprite.Offset.Y) / 2f - (float)(accOffsetR - proto.Offset) / EyeManager.PixelsPerMeter;
-                    xOffset = (bounds.Width + sprite.Offset.X) / 2f - (float)texture.Width / EyeManager.PixelsPerMeter;
+                    xOffset = (bounds.Width + sprite.Offset.X) / 2f - (float)(texture.Width - proto.OffsetHorizontal) / EyeManager.PixelsPerMeter;
 
                 }