From c7bbaa48a4e70dc8e93385af2583843766b8d1dd Mon Sep 17 00:00:00 2001 From: Whisper <121047731+QuietlyWhisper@users.noreply.github.com> Date: Sat, 20 Apr 2024 10:44:10 -0400 Subject: [PATCH] fix burning to ash not working on all mobs (#27158) --- .../Thresholds/Behaviors/BurnBodyBehavior.cs | 10 +++++----- Resources/Locale/en-US/burning/bodyburn.ftl | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs index 28c4b2ef16..f0499dc6a2 100644 --- a/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs +++ b/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs @@ -17,12 +17,12 @@ public sealed partial class BurnBodyBehavior : IThresholdBehavior var inventorySystem = system.EntityManager.System(); var sharedPopupSystem = system.EntityManager.System(); - if (!system.EntityManager.TryGetComponent(bodyId, out var comp)) - return; - - foreach (var item in inventorySystem.GetHandOrInventoryEntities(bodyId)) + if (system.EntityManager.TryGetComponent(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); diff --git a/Resources/Locale/en-US/burning/bodyburn.ftl b/Resources/Locale/en-US/burning/bodyburn.ftl index 896a0b6d04..58b98c09bb 100644 --- a/Resources/Locale/en-US/burning/bodyburn.ftl +++ b/Resources/Locale/en-US/burning/bodyburn.ftl @@ -1 +1 @@ -bodyburn-text-others = {$name}'s body burns to ash! +bodyburn-text-others = {$name} burns to ash! -- 2.52.0