--- /dev/null
+using Content.Shared.Administration;
+
+namespace Content.Client.Administration.Systems;
+
+public sealed class AdminFrozenSystem : SharedAdminFrozenSystem
+{
+}
--- /dev/null
+using Content.Shared.Administration;
+
+namespace Content.Server.Administration.Systems;
+
+public sealed class AdminFrozenSystem : SharedAdminFrozenSystem
+{
+ /// <summary>
+ /// Freezes and mutes the given entity.
+ /// </summary>
+ public void FreezeAndMute(EntityUid uid)
+ {
+ var comp = EnsureComp<AdminFrozenComponent>(uid);
+ comp.Muted = true;
+ Dirty(uid, comp);
+ }
+}
[Dependency] private readonly StationSystem _stations = default!;
[Dependency] private readonly StationSpawningSystem _spawning = default!;
[Dependency] private readonly ExamineSystemShared _examine = default!;
+ [Dependency] private readonly AdminFrozenSystem _freeze = default!;
private readonly Dictionary<ICommonSession, List<EditSolutionsEui>> _openSolutionUis = new();
args.Verbs.Add(prayerVerb);
// Freeze
- var frozen = HasComp<AdminFrozenComponent>(args.Target);
- args.Verbs.Add(new Verb
+ var frozen = TryComp<AdminFrozenComponent>(args.Target, out var frozenComp);
+ var frozenAndMuted = frozenComp?.Muted ?? false;
+
+ if (!frozen)
{
- Priority = -1, // This is just so it doesn't change position in the menu between freeze/unfreeze.
- Text = frozen
- ? Loc.GetString("admin-verbs-unfreeze")
- : Loc.GetString("admin-verbs-freeze"),
- Category = VerbCategory.Admin,
- Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/snow.svg.192dpi.png")),
- Act = () =>
+ args.Verbs.Add(new Verb
{
- if (frozen)
- RemComp<AdminFrozenComponent>(args.Target);
- else
+ Priority = -1, // This is just so it doesn't change position in the menu between freeze/unfreeze.
+ Text = Loc.GetString("admin-verbs-freeze"),
+ Category = VerbCategory.Admin,
+ Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/snow.svg.192dpi.png")),
+ Act = () =>
+ {
EnsureComp<AdminFrozenComponent>(args.Target);
- },
- Impact = LogImpact.Medium,
- });
+ },
+ Impact = LogImpact.Medium,
+ });
+ }
+
+ if (!frozenAndMuted)
+ {
+ // allow you to additionally mute someone when they are already frozen
+ args.Verbs.Add(new Verb
+ {
+ Priority = -1, // This is just so it doesn't change position in the menu between freeze/unfreeze.
+ Text = Loc.GetString("admin-verbs-freeze-and-mute"),
+ Category = VerbCategory.Admin,
+ Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/snow.svg.192dpi.png")),
+ Act = () =>
+ {
+ _freeze.FreezeAndMute(args.Target);
+ },
+ Impact = LogImpact.Medium,
+ });
+ }
+
+ if (frozen)
+ {
+ args.Verbs.Add(new Verb
+ {
+ Priority = -1, // This is just so it doesn't change position in the menu between freeze/unfreeze.
+ Text = Loc.GetString("admin-verbs-unfreeze"),
+ Category = VerbCategory.Admin,
+ Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/snow.svg.192dpi.png")),
+ Act = () =>
+ {
+ RemComp<AdminFrozenComponent>(args.Target);
+ },
+ Impact = LogImpact.Medium,
+ });
+ }
// Erase
args.Verbs.Add(new Verb
using Content.Server.GameTicking;
+using Content.Server.Popups;
using Content.Shared.Administration;
using Content.Shared.Mind;
using Robust.Shared.Console;
if (player.Status != SessionStatus.InGame || player.AttachedEntity == null)
return;
- var minds = IoCManager.Resolve<IEntityManager>().System<SharedMindSystem>();
+ var entityManager = IoCManager.Resolve<IEntityManager>();
+ var minds = entityManager.System<SharedMindSystem>();
// This check also proves mind not-null for at the end when the mob is ghosted.
if (!minds.TryGetMind(player, out var mindId, out var mind) ||
mind.OwnedEntity is not { Valid: true } victim)
{
- shell.WriteLine("You don't have a mind!");
+ shell.WriteLine(Loc.GetString("suicide-command-no-mind"));
return;
}
- var gameTicker = EntitySystem.Get<GameTicker>();
- var suicideSystem = EntitySystem.Get<SuicideSystem>();
+ if (entityManager.HasComponent<AdminFrozenComponent>(victim))
+ {
+ var deniedMessage = Loc.GetString("suicide-command-denied");
+ shell.WriteLine(deniedMessage);
+ entityManager.System<PopupSystem>()
+ .PopupEntity(deniedMessage, victim, victim);
+ return;
+ }
+
+ var gameTicker = entityManager.System<GameTicker>();
+ var suicideSystem = entityManager.System<SuicideSystem>();
if (suicideSystem.Suicide(victim))
{
// Prevent the player from returning to the body.
if (gameTicker.OnGhostAttempt(mindId, true, mind: mind))
return;
- shell.WriteLine("You can't ghost right now.");
+ shell.WriteLine(Loc.GetString("ghost-command-denied"));
}
}
}
using Content.Server.GameTicking;
+using Content.Server.Popups;
using Content.Shared.Administration;
using Content.Shared.Mind;
using Robust.Shared.Console;
[Dependency] private readonly IEntityManager _entities = default!;
public string Command => "ghost";
- public string Description => "Give up on life and become a ghost.";
- public string Help => "ghost";
+ public string Description => Loc.GetString("ghost-command-description");
+ public string Help => Loc.GetString("ghost-command-help-text");
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var player = shell.Player;
if (player == null)
{
- shell.WriteLine("You have no session, you can't ghost.");
+ shell.WriteLine(Loc.GetString("ghost-command-no-session"));
+ return;
+ }
+
+ if (player.AttachedEntity is { Valid: true } frozen &&
+ _entities.HasComponent<AdminFrozenComponent>(frozen))
+ {
+ var deniedMessage = Loc.GetString("ghost-command-denied");
+ shell.WriteLine(deniedMessage);
+ _entities.System<PopupSystem>()
+ .PopupEntity(deniedMessage, frozen, frozen);
return;
}
mind = _entities.GetComponent<MindComponent>(mindId);
}
- if (!EntitySystem.Get<GameTicker>().OnGhostAttempt(mindId, true, true, mind))
+ if (!_entities.System<GameTicker>().OnGhostAttempt(mindId, true, true, mind))
{
- shell.WriteLine("You can't ghost right now.");
+ shell.WriteLine(Loc.GetString("ghost-command-denied"));
}
}
}
namespace Content.Shared.Administration;
-[RegisterComponent, Access(typeof(AdminFrozenSystem))]
-[NetworkedComponent]
+[RegisterComponent, Access(typeof(SharedAdminFrozenSystem))]
+[NetworkedComponent, AutoGenerateComponentState]
public sealed partial class AdminFrozenComponent : Component
{
+ /// <summary>
+ /// Whether the player is also muted.
+ /// </summary>
+ [DataField, AutoNetworkedField]
+ public bool Muted;
}
using Content.Shared.ActionBlocker;
+using Content.Shared.Emoting;
using Content.Shared.Interaction.Events;
using Content.Shared.Item;
using Content.Shared.Movement.Events;
using Content.Shared.Movement.Pulling.Components;
using Content.Shared.Movement.Pulling.Events;
using Content.Shared.Movement.Pulling.Systems;
+using Content.Shared.Speech;
using Content.Shared.Throwing;
namespace Content.Shared.Administration;
-public sealed class AdminFrozenSystem : EntitySystem
+public abstract class SharedAdminFrozenSystem : EntitySystem
{
[Dependency] private readonly ActionBlockerSystem _blocker = default!;
[Dependency] private readonly PullingSystem _pulling = default!;
SubscribeLocalEvent<AdminFrozenComponent, PullAttemptEvent>(OnPullAttempt);
SubscribeLocalEvent<AdminFrozenComponent, AttackAttemptEvent>(OnAttempt);
SubscribeLocalEvent<AdminFrozenComponent, ChangeDirectionAttemptEvent>(OnAttempt);
+ SubscribeLocalEvent<AdminFrozenComponent, EmoteAttemptEvent>(OnEmoteAttempt);
+ SubscribeLocalEvent<AdminFrozenComponent, SpeakAttemptEvent>(OnSpeakAttempt);
+ }
+
+ private void OnSpeakAttempt(EntityUid uid, AdminFrozenComponent component, SpeakAttemptEvent args)
+ {
+ if (!component.Muted)
+ return;
+
+ args.Cancel();
}
private void OnAttempt(EntityUid uid, AdminFrozenComponent component, CancellableEntityEventArgs args)
{
_blocker.UpdateCanMove(uid);
}
+
+ private void OnEmoteAttempt(EntityUid uid, AdminFrozenComponent component, EmoteAttemptEvent args)
+ {
+ if (component.Muted)
+ args.Cancel();
+ }
}
admin-verbs-teleport-to = Teleport To
admin-verbs-teleport-here = Teleport Here
admin-verbs-freeze = Freeze
+admin-verbs-freeze-and-mute = Freeze And Mute
admin-verbs-unfreeze = Unfreeze
admin-verbs-erase = Erase
admin-verbs-erase-description = Removes the player from the round and crew manifest and deletes their chat messages.
--- /dev/null
+ghost-command-description = Give up on life and become a ghost.
+ghost-command-help-text = The ghost command turns you into a ghost and makes the character you played permanently catatonic.
+ Please note that you cannot return to your character's body after ghosting.
+ghost-command-no-session = You have no session, you can't ghost.
+ghost-command-denied = You cannot ghost right now.
suicide-command-default-text-others = {$name} is attempting to bite their own tongue!
suicide-command-default-text-self = You attempt to bite your own tongue!
suicide-command-already-dead = You can't suicide. You're dead.
+suicide-command-no-mind = You have no mind!
+suicide-command-denied = You cannot suicide right now.
projects / space-station-14.git / commitdiff