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.

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

Port: Disable round end pacifism and add a new command to pacify everyone #2642

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
61 changes: 0 additions & 61 deletions Content.Server/_DV/RoundEnd/RoundEndSystem.Pacified.cs

This file was deleted.

60 changes: 60 additions & 0 deletions Content.Server/_Harmony/RoundEnd/PacifyAllCommand
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
// Credits:
// This code was originally created by DebugOk, deltanedas, and NullWanderer for DeltaV.
// Available at https://github.com/DebugOk/Delta-v/blob/master/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs
// Original PR: https://github.com/DeltaV-Station/Delta-v/pull/350
// Modified by FluffMe on 12.10.2024 with no major changes except the Namespaces and the CVar name.
// Modified and moved by youtissoum on 04.01.2025 to turn into a command.
using Content.Server.Administration;
using Content.Server.Explosion.Components; // DeltaV
using Content.Shared.Administration;
using Content.Shared.CombatMode;
using Content.Shared.CombatMode.Pacification;
using Content.Shared.Explosion.Components;
using Content.Shared.Flash.Components;
using Content.Shared.Store.Components;
using Robust.Shared.Console;

namespace Content.Server._Harmony.RoundEnd;

[AdminCommand(AdminFlags.Admin)]
public sealed class PacifyAllCommand : IConsoleCommand
{
[Dependency] private readonly IEntityManager _entityManager = default!;

public string Command => "pacifyall";
public string Description => "Pacify all players permanently.";
public string Help => string.Empty;

public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var harmQuery = _entityManager.EntityQueryEnumerator<CombatModeComponent>();
while (harmQuery.MoveNext(out var uid, out _))
{
_entityManager.EnsureComponent<PacifiedComponent>(uid);
}

var explosiveQuery = _entityManager.EntityQueryEnumerator<ExplosiveComponent>();
while (explosiveQuery.MoveNext(out var uid, out _))
{
_entityManager.RemoveComponent<ExplosiveComponent>(uid);
}

var grenadeQuery = _entityManager.EntityQueryEnumerator<OnUseTimerTriggerComponent>();
while (grenadeQuery.MoveNext(out var uid, out _))
{
_entityManager.RemoveComponent<OnUseTimerTriggerComponent>(uid);
}

var flashQuery = _entityManager.EntityQueryEnumerator<FlashComponent>();
while (flashQuery.MoveNext(out var uid, out _))
{
_entityManager.RemoveComponent<FlashComponent>(uid);
}

var uplinkQuery = _entityManager.EntityQueryEnumerator<StoreComponent>();
while (uplinkQuery.MoveNext(out var uid, out _))
{
_entityManager.RemoveComponent<StoreComponent>(uid);
}
}
}
17 changes: 0 additions & 17 deletions Content.Shared/_DV/CCVars/DCCVars.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,6 @@ public sealed class DCCVars
public static readonly CVarDef<bool> PsionicRollsEnabled =
CVarDef.Create("psionics.rolls_enabled", true, CVar.SERVERONLY);

/// <summary>
/// Anti-EORG measure. Will add pacified to all players upon round end.
/// Its not perfect, but gets the job done.
/// </summary>
public static readonly CVarDef<bool> RoundEndPacifist =
CVarDef.Create("game.round_end_pacifist", false, CVar.SERVERONLY);

/*
* No EORG
*/

/// <summary>
/// Whether the no EORG popup is enabled.
/// </summary>
public static readonly CVarDef<bool> RoundEndNoEorgPopup =
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unremove

CVarDef.Create("game.round_end_eorg_popup_enabled", true, CVar.SERVER | CVar.REPLICATED);

/// <summary>
/// Skip the no EORG popup.
/// </summary>
Expand Down
Loading