v3

Rxup · Feb 24, 2025 · c68889e · c68889e
1 parent 1bc06d0
commit c68889e
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 12 deletions.
diff --git a/Content.Server/Backmen/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs b/Content.Server/Backmen/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
@@ -130,9 +130,12 @@ private void OnAnomalySupercritical(EntityUid uid, GlimmerSourceComponent compon
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
-        var q = EntityQueryEnumerator<GlimmerSourceComponent>();
-        while (q.MoveNext(out var owner, out var source))
+        var q = EntityQueryEnumerator<GlimmerSourceComponent, MetaDataComponent>();
+        while (q.MoveNext(out var owner, out var source, out var md))
         {
+            if(Paused(owner, md))
+                continue;
+
             if (!source.Active)
                 continue;
 

diff --git a/Content.Server/Backmen/StationEvents/Events/GlimmerRevenantSpawnRule.cs b/Content.Server/Backmen/StationEvents/Events/GlimmerRevenantSpawnRule.cs
@@ -27,6 +27,9 @@ protected override void Started(EntityUid uid, GlimmerRevenantRuleComponent comp
         var query = EntityQueryEnumerator<GlimmerSourceComponent,TransformComponent>();
         while (query.MoveNext(out var source, out _, out var transform))
         {
+            if(Paused(source))
+                continue;
+
             if (_stationSystem.GetOwningStation(source, transform) == station)
                 glimmerSources.Add(source);
         }

diff --git a/Content.Server/Backmen/StationEvents/Events/GlimmerWispSpawnRule.cs b/Content.Server/Backmen/StationEvents/Events/GlimmerWispSpawnRule.cs
@@ -38,6 +38,9 @@ protected override void Started(EntityUid uid, GlimmerWispRuleComponent componen
             var locations = EntityQueryEnumerator<GlimmerSourceComponent, TransformComponent>();
             while (locations.MoveNext(out var sUid, out _, out var transform))
             {
+                if(Paused(sUid))
+                    continue;
+
                 if (_stationSystem.GetOwningStation(sUid, transform) == station)
                 {
                     glimmerSources.Add(transform.Coordinates);

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -154,9 +154,11 @@
           maxVol: 50
           reagents:
             - ReagentId: Ash
-              Quantity: 25
+              Quantity: 10
             - ReagentId: Necrosol
-              Quantity: 25
+              Quantity: 10
+            - ReagentId: Ectoplasm
+              Quantity: 5
     - type: GuideHelp
       guides:
       - MinorAntagonists
diff --git a/Resources/Prototypes/_Backmen/GameRules/events.yml b/Resources/Prototypes/_Backmen/GameRules/events.yml
@@ -112,10 +112,9 @@
   abstract: true
   components:
     - type: StationEvent
-      # Favor glimmer events just a little more than regular events.
       weight: 12
       earliestStart: 1
-      reoccurrenceDelay: 1
+      reoccurrenceDelay: 5
     - type: GlimmerEvent
 
 ## Glimmer events
@@ -134,7 +133,7 @@
   components:
     - type: GlimmerEvent
       minimumGlimmer: 300
-      maximumGlimmer: 900
+      maximumGlimmer: 1000
     - type: NoosphericFryRule
 
 
@@ -177,6 +176,10 @@
   parent: BaseGlimmerEvent
   categories: [ HideSpawnMenu ]
   components:
+  - type: StationEvent
+    weight: 12
+    earliestStart: 1
+    reoccurrenceDelay: 1
   - type: GlimmerEvent
     minimumGlimmer: 0
     maximumGlimmer: 100
@@ -190,6 +193,10 @@
   parent: BaseGlimmerEvent
   categories: [ HideSpawnMenu ]
   components:
+    - type: StationEvent
+      weight: 12
+      earliestStart: 1
+      reoccurrenceDelay: 1
     - type: GlimmerEvent
       minimumGlimmer: 300
       maximumGlimmer: 1000

diff --git a/Resources/Prototypes/_Backmen/Reactions/psionic.yml b/Resources/Prototypes/_Backmen/Reactions/psionic.yml
@@ -18,15 +18,15 @@
   minTemp: 400
   reactants:
     Ash:
-      amount: 10
+      amount: 5
     Water:
-      amount: 10
+      amount: 5
     Blood:
-      amount: 10
+      amount: 5
     Ectoplasm:
-      amount: 10
+      amount: 5
     Plasma:
-      amount: 10
+      amount: 5
       catalyst: true
   effects:
     - !type:CreateEntityReactionEffect

diff --git a/Resources/ServerInfo/_Backmen/Guidebook/Epistemics/Psionics.xml b/Resources/ServerInfo/_Backmen/Guidebook/Epistemics/Psionics.xml
@@ -54,6 +54,9 @@
 [color=#a4885c]Снаряды Soulbreaker[/color] удаляют псионику у псиоников, в которых они попадают.
 
 <GuideEntityEmbed Entity="Ectoplasm" />
+  <GuideReagentEmbed Reagent="Ectoplasm"/>
 [color=#a4885c] Эктоплазма[/color], смешанная в мензурке с равными частями воды, золы, крови и плазмы, при достаточном нагревании даст нормальный кристалл. [color=#fcdf03]Используйте для этого горячую плиту.[/color]
 
+
+
 </Document>