From 4d41e720bbf17026bcb74f9ce4f85cd328896599 Mon Sep 17 00:00:00 2001 From: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com> Date: Sat, 12 Apr 2025 19:27:00 -0400 Subject: [PATCH] Fix for anomaly double explosion sound and sprite scaling flicker before removal (#36489) * 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs index 30a7cb04d0..61b8cc7f90 100644 --- a/Content.Shared/Anomaly/SharedAnomalySystem.cs +++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs @@ -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 } }