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

Fix entities burning to ash not using identity, and bad formatting (#36268)

Browse Source 
* Make burning to ash use identity

* CAPITALIZE(THE())
This commit is contained in:
Tayrtahn
2025-04-02 22:02:09 -04:00
committed by GitHub
parent 7e4cf87820
commit bb864f2b56
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
View File

@@ -1,4 +1,5 @@
using Content.Shared.Body.Components; using Content.Shared.Body.Components;
using Content.Shared.IdentityManagement;
using Content.Shared.Inventory; using Content.Shared.Inventory;
using Content.Shared.Popups; using Content.Shared.Popups;
using JetBrains.Annotations; using JetBrains.Annotations;
@@ -25,7 +26,8 @@ public sealed partial class BurnBodyBehavior : IThresholdBehavior
} }
} }
sharedPopupSystem.PopupCoordinates(Loc.GetString("bodyburn-text-others", ("name", bodyId)), transformSystem.GetMoverCoordinates(bodyId), PopupType.LargeCaution); var bodyIdentity = Identity.Entity(bodyId, system.EntityManager);
sharedPopupSystem.PopupCoordinates(Loc.GetString("bodyburn-text-others", ("name", bodyIdentity)), transformSystem.GetMoverCoordinates(bodyId), PopupType.LargeCaution);
system.EntityManager.QueueDeleteEntity(bodyId); system.EntityManager.QueueDeleteEntity(bodyId);
} }

2
Resources/Locale/en-US/burning/bodyburn.ftl
View File

@@ -1 +1 @@
bodyburn-text-others = {$name} burns to ash! bodyburn-text-others = {CAPITALIZE(THE($name))} burns to ash!