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(); while (harmQuery.MoveNext(out var uid, out var _)) { - _entityManager.EnsureComponent(uid); + EnsureComp(uid); } - var grenadeQuery = EntityQueryEnumerator(); + var explosiveQuery = EntityQueryEnumerator(); + while (explosiveQuery.MoveNext(out var uid, out var _)) + { + RemComp(uid); + } + + var grenadeQuery = EntityQueryEnumerator(); while (grenadeQuery.MoveNext(out var uid, out var _)) { - _entityManager.RemoveComponent(uid); + RemComp(uid); } - var empQuery = EntityQueryEnumerator(); - while (empQuery.MoveNext(out var uid, out var _)) + var flashQuery = EntityQueryEnumerator(); + while (flashQuery.MoveNext(out var uid, out var _)) { - _entityManager.RemoveComponent(uid); + RemComp(uid); } var uplinkQuery = EntityQueryEnumerator();