AI: Reconnect to last shunt

Content.Shared/Silicons/Borgs/SharedBorgSystem.cs

@@ -216,7 +216,9 @@ protected virtual void OnInserted(Entity<BorgChassisComponent> chassis, ref EntI
                 EnsureComp<StationAIShuntComponent>(chassis, out var borgShunt)
                 )
                 {
-                    shuntable.Inhabited = chassis;
+                    shuntable.Inhabited = chassis; // Starlight
+                    shuntable.LastShunt = chassis; // Starlight
+                    Dirty(shunt.Return.Value, shuntable); // Starlight
                     borgShunt.Return = shunt.Return;
                     borgShunt.ReturnAction = _actions.AddAction(chassis, shuntable.UnshuntAction);
                 }
@@ -254,7 +256,9 @@ protected virtual void OnRemoved(Entity<BorgChassisComponent> chassis, ref EntRe
                 TryComp<StationAIShuntableComponent>(shunt.Return, out var shuntable) &&
                 TryComp<StationAIShuntComponent>(chassis, out var borgShunt))
                 {
-                    shuntable.Inhabited = args.Entity;
+                    shuntable.Inhabited = args.Entity; // Starlight
+                    shuntable.LastShunt = args.Entity; // Starlight
+                    Dirty(shunt.Return.Value, shuntable); // Starlight
                     if (TryComp<ActionComponent>(borgShunt.ReturnAction, out var action))
                         _actions.RemoveAction((borgShunt.ReturnAction.Value, action)); //delete the action as we leave the body
                     borgShunt.Return = null;

Content.Shared/_Starlight/Silicons/Borgs/StationAIShuntSystem.Reconnect.cs

@@ -0,0 +1,30 @@
+using Content.Shared.Actions;
+
+namespace Content.Shared._Starlight.Silicons.Borgs;
+
+public sealed partial class StationAIShuntSystem
+{
+    private void InitializeReconnect()
+    {
+        SubscribeLocalEvent<StationAIShuntableComponent, AIReconnectShuntActionEvent>(OnAttemptReconnect);
+    }
+
+    private void OnAttemptReconnect(EntityUid uid, StationAIShuntableComponent shuntable, AIReconnectShuntActionEvent ev)
+    {
+        if (ev.Handled || shuntable.Inhabited.HasValue || shuntable.LastShunt is not { } lastShunt || Deleted(lastShunt))
+            return;
+
+        var shuntEv = new AIShuntActionEvent
+        {
+            Target = lastShunt,
+            Performer = uid,
+            IgnoreCameraView = true
+        };
+        RaiseLocalEvent(uid, shuntEv);
+        ev.Handled = shuntEv.Handled;
+    }
+}
+
+public sealed partial class AIReconnectShuntActionEvent : Content.Shared.Actions.InstantActionEvent
+{
+}

Content.Shared/_Starlight/Silicons/Borgs/StationAIShuntSystem.cs

@@ -42,6 +42,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<StationAIShuntThroughComponent, GetVerbsEvent<AlternativeVerb>>(GetAltVerbs);
         SubscribeLocalEvent<StationAIShuntThroughComponent, FindShuntTargetEvent>(OnFindShuntTarget);
+        InitializeReconnect();
     }
 
     #region Actions
@@ -50,7 +51,7 @@ private void OnAttemptShunt(EntityUid uid, StationAIShuntableComponent shuntable
         if (ev.Handled)
             return;
         var target = ev.Target;
-        if (_vision.IsOutsideCameraViewCached(target))
+        if (!ev.IgnoreCameraView && _vision.IsOutsideCameraViewCached(target))
             return;
 
         // If target has ShuntThrough component, search for a valid target in containers
@@ -107,6 +108,8 @@ private void OnAttemptShunt(EntityUid uid, StationAIShuntableComponent shuntable
         _mindSystem.TransferTo(mindId, target);
         shunt.ReturnAction = _actionSystem.AddAction(target, shuntable.UnshuntAction.Id);
         shuntable.Inhabited = target;
+        shuntable.LastShunt = target;
+        Dirty(uid, shuntable);
 
         if (TryComp<SiliconLawProviderComponent>(uid, out var coreLaws))
         {
@@ -317,6 +320,7 @@ private void OnFindShuntTarget(EntityUid uid, StationAIShuntThroughComponent com
 
 public sealed partial class AIShuntActionEvent : EntityTargetActionEvent
 {
+    public bool IgnoreCameraView;
 }
 
 public sealed partial class AIUnShuntActionEvent : InstantActionEvent

Content.Shared/_Starlight/Silicons/Borgs/StationAIShuntableComponent.Reconnect.cs

@@ -0,0 +1,14 @@
+using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._Starlight.Silicons.Borgs;
+
+public sealed partial class StationAIShuntableComponent
+{
+    /// <summary>
+    /// The last shunt target used by this AI, if it still exists.
+    /// </summary>
+    [ViewVariables]
+    [DataField, AutoNetworkedField]
+    public EntityUid? LastShunt { get; set; }
+}

Content.Shared/_Starlight/Silicons/Borgs/StationAIShuntableComponent.cs

@@ -7,7 +7,7 @@ namespace Content.Shared._Starlight.Silicons.Borgs;
 /// <summary>
 /// This comp is added to station AI's invisible posibrain to handle shunting logics.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class StationAIShuntableComponent : Component
 {
     /// <summary>

Resources/Locale/en-US/_Starlight/station-ai/verbs.ftl

@@ -1,2 +1,3 @@
 ai-shunt-into = Enter Chassis
 ai-shunt-out-of = Exit Chassis
+ai-shunt-reconnect = Reconnect Chassis

Resources/Prototypes/Entities/Mobs/Player/silicon.yml

@@ -42,6 +42,7 @@
     - ActionSurvCameraLights
     - ActionAIViewLaws
     - ActionAIShunt # Starlight AI Shunt ability
+    - ActionAIReconnectShunt # Starlight AI Shunt reconnect ability
     - ActionAIWarp # Starlight
   - type: UserInterface
     interfaces:
@@ -85,9 +86,7 @@
     - sprite: Mobs/Silicon/station_ai.rsi
       state: default
   - type: ShowJobIcons
-  #region Starlight
-  - type: StationAIShuntable
-  #endregion Starlight
+  - type: StationAIShuntable # Starlight
   - type: DamagedSiliconAccent
     startPowerCorruptionAtCharIdx: 4
     maxPowerCorruptionAtCharIdx: 20

Resources/Prototypes/_Starlight/station_ai.yml

@@ -40,13 +40,27 @@
     - type: InstantAction
       event: !type:AIUnShuntActionEvent
 
+- type: entity
+  parent: BaseMentalAction
+  id: ActionAIReconnectShunt
+  name: Reconnect Shunt
+  description: Reconnect to the last chassis or interface you shunted into.
+  components:
+    - type: Action
+      icon:
+        { sprite: _Starlight/Interface/Actions/actions_shunt.rsi, state: icon }
+      itemIconStyle: BigAction
+    - type: InstantAction
+      event: !type:AIReconnectShuntActionEvent
+
 - type: entity
   parent: BaseAction
   id: ActionAIWarp
   name: Warp
   description: Open a list of crew and locations to warp to.
   components:
     - type: Action
+      priority: 3
       itemIconStyle: BigAction
       icon:
         sprite: Interface/Actions/actions_ai.rsi