From fe526b7f073ecfbc1cb62f51977eb4cc24142df6 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Fri, 29 Dec 2023 19:43:26 +0000
Subject: [PATCH] death to eorg (#598)

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 .../RoundEnd/RoundEndSystem.Pacified.cs       | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs b/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs
index 7d5d31dfb04..36615a425f7 100644
--- a/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs
+++ b/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs
@@ -1,5 +1,5 @@
-using Content.Server.Emp;
 using Content.Server.Explosion.Components;
+using Content.Server.Flash.Components;
 using Content.Server.GameTicking;
 using Content.Server.Popups;
 using Content.Server.Store.Components;
@@ -38,19 +38,25 @@ private void OnRoundEnded(RoundEndTextAppendEvent ev)
         var harmQuery = EntityQueryEnumerator<CombatModeComponent>();
         while (harmQuery.MoveNext(out var uid, out var _))
         {
-            _entityManager.EnsureComponent<PacifiedComponent>(uid);
+            EnsureComp<PacifiedComponent>(uid);
         }
 
-        var grenadeQuery = EntityQueryEnumerator<ExplodeOnTriggerComponent>();
+        var explosiveQuery = EntityQueryEnumerator<ExplosiveComponent>();
+        while (explosiveQuery.MoveNext(out var uid, out var _))
+        {
+            RemComp<ExplosiveComponent>(uid);
+        }
+
+        var grenadeQuery = EntityQueryEnumerator<OnUseTimerTriggerComponent>();
         while (grenadeQuery.MoveNext(out var uid, out var _))
         {
-            _entityManager.RemoveComponent<ExplodeOnTriggerComponent>(uid);
+            RemComp<OnUseTimerTriggerComponent>(uid);
         }
 
-        var empQuery = EntityQueryEnumerator<EmpOnTriggerComponent>();
-        while (empQuery.MoveNext(out var uid, out var _))
+        var flashQuery = EntityQueryEnumerator<FlashComponent>();
+        while (flashQuery.MoveNext(out var uid, out var _))
         {
-            _entityManager.RemoveComponent<EmpOnTriggerComponent>(uid);
+            RemComp<FlashComponent>(uid);
         }
 
         var uplinkQuery = EntityQueryEnumerator<StoreComponent>();