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

Add ability to burn papers +Flammable tweaks. (#18955)

Browse Source
This commit is contained in:
mhamster
2023-08-15 02:45:55 +07:00
committed by GitHub
parent da62b05f4b
commit 5ce47fbb03
3 changed files with 74 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,15 +148,30 @@ namespace Content.Server.Atmos.EntitySystems
{
if (otherFlammable.OnFire)
{
var fireSplit = (flammable.FireStacks + otherFlammable.FireStacks) / 2;
flammable.FireStacks = fireSplit;
otherFlammable.FireStacks = fireSplit;
if (flammable.CanExtinguish)
{
var fireSplit = (flammable.FireStacks + otherFlammable.FireStacks) / 2;
flammable.FireStacks = fireSplit;
otherFlammable.FireStacks = fireSplit;
}
else
{
otherFlammable.FireStacks = flammable.FireStacks / 2;
}
}
else
{
flammable.FireStacks /= 2;
otherFlammable.FireStacks += flammable.FireStacks;
Ignite(otherUid, uid, otherFlammable);
if (!flammable.CanExtinguish)
{
otherFlammable.FireStacks += flammable.FireStacks / 2;
Ignite(otherUid, uid, otherFlammable);
}
else
{
flammable.FireStacks /= 2;
otherFlammable.FireStacks += flammable.FireStacks;
Ignite(otherUid, uid, otherFlammable);
}
}
}
else if (otherFlammable.OnFire)
@@ -215,7 +230,7 @@ namespace Content.Server.Atmos.EntitySystems
if (!Resolve(uid, ref flammable))
return;
if (!flammable.OnFire)
if (!flammable.OnFire || !flammable.CanExtinguish)
return;
_adminLogger.Add(LogType.Flammable, $"{ToPrettyString(flammable.Owner):entity} stopped being on fire damage");
@@ -233,6 +248,11 @@ namespace Content.Server.Atmos.EntitySystems
if (!Resolve(uid, ref flammable))
return;
if (flammable.AlwaysCombustible)
{
flammable.FireStacks = Math.Max(flammable.FirestacksOnIgnite, flammable.FireStacks);
}
if (flammable.FireStacks > 0 && !flammable.OnFire)
{
if (ignitionSourceUser != null)