juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ed-19-05-2024-upstream

Browse Source
This commit is contained in:
Ed
2024-05-19 15:57:20 +03:00
committed by GitHub
parent 6a639107b3 1ce32bd1c7
commit 1dbb4e7e94
22 changed files with 359 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -459,7 +459,7 @@ namespace Content.Server.Atmos.EntitySystems
_damageableSystem.TryChangeDamage(uid, flammable.Damage * flammable.FireStacks * ev.Multiplier, interruptsDoAfters: false);
AdjustFireStacks(uid, flammable.FirestackFade * (flammable.Resisting ? 10f : 1f), flammable);
AdjustFireStacks(uid, flammable.FirestackFade * (flammable.Resisting ? 10f : 1f), flammable, flammable.OnFire);
}
else
{

14
Content.Server/_CP14/Temperature/Fireplace/CP14FireplaceSystem.cs
View File

@@ -1,8 +1,10 @@
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Popups;
using Content.Server.Stack;
using Content.Shared._CP14.Temperature;
using Content.Shared.Interaction;
using Content.Shared.Stacks;
using Content.Shared.Throwing;
using Robust.Server.Audio;
using Robust.Server.Containers;
@@ -18,8 +20,7 @@ public sealed partial class CP14FireplaceSystem : EntitySystem
[Dependency] private readonly AudioSystem _audio = default!;
[Dependency] private readonly ContainerSystem _containerSystem = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly FlammableSystem _flammable = default!;
[Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly StackSystem _stackSystem = default!;
public override void Initialize()
{
@@ -67,7 +68,14 @@ public sealed partial class CP14FireplaceSystem : EntitySystem
if (flammable.OnFire)
_audio.PlayPvs(component.InsertFuelSound, uid);
QueueDel(fuel);
if (TryComp<StackComponent>(fuel, out var stack))
{
_stackSystem.SetCount(fuel, stack.Count - 1);
}
else
{
QueueDel(fuel);
}
}
public override void Update(float frameTime)