ITs live time

Content.Client/Atmos/Consoles/AtmosAlertsComputerBoundUserInterface.cs

@@ -1,13 +1,23 @@
 using Content.Shared.Atmos.Components;
+using Content.Shared.Medical.CrewMonitoring;
+using Content.Shared.Silicons.StationAi;
+using Robust.Shared.Map;
+using Robust.Shared.Player;
 
 namespace Content.Client.Atmos.Consoles;
 
 public sealed class AtmosAlertsComputerBoundUserInterface : BoundUserInterface
 {
+    #region Starlight
+    [Dependency] private ISharedPlayerManager _playerManager = default!;
+    #endregion
     [ViewVariables]
     private AtmosAlertsComputerWindow? _menu;
 
-    public AtmosAlertsComputerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { }
+    public AtmosAlertsComputerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+        IoCManager.InjectDependencies(this); // Starlight: go to clicked location for AI
+    }
 
     protected override void Open()
     {
@@ -18,6 +28,21 @@ protected override void Open()
         _menu.OnClose += Close;
     }
 
+    #region Starlight
+    /// <summary>
+    /// Sends a map-click request to move the Station AI's remote eye to the specified coordinates.
+    /// </summary>
+    /// <param name="coordinates">The map coordinates selected by the user.</param>
+    public void SendMapClicked(EntityCoordinates coordinates)
+    {
+        var local = _playerManager.LocalEntity;
+        if (local is null || !EntMan.HasComponent<StationAiHeldComponent>(local.Value))
+            return;
+
+        SendMessage(new CrewMonitoringWarpRequestMessage(EntMan.GetNetCoordinates(coordinates)));
+    }
+    #endregion
+
     protected override void UpdateState(BoundUserInterfaceState state)
     {
         base.UpdateState(state);

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

@@ -37,6 +37,7 @@ public sealed partial class AtmosAlertsComputerWindow : FancyWindow
 
     public event Action<NetEntity?>? SendFocusChangeMessageAction;
     public event Action<NetEntity, bool>? SendDeviceSilencedMessageAction;
+    public event Action<EntityCoordinates>? MapClicked; // Starlight: go to clicked location for AI
 
     private bool _autoScrollActive = false;
     private bool _autoScrollAwaitsUpdate = false;
@@ -95,6 +96,7 @@ public AtmosAlertsComputerWindow(AtmosAlertsComputerBoundUserInterface userInter
 
         // Set trackable entity selected action
         NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap;
+        NavMap.MapClickedAction += OnNavMapClicked; // Starlight: go to clicked location for AI
 
         // Update nav map
         NavMap.ForceNavMapUpdate();
@@ -113,8 +115,15 @@ public AtmosAlertsComputerWindow(AtmosAlertsComputerBoundUserInterface userInter
         // Set atmos monitoring message action
         SendFocusChangeMessageAction += userInterface.SendFocusChangeMessage;
         SendDeviceSilencedMessageAction += userInterface.SendDeviceSilencedMessage;
+        MapClicked += userInterface.SendMapClicked; // Starlight: go to clicked location for AI
     }
 
+    #region Starlight
+    private void OnNavMapClicked(EntityCoordinates coordinates)
+    {
+        MapClicked?.Invoke(coordinates);
+    }
+    #endregion
     #region Toggle handling
 
     private void OnShowAlarmsToggled(CheckBox toggle, AtmosAlarmType toggledAlarmState)

Content.Client/Atmos/Consoles/AtmosMonitoringConsoleBoundUserInterface.cs

@@ -1,13 +1,23 @@
 using Content.Shared.Atmos.Components;
+using Content.Shared.Medical.CrewMonitoring;
+using Content.Shared.Silicons.StationAi;
+using Robust.Shared.Map;
+using Robust.Shared.Player;
 
 namespace Content.Client.Atmos.Consoles;
 
 public sealed class AtmosMonitoringConsoleBoundUserInterface : BoundUserInterface
 {
+    #region Starlight
+    [Dependency] private ISharedPlayerManager _playerManager = default!;
+    #endregion
     [ViewVariables]
     private AtmosMonitoringConsoleWindow? _menu;
 
-    public AtmosMonitoringConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { }
+    public AtmosMonitoringConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+        IoCManager.InjectDependencies(this); // Starlight: go to clicked position for AI
+    }
 
     protected override void Open()
     {
@@ -18,6 +28,20 @@ protected override void Open()
         _menu.OnClose += Close;
     }
 
+    #region Starlight
+    /// <summary>
+    /// Sends a map-click request to move the Station AI's remote eye to the specified coordinates.
+    /// </summary>
+    /// <param name="coordinates">The map coordinates selected by the user.</param>
+    public void SendMapClicked(EntityCoordinates coordinates)
+    {
+        var local = _playerManager.LocalEntity;
+        if (local is null || !EntMan.HasComponent<StationAiHeldComponent>(local.Value))
+            return;
+
+        SendMessage(new CrewMonitoringWarpRequestMessage(EntMan.GetNetCoordinates(coordinates)));
+    }
+    #endregion
     protected override void UpdateState(BoundUserInterfaceState state)
     {
         base.UpdateState(state);

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

@@ -29,6 +29,7 @@ public sealed partial class AtmosMonitoringConsoleWindow : FancyWindow
     private int? _focusNetId;
 
     private bool _autoScrollActive = false;
+    public event Action<EntityCoordinates>? MapClicked; // Starlight: go to clicked position for AI
 
     private readonly Color _unfocusedDeviceColor = Color.DimGray;
     private ProtoId<NavMapBlipPrototype> _navMapConsoleProtoId = "NavMapConsole";
@@ -84,6 +85,8 @@ public AtmosMonitoringConsoleWindow(AtmosMonitoringConsoleBoundUserInterface use
 
         // Set trackable entity selected action
         NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap;
+        NavMap.MapClickedAction += OnNavMapClicked; // Starlight: go to clicked position for AI
+        MapClicked += userInterface.SendMapClicked; // Starlight: go to clicked position for AI
 
         // Update nav map
         NavMap.ForceNavMapUpdate();
@@ -106,6 +109,13 @@ public AtmosMonitoringConsoleWindow(AtmosMonitoringConsoleBoundUserInterface use
         UpdateUI(consoleCoords, Array.Empty<AtmosMonitoringConsoleEntry>());
     }
 
+    #region Starlight
+    private void OnNavMapClicked(EntityCoordinates coordinates)
+    {
+        MapClicked?.Invoke(coordinates);
+    }
+    #endregion
+
     #region Toggle handling
 
     private void OnShowPipeNetworkToggled()

Content.Client/Content.Client.csproj

@@ -30,4 +30,5 @@
   </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <Import Project="..\RobustToolbox\MSBuild\XamlIL.targets" />
+  <Import Project="..\RobustToolbox\MSBuild\Robust.EntitySystemSubscriptionsGenerator.targets" />
 </Project>

Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs

@@ -36,7 +36,7 @@ public GuideReagentReaction(ReactionPrototype prototype, IPrototypeManager proto
         Container container = ReactantsContainer;
         SetReagents(prototype.Reactants, ref container, protoMan);
         Container productContainer = ProductsContainer;
-        var products = new Dictionary<string, FixedPoint2>(prototype.Products);
+        var products = new Dictionary<ProtoId<ReagentPrototype>, FixedPoint2>(prototype.Products);
         foreach (var (reagent, reactantProto) in prototype.Reactants)
         {
             if (reactantProto.Catalyst)
@@ -103,9 +103,9 @@ public GuideReagentReaction(GasPrototype prototype,
 
         if (prototype.Reagent != null)
         {
-            var quantity = new Dictionary<string, FixedPoint2>
+            var quantity = new Dictionary<ProtoId<ReagentPrototype>, FixedPoint2>
             {
-                { prototype.Reagent, FixedPoint2.New(0.21f) }
+                { prototype.Reagent.Value, FixedPoint2.New(0.21f) }
             };
             Container productContainer = ProductsContainer;
             SetReagents(quantity, ref productContainer, protoMan, false);
@@ -115,48 +115,34 @@ public GuideReagentReaction(GasPrototype prototype,
 
     private void SetReagents(List<ReagentQuantity> reagents, ref Container container, IPrototypeManager protoMan, bool addLinks = true)
     {
-        var amounts = new Dictionary<string, FixedPoint2>();
+        var amounts = new Dictionary<ProtoId<ReagentPrototype>, FixedPoint2>();
         foreach (var (reagent, quantity) in reagents)
         {
             amounts.Add(reagent.Prototype, quantity);
         }
         SetReagents(amounts, ref container, protoMan, addLinks);
     }
 
-    private void SetReagents(
-        Dictionary<string, ReactantPrototype> reactants,
-        ref Container container,
-        IPrototypeManager protoMan,
-        bool addLinks = true)
-    {
-        var amounts = new Dictionary<string, FixedPoint2>();
-        foreach (var (reagent, reactantPrototype) in reactants)
-        {
-            amounts.Add(reagent, reactantPrototype.Amount);
-        }
-        SetReagents(amounts, ref container, protoMan, addLinks);
-    }
-
     [PublicAPI]
     private void SetReagents(
-        Dictionary<ProtoId<MixingCategoryPrototype>, ReactantPrototype> reactants,
+        Dictionary<ProtoId<ReagentPrototype>, ReactantPrototype> reactants,
         ref Container container,
         IPrototypeManager protoMan,
         bool addLinks = true)
     {
-        var amounts = new Dictionary<string, FixedPoint2>();
+        var amounts = new Dictionary<ProtoId<ReagentPrototype>, FixedPoint2>();
         foreach (var (reagent, reactantPrototype) in reactants)
         {
             amounts.Add(reagent, reactantPrototype.Amount);
         }
         SetReagents(amounts, ref container, protoMan, addLinks);
     }
 
-    private void SetReagents(Dictionary<string, FixedPoint2> reagents, ref Container container, IPrototypeManager protoMan, bool addLinks = true)
+    private void SetReagents(Dictionary<ProtoId<ReagentPrototype>, FixedPoint2> reagents, ref Container container, IPrototypeManager protoMan, bool addLinks = true)
     {
         foreach (var (product, amount) in reagents.OrderByDescending(p => p.Value))
         {
-            var productProto = protoMan.Index<ReagentPrototype>(product);
+            var productProto = protoMan.Index(product);
             var msg = new FormattedMessage();
             msg.AddMarkupOrThrow(Loc.GetString("guidebook-reagent-recipes-reagent-display",
                 ("reagent", productProto.LocalizedName), ("ratio", amount)));

Content.Client/IconSmoothing/IconSmoothComponent.cs

@@ -1,5 +1,6 @@
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Client.IconSmoothing
@@ -38,8 +39,8 @@ public sealed partial class IconSmoothComponent : Component
         [ViewVariables(VVAccess.ReadWrite), DataField("base")]
         public string StateBase { get; set; } = string.Empty;
 
-        [DataField("shader", customTypeSerializer:typeof(PrototypeIdSerializer<ShaderPrototype>))]
-        public string? Shader;
+        [DataField("shader")]
+        public ProtoId<ShaderPrototype>? Shader;
 
         /// <summary>
         ///     Mode that controls how the icon should be selected.

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

@@ -15,6 +15,7 @@
 using Content.Shared._Starlight.Medical.Limbs;
 using Content.Client._Starlight.Humanoid;
 using Content.Shared._Starlight.Humanoid;
+using Content.Shared._Starlight.Roles;
 #endregion
 
 namespace Content.Client.Lobby.UI.ProfileEditorControls;
@@ -126,6 +127,13 @@ private void LoadHumanoidEntity(HumanoidCharacterProfile humanoid, JobPrototype?
                 JobName = job.LocalizedName;
                 // Grab the loadout specific name too!
                 LoadoutName = GetLoadoutName(loadout);
+                // Starlight - the preview dummy never reaches the server, so
+                // give client-side systems a chance to react to the loadout too
+                EntMan.EventBus.RaiseLocalEvent(PreviewDummy, new RoleLoadoutAppliedEvent(loadout));
+                // Starlight - actually equip loadout-selected clothing on the
+                // dummy too, same as the humanoid path below does. Borg/AI
+                // never had wearable loadout slots so this was never hit.
+                GiveDummyLoadout(PreviewDummy, loadout);
                 return;
             }
         }

Content.Client/Overlays/ShowJobIconsSystem.cs

@@ -1,10 +1,15 @@
+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;
 
@@ -13,6 +18,11 @@ public sealed partial class ShowJobIconsSystem : EquipmentHudSystem<ShowJobIcons
     [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()
@@ -29,7 +39,13 @@ private void OnGetStatusIconsEvent(EntityUid uid, StatusIconComponent _, ref Get
 
         var iconId = JobIconForNoId;
 
-        if (_accessReader.FindAccessItemsInventory(uid, out var items))
+        // 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)
             {
@@ -51,6 +67,29 @@ private void OnGetStatusIconsEvent(EntityUid uid, StatusIconComponent _, ref Get
             }
         }
 
+        // 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

Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs

@@ -1,14 +1,23 @@
 using Content.Shared.Power;
+using Content.Shared.Medical.CrewMonitoring;
+using Content.Shared.Silicons.StationAi;
 using Robust.Client.UserInterface;
+using Robust.Shared.Map;
+using Robust.Shared.Player;
 
 namespace Content.Client.Power;
 
 public sealed class PowerMonitoringConsoleBoundUserInterface : BoundUserInterface
 {
+    [Dependency] private ISharedPlayerManager _playerManager = default!; // Starlight: go to clicked position for AI
+
     [ViewVariables]
     private PowerMonitoringWindow? _menu;
 
-    public PowerMonitoringConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { }
+    public PowerMonitoringConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+        IoCManager.InjectDependencies(this); // Starlight: go to clicked position for AI
+    }
 
     protected override void Open()
     {
@@ -17,6 +26,7 @@ protected override void Open()
         _menu = this.CreateWindow<PowerMonitoringWindow>();
         _menu.SetEntity(Owner);
         _menu.SendPowerMonitoringConsoleMessageAction += SendPowerMonitoringConsoleMessage;
+        _menu.MapClicked += SendMapClicked; // Starlight: go to clicked position for AI
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -40,4 +50,15 @@ public void SendPowerMonitoringConsoleMessage(NetEntity? netEntity, PowerMonitor
     {
         SendMessage(new PowerMonitoringConsoleMessage(netEntity, group));
     }
+
+    #region Starlight
+    private void SendMapClicked(EntityCoordinates coordinates)
+    {
+        var local = _playerManager.LocalEntity;
+        if (local is null || !EntMan.HasComponent<StationAiHeldComponent>(local.Value))
+            return;
+
+        SendMessage(new CrewMonitoringWarpRequestMessage(EntMan.GetNetCoordinates(coordinates)));
+    }
+    #endregion
 }