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

Holoparasite injector fix (#36109)

Browse Source 
* 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>
This commit is contained in:
YoungThug
2025-03-31 14:18:21 -07:00
committed by GitHub
parent 3c3cf1d867
commit f01c6e9b37
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Guardian/GuardianSystem.cs
View File

@@ -8,6 +8,7 @@ using Content.Shared.Examine;
using Content.Shared.Guardian; using Content.Shared.Guardian;
using Content.Shared.Hands.Components; using Content.Shared.Hands.Components;
using Content.Shared.Hands.EntitySystems; using Content.Shared.Hands.EntitySystems;
using Content.Shared.IdentityManagement;
using Content.Shared.Interaction; using Content.Shared.Interaction;
using Content.Shared.Interaction.Events; using Content.Shared.Interaction.Events;
using Content.Shared.Mobs; using Content.Shared.Mobs;
@@ -188,7 +189,9 @@ namespace Content.Server.Guardian
// Can only inject things with the component... // Can only inject things with the component...
if (!HasComp<CanHostGuardianComponent>(target)) 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; return;
} }

3
Resources/Locale/en-US/guardian/guardian.ftl
View 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-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-invalid-creation = The injector is spent.
guardian-activator-empty-examine = [color=#ba1919]The injector is spent.[/color] guardian-activator-empty-examine = [color=#ba1919]The injector is spent.[/color]
# TODO: Change this once other species can inject it? guardian-activator-invalid-target = {CAPITALIZE(THE($entity))} cannot be injected!
guardian-activator-invalid-target = Only humans can be injected!
guardian-no-soul = Your guardian has no soul. guardian-no-soul = Your guardian has no soul.
guardian-available = Your guardian now has a soul. guardian-available = Your guardian now has a soul.
guardian-inside-container = There's no room to release your guardian! guardian-inside-container = There's no room to release your guardian!