From dad471562d1b457929944a6ac0b597b1df1b9fc7 Mon Sep 17 00:00:00 2001
From: Vera Aguilera Puerto <gradientvera@outlook.com>
Date: Sat, 23 Oct 2021 10:49:59 +0200
Subject: [PATCH] Singularity plays collapsing sound on shutdown, not on
 remove.

---
 .../Singularity/Components/ServerSingularityComponent.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Singularity/Components/ServerSingularityComponent.cs b/Content.Server/Singularity/Components/ServerSingularityComponent.cs
index 8c57871b77..031363a906 100644
--- a/Content.Server/Singularity/Components/ServerSingularityComponent.cs
+++ b/Content.Server/Singularity/Components/ServerSingularityComponent.cs
@@ -93,10 +93,10 @@ namespace Content.Server.Singularity.Components
             _singularitySystem.ChangeSingularityLevel(this, 1);
         }
 
-        protected override void OnRemove()
+        protected override void Shutdown()
         {
+            base.Shutdown();
             SoundSystem.Play(Filter.Pvs(Owner), _singularityCollapsingSound.GetSound(), Owner.Transform.Coordinates);
-            base.OnRemove();
         }
     }
 }