tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent admin-frozen players from ghosting or suiciding, add "Freeze And Mute" verb (#27813)

Browse Source 
* prevent admin-frozen players from ghosting or suiciding

* Add "Freeze and Mute" admin verb

* Allow "Freeze And Mute" admin verb when player is already frozen but not muted

* Remove redundant scream handler (scream action just emotes, duh)

* AdminFrozenSystem: clean imports

* Update Content.Server/Chat/Commands/SuicideCommand.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Ghost.cs

* retrigger ci (empty commit)

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
no
2024-05-12 16:35:30 +02:00
committed by GitHub
parent 855234aa30
commit 37099e481e
10 changed files with 138 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Content.Server/Chat/Commands/SuicideCommand.cs
View File

@@ -1,4 +1,5 @@
using Content.Server.GameTicking;
using Content.Server.Popups;
using Content.Shared.Administration;
using Content.Shared.Mind;
using Robust.Shared.Console;
@@ -26,17 +27,27 @@ namespace Content.Server.Chat.Commands
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.
@@ -48,7 +59,7 @@ namespace Content.Server.Chat.Commands
if (gameTicker.OnGhostAttempt(mindId, true, mind: mind))
return;
shell.WriteLine("You can't ghost right now.");
shell.WriteLine(Loc.GetString("ghost-command-denied"));
}
}
}