]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix for anomaly double explosion sound and sprite scaling flicker before removal...
authorQuantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Sat, 12 Apr 2025 23:27:00 +0000 (19:27 -0400)
committerGitHub <noreply@github.com>
Sat, 12 Apr 2025 23:27:00 +0000 (01:27 +0200)
* Fix anomaly supercrit explosion sound playing twice.

* Fix so that the supercritical anomaly doesn't scale back to normal visually before removal.

Content.Shared/Anomaly/SharedAnomalySystem.cs

index 30a7cb04d0debb3d732b5b2da4f30ac309c976e9..61b8cc7f90689f892353f91cd254747b0353eca3 100644 (file)
@@ -153,10 +153,11 @@ public abstract class SharedAnomalySystem : EntitySystem
         if (!Timing.IsFirstTimePredicted)
             return;
 
-        Audio.PlayPvs(component.SupercriticalSound, Transform(uid).Coordinates);
-
         if (_net.IsServer)
+        {
+            Audio.PlayPvs(component.SupercriticalSound, Transform(uid).Coordinates);
             Log.Info($"Raising supercritical event. Entity: {ToPrettyString(uid)}");
+        }
 
         var powerMod = 1f;
         if (component.CurrentBehavior != null)
@@ -355,7 +356,7 @@ public abstract class SharedAnomalySystem : EntitySystem
             if (Timing.CurTime <= super.EndTime)
                 continue;
             DoAnomalySupercriticalEvent(ent, anom);
-            RemComp(ent, super);
+            // Removal of the supercritical component is handled by DoAnomalySupercriticalEvent
         }
     }