From 741ceceebcc34e6762854a1fc29a3886a3965db6 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 15 Jul 2024 12:31:15 -0400 Subject: [PATCH] Fixes from latest feedback --- .../StationEvents/Events/MassMindSwapRule.cs | 10 +++++----- .../StationEvents/Events/NoosphericFryRule.cs | 2 +- .../Psionics/Glimmer/GlimmerReactiveSystem.cs | 8 ++++---- .../DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml | 1 + .../Nyanotrasen/Entities/Clothing/Head/hats.yml | 2 ++ 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs index 89f3bc9750..3be2eed638 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs @@ -66,11 +66,11 @@ protected override void Started(EntityUid uid, MassMindSwapRuleComponent compone // Do the swap. _mindSwap.Swap(actor, other); - if (!component.IsTemporary) - { - _mindSwap.GetTrapped(actor); - _mindSwap.GetTrapped(other); - } + //if (!component.IsTemporary) + //{ + // _mindSwap.GetTrapped(actor); + // _mindSwap.GetTrapped(other); + //} } while (true); } } diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs index cf7b8e6cc9..d7880af903 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs @@ -103,7 +103,7 @@ protected override void Started(EntityUid uid, NoosphericFryRuleComponent compon while (queryReactive.MoveNext(out var reactive, out _, out var xform, out var physics)) { // shoot out three bolts of lighting... - _glimmerReactiveSystem.BeamRandomNearProber(reactive, 3, 12); + //_glimmerReactiveSystem.BeamRandomNearProber(reactive, 3, 12); // try to anchor if we can if (!xform.Anchored) diff --git a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs index 8503457488..584b1a61e2 100644 --- a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs +++ b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs @@ -374,10 +374,10 @@ public override void Update(float frameTime) _ghostSystem.MakeVisible(true); _revenantSystem.MakeVisible(true); GhostsVisible = true; - foreach (var reactive in reactives) - { - BeamRandomNearProber(reactive.Owner, 1, 12); - } + //foreach (var reactive in reactives) + //{ + // BeamRandomNearProber(reactive.Owner, 1, 12); + //} } else if (GhostsVisible == true) { _ghostSystem.MakeVisible(false); diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml index 1f1000f04a..d0982c8174 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml @@ -29,6 +29,7 @@ psychicFeedback: - "glimmer-mite-feedback" - type: GlimmerSource + glimmerExponentOffset: 3 - type: AmbientSound range: 6 volume: -3 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml index 83e3756c0f..781e42c172 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml @@ -113,6 +113,8 @@ sprite: Nyanotrasen/Clothing/Head/Helmets/insulative_skullcap.rsi - type: Clothing sprite: Nyanotrasen/Clothing/Head/Helmets/insulative_skullcap.rsi + - type: TinfoilHat + destroyOnFry: false - type: Armor modifiers: coefficients: