From fdc0853053837aaf715f8dd1b9c1401bc778f978 Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Fri, 10 Jan 2025 17:57:46 -0500 Subject: [PATCH] Add a popup message when ghost Boo action does nothing (#34369) --- Content.Server/Ghost/GhostSystem.cs | 5 +++++ Resources/Locale/en-US/ghost/components/ghost-component.ftl | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs index 77cf813b56..71a75ee4c6 100644 --- a/Content.Server/Ghost/GhostSystem.cs +++ b/Content.Server/Ghost/GhostSystem.cs @@ -24,6 +24,7 @@ using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; using Content.Shared.Movement.Events; using Content.Shared.Movement.Systems; +using Content.Shared.Popups; using Content.Shared.Storage.Components; using Robust.Server.GameObjects; using Robust.Server.Player; @@ -61,6 +62,7 @@ namespace Content.Server.Ghost [Dependency] private readonly SharedMindSystem _mind = default!; [Dependency] private readonly GameTicker _gameTicker = default!; [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; private EntityQuery _ghostQuery; private EntityQuery _physicsQuery; @@ -139,6 +141,9 @@ namespace Content.Server.Ghost break; } + if (booCounter == 0) + _popup.PopupEntity(Loc.GetString("ghost-component-boo-action-failed"), uid, uid); + args.Handled = true; } diff --git a/Resources/Locale/en-US/ghost/components/ghost-component.ftl b/Resources/Locale/en-US/ghost/components/ghost-component.ftl index 48a191da33..051b7263ba 100644 --- a/Resources/Locale/en-US/ghost/components/ghost-component.ftl +++ b/Resources/Locale/en-US/ghost/components/ghost-component.ftl @@ -1,3 +1,5 @@ ghost-component-on-examine-death-time-info-minutes = {$minutes} minutes ago ghost-component-on-examine-death-time-info-seconds = {$seconds} seconds ago -ghost-component-on-examine-message = Died [color=yellow]{$timeOfDeath}[/color]. \ No newline at end of file +ghost-component-on-examine-message = Died [color=yellow]{$timeOfDeath}[/color]. + +ghost-component-boo-action-failed = Despite your best efforts, nothing spooky happens -- 2.51.2