From 03b7788774b6af979ab674cdcd596fbfea3cf3ac Mon Sep 17 00:00:00 2001 From: SomegnihT <145168694+SomegnihT@users.noreply.github.com> Date: Wed, 7 Jan 2026 12:24:19 -0700 Subject: [PATCH] Vox now say they become fried chicken upon taking enough heat dmg (#42280) * Made it so that vox now say they become fried chicken upon taking enough heat dmg * updated a comment to be more clear * changed the name of bodyburnvox-text-other to bodyburn-vox-text-other * forgot that I needed to also update the text in vox.yml to go with the previous commit change * BurnBodyBehavior now takes bodyburn-text-others as default * fixed suggested changes * Relized I forgot to do a suggested change, I have now done it * Update Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs * Update Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs | 7 ++++++- Resources/Locale/en-US/burning/bodyburn.ftl | 1 + Resources/Prototypes/Entities/Mobs/Species/vox.yml | 3 ++- Resources/Prototypes/Entities/Mobs/base.yml | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs index 1d3c1993f9..5bc83702c7 100644 --- a/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs +++ b/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs @@ -11,6 +11,11 @@ namespace Content.Server.Destructible.Thresholds.Behaviors; [DataDefinition] public sealed partial class BurnBodyBehavior : IThresholdBehavior { + /// + /// The popup displayed upon destruction. + /// + [DataField] + public LocId PopupMessage = "bodyburn-text-others"; public void Execute(EntityUid bodyId, DestructibleSystem system, EntityUid? cause = null) { @@ -27,7 +32,7 @@ public sealed partial class BurnBodyBehavior : IThresholdBehavior } var bodyIdentity = Identity.Entity(bodyId, system.EntityManager); - sharedPopupSystem.PopupCoordinates(Loc.GetString("bodyburn-text-others", ("name", bodyIdentity)), transformSystem.GetMoverCoordinates(bodyId), PopupType.LargeCaution); + sharedPopupSystem.PopupCoordinates(Loc.GetString(PopupMessage, ("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 929b2344cf..7387c2826a 100644 --- a/Resources/Locale/en-US/burning/bodyburn.ftl +++ b/Resources/Locale/en-US/burning/bodyburn.ftl @@ -1 +1,2 @@ bodyburn-text-others = {CAPITALIZE(THE($name))} burns to ash! +bodyburn-vox-text-others = {CAPITALIZE(THE($name))} turned into fried vox! diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml index c0b70ae2b8..f9ef0a357d 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml @@ -50,7 +50,8 @@ FoodMeatChickenFriedVox: min: 3 max: 5 - - !type:BurnBodyBehavior { } + - !type:BurnBodyBehavior + popupMessage: bodyburn-vox-text-others - !type:PlaySoundBehavior sound: collection: MeatLaserImpact diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml index 26f9215247..376d8e35b3 100644 --- a/Resources/Prototypes/Entities/Mobs/base.yml +++ b/Resources/Prototypes/Entities/Mobs/base.yml @@ -89,7 +89,7 @@ Ash: min: 1 max: 1 - - !type:BurnBodyBehavior { } + - !type:BurnBodyBehavior - !type:PlaySoundBehavior sound: collection: MeatLaserImpact -- 2.52.0