diff --git a/Content.Server/Atmos/Components/IgniteOnMeleeHitComponent.cs b/Content.Server/Atmos/Components/IgniteOnMeleeHitComponent.cs
index 26dd9ad24d..f30b20db30 100644
--- a/Content.Server/Atmos/Components/IgniteOnMeleeHitComponent.cs
+++ b/Content.Server/Atmos/Components/IgniteOnMeleeHitComponent.cs
@@ -1,8 +1,11 @@
namespace Content.Server.Atmos.Components;
+///
+/// Component that can be used to add (or remove) fire stacks when used as a melee weapon.
+///
[RegisterComponent]
public sealed partial class IgniteOnMeleeHitComponent : Component
{
- [DataField("fireStacks")]
+ [DataField]
public float FireStacks { get; set; }
}
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index a0b85a26fa..36722884e5 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -85,8 +85,9 @@ namespace Content.Server.Atmos.EntitySystems
if (!TryComp(entity, out var flammable))
continue;
- flammable.FireStacks += component.FireStacks;
- Ignite(entity, args.Weapon, flammable, args.User);
+ AdjustFireStacks(entity, component.FireStacks, flammable);
+ if (component.FireStacks >= 0)
+ Ignite(entity, args.Weapon, flammable, args.User);
}
}
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index 0d882a6645..1a96d7d17b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -42,6 +42,8 @@
- type: Prying
- type: UseDelay
delay: 1
+ - type: IgniteOnMeleeHit
+ fireStacks: -4
- type: entity
id: FireAxeFlaming