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

[BUGFIX] "Ghost" in the lobby lets you see the whole chat (#33529)

Browse Source 
* fix bug, in ghost command lobby

* fix

* Fix build
This commit is contained in:
Schrödinger
2024-11-25 07:20:31 +00:00
committed by GitHub
parent ed2cd23309
commit f53e3ec3c1
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Ghost/GhostCommand.cs
View File

@@ -1,7 +1,9 @@
using Content.Server.Popups; using Content.Server.Popups;
using Content.Shared.Administration; using Content.Shared.Administration;
using Content.Shared.GameTicking;
using Content.Shared.Mind; using Content.Shared.Mind;
using Robust.Shared.Console; using Robust.Shared.Console;
using Content.Server.GameTicking;
namespace Content.Server.Ghost namespace Content.Server.Ghost
{ {
@@ -23,6 +25,14 @@ namespace Content.Server.Ghost
return; return;
} }
var gameTicker = _entities.System<GameTicker>();
if (!gameTicker.PlayerGameStatuses.TryGetValue(player.UserId, out var playerStatus) ||
playerStatus is not PlayerGameStatus.JoinedGame)
{
shell.WriteLine("ghost-command-error-lobby");
return;
}
if (player.AttachedEntity is { Valid: true } frozen && if (player.AttachedEntity is { Valid: true } frozen &&
_entities.HasComponent<AdminFrozenComponent>(frozen)) _entities.HasComponent<AdminFrozenComponent>(frozen))
{ {

1
Resources/Locale/en-US/chat/commands/ghost-command.ftl
View File

@@ -3,3 +3,4 @@ ghost-command-help-text = The ghost command turns you into a ghost and makes the
Please note that you cannot return to your character's body after ghosting. 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-no-session = You have no session, you can't ghost.
ghost-command-denied = You cannot ghost right now. ghost-command-denied = You cannot ghost right now.
ghost-command-error-lobby = You can't ghost right now. You are not in the game!