]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Add a popup message when ghost Boo action does nothing (#34369)
authorTayrtahn <tayrtahn@gmail.com>
Fri, 10 Jan 2025 22:57:46 +0000 (17:57 -0500)
committerGitHub <noreply@github.com>
Fri, 10 Jan 2025 22:57:46 +0000 (23:57 +0100)
Content.Server/Ghost/GhostSystem.cs
Resources/Locale/en-US/ghost/components/ghost-component.ftl

index 77cf813b56b4f712fd76ef5817d7cf0e1d012396..71a75ee4c6e194ba8ae604080330173d82f43cc5 100644 (file)
@@ -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<GhostComponent> _ghostQuery;
         private EntityQuery<PhysicsComponent> _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;
         }
 
index 48a191da3319686e8f7eef5cfab73f1cfaed4f22..051b7263ba67aab45d8a800fd492b5fb62b6cdfd 100644 (file)
@@ -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