]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Holoparasite injector fix (#36109)
authorYoungThug <ramialanbagy@gmail.com>
Mon, 31 Mar 2025 21:18:21 +0000 (14:18 -0700)
committerGitHub <noreply@github.com>
Mon, 31 Mar 2025 21:18:21 +0000 (17:18 -0400)
* HoloParaTextFix

* PleaseSpeedMergeLmao

* ThankYouOrks

* Update Resources/Locale/en-US/guardian/guardian.ftl

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* Update Content.Server/Guardian/GuardianSystem.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* Update Content.Server/Guardian/GuardianSystem.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Content.Server/Guardian/GuardianSystem.cs
Resources/Locale/en-US/guardian/guardian.ftl

index 341993ce2f927735d6cd834e2d67f3c14e801616..e8c3fe7028f0d9e6158522f7bd05aa06596a3008 100644 (file)
@@ -8,6 +8,7 @@ using Content.Shared.Examine;
 using Content.Shared.Guardian;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Mobs;
@@ -188,7 +189,9 @@ namespace Content.Server.Guardian
             // Can only inject things with the component...
             if (!HasComp<CanHostGuardianComponent>(target))
             {
-                _popupSystem.PopupEntity(Loc.GetString("guardian-activator-invalid-target"), user, user);
+                var msg = Loc.GetString("guardian-activator-invalid-target", ("entity", Identity.Entity(target, EntityManager, user)));
+
+                _popupSystem.PopupEntity(msg, user, user);
                 return;
             }
 
index 141646087d381d5207ce4e7c8f43fdd89b68e585..13cb9ad9dacc79d9f8716e2beea6e7bb3abab1f4 100644 (file)
@@ -6,8 +6,7 @@ guardian-already-present-invalid-creation = You are NOT re-living that haunting
 guardian-no-actions-invalid-creation = You don't have the ability to host a guardian!
 guardian-activator-empty-invalid-creation = The injector is spent.
 guardian-activator-empty-examine = [color=#ba1919]The injector is spent.[/color]
-# TODO: Change this once other species can inject it?
-guardian-activator-invalid-target = Only humans can be injected!
+guardian-activator-invalid-target = {CAPITALIZE(THE($entity))} cannot be injected!
 guardian-no-soul = Your guardian has no soul.
 guardian-available = Your guardian now has a soul.
 guardian-inside-container = There's no room to release your guardian!