From b5a7e1bc92602a7c230d174f3b825bf11890c965 Mon Sep 17 00:00:00 2001 From: SolStar <44028047+ewokswagger@users.noreply.github.com> Date: Mon, 23 Dec 2024 16:58:03 -0500 Subject: [PATCH 1/4] Precog fixes (#2519) Fix Precog results not cached on init --- .../DeltaV/Abilities/Psionics/PrecognitionPowerSystem.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Content.Server/DeltaV/Abilities/Psionics/PrecognitionPowerSystem.cs b/Content.Server/DeltaV/Abilities/Psionics/PrecognitionPowerSystem.cs index 79a56066e31..5edf08e097c 100644 --- 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(OnMapInit); SubscribeLocalEvent(OnShutdown); @@ -161,12 +162,12 @@ private void OnDoAfter(EntityUid uid, PrecognitionPowerComponent component, Prec /// Gets the precognition result message corosponding to the passed event id. /// /// message string corosponding to the event id passed - 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; From 14b11d6c8b2ddc6f0b51b62da65e290aaa4794e9 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 23 Dec 2024 22:58:23 +0100 Subject: [PATCH 2/4] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 322e931cb51..b6818e3f51a 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +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 @@ -3833,3 +3826,10 @@ 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 From 82de8a5f263a159502db3b2b399e2f502b9bf0b1 Mon Sep 17 00:00:00 2001 From: juniwoofs Date: Mon, 23 Dec 2024 14:08:28 -0800 Subject: [PATCH 3/4] added morty plushie to plushie, toy, and arcade reward pools, (#2516) * morty plushie :3 * Morty Plushie fixed real * Update toys.yml Fixed but for realer this time Signed-off-by: juniwoofs * Update toys.yml Signed-off-by: juniwoofs * fixedbutforrealipromise * fixedbutforrealrealrealtrustme * jessiepleaseworkjessie * waitwasthisthefix * imhonestlyembarassed * Plushie morty in the pools * added deltav notation --------- Signed-off-by: juniwoofs Co-authored-by: juniwoofs Co-authored-by: juniwoofs --- Resources/Prototypes/Catalog/Fills/Crates/fun.yml | 1 + Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml | 1 + .../Entities/Structures/Machines/Computers/arcades.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 551f8654684..ecc017f40aa 100644 --- 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 index eba1e300edf..6c2f94b3190 100644 --- 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 index dda0b40fff7..10aade2eb47 100644 --- 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 From 0b146c79ab8fcd58082f40c41b11702021eab978 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 23 Dec 2024 23:08:48 +0100 Subject: [PATCH 4/4] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index b6818e3f51a..c05ed3010be 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- 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 +3826,10 @@ 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