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

remove ignition functional from welder component (#37586)

Browse Source 
* a

* webedit
This commit is contained in:
kosticia
2025-05-19 12:49:59 +03:00
committed by GitHub
parent b383e7c74c
commit 791ce3a5cd
3 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Server/IgnitionSource/IgnitionSourceSystem.cs
View File

@@ -2,6 +2,7 @@ using Content.Server.Atmos.EntitySystems;
using Content.Shared.IgnitionSource; using Content.Shared.IgnitionSource;
namespace Content.Server.IgnitionSource; namespace Content.Server.IgnitionSource;
public sealed partial class IgnitionSourceSystem : SharedIgnitionSourceSystem public sealed partial class IgnitionSourceSystem : SharedIgnitionSourceSystem
{ {
[Dependency] private readonly AtmosphereSystem _atmosphere = default!; [Dependency] private readonly AtmosphereSystem _atmosphere = default!;

16
Content.Server/Tools/ToolSystem.cs
View File

@@ -1,8 +1,6 @@
using Content.Server.Atmos.EntitySystems;
using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.Components.SolutionManager;
using Content.Shared.FixedPoint; using Content.Shared.FixedPoint;
using Content.Shared.Tools.Components; using Content.Shared.Tools.Components;
using Robust.Server.GameObjects;
using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem; using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
@@ -10,20 +8,6 @@ namespace Content.Server.Tools;
public sealed class ToolSystem : SharedToolSystem public sealed class ToolSystem : SharedToolSystem
{ {
[Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
[Dependency] private readonly TransformSystem _transformSystem = default!;
public override void TurnOn(Entity<WelderComponent> entity, EntityUid? user)
{
base.TurnOn(entity, user);
var xform = Transform(entity);
if (xform.GridUid is { } gridUid)
{
var position = _transformSystem.GetGridOrMapTilePosition(entity.Owner, xform);
_atmosphereSystem.HotspotExpose(gridUid, position, 700, 50, entity.Owner, true);
}
}
public override void Update(float frameTime) public override void Update(float frameTime)
{ {
base.Update(frameTime); base.Update(frameTime);

2
Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
View File

@@ -29,7 +29,7 @@ public abstract partial class SharedToolSystem
SubscribeLocalEvent<WelderComponent, ItemToggleActivateAttemptEvent>(OnActivateAttempt); SubscribeLocalEvent<WelderComponent, ItemToggleActivateAttemptEvent>(OnActivateAttempt);
} }
public virtual void TurnOn(Entity<WelderComponent> entity, EntityUid? user) public void TurnOn(Entity<WelderComponent> entity, EntityUid? user)
{ {
if (!SolutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.FuelSolutionName, out var solutionComp, out _)) if (!SolutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.FuelSolutionName, out var solutionComp, out _))
return; return;