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

FlammableSystem only calls TemperatureSystem.ChangeHeat if the entity has the appropriate component.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2022-03-04 16:25:32 +01:00
parent 4eb778ad43
commit 0b0de4fe10
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using Content.Server.Administration.Logs; using Content.Server.Administration.Logs;
using Content.Server.Atmos.Components; using Content.Server.Atmos.Components;
using Content.Server.Stunnable; using Content.Server.Stunnable;
using Content.Server.Temperature.Components;
using Content.Server.Temperature.Systems; using Content.Server.Temperature.Systems;
using Content.Shared.ActionBlocker; using Content.Shared.ActionBlocker;
using Content.Shared.Alert; using Content.Shared.Alert;
@@ -62,7 +63,7 @@ namespace Content.Server.Atmos.EntitySystems
flammable.FireStacks += component.FireStacks; flammable.FireStacks += component.FireStacks;
Ignite(otherFixture, flammable); Ignite(otherFixture, flammable);
} }
private void OnInteractUsingEvent(EntityUid uid, FlammableComponent flammable, InteractUsingEvent args) private void OnInteractUsingEvent(EntityUid uid, FlammableComponent flammable, InteractUsingEvent args)
{ {
if (args.Handled) if (args.Handled)
@@ -211,9 +212,9 @@ namespace Content.Server.Atmos.EntitySystems
var fireStackDelta = fireStackMod - flammable.FireStacks; var fireStackDelta = fireStackMod - flammable.FireStacks;
if (fireStackDelta > 0) if (fireStackDelta > 0)
{ {
AdjustFireStacks((flammable).Owner, fireStackDelta, flammable); AdjustFireStacks(flammable.Owner, fireStackDelta, flammable);
} }
Ignite((flammable).Owner, flammable); Ignite(flammable.Owner, flammable);
} }
_fireEvents.Clear(); _fireEvents.Clear();
@@ -247,7 +248,10 @@ namespace Content.Server.Atmos.EntitySystems
{ {
// TODO FLAMMABLE: further balancing // TODO FLAMMABLE: further balancing
var damageScale = Math.Min((int)flammable.FireStacks, 5); var damageScale = Math.Min((int)flammable.FireStacks, 5);
_temperatureSystem.ChangeHeat(uid, 12500 * damageScale);
if(TryComp(uid, out TemperatureComponent? temp))
_temperatureSystem.ChangeHeat(uid, 12500 * damageScale, false, temp);
_damageableSystem.TryChangeDamage(uid, flammable.Damage * damageScale); _damageableSystem.TryChangeDamage(uid, flammable.Damage * damageScale);
AdjustFireStacks(uid, -0.1f * (flammable.Resisting ? 10f : 1f), flammable); AdjustFireStacks(uid, -0.1f * (flammable.Resisting ? 10f : 1f), flammable);