Fix flammables air ignition (#23063)
* Fix welder ignition * fix mobs on fire hotspot expose frequency * fix shotgun pellets ignition * ensure ignitionComp on flammable init * \n * Revert "ensure ignitionComp on flammable init" This reverts commit 6915dcdc
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
using System.Linq;
|
||||
using Content.Server.Chemistry.Components;
|
||||
using Content.Server.IgnitionSource;
|
||||
using Content.Server.Tools.Components;
|
||||
using Content.Shared.Chemistry.Components.SolutionManager;
|
||||
using Content.Shared.Database;
|
||||
@@ -17,6 +18,7 @@ namespace Content.Server.Tools
|
||||
public sealed partial class ToolSystem
|
||||
{
|
||||
[Dependency] private readonly SharedItemToggleSystem _itemToggle = default!;
|
||||
[Dependency] private readonly IgnitionSourceSystem _ignitionSource = default!;
|
||||
private readonly HashSet<EntityUid> _activeWelders = new();
|
||||
|
||||
private const float WelderUpdateTimer = 1f;
|
||||
@@ -68,6 +70,8 @@ namespace Content.Server.Tools
|
||||
// Logging
|
||||
_adminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(args.User):user} toggled {ToPrettyString(uid):welder} on");
|
||||
|
||||
_ignitionSource.SetIgnited(uid);
|
||||
|
||||
if (transform.GridUid is { } gridUid)
|
||||
{
|
||||
var position = _transformSystem.GetGridOrMapTilePosition(uid, transform);
|
||||
@@ -84,6 +88,8 @@ namespace Content.Server.Tools
|
||||
// Logging
|
||||
_adminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(args.User):user} toggled {ToPrettyString(uid):welder} off");
|
||||
|
||||
_ignitionSource.SetIgnited(uid, false);
|
||||
|
||||
Dirty(uid, welder);
|
||||
|
||||
_activeWelders.Remove(uid);
|
||||
|
||||
Reference in New Issue
Block a user