Merge branch 'master' into Research_Digiboard

DeltaV-Station · Dec 23, 2024 · 4ee5ac6 · 4ee5ac6
2 parents ff1eb75 + 0b146c7
commit 4ee5ac6
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/Content.Server/DeltaV/Abilities/Psionics/PrecognitionPowerSystem.cs b/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);
@@ -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;

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,18 +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.)
@@ -3833,3 +3819,17 @@
   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
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -43,6 +43,7 @@
     - id: PlushieMothRandom # Nyano - random moth plushies
     - id: PlushieArachind
     - id: PlushiePenguin
+    - id: PlushieMort # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml
 
 - type: entity
   id: CrateFunPlushie

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -36,6 +36,7 @@
         - PlushieMoth
         - PlushieMothRandom # Nyanotrasen Random Moth Plushies
         - PlushieArachind
+        - PlushieMort # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml
       chance: 0.5
       offset: 0.2
 

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -122,6 +122,7 @@
     - PlushieSharkBlue
     - PlushieVox
     - PlushieXeno
+    - PlushieMort # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml
     - PlasticBanana
     - RevolverCapGun
     - SnapPopBox