Update Engine to v228.0.0

Content.IntegrationTests/Tests/Interaction/InteractionTest.EntitySpecifier.cs

@@ -92,7 +92,7 @@ protected async Task<EntityUid> SpawnEntity(EntitySpecifier spec, EntityCoordina
         {
             await Server.WaitPost(() =>
             {
-                uid = SEntMan.SpawnEntity(stackProto.Spawn, coords);
+                uid = SEntMan.SpawnAtPosition(stackProto.Spawn, coords);
                 Stack.SetCount(uid, spec.Quantity);
             });
             return uid;
@@ -114,13 +114,13 @@ await Server.WaitPost(() =>
             return await SpawnEntity((stack.StackTypeId, spec.Quantity), coords);
 
         Assert.That(spec.Quantity, Is.EqualTo(1), "SpawnEntity only supports returning a singular entity");
-        await Server.WaitPost(() => uid = SEntMan.SpawnEntity(spec.Prototype, coords));
+        await Server.WaitPost(() => uid = SEntMan.SpawnAtPosition(spec.Prototype, coords));
         return uid;
     }
 
     /// <summary>
     /// Convert an entity-uid to a matching entity specifier. Useful when doing entity lookups & checking that the
-    /// right quantity of entities/materials werre produced. Returns null if passed an entity with a null prototype.
+    /// right quantity of entities/materials were produced. Returns null if passed an entity with a null prototype.
     /// </summary>
     protected EntitySpecifier? ToEntitySpecifier(EntityUid uid)
     {

Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs

@@ -88,7 +88,7 @@ protected async Task SpawnTarget(string prototype)
         Target = NetEntity.Invalid;
         await Server.WaitPost(() =>
         {
-            Target = SEntMan.GetNetEntity(SEntMan.SpawnEntity(prototype, SEntMan.GetCoordinates(TargetCoords)));
+            Target = SEntMan.GetNetEntity(SEntMan.SpawnAtPosition(prototype, SEntMan.GetCoordinates(TargetCoords)));
         });
 
         await RunTicks(5);

Content.Server/FloofStation/HideoutGeneratorComponent.cs

@@ -0,0 +1,17 @@
+using Robust.Shared.Map;
+
+
+namespace Content.Server.FloofStation;
+
+
+[RegisterComponent]
+public sealed partial class HideoutGeneratorComponent : Component
+{
+
+    /// <summary>
+    /// Maps we've generated.
+    /// </summary>
+    [DataField]
+    public List<MapId> Generated = new();
+
+}

Content.Server/FloofStation/TheDarkSystem.cs

@@ -14,12 +14,13 @@ public sealed class TheDarkSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-
-        SubscribeLocalEvent<RoundStartingEvent>(SetupTheDark);
+        SubscribeLocalEvent<HideoutGeneratorComponent, MapInitEvent>(SetupTheDark);
+        SubscribeLocalEvent<HideoutGeneratorComponent, ComponentShutdown>(DestroyTheDark);
     }
 
-    private void SetupTheDark(RoundStartingEvent ev)
+    private void SetupTheDark(EntityUid uid, HideoutGeneratorComponent component, MapInitEvent args)
     {
+        Logger.Debug(uid.ToString());
         var mapId = _mapManager.CreateMap();
         _mapManager.AddUninitializedMap(mapId);
 
@@ -30,7 +31,21 @@ private void SetupTheDark(RoundStartingEvent ev)
         {
             EnsureComp<PreventPilotComponent>(id);
         }
-
+        component.Generated.Add(mapId);
         _mapManager.DoMapInitialize(mapId);
     }
+
+    private void DestroyTheDark(EntityUid uid, HideoutGeneratorComponent component, ComponentShutdown args)
+    {
+
+        foreach (var mapId in component.Generated)
+        {
+            if (!_mapManager.MapExists(mapId))
+                continue;
+
+            _mapManager.DeleteMap(mapId);
+        }
+
+
+    }
 }

Resources/Prototypes/Entities/Stations/base.yml

@@ -180,3 +180,10 @@
   abstract: true
   components:
     - type: StationEventEligible # For when someone makes this more granular in the future.
+
+# Floof
+- type: entity
+  id: BaseStationTheDark
+  abstract: true
+  components:
+  - type: HideoutGenerator

Resources/Prototypes/Entities/Stations/nanotrasen.yml

@@ -27,6 +27,7 @@
     - BaseStationNanotrasen
     - BaseRandomStation
     - BaseStationMail # Nyano component, required for station mail to function
+    - BaseStationTheDark # Floof
   noSpawn: true
   components:
     - type: Transform