The Reclaimer MK2 returns! (#5245)

* The Reclaimer returns

* Added the ability to name GridSpawns with a specific name

* formatting

---------

Co-authored-by: Vanessa <vanessalouwagie@gmail.com>

Content.Server/Shuttles/Components/GridSpawnComponent.cs

@@ -55,6 +55,11 @@ public interface IGridSpawnGroup
     /// </summary>
     public bool NameGrid { get; set; }
 
+    /// <summary>
+    /// DeltaV - If <see cref="NameGrid"> is true and this is not null, the grid will use this name instead of the file name.
+    /// </summary>
+    public string? Name { get; set; }
+
     /// <summary>
     /// Should we add this to the station's grids (if possible / relevant).
     /// </summary>
@@ -92,6 +97,9 @@ public sealed partial class DungeonSpawnGroup : IGridSpawnGroup
     /// <inheritdoc />
     public bool NameGrid { get; set; } = false;
 
+    /// <inheritdoc />
+    public string? Name { get; set; } = null; // DeltaV
+
     /// <inheritdoc />
     public bool StationGrid { get; set; } = false;
 }
@@ -112,6 +120,9 @@ public sealed partial class GridSpawnGroup : IGridSpawnGroup
     public ComponentRegistry AddComponents { get; set; } = new();
     public bool Hide { get; set; } = false;
     public bool NameGrid { get; set; } = true;
+
+    /// <inheritdoc />
+    public string? Name { get; set; } = null; // DeltaV
     public bool StationGrid { get; set; } = true;
 }
 

Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs

@@ -144,6 +144,11 @@ public sealed partial class ShuttleSystem
             if (group.NameGrid)
             {
                 var name = path.FilenameWithoutExtension;
+
+                // DeltaV - Allow grid names to be specified
+                if (!string.IsNullOrWhiteSpace(group.Name))
+                    name = group.Name;
+
                 _metadata.SetEntityName(grid.Value, name);
             }
 

Resources/Prototypes/Entities/Stations/base.yml

@@ -61,6 +61,11 @@
 #          paths:
 #          - /Maps/Shuttles/trading_outpost.yml
         # Spawn last
+        salvageShuttle: !type:GridSpawnGroup # DeltaV - salvage gets their own ship
+          paths:
+          - /Maps/_DV/Shuttles/Misc/reclaimer_mk2.yml
+          nameGrid: true
+          name: Reclaimer Mk2
         ruins: !type:GridSpawnGroup
           hide: true
           nameGrid: true