]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Vox now say they become fried chicken upon taking enough heat dmg (#42280)
authorSomegnihT <145168694+SomegnihT@users.noreply.github.com>
Wed, 7 Jan 2026 19:24:19 +0000 (12:24 -0700)
committerGitHub <noreply@github.com>
Wed, 7 Jan 2026 19:24:19 +0000 (19:24 +0000)
* 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>
Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
Resources/Locale/en-US/burning/bodyburn.ftl
Resources/Prototypes/Entities/Mobs/Species/vox.yml
Resources/Prototypes/Entities/Mobs/base.yml

index 1d3c1993f970b3e90eb1e51161b85ef1cedc6cb5..5bc83702c7567d641a809c93e1c8711e9c72c68a 100644 (file)
@@ -11,6 +11,11 @@ namespace Content.Server.Destructible.Thresholds.Behaviors;
 [DataDefinition]
 public sealed partial class BurnBodyBehavior : IThresholdBehavior
 {
+    /// <summary>
+    ///     The popup displayed upon destruction.
+    /// </summary>
+    [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);
     }
index 929b2344cfe47f5eea2a3a362cb4451fd2247590..7387c2826a2a4f1324acdd90d969e38417113e31 100644 (file)
@@ -1 +1,2 @@
 bodyburn-text-others = {CAPITALIZE(THE($name))} burns to ash!
+bodyburn-vox-text-others = {CAPITALIZE(THE($name))} turned into fried vox!
index c0b70ae2b8f8e965ecdeffbd05aa255098ebda96..f9ef0a357d6a72cf82c6687be99a3188cc8f687e 100644 (file)
@@ -50,7 +50,8 @@
           FoodMeatChickenFriedVox:
             min: 3
             max: 5
-      - !type:BurnBodyBehavior { }
+      - !type:BurnBodyBehavior
+        popupMessage: bodyburn-vox-text-others
       - !type:PlaySoundBehavior
         sound:
           collection: MeatLaserImpact
index 26f9215247459ec78bcafa5f030ed902ca72b2cb..376d8e35b3e961fa9df29f614fe4182f5a40b7f2 100644 (file)
@@ -89,7 +89,7 @@
           Ash:
             min: 1
             max: 1
-      - !type:BurnBodyBehavior { }
+      - !type:BurnBodyBehavior
       - !type:PlaySoundBehavior
         sound:
           collection: MeatLaserImpact