Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

death to eorg #598

Merged
merged 1 commit into from
Dec 29, 2023
Merged

death to eorg #598

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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>();
Expand Down
Loading