From d433234fe32b91d863c0bb89c287f56cb8428ba7 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Mon, 2 May 2022 23:51:24 +0100 Subject: [PATCH] Industrial and Advanced Welders (#7855) --- .../Catalog/Fills/Crates/salvage.yml | 2 + .../Catalog/Fills/Lockers/engineer.yml | 4 +- .../Entities/Objects/Tools/welders.yml | 43 ++++++++-- .../welder_industrial.rsi/equipped-BELT.png | Bin 0 -> 186 bytes .../Tools/welder_industrial.rsi/icon.png | Bin 0 -> 345 bytes .../Tools/welder_industrial.rsi/meta.json | 79 ++++++++++++++++++ .../welder_industrial.rsi/off-inhand-left.png | Bin 0 -> 342 bytes .../off-inhand-right.png | Bin 0 -> 353 bytes .../welder_industrial.rsi/on-inhand-left.png | Bin 0 -> 586 bytes .../welder_industrial.rsi/on-inhand-right.png | Bin 0 -> 603 bytes .../welder_industrial.rsi/welder_flame.png | Bin 0 -> 297 bytes .../equipped-BELT.png | Bin 0 -> 186 bytes .../Tools/welder_industrialadv.rsi/icon.png | Bin 0 -> 396 bytes .../Tools/welder_industrialadv.rsi/meta.json | 79 ++++++++++++++++++ .../off-inhand-left.png | Bin 0 -> 342 bytes .../off-inhand-right.png | Bin 0 -> 353 bytes .../on-inhand-left.png | Bin 0 -> 586 bytes .../on-inhand-right.png | Bin 0 -> 603 bytes .../welder_industrialadv.rsi/welder_flame.png | Bin 0 -> 298 bytes 19 files changed, 201 insertions(+), 6 deletions(-) create mode 100644 Resources/Textures/Objects/Tools/welder_industrial.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json create mode 100644 Resources/Textures/Objects/Tools/welder_industrial.rsi/off-inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrial.rsi/off-inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrial.rsi/on-inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrial.rsi/on-inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrialadv.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json create mode 100644 Resources/Textures/Objects/Tools/welder_industrialadv.rsi/off-inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrialadv.rsi/off-inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrialadv.rsi/on-inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrialadv.rsi/on-inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index 38cdb40519..0a1c5f588c 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -37,6 +37,8 @@ prob: 0.1 - id: SheetPlasma prob: 0.1 + - id: WelderIndustrialAdvanced + prob: 0.1 # - Service - id: CrayonBox prob: 0.1 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index bddbba129e..b9d0f4a318 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -67,7 +67,9 @@ contents: - id: WelderMini - id: Welder - prob: 0.1 + prob: 0.7 + - id: WelderIndustrial + prob: 0.5 - id: ClothingHeadHatWelding prob: 0.5 diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index 77fdc1c080..a9a4fdc685 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml @@ -51,6 +51,44 @@ color: orange - type: Appearance +- type: entity + name: industrial welding tool + parent: Welder + id: WelderIndustrial + description: "An industrial welder with over double the fuel capacity." + components: + - type: Sprite + sprite: Objects/Tools/welder_industrial.rsi + - type: Item + sprite: Objects/Tools/welder_industrial.rsi + - type: SolutionContainerManager + solutions: + Welder: + reagents: + - ReagentId: WeldingFuel + Quantity: 250 + maxVol: 250 + +- type: entity + name: advanced industrial welding tool + parent: WelderIndustrial + id: WelderIndustrialAdvanced + description: "An advanced industrial welder with over double the fuel capacity and hotter flame." + components: + - type: Sprite + sprite: Objects/Tools/welder_industrialadv.rsi + - type: Item + sprite: Objects/Tools/welder_industrialadv.rsi + - type: SolutionContainerManager + solutions: + Welder: + reagents: + - ReagentId: WeldingFuel + Quantity: 250 + maxVol: 250 + - type: Tool + speed: 1.3 + - type: entity name: experimental welding tool parent: Welder @@ -61,8 +99,6 @@ sprite: Objects/Tools/welder_experimental.rsi - type: Item sprite: Objects/Tools/welder_experimental.rsi - - type: RefillableSolution - solution: welder - type: SolutionContainerManager solutions: Welder: @@ -95,9 +131,6 @@ Quantity: 25 maxVol: 25 - type: Tool - useSound: - collection: Welder - qualities: Welding speed: 0.7 - type: PointLight enabled: false diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..3e636ae5aa4141cbba43c12cecdbdd881e60e60b GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jh-%!Ar*7pUfIZd$bpA7z&(lK zRd(cyZzqkun3!`g8#vAqxxUQWDoTZ0ljYv)m>ZkwA94V-F+7-S7=P@Zb0zV@G)gN`Zxvj!Oe b0TylQ%9fJdc7;1ufdo8V{an^LB{Ts5Yk@$V literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5c6c99c5d93c3a85c31d016752459a504da2b50d GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$Dv*8>L*$jHc8T08jo1GvSI(O!L@P<%>i^dNg>74h`Jjqbh)4RjMILP?2v6sS}N0W|B3Q-8w zG}d2gW2&yY)uXf9SatIX35~Q9M`wmjnK7FyQCoY*ubmCOYz%uHrBBwGb6*8oT;}QG z7@{#TIbnggK#0RrV=YNd10xQDgRQMGO}$fqpf^TFfl0}0)iH;JB@$B87=jnFFm+{e z1{nABvWT(*!GmR5ng&{nBF|`as4Zw&BF8eLXX*u(GorE=Se-6x(O9;SOJZT9cU!|I kp_5Eb8G6UR=(I90oNnjq3s7dA2y_91r>mdKI;Vst09R&sEdT%j 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 new file mode 100644 index 0000000000..baa2102766 --- /dev/null +++ b/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json @@ -0,0 +1,79 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "welder_flame", + "delays": [ + [ + 0.2, + 0.1 + ] + ] + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4, + "delays": [ + [ + 0.2, + 0.1 + ], + [ + 0.2, + 0.1 + ], + [ + 0.2, + 0.1 + ], + [ + 0.2, + 0.1 + ] + ] + }, + { + "name": "on-inhand-right", + "directions": 4, + "delays": [ + [ + 0.2, + 0.1 + ], + [ + 0.2, + 0.1 + ], + [ + 0.2, + 0.1 + ], + [ + 0.2, + 0.1 + ] + ] + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} 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 new file mode 100644 index 0000000000000000000000000000000000000000..3b949b63b39444486be3f0799c53b70d6fe2ca52 GIT binary patch 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 literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..4f3d279d5a0eda85c909f0f4408b612b194dd458 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png new file mode 100644 index 0000000000000000000000000000000000000000..46bb4a6ff1fbafe3c3b0bececc45611f73087ca4 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQYryHA+84w9GEfV$B6_Wn(<>s z!Ve&skdW}>$B7?5egGvrBz~NjaoNPu7pR`GB*-tA!Qt7BG$5y@DkP%BCAB!YD6^m> zGe3`kp<+&OSV2+g_bZkwA94V-F+7-S7=P@Zb0zV@G)gN`Zxvj!Oe b0TylQ%9fJdc7;1ufdo8V{an^LB{Ts5Yk@$V literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c187486f2bc9e34736019ee3a74cd4ef72380787 GIT binary patch literal 396 zcmV;70dxL|P)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRL zOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5sk9(7FQq&+CndE=iHkEOv#1y-YRJWzR+N~V z3SlcNxca$(4F>=PKOC-yiw-XU005XtL_t(2k)@Ea5yCJGMHNqA8^fms-X36Yd=KD&ebbE9`(Uy_Ob5ckKb?hupjNZ$&2#0*o~z;w-cmIPvD7E#K+l$e|1|55n{H=CT_s!582pwA$X~6l!ozhZYQT q1IBxk;b|w3FZ&(To6B*vVYfbaofqt>`{FkM0000_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 literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..4f3d279d5a0eda85c909f0f4408b612b194dd458 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png new file mode 100644 index 0000000000000000000000000000000000000000..7ffba68d652e4f6e947e0f17ed42dc765d2aedbe GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQYryHA+84w9GEfV$B6_Wn(<>s z!Ve&skdW}>$B7?5egGvrBz~NjaoNPu7pR`GB*-tA!Qt7BG$5z0DkP%BCAB!YD6^m> zGe3`kp<+&OSV2+g_bQ)bPd;iXEW7W+oBs3CF9Gw|9WyWl-B<8QnmON7l zYicRw**Qft=5Ne_X^adU=M