From b0a3bb60a03445a83cc6e2444772b114bfaa1027 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Wed, 2 Apr 2025 22:02:09 -0400
Subject: [PATCH] Fix entities burning to ash not using identity, and bad
 formatting (#36268)

* Make burning to ash use identity

* CAPITALIZE(THE())
---
 .../Thresholds/Behaviors/BurnBodyBehavior.cs           | 10 ++++++++--
 Resources/Locale/en-US/burning/bodyburn.ftl            |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
index 4a2a3d1f73..a697633397 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part; // Shitmed Change
+using Content.Shared.IdentityManagement;
 using Content.Shared.Inventory;
 using Content.Shared.Popups;
 using JetBrains.Annotations;
@@ -26,16 +27,21 @@ public sealed partial class BurnBodyBehavior : IThresholdBehavior
             }
         }
 
+        var bodyIdentity = Identity.Entity(bodyId, system.EntityManager);
+        // Begin Shitmed Changes
         if (system.EntityManager.TryGetComponent<BodyPartComponent>(bodyId, out var bodyPart))
         {
             if (bodyPart.CanSever
                 && system.BodySystem.BurnPart(bodyId, bodyPart))
-                sharedPopupSystem.PopupCoordinates(Loc.GetString("bodyburn-text-others", ("name", bodyId)), transformSystem.GetMoverCoordinates(bodyId), PopupType.LargeCaution);
+                sharedPopupSystem.PopupCoordinates(Loc.GetString("bodyburn-text-others", ("name", bodyIdentity)), transformSystem.GetMoverCoordinates(bodyId), PopupType.LargeCaution);
         }
         else
         {
-            sharedPopupSystem.PopupCoordinates(Loc.GetString("bodyburn-text-others", ("name", bodyId)), transformSystem.GetMoverCoordinates(bodyId), PopupType.LargeCaution);
+            sharedPopupSystem.PopupCoordinates(Loc.GetString("bodyburn-text-others", ("name", bodyIdentity)), transformSystem.GetMoverCoordinates(bodyId), PopupType.LargeCaution);
             system.EntityManager.QueueDeleteEntity(bodyId);
         }
+        // End Shitmed Changes
+
+        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!