]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
fix burning to ash not working on all mobs (#27158)
authorWhisper <121047731+QuietlyWhisper@users.noreply.github.com>
Sat, 20 Apr 2024 14:44:10 +0000 (10:44 -0400)
committerGitHub <noreply@github.com>
Sat, 20 Apr 2024 14:44:10 +0000 (10:44 -0400)
Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
Resources/Locale/en-US/burning/bodyburn.ftl

index 28c4b2ef16efaa9b41f8d40182c0f0b2f58de9e6..f0499dc6a2d1b1df879d1cb8cf52e45ed28a0b04 100644 (file)
@@ -17,12 +17,12 @@ public sealed partial class BurnBodyBehavior : IThresholdBehavior
         var inventorySystem = system.EntityManager.System<InventorySystem>();
         var sharedPopupSystem = system.EntityManager.System<SharedPopupSystem>();
 
-        if (!system.EntityManager.TryGetComponent<InventoryComponent>(bodyId, out var comp))
-            return;
-
-        foreach (var item in inventorySystem.GetHandOrInventoryEntities(bodyId))
+        if (system.EntityManager.TryGetComponent<InventoryComponent>(bodyId, out var comp))
         {
-            transformSystem.DropNextTo(item, bodyId);
+            foreach (var item in inventorySystem.GetHandOrInventoryEntities(bodyId))
+            {
+                transformSystem.DropNextTo(item, bodyId);
+            }
         }
 
         sharedPopupSystem.PopupCoordinates(Loc.GetString("bodyburn-text-others", ("name", bodyId)), transformSystem.GetMoverCoordinates(bodyId), PopupType.LargeCaution);
index 896a0b6d042d3b74f16cf84ed9e723dce876bfff..58b98c09bbbbc9285303c5f1da78a5ddef992861 100644 (file)
@@ -1 +1 @@
-bodyburn-text-others = {$name}'s body burns to ash!
+bodyburn-text-others = {$name} burns to ash!