From: Tayrtahn <tayrtahn@gmail.com>
Date: Thu, 3 Apr 2025 02:02:09 +0000 (-0400)
Subject: Fix entities burning to ash not using identity, and bad formatting (#36268)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=bb864f2b5693d1cd1f7be99e381036f1deac901b;p=space-station-14.git

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

* Make burning to ash use identity

* CAPITALIZE(THE())
---

diff --git a/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
index f0499dc6a2..1d3c1993f9 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Body.Components;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Inventory;
 using Content.Shared.Popups;
 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);
     }
diff --git a/Resources/Locale/en-US/burning/bodyburn.ftl b/Resources/Locale/en-US/burning/bodyburn.ftl
index 58b98c09bb..929b2344cf 100644
--- a/Resources/Locale/en-US/burning/bodyburn.ftl
+++ b/Resources/Locale/en-US/burning/bodyburn.ftl
@@ -1 +1 @@
-bodyburn-text-others = {$name} burns to ash!
+bodyburn-text-others = {CAPITALIZE(THE($name))} burns to ash!