ups fix

Author: GeneralGaws

Content.Server/DeltaV/Abilities/Psionics/PrecognitionPowerSystem.cs

@@ -45,6 +45,7 @@ public sealed class PrecognitionPowerSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
+        CachePrecognitionResults();
 
         SubscribeLocalEvent<PrecognitionPowerComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<PrecognitionPowerComponent, ComponentShutdown>(OnShutdown);
@@ -148,7 +149,7 @@ private void OnDoAfter(EntityUid uid, PrecognitionPowerComponent component, Prec
         var msg = Loc.GetString(locId);
         _chat.ChatMessageToOne(ChatChannel.Server,
             msg,
-            Loc.GetString("chat-manager-server-wrap-message", ("message", message)),
+            Loc.GetString("chat-manager-server-wrap-message", ("message", msg)),
             uid,
             false,
             mindComponent.Session.Channel,
@@ -161,12 +162,12 @@ private void OnDoAfter(EntityUid uid, PrecognitionPowerComponent component, Prec
     /// Gets the precognition result message corosponding to the passed event id.
     /// </summary>
     /// <returns>message string corosponding to the event id passed</returns>
-    private LocId GetResultMessage(EntProtoId eventId)
+    private LocId? GetResultMessage(EntProtoId eventId)
     {
         if (!Results.TryGetValue(eventId, out var result))
         {
             Log.Error($"Prototype {eventId} does not have an associated precognitionResult!");
-            return string.Empty;
+            return null;
         }
 
         return result.Message;

Content.Server/StationEvents/Components/VentCrittersRuleComponent.cs

@@ -1,4 +1,5 @@
 using Content.Server.StationEvents.Events;
+using Content.Shared.EntityTable.EntitySelectors;
 using Content.Shared.Storage;
 using Robust.Shared.Map; // DeltaV
 
@@ -7,8 +8,15 @@ namespace Content.Server.StationEvents.Components;
 [RegisterComponent, Access(typeof(VentCrittersRule))]
 public sealed partial class VentCrittersRuleComponent : Component
 {
-    [DataField("entries")]
-    public List<EntitySpawnEntry> Entries = new();
+    // DeltaV: Replaced by Table
+    //[DataField("entries")]
+    //public List<EntitySpawnEntry> Entries = new();
+
+    /// <summary>
+    /// DeltaV: Table of possible entities to spawn.
+    /// </summary>
+    [DataField(required: true)]
+    public EntityTableSelector Table = default!;
 
     /// <summary>
     /// At least one special entry is guaranteed to spawn

Content.Server/StationEvents/Events/VentCrittersRule.cs

@@ -2,6 +2,7 @@
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Pinpointer;
 using Content.Server.StationEvents.Components;
+using Content.Shared.EntityTable;
 using Content.Shared.GameTicking.Components;
 using Content.Shared.Station.Components;
 using Content.Shared.Storage;
@@ -26,6 +27,7 @@ public sealed class VentCrittersRule : StationEventSystem<VentCrittersRuleCompon
      */
 
     [Dependency] private readonly AntagSelectionSystem _antag = default!;
+    [Dependency] private readonly EntityTableSystem _entityTable = default!;
     [Dependency] private readonly ISharedPlayerManager _player = default!;
     [Dependency] private readonly NavMapSystem _navMap = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
@@ -62,9 +64,10 @@ protected override void Ended(EntityUid uid, VentCrittersRuleComponent comp, Gam
         var min = comp.Min * players / comp.PlayerRatio;
         var max = comp.Max * players / comp.PlayerRatio;
         var count = Math.Max(RobustRandom.Next(min, max), 1);
+        Log.Info($"Spawning {count} critters for {ToPrettyString(uid):rule}");
         for (int i = 0; i < count; i++)
         {
-            foreach (var spawn in EntitySpawnCollection.GetSpawns(comp.Entries, RobustRandom))
+            foreach (var spawn in _entityTable.GetSpawns(comp.Table))
             {
                 Spawn(spawn, coords);
             }

Resources/Changelog/DeltaVChangelog.yml

@@ -1,25 +1,4 @@
 Entries:
-- author: pissdemon
-  changes:
-  - message: Gumballs and lollipops now come in 32 awesome flavors! Try them all!
-    type: Add
-  id: 314
-  time: '2024-04-14T16:49:00.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1074
-- author: Velcroboy
-  changes:
-  - message: Fixed mail access
-    type: Fix
-  id: 315
-  time: '2024-04-15T19:38:04.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1095
-- author: adeinitas
-  changes:
-  - message: Mr. Butlertron can now be vinced (and also unanchored.)
-    type: Tweak
-  id: 316
-  time: '2024-04-16T15:45:18.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1100
 - author: deltanedas
   changes:
   - message: The SecDrobe now has Prison Headsets. Prisoners have rights too!
@@ -3833,3 +3812,25 @@
   id: 813
   time: '2024-12-23T10:45:34.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2495
+- author: ewokswagger
+  changes:
+  - message: Fixed Precognition results not appearing when power is used.
+    type: Fix
+  id: 814
+  time: '2024-12-23T21:58:04.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2519
+- author: juniwoofs
+  changes:
+  - message: added Morty Plushie to a few loot tables!
+    type: Tweak
+  id: 815
+  time: '2024-12-23T22:08:29.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2516
+- author: Colin-Tel
+  changes:
+  - message: Added a recipe for a box of chicken nuggets. Requires protein, egg, flour,
+      and cardboard!
+    type: Add
+  id: 816
+  time: '2024-12-26T09:42:07.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2524