tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Incendiary projectiles and lava firestack reduction (#23479)

Browse Source 
* Firestack reduction and FireStackOnHit added

* Slight lava tweak

* Remove component and tweaked incendiary pellets

* Incendiary grenade tweak

* Now ignites on projectile fixture or ignition fixture + incendiary grenade tweak

* flare shells now  ignite entities again

* Comment

* undo flare gun ignite
This commit is contained in:
Arendian
2024-01-08 06:41:42 +01:00
committed by GitHub
parent 81aa5d3a18
commit 6bf6994298
7 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Atmos/EntitySystems/FlammableSystem.cs
View File

@@ -13,6 +13,7 @@ using Content.Shared.Database;
using Content.Shared.Interaction;
using Content.Shared.Physics;
using Content.Shared.Popups;
using Content.Shared.Projectiles;
using Content.Shared.Rejuvenate;
using Content.Shared.Temperature;
using Content.Shared.Throwing;
@@ -102,6 +103,12 @@ namespace Content.Server.Atmos.EntitySystems
if (!EntityManager.TryGetComponent(otherEnt, out FlammableComponent? flammable))
return;
//Only ignite when the colliding fixture is projectile or ignition.
if (args.OurFixtureId != component.FixtureId && args.OurFixtureId != SharedProjectileSystem.ProjectileFixture)
{
return;
}
flammable.FireStacks += component.FireStacks;
Ignite(otherEnt, uid, flammable);
component.Count--;