Merge remote-tracking branch 'EE-Personal/Psionic-Power-Refactor' int…

…o Upstream-Merge-7/15/2024
SS14-Classic · Jul 15, 2024 · 0865bac · 0865bac
2 parents fe74154 + 0df9b71
commit 0865bac
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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: