diff --git a/Content.Server/Tools/ToolSystem.Welder.cs b/Content.Server/Tools/ToolSystem.Welder.cs index 139926d8ae..4f8a576060 100644 --- a/Content.Server/Tools/ToolSystem.Welder.cs +++ b/Content.Server/Tools/ToolSystem.Welder.cs @@ -4,12 +4,12 @@ using Content.Server.Chemistry.Components.SolutionManager; using Content.Server.Chemistry.EntitySystems; using Content.Server.Tools.Components; using Content.Server.Weapons.Melee.Events; -using Content.Shared.Audio; using Content.Shared.Examine; using Content.Shared.FixedPoint; using Content.Shared.Interaction; using Content.Shared.Item; using Content.Shared.Temperature; +using Content.Shared.Toggleable; using Content.Shared.Tools.Components; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -20,6 +20,11 @@ namespace Content.Server.Tools { public sealed partial class ToolSystem { + [Dependency] private readonly IEntityManager _entityManager = default!; + + [Dependency] private readonly AppearanceSystem _appearanceSystem = default!; + [Dependency] private readonly SharedAudioSystem _audioSystem = default!; + private readonly HashSet _activeWelders = new(); private const float WelderUpdateTimer = 1f; @@ -106,15 +111,13 @@ namespace Content.Server.Tools var ev = new WelderToggledEvent(true); RaiseLocalEvent(welder.Owner, ev, false); - if(item != null) - _itemSystem.SetHeldPrefix(uid, "on", item); - - appearance?.SetData(WelderVisuals.Lit, true); + _appearanceSystem.SetData(uid, WelderVisuals.Lit, true); + _appearanceSystem.SetData(uid, ToggleableLightVisuals.Enabled, true); if (light != null) light.Enabled = true; - SoundSystem.Play(welder.WelderOnSounds.GetSound(), Filter.Pvs(uid), uid, AudioHelpers.WithVariation(0.125f).WithVolume(-5f)); + _audioSystem.PlayPvs(welder.WelderOnSounds, uid, AudioParams.Default.WithVariation(0.125f).WithVolume(-5f)); if (transform.GridUid is {} gridUid) { @@ -122,7 +125,7 @@ namespace Content.Server.Tools _atmosphereSystem.HotspotExpose(gridUid, position, 700, 50, true); } - welder.Dirty(); + _entityManager.Dirty(welder); _activeWelders.Add(uid); return true; @@ -145,27 +148,24 @@ namespace Content.Server.Tools var ev = new WelderToggledEvent(false); RaiseLocalEvent(welder.Owner, ev, false); - // TODO: Make all this use visualizers. - if (item != null) - _itemSystem.SetHeldPrefix(uid, "off", item); - // Layer 1 is the flame. - appearance?.SetData(WelderVisuals.Lit, false); + _appearanceSystem.SetData(uid, WelderVisuals.Lit, false); + _appearanceSystem.SetData(uid, ToggleableLightVisuals.Enabled, false); if (light != null) light.Enabled = false; - SoundSystem.Play(welder.WelderOffSounds.GetSound(), Filter.Pvs(uid), uid, AudioHelpers.WithVariation(0.125f).WithVolume(-5f)); + _audioSystem.PlayPvs(welder.WelderOffSounds, uid, AudioParams.Default.WithVariation(0.125f).WithVolume(-5f)); - welder.Dirty(); + _entityManager.Dirty(welder); _activeWelders.Remove(uid); return true; } - private void OnWelderStartup(EntityUid uid, WelderComponent component, ComponentStartup args) + private void OnWelderStartup(EntityUid uid, WelderComponent welder, ComponentStartup args) { - component.Dirty(); + _entityManager.Dirty(welder); } private void OnWelderIsHotEvent(EntityUid uid, WelderComponent welder, IsHotEvent args) @@ -198,7 +198,7 @@ namespace Content.Server.Tools private void OnWelderSolutionChange(EntityUid uid, WelderComponent welder, SolutionChangedEvent args) { - welder.Dirty(); + _entityManager.Dirty(welder); } private void OnWelderActivate(EntityUid uid, WelderComponent welder, ActivateInWorldEvent args) @@ -226,7 +226,7 @@ namespace Content.Server.Tools { var drained = _solutionContainerSystem.Drain(target, targetSolution, trans); _solutionContainerSystem.TryAddSolution(uid, welderSolution, drained); - SoundSystem.Play(welder.WelderRefill.GetSound(), Filter.Pvs(uid), uid); + _audioSystem.PlayPvs(welder.WelderRefill, uid); _popupSystem.PopupEntity(Loc.GetString("welder-component-after-interact-refueled-message"), uid, Filter.Entities(args.User)); } else if (welderSolution.AvailableVolume <= 0) @@ -292,7 +292,7 @@ namespace Content.Server.Tools } solution.RemoveReagent(welder.FuelReagent, neededFuel); - welder.Dirty(); + _entityManager.Dirty(welder); } private void OnWelderShutdown(EntityUid uid, WelderComponent welder, ComponentShutdown args) @@ -335,7 +335,7 @@ namespace Content.Server.Tools if (solution.GetReagentQuantity(welder.FuelReagent) <= FixedPoint2.Zero) TryTurnWelderOff(tool, null, welder); - welder.Dirty(); + _entityManager.Dirty(welder); } _welderTimer -= WelderUpdateTimer; diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index 313eb70ec5..c0a15dbf30 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml @@ -20,7 +20,15 @@ - type: Item size: 10 sprite: Objects/Tools/welder.rsi - heldPrefix: off + - type: ToggleableLightVisuals + spriteLayer: flame + inhandVisuals: + left: + - state: inhand-left-flame + shader: unshaded + right: + - state: inhand-right-flame + shader: unshaded - type: ItemCooldown - type: MeleeWeapon damage: @@ -46,6 +54,7 @@ Heat: 10 Blunt: -10 - type: PointLight + netsync: false enabled: false radius: 1.5 color: orange diff --git a/Resources/Textures/Objects/Tools/welder.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tools/welder.rsi/equipped-BELT.png index 3e636ae5aa..a635b3af57 100644 Binary files a/Resources/Textures/Objects/Tools/welder.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Tools/welder.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tools/welder.rsi/icon.png b/Resources/Textures/Objects/Tools/welder.rsi/icon.png index c2d2169aac..a023a035ad 100644 Binary files a/Resources/Textures/Objects/Tools/welder.rsi/icon.png and b/Resources/Textures/Objects/Tools/welder.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/welder.rsi/inhand-left-flame.png b/Resources/Textures/Objects/Tools/welder.rsi/inhand-left-flame.png new file mode 100644 index 0000000000..cbb49ca3be Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder.rsi/inhand-left-flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder.rsi/off-inhand-left.png b/Resources/Textures/Objects/Tools/welder.rsi/inhand-left.png similarity index 61% rename from Resources/Textures/Objects/Tools/welder.rsi/off-inhand-left.png rename to Resources/Textures/Objects/Tools/welder.rsi/inhand-left.png index 3b949b63b3..5e17c0f048 100644 Binary files a/Resources/Textures/Objects/Tools/welder.rsi/off-inhand-left.png and b/Resources/Textures/Objects/Tools/welder.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/welder.rsi/inhand-right-flame.png b/Resources/Textures/Objects/Tools/welder.rsi/inhand-right-flame.png new file mode 100644 index 0000000000..c077bc7377 Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder.rsi/inhand-right-flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/off-inhand-right.png b/Resources/Textures/Objects/Tools/welder.rsi/inhand-right.png similarity index 56% rename from Resources/Textures/Objects/Tools/welder_industrialadv.rsi/off-inhand-right.png rename to Resources/Textures/Objects/Tools/welder.rsi/inhand-right.png index 9aa9548cce..c46b69590d 100644 Binary files a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/off-inhand-right.png and b/Resources/Textures/Objects/Tools/welder.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/welder.rsi/meta.json b/Resources/Textures/Objects/Tools/welder.rsi/meta.json index ad660c7299..5f876da9ae 100644 --- a/Resources/Textures/Objects/Tools/welder.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder.rsi/meta.json @@ -20,54 +20,62 @@ ] }, { - "name": "off-inhand-left", + "name": "inhand-left", "directions": 4 }, { - "name": "off-inhand-right", + "name": "inhand-right", "directions": 4 }, { - "name": "on-inhand-left", + "name": "inhand-left-flame", "directions": 4, "delays": [ [ 0.2, - 0.1 + 0.2, + 0.2 ], [ 0.2, - 0.1 + 0.2, + 0.2 ], [ 0.2, - 0.1 + 0.2, + 0.2 ], [ 0.2, - 0.1 + 0.2, + 0.2 ] ] }, { - "name": "on-inhand-right", + "name": "inhand-right-flame", "directions": 4, "delays": [ [ 0.2, - 0.1 + 0.2, + 0.2 ], [ 0.2, - 0.1 + 0.2, + 0.2 ], [ 0.2, - 0.1 + 0.2, + 0.2 ], [ 0.2, - 0.1 + 0.2, + 0.2 ] ] }, diff --git a/Resources/Textures/Objects/Tools/welder.rsi/off-inhand-right.png b/Resources/Textures/Objects/Tools/welder.rsi/off-inhand-right.png deleted file mode 100644 index 9aa9548cce..0000000000 Binary files a/Resources/Textures/Objects/Tools/welder.rsi/off-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tools/welder.rsi/on-inhand-left.png b/Resources/Textures/Objects/Tools/welder.rsi/on-inhand-left.png deleted file mode 100644 index 4f3d279d5a..0000000000 Binary files a/Resources/Textures/Objects/Tools/welder.rsi/on-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tools/welder.rsi/on-inhand-right.png b/Resources/Textures/Objects/Tools/welder.rsi/on-inhand-right.png deleted file mode 100644 index a03c058690..0000000000 Binary files a/Resources/Textures/Objects/Tools/welder.rsi/on-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/equipped-BELT.png new file mode 100644 index 0000000000..da1b076dea Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_experimental.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png index 2a36d55002..446d4b21bf 100644 Binary files a/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png and b/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/inhand-left-flame.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/inhand-left-flame.png new file mode 100644 index 0000000000..ea0f2325e6 Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_experimental.rsi/inhand-left-flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/off-inhand-left.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/inhand-left.png similarity index 61% rename from Resources/Textures/Objects/Tools/welder_experimental.rsi/off-inhand-left.png rename to Resources/Textures/Objects/Tools/welder_experimental.rsi/inhand-left.png index 045e42531c..5b31edc26a 100644 Binary files a/Resources/Textures/Objects/Tools/welder_experimental.rsi/off-inhand-left.png and b/Resources/Textures/Objects/Tools/welder_experimental.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/inhand-right-flame.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/inhand-right-flame.png new file mode 100644 index 0000000000..10d36469a5 Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_experimental.rsi/inhand-right-flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/off-inhand-right.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/inhand-right.png similarity index 55% rename from Resources/Textures/Objects/Tools/welder_experimental.rsi/off-inhand-right.png rename to Resources/Textures/Objects/Tools/welder_experimental.rsi/inhand-right.png index 45628f9983..2d64d9abf1 100644 Binary files a/Resources/Textures/Objects/Tools/welder_experimental.rsi/off-inhand-right.png and b/Resources/Textures/Objects/Tools/welder_experimental.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json index 6c5de82cd2..69fb27b148 100644 --- a/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json @@ -28,15 +28,15 @@ ] }, { - "name": "off-inhand-left", + "name": "inhand-left", "directions": 4 }, { - "name": "off-inhand-right", + "name": "inhand-right", "directions": 4 }, { - "name": "on-inhand-left", + "name": "inhand-left-flame", "directions": 4, "delays": [ [ @@ -62,7 +62,7 @@ ] }, { - "name": "on-inhand-right", + "name": "inhand-right-flame", "directions": 4, "delays": [ [ diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/on-inhand-left.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/on-inhand-left.png deleted file mode 100644 index 7af2bb027e..0000000000 Binary files a/Resources/Textures/Objects/Tools/welder_experimental.rsi/on-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/on-inhand-right.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/on-inhand-right.png deleted file mode 100644 index 85c42df8b2..0000000000 Binary files a/Resources/Textures/Objects/Tools/welder_experimental.rsi/on-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png index 5c3bdc7bbe..1efc7aaa60 100644 Binary files a/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png and b/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/equipped-BELT.png index 3e636ae5aa..cdd8229ce2 100644 Binary files a/Resources/Textures/Objects/Tools/welder_industrial.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/inhand-left-flame.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/inhand-left-flame.png new file mode 100644 index 0000000000..cbb49ca3be Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/inhand-left-flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/inhand-left.png new file mode 100644 index 0000000000..7d09476c56 Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/inhand-right-flame.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/inhand-right-flame.png new file mode 100644 index 0000000000..c077bc7377 Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/inhand-right-flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/inhand-right.png new file mode 100644 index 0000000000..19c0f4f76c Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json index baa2102766..ab4744aaa6 100644 --- a/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json @@ -20,54 +20,62 @@ ] }, { - "name": "off-inhand-left", + "name": "inhand-left", "directions": 4 }, { - "name": "off-inhand-right", + "name": "inhand-right", "directions": 4 }, { - "name": "on-inhand-left", + "name": "inhand-left-flame", "directions": 4, "delays": [ [ 0.2, - 0.1 + 0.2, + 0.2 ], [ 0.2, - 0.1 + 0.2, + 0.2 ], [ 0.2, - 0.1 + 0.2, + 0.2 ], [ 0.2, - 0.1 + 0.2, + 0.2 ] ] }, { - "name": "on-inhand-right", + "name": "inhand-right-flame", "directions": 4, "delays": [ [ 0.2, - 0.1 + 0.2, + 0.2 ], [ 0.2, - 0.1 + 0.2, + 0.2 ], [ 0.2, - 0.1 + 0.2, + 0.2 ], [ 0.2, - 0.1 + 0.2, + 0.2 ] ] }, diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/off-inhand-left.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/off-inhand-left.png deleted file mode 100644 index 3b949b63b3..0000000000 Binary files a/Resources/Textures/Objects/Tools/welder_industrial.rsi/off-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/off-inhand-right.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/off-inhand-right.png deleted file mode 100644 index 9aa9548cce..0000000000 Binary files a/Resources/Textures/Objects/Tools/welder_industrial.rsi/off-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/on-inhand-left.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/on-inhand-left.png deleted file mode 100644 index 4f3d279d5a..0000000000 Binary files a/Resources/Textures/Objects/Tools/welder_industrial.rsi/on-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/on-inhand-right.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/on-inhand-right.png deleted file mode 100644 index a03c058690..0000000000 Binary files a/Resources/Textures/Objects/Tools/welder_industrial.rsi/on-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png index 46bb4a6ff1..7814b74851 100644 Binary files a/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/equipped-BELT.png index 3e636ae5aa..9dc6a32408 100644 Binary files a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/inhand-left-flame.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/inhand-left-flame.png new file mode 100644 index 0000000000..cbb49ca3be Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/inhand-left-flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/inhand-left.png new file mode 100644 index 0000000000..9748b0a745 Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/inhand-right-flame.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/inhand-right-flame.png new file mode 100644 index 0000000000..c077bc7377 Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/inhand-right-flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/inhand-right.png new file mode 100644 index 0000000000..de260aff7a Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json index baa2102766..ab4744aaa6 100644 --- a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json @@ -20,54 +20,62 @@ ] }, { - "name": "off-inhand-left", + "name": "inhand-left", "directions": 4 }, { - "name": "off-inhand-right", + "name": "inhand-right", "directions": 4 }, { - "name": "on-inhand-left", + "name": "inhand-left-flame", "directions": 4, "delays": [ [ 0.2, - 0.1 + 0.2, + 0.2 ], [ 0.2, - 0.1 + 0.2, + 0.2 ], [ 0.2, - 0.1 + 0.2, + 0.2 ], [ 0.2, - 0.1 + 0.2, + 0.2 ] ] }, { - "name": "on-inhand-right", + "name": "inhand-right-flame", "directions": 4, "delays": [ [ 0.2, - 0.1 + 0.2, + 0.2 ], [ 0.2, - 0.1 + 0.2, + 0.2 ], [ 0.2, - 0.1 + 0.2, + 0.2 ], [ 0.2, - 0.1 + 0.2, + 0.2 ] ] }, diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/off-inhand-left.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/off-inhand-left.png deleted file mode 100644 index 3b949b63b3..0000000000 Binary files a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/off-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/on-inhand-left.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/on-inhand-left.png deleted file mode 100644 index 4f3d279d5a..0000000000 Binary files a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/on-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/on-inhand-right.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/on-inhand-right.png deleted file mode 100644 index a03c058690..0000000000 Binary files a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/on-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png index 7ffba68d65..d8ba3f28bd 100644 Binary files a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png differ