From 784e0ab51f912f25c0675b2057ccad3035538716 Mon Sep 17 00:00:00 2001 From: Vordenburg <114301317+Vordenburg@users.noreply.github.com> Date: Tue, 1 Nov 2022 21:16:33 -0400 Subject: [PATCH] Make welder flames like proper unshaded lights. (#12320) * Make welders use ToggleableLightVisualsComponent. * Remove old code from ToolSystem.Welder. * Update welder sprites. --- Content.Server/Tools/ToolSystem.Welder.cs | 40 +++++++++--------- .../Entities/Objects/Tools/welders.yml | 11 ++++- .../Tools/welder.rsi/equipped-BELT.png | Bin 186 -> 159 bytes .../Objects/Tools/welder.rsi/icon.png | Bin 527 -> 290 bytes .../Tools/welder.rsi/inhand-left-flame.png | Bin 0 -> 201 bytes .../{off-inhand-left.png => inhand-left.png} | Bin 342 -> 341 bytes .../Tools/welder.rsi/inhand-right-flame.png | Bin 0 -> 201 bytes .../inhand-right.png} | Bin 353 -> 352 bytes .../Objects/Tools/welder.rsi/meta.json | 32 ++++++++------ .../Tools/welder.rsi/off-inhand-right.png | Bin 353 -> 0 bytes .../Tools/welder.rsi/on-inhand-left.png | Bin 586 -> 0 bytes .../Tools/welder.rsi/on-inhand-right.png | Bin 603 -> 0 bytes .../welder_experimental.rsi/equipped-BELT.png | Bin 0 -> 170 bytes .../Tools/welder_experimental.rsi/icon.png | Bin 583 -> 564 bytes .../inhand-left-flame.png | Bin 0 -> 185 bytes .../{off-inhand-left.png => inhand-left.png} | Bin 345 -> 343 bytes .../inhand-right-flame.png | Bin 0 -> 187 bytes ...{off-inhand-right.png => inhand-right.png} | Bin 358 -> 356 bytes .../Tools/welder_experimental.rsi/meta.json | 8 ++-- .../on-inhand-left.png | Bin 868 -> 0 bytes .../on-inhand-right.png | Bin 809 -> 0 bytes .../welder_experimental.rsi/welder_flame.png | Bin 296 -> 295 bytes .../welder_industrial.rsi/equipped-BELT.png | Bin 186 -> 170 bytes .../inhand-left-flame.png | Bin 0 -> 201 bytes .../welder_industrial.rsi/inhand-left.png | Bin 0 -> 238 bytes .../inhand-right-flame.png | Bin 0 -> 201 bytes .../welder_industrial.rsi/inhand-right.png | Bin 0 -> 249 bytes .../Tools/welder_industrial.rsi/meta.json | 32 ++++++++------ .../welder_industrial.rsi/off-inhand-left.png | Bin 342 -> 0 bytes .../off-inhand-right.png | Bin 353 -> 0 bytes .../welder_industrial.rsi/on-inhand-left.png | Bin 586 -> 0 bytes .../welder_industrial.rsi/on-inhand-right.png | Bin 603 -> 0 bytes .../welder_industrial.rsi/welder_flame.png | Bin 297 -> 296 bytes .../equipped-BELT.png | Bin 186 -> 170 bytes .../inhand-left-flame.png | Bin 0 -> 201 bytes .../welder_industrialadv.rsi/inhand-left.png | Bin 0 -> 238 bytes .../inhand-right-flame.png | Bin 0 -> 201 bytes .../welder_industrialadv.rsi/inhand-right.png | Bin 0 -> 249 bytes .../Tools/welder_industrialadv.rsi/meta.json | 32 ++++++++------ .../off-inhand-left.png | Bin 342 -> 0 bytes .../on-inhand-left.png | Bin 586 -> 0 bytes .../on-inhand-right.png | Bin 603 -> 0 bytes .../welder_industrialadv.rsi/welder_flame.png | Bin 298 -> 297 bytes 43 files changed, 94 insertions(+), 61 deletions(-) create mode 100644 Resources/Textures/Objects/Tools/welder.rsi/inhand-left-flame.png rename Resources/Textures/Objects/Tools/welder.rsi/{off-inhand-left.png => inhand-left.png} (61%) create mode 100644 Resources/Textures/Objects/Tools/welder.rsi/inhand-right-flame.png rename Resources/Textures/Objects/Tools/{welder_industrialadv.rsi/off-inhand-right.png => welder.rsi/inhand-right.png} (56%) delete mode 100644 Resources/Textures/Objects/Tools/welder.rsi/off-inhand-right.png delete mode 100644 Resources/Textures/Objects/Tools/welder.rsi/on-inhand-left.png delete mode 100644 Resources/Textures/Objects/Tools/welder.rsi/on-inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/welder_experimental.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Tools/welder_experimental.rsi/inhand-left-flame.png rename Resources/Textures/Objects/Tools/welder_experimental.rsi/{off-inhand-left.png => inhand-left.png} (61%) create mode 100644 Resources/Textures/Objects/Tools/welder_experimental.rsi/inhand-right-flame.png rename Resources/Textures/Objects/Tools/welder_experimental.rsi/{off-inhand-right.png => inhand-right.png} (55%) delete mode 100644 Resources/Textures/Objects/Tools/welder_experimental.rsi/on-inhand-left.png delete mode 100644 Resources/Textures/Objects/Tools/welder_experimental.rsi/on-inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrial.rsi/inhand-left-flame.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrial.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrial.rsi/inhand-right-flame.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrial.rsi/inhand-right.png delete mode 100644 Resources/Textures/Objects/Tools/welder_industrial.rsi/off-inhand-left.png delete mode 100644 Resources/Textures/Objects/Tools/welder_industrial.rsi/off-inhand-right.png delete mode 100644 Resources/Textures/Objects/Tools/welder_industrial.rsi/on-inhand-left.png delete mode 100644 Resources/Textures/Objects/Tools/welder_industrial.rsi/on-inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrialadv.rsi/inhand-left-flame.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrialadv.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrialadv.rsi/inhand-right-flame.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrialadv.rsi/inhand-right.png delete mode 100644 Resources/Textures/Objects/Tools/welder_industrialadv.rsi/off-inhand-left.png delete mode 100644 Resources/Textures/Objects/Tools/welder_industrialadv.rsi/on-inhand-left.png delete mode 100644 Resources/Textures/Objects/Tools/welder_industrialadv.rsi/on-inhand-right.png 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 3e636ae5aa4141cbba43c12cecdbdd881e60e60b..a635b3af57e5e5e3edb16fa9966fa1bdcf3abc1f 100644 GIT binary patch delta 143 zcmdnRIG=HXL_G^L0|P^Zd(K-RB^Tfm;tHg-w6x64&F$^&0|ElFva-&sX8gdw@V{F5 z{|$zHJEm0uRWOzW`2{mLJiCzwgTe~DWM4f#cV3F delta 170 zcmbQwxQlUuL_G%^0|UdV%))y>s?pQMF{EP7+bbJ+4>|C#2Dm3NyvmMz@$ID17ZY<1 zW&_7rBG;E$TScjGYqH#X9dlz-{X-6*Hiidt4daj9v#vQcC3Dr*zMxa9tm<$u;76Cl8%OmdKI;Vst0Q9v#e1fl|v8Gi!+002a!ipBr{06$PnR7C&)02vt>AS*y7CMGH=DJv=}F)=Yc zJv~H1LPtkONHzdSNJvyvR8><`X=!O{Pyu&$cYIz1jQ{|db`H;<52tCijsO4v0d!JM zQvg8b*k%9#0Fg;VK~y-)-IGZYLLm%9L7PYm%^$-3&*}lbhJS?%tIW1vCFu+){Zjx7 zy?4a=^bRw#Pk@`bk)n~j&FPm6?wyoG@{!&Bxm|lOqgYBQ`8bZZE{rNA^io@_r=0U* zSP18ZI;s>D!PtjzE;8Ue1E30#4X`S-2{z#y03aK}lVJ-14z;iX_i>MbQL$Rpk3Q-J YRQd(HNLK_J01E&B07*qoM6N<$g0{kD3;+NC delta 512 zcmV+b0{{J@0*?fc8Gi-<0047(dh`GQ0oF-GK~#90?Uu1l<3JQe&ul`Vh%80gSb`E1 zSq@biJ^*ddO8XZyOAj4?fJ8&VZ?NSm{6U&j9?J?uBB9u73mYO)Jqj|G5yZ)0v)kl0 z9*<`9?%cWW&4U$ISRn^(-n}jbEx%4 zW7`uLMiFrwGmN5F^XH3lEeF;nH1Y>pqm<(K1DTYCm3ab{wY7Atlqw|+tq1^AYc&8w z%6X-&36zbc2xRkLL`WVVOCzw*gxSUrfh0+2Hk;`aJifatTmh{J0631r zSJ!1U8kG^(o`5Mp)k>wb)5DTQBx}OYYED=9Z+Hge7^!o~&8mR_0000|g zj`J4GF8Lq)^}f?4g+Rm4-(v(EKO|-!FggC$VjcJEu+y2{8uJ($!bP0sy+3O6W<~)g u!~X2i>T6l9v-jzp+&ftiP_gs*18^O2ZN`ppUXO@geCx;;6}p$ literal 0 HcmV?d00001 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 3b949b63b39444486be3f0799c53b70d6fe2ca52..5e17c0f04824a3a9423c24bafe0d26629fae2d71 100644 GIT binary patch delta 83 zcmcb{bd_ns8TJxS7sn8f;}b7CIu;&fUT4GRIb1kJkY{l!3m*f+_6E+z^@USEF#v(5tDnm{r-UW|9`qgj delta 84 zcmcc0bd71k8TL|77sn8f&WV>Do#GT4+S%DAJYwY8FkSG#BSnTohXUP}h$X8-^I 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 0000000000000000000000000000000000000000..c077bc73777839c97c300437be511fe15c70a7d6 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Py!VDzYJ{5KXDVB6cUq=Rpjs4tz5?O(K{s5m4 zS0H`t{r{I@Vjq70{~E(^M(DA1aYPE&KIs)@wT$tDdpy7B+2L3bcd4)78&qol`;+0Jj=U%>V!Z literal 0 HcmV?d00001 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 9aa9548cce9c7eb7f9edde4683d175958f5611a1..c46b69590d5f143610b0e3eb9d1fdc5b12be4fdd 100644 GIT binary patch delta 100 zcmV-q0Gt2e0^kCW%m;r-L_t(Y$C1-JQU;^(KMF)e_1!5cyiE*d|0q;uX!^CUx2Pwx&3;~?Y9#$F0@9!)wjDMTT7 zrH!e&>Q;}=Ze!KWDFVdQ&MBb@0Dmcd#Q*>R 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 4f3d279d5a0eda85c909f0f4408b612b194dd458..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 586 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U=s9naSW-L^Y-q-eBnfi;~(Rv zU)?Z4Yn^GzE4{NpD(n6qY>n~}<~e!xyt0SdM-HBoJXL&#rtQtCJHLpwB$OQuxHz** z+}YadP?_}iZ!b;n_wO-z|GxJA>AN$ZS86i?tpS5O!IM<#gg-g2Uo4n(LB;dW%h^tU zo44&M+_U3f-v5wETRtZ)n!DKGX6mQK>64efc^OdmYmcgD)z5AFcg(Y1{?lUdMU4|R z&3R7deP5sciJ5dI$L#B`qf1p*n*Ukn?teS0|9INZy?5Q5Cv|CjvbPhpvaZtctor(| zF>Uiqm6s>)%`1A|lv`I2Iqhe+-}CkE6;@Zg;{5-g(l?&p?RPvqGVPa?t1R!OE75fg z&QH`mAF*djrT9jN@|k%A&$r(G2DOW@9Qp@zrb{kz-z1j zyEn~yANyH6_4?z-)24^T%g1m1Sa>@6tLmL;^?UUlCv8)G`DXTa_5H6O7eAl&>hW*( zRcD`hN13GlxhY=o>E}X~mE}Kzj~?H~e{*_4@IDhw`+(Tjk2mXlo>t3g{&ev=r)$T< zPyXuUoo1h3wc@bvjffmO6c?=Vxclnkb>Ednxu-vWeQvh2{^72-x9b92CjPIgDBZU& z^#6f9$M(JZ%l&;*-}Bee&zZy5cwb-p`MCgFJUW_~Y-^`pkF17-QRUtgk00 zlB7nXp;vpqB}twB58Zp*RI?~f$2IBe!s9ZGBAceEx5wXieihO*wZka7Fou84H`bXk z#`coL+p77_UqvrT>?(g8Zk72`JB~HTbNQMC-}z-W8Ppo)AaZQslKXgMuh+X002ovPDHLkV1nfsDu@68 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 0000000000000000000000000000000000000000..da1b076dea674926f2b7862d4ca5032268b64dd3 GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|emUKs7M+SzC{oH>NS%G}%0G|+7 zAg!gPWo~Y6Z*LzE5Rk@@mX(z?lOgQ`1H*|NhwDIT#*!evU^geb6^orBZH@_ KpUXO@geCxqswq_f literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png index 2a36d550027e42f9a1071b68423d997ed493d3d1..446d4b21bf7742ce04c265fb06bf89a17c91643c 100644 GIT binary patch delta 303 zcmV+~0nq-(1hfRO4*`D=Nkl*=~g}5JPPS!?1OuK>Pnc+86dJHwCHEeTW}( zMjk65#X!Z|8vn2mS5+qm*eg zP*-$)S(g5JdAUC@E-~DCH>eP}%JauGgC*wvH$=8 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 0000000000000000000000000000000000000000..ea0f2325e672b2c2aeada1cbe9da7ca0fdcd2470 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Py#0(@mH??R2DVB6cUq=Rpjs4tz5?O(K&H$ef zS0H`t{r?ZY|Ht2bwin1@ED7=pW^j0RBMr#$^K@|x@i?BGAi?U)wPC?W)&w3+853sZ zSzgmFI>@jd=C^q8$p3(2a*ARjh_7rq+d%Jt-{H-y%2B08Ty6(XoRIPn-f+2NjX_lN b1a5|dX%3Z!#XSy8i&I&+7#O+&xP^~&ZN9|-1fH&bF6*2UngE^>AKm}} 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 0000000000000000000000000000000000000000..10d36469a502e5e67ba83c8ff0f409430f2bd303 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Py#0(@mH??R2DVB6cUq=Rpjs4tz5?O(K&H$ef zS0H`t{r?ZY|Ht2bwin1@ED7=pW^j0RBMrz2@N{tu@i?BGAi?U)Z1Lcc{{hFtjSNz@ zTy6(9ubP0l+XkKz3DuV literal 0 HcmV?d00001 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 45628f9983c3d0f774a319fc02e07f58b68902c9..2d64d9abf1d76d4343a5c71ea0b78679b16a108c 100644 GIT binary patch delta 158 zcmV;P0Ac^;0^|aa&VPYPL_t&-8STL_3c@fLfYC2Ta19MQ+j@b-fOCh4vtSP(LT88G zAB%$3CIsF8_Yh*vkY#vkg0IO@b=YqqcAJ|a%l7L_WHgYsyz?vN$nd;rOG;ZNjtqwo zqD=8gk*I8Fcv@K9ckr}NNazIyLNGPu}lNoO52m=7Ul?tBQ?d=-? O0000EaktG3V{v{aLpIMB4kk z_LQzLcYfZH^ntr%Rl4)Mg~5LrYWr*&Y`>~*s(v+1Goi~!e2;2tp5C3J)YCIe%GSTB z{S`1ShIgxczl597Q2%Vy91 zT~NFC=hcgMe-~M9%l!8DAqupWrJ{ifA%R^QhN$2(>Gn|16n`?ghk|0rHnd?DF?Jn!P`w>Bbw`#NH4JpPrfTlFtX zdeilP9|AU+q)%D0;&r|7?j5r)p3u}k@O+wlXaoQMk3TYQi_cTDJpJd!bBFzcllJak zmbY)$zZKURR``F(X1K!4m?WUUMk-P8YEIPr`ZI2;Cd^xLrz=Jb$*q z{j~6}JAY4mJ;VB&>Z+R3zcb$l&;M`s`E4vpgo3~=;lA2wMkAARp;9)wVKrV51 zqrU0hCqJ2dpZwo$J?ke^=Ii^nrC;4&`+oYWpG>dqentH>td8Yhxxeh+zQf7!^7Ycs zxJ@SR|IT5tyzW2O*Ux;VpBLX@HH?4o;g1H>t$%g@7k}#C%e#8V5s-<@ptS68+FKT_S?MwtNl(be)qHY^Lw#2_Gxp|9zQ6* zol~-R&r7@b*qiP8`D?GgZatbbap@lE(4Vh9n*Y*&ulFcP)#Uu=M>QAT-|n0nc}o2M zaewa5(Z-?ss{Z)zGu^i>D$zzRKlRto65)R*ZchJmroN$1JakemUrl|9igD=kKVD4t zWaPw(7kfFa{k-~I=zBNim&Y&edbXLZW2FhJqm_UH8)Fjb#3arSR`ZK8c2BzRAsYAX z)!u92Mzi+no$EVnqFw!S)gO_ap`Y2!gSC&(b7}bg^7Mz(Kll8I-+Xh+w7anl`+wX! z{e3UvdZ~}9A!o})em39#t<+^7^v!Z_{CnHq%jNz@>(@*FTv@!jXa63yT?>;I=^u)F z7^c^-dzyS`Lwj|9UFpM{YSuI5tM4VtAFTShhB4`fnhsf>5Kwp)$#jGH!=FFBuV21l z>@fb<%esMG;nI)bvImFd-ZQS4Hx#;x0+n&HvY^|}qV3==85f delta 71 zcmZ3^w1R2E3kPja7sn8b-sA)c)`*4)oLccFj8o6wGvc0lzxNdTD-TEGiw#&U>cv7h@-A}f$D9pDq<3Z%8Pw9L)T?d|OY z0s^wKvZ|!SRtfWdU|?YXu&5I#%~%rT7tG-B>_!@pqwDG77~*j}IYEMTae@Mav?8m{ zLd74V2Gs%vje(5~Ol4iNmRxQJH6&P-MHv`+g<~0YSFVee1?pt*boFyt=akR{0PR31 AQ2+n{ delta 170 zcmZ3*xQlUuL_G%^0|UdV%))y>s?pQMF{EP7+bbJ+4>|C#2Dm3NyvmMz@$ID17ZY<1 zW&_7rBG;E$TScjGYqH#X9dlz-{X-6*Hiidt4daj9v#vQcC3Dr*zMxa9tm<$u;76Cl8%OmdKI;Vst0Q>_#?*IS* 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 0000000000000000000000000000000000000000..cbb49ca3be4e1f49e8200b049d7cd0c9c30da2d1 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Py!VDzYJ{5KXDVB6cUq=Rpjs4tz5?O(K{s5m4 zS0H`t{r{I@Vjq70{~E(^M|g zj`J4GF8Lq)^}f?4g+Rm4-(v(EKO|-!FggC$VjcJEu+y2{8uJ($!bP0sy+3O6W<~)g u!~X2i>T6l9v-jzp+&ftiP_gs*18^O2ZN`ppUXO@geCx;;6}p$ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7d09476c564075ab5a8e7b87ef40406c12e85fb6 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|emUKs7M+SzC{oH>NS%G|s0G|+7 zAg!pVsHUdo=k1-Io?ay-wn~`yg@nYP==5tqImVJ8zhDN3XE)M-oDxqL#}JR>$q5py ziy5o~4kRpKTBee`nT4&*BzduljG6}bsy2fSEm~ZU4H_GlGB{12@Y+qeC7Wl%Nn`Eg zWF=}1xZD^Ek20?_VhXZpVEksp6k)^SaGLQ=YKu3cQ2QLCCf2n_l%^amoFd4x dIF*HufkBU%yZ?!Aqao0K22WQ%mvv4FO#qZBL^%Ke literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c077bc73777839c97c300437be511fe15c70a7d6 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Py!VDzYJ{5KXDVB6cUq=Rpjs4tz5?O(K{s5m4 zS0H`t{r{I@Vjq70{~E(^M(DA1aYPE&KIs)@wT$tDdpy7B+2L3bcd4)78&qol`;+0Jj=U%>V!Z literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..19c0f4f76c55953a39705a0b4c274b1b41512b43 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|emUKs7M+SzC{oH>NS%G|s0G|+7 zAg!pVsHUdo=k1-Io?ay-wn~`yg@nYP==5tqImVJ8zhDN3XE)M-oO(|e#}En0w+AnY s+=|rQRx8(U?$b9FHZ(ZD=$S2pz#OjRgGbgc20Deo)78&qol`;+04&E_O8@`> literal 0 HcmV?d00001 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 3b949b63b39444486be3f0799c53b70d6fe2ca52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|ei2$DvS0JsXruJ$xzn{0aqN3u8 zR+;ql^cNBmUgeWM0p%D=g8YIR9G=}s19GyfLLy3BQj3#|G7CyF^Ya)OD&_=-6%>_z z{}NpA@#_;UZ(Xf(XU+$22sOB9{NRz!c^}P_3`IS?J1mTYj4vB|Da?5^>ByuIh2WJo zrs}F&JvzIMRX4AYSkm2XyjH`|T=a<9lc2DIuf>eBxfvo?N=;O@t_}rSTk7fJ7~;{H zoFKuvn88}$K*9nhH`iokRyH=(WM@|yHICgKZH60KyDT0XG&ZhfaGE~xwVQKGHqVBW z#@xxtO3ch_&IB58xiQ8mG_)e_1!5cyiE*d|0q;uX!^CUx2Pwx&3;~?Y9#$F0@9!)wjDMTT7 zrH!e&>Q;}=Ze!KWDFVdQ&MBb@0Dmcd#Q*>R 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 4f3d279d5a0eda85c909f0f4408b612b194dd458..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 586 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U=s9naSW-L^Y-q-eBnfi;~(Rv zU)?Z4Yn^GzE4{NpD(n6qY>n~}<~e!xyt0SdM-HBoJXL&#rtQtCJHLpwB$OQuxHz** z+}YadP?_}iZ!b;n_wO-z|GxJA>AN$ZS86i?tpS5O!IM<#gg-g2Uo4n(LB;dW%h^tU zo44&M+_U3f-v5wETRtZ)n!DKGX6mQK>64efc^OdmYmcgD)z5AFcg(Y1{?lUdMU4|R z&3R7deP5sciJ5dI$L#B`qf1p*n*Ukn?teS0|9INZy?5Q5Cv|CjvbPhpvaZtctor(| zF>Uiqm6s>)%`1A|lv`I2Iqhe+-}CkE6;@Zg;{5-g(l?&p?RPvqGVPa?t1R!OE75fg z&QH`mAF*djrT9jN@|k%A&$r(G2DOW@9Qp@zrb{kz-z1j zyEn~yANyH6_4?z-)24^T%g1m1Sa>@6tLmL;^?UUlCv8)G`DXTa_5H6O7eAl&>hW*( zRcD`hN13GlxhY=o>E}X~mE}Kzj~?H~e{*_4@IDhw`+(Tjk2mXlo>t3g{&ev=r)$T< zPyXuUoo1h3wc@bvjffmO6c?=Vxclnkb>Ednxu-vWeQvh2{^72-x9b92CjPIgDBZU& z^#6f9$M(JZ%l&;*-}Bee&zZy5cwb-p`MCgFJUW_~Y-^`pkF17-QRUtgk00 zlB7nXp;vpqB}twB58Zp*RI?~f$2IBe!s9ZGBAceEx5wXieihO*wZka7Fou84H`bXk z#`coL+p77_UqvrT>?(g8Zk72`JB~HTbNQMC-}z-W8Ppo)AaZQslKXgMuh+X002ovPDHLkV1nfsDu@68 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 46bb4a6ff1fbafe3c3b0bececc45611f73087ca4..7814b7485199170ae34cacd3a4ecfe43995e1367 100644 GIT binary patch delta 70 zcmZ3&U>cv7h@-A}f$D9pDq<3Zj!clFz@i?BGAi=sgL4m3*RT~s?pQMF{EP7+bbJ+4>|C#2Dm3NyvmMz@$ID17ZY<1 zW&_7rBG;E$TScjGYqH#X9dlz-{X-6*Hiidt4daj9v#vQcC3Dr*zMxa9tm<$u;76Cl8%OmdKI;Vst0Q>_#?*IS* 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 0000000000000000000000000000000000000000..cbb49ca3be4e1f49e8200b049d7cd0c9c30da2d1 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Py!VDzYJ{5KXDVB6cUq=Rpjs4tz5?O(K{s5m4 zS0H`t{r{I@Vjq70{~E(^M|g zj`J4GF8Lq)^}f?4g+Rm4-(v(EKO|-!FggC$VjcJEu+y2{8uJ($!bP0sy+3O6W<~)g u!~X2i>T6l9v-jzp+&ftiP_gs*18^O2ZN`ppUXO@geCx;;6}p$ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9748b0a7453c64bbfa0471c966c1eabddcc91674 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|emUKs7M+SzC{oH>NS%G|s0G|+7 zAT6ETAs4VsQBhIZxkXJ)&ClCAJw1K$1g+^nImVJ8zhDN3XE)M-oDxqL#}JR>$q5py ziy5pr4kRpK3cI>Rg_VtM>6VaC8MPM4_8rC>cC*ZWXwcXg%iz>K`Sr1omTaL7CpWhy zCMz|wtT_{Cz~#nRc$9ga5mS&&1LHR%rU)AghtrI2QeAd32(`~KYLZ=hL}|+5!YP70 ei&I(n7#KDP^EuCU`rre!pTX1B&t;ucLK6U(q(|fc literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c077bc73777839c97c300437be511fe15c70a7d6 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Py!VDzYJ{5KXDVB6cUq=Rpjs4tz5?O(K{s5m4 zS0H`t{r{I@Vjq70{~E(^M(DA1aYPE&KIs)@wT$tDdpy7B+2L3bcd4)78&qol`;+0Jj=U%>V!Z literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..de260aff7a9b7d1cbc48c56d7e6459963224c296 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|emUKs7M+SzC{oH>NS%G|s0G|+7 zAT6ETAs4VsQBhIZxkXJ)&ClCAJw1K$1g+^nImVJ8zhDN3XE)M-oO(|e#}En0w+ATOLqlY75}C+xV@ rq}|3*U;do6+E?OpbP0l+XkKYO7Wl literal 0 HcmV?d00001 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 3b949b63b39444486be3f0799c53b70d6fe2ca52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|ei2$DvS0JsXruJ$xzn{0aqN3u8 zR+;ql^cNBmUgeWM0p%D=g8YIR9G=}s19GyfLLy3BQj3#|G7CyF^Ya)OD&_=-6%>_z z{}NpA@#_;UZ(Xf(XU+$22sOB9{NRz!c^}P_3`IS?J1mTYj4vB|Da?5^>ByuIh2WJo zrs}F&JvzIMRX4AYSkm2XyjH`|T=a<9lc2DIuf>eBxfvo?N=;O@t_}rSTk7fJ7~;{H zoFKuvn88}$K*9nhH`iokRyH=(WM@|yHICgKZH60KyDT0XG&ZhfaGE~xwVQKGHqVBW z#@xxtO3ch_&IB58xiQ8mG_U=s9naSW-L^Y-q-eBnfi;~(Rv zU)?Z4Yn^GzE4{NpD(n6qY>n~}<~e!xyt0SdM-HBoJXL&#rtQtCJHLpwB$OQuxHz** z+}YadP?_}iZ!b;n_wO-z|GxJA>AN$ZS86i?tpS5O!IM<#gg-g2Uo4n(LB;dW%h^tU zo44&M+_U3f-v5wETRtZ)n!DKGX6mQK>64efc^OdmYmcgD)z5AFcg(Y1{?lUdMU4|R z&3R7deP5sciJ5dI$L#B`qf1p*n*Ukn?teS0|9INZy?5Q5Cv|CjvbPhpvaZtctor(| zF>Uiqm6s>)%`1A|lv`I2Iqhe+-}CkE6;@Zg;{5-g(l?&p?RPvqGVPa?t1R!OE75fg z&QH`mAF*djrT9jN@|k%A&$r(G2DOW@9Qp@zrb{kz-z1j zyEn~yANyH6_4?z-)24^T%g1m1Sa>@6tLmL;^?UUlCv8)G`DXTa_5H6O7eAl&>hW*( zRcD`hN13GlxhY=o>E}X~mE}Kzj~?H~e{*_4@IDhw`+(Tjk2mXlo>t3g{&ev=r)$T< zPyXuUoo1h3wc@bvjffmO6c?=Vxclnkb>Ednxu-vWeQvh2{^72-x9b92CjPIgDBZU& z^#6f9$M(JZ%l&;*-}Bee&zZy5cwb-p`MCgFJUW_~Y-^`pkF17-QRUtgk00 zlB7nXp;vpqB}twB58Zp*RI?~f$2IBe!s9ZGBAceEx5wXieihO*wZka7Fou84H`bXk z#`coL+p77_UqvrT>?(g8Zk72`JB~HTbNQMC-}z-W8Ppo)AaZQslKXgMuh+X002ovPDHLkV1nfsDu@68 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 7ffba68d652e4f6e947e0f17ed42dc765d2aedbe..d8ba3f28bdc7cc71fd50d8352f699f748e44cd3f 100644 GIT binary patch delta 69 zcmZ3*w32DUYdcL(7sn8b)5!@EZ4M_`rs~gXIF+71v-Q;bd97(p8C#*h>Z=@O1TaS?83{1OVf98-xG= delta 70 zcmZ3YK;Y@>=d#Wzp$PyCKpbuW