From 0215292baaa50044189ffa5176431a99942e93bd Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sat, 27 Apr 2024 01:47:38 -0400 Subject: [PATCH] welding gas mask (#27108) * welding gas mask * eek --- .../Entities/Clothing/Masks/specific.yml | 29 +++++++++++ .../Entities/Structures/Machines/lathe.yml | 1 + .../Prototypes/Recipes/Lathes/devices.yml | 10 +++- Resources/Prototypes/Research/industrial.yml | 1 + .../welding-gas.rsi/equipped-MASK-vox.png | Bin 0 -> 693 bytes .../Mask/welding-gas.rsi/equipped-MASK.png | Bin 0 -> 599 bytes .../Clothing/Mask/welding-gas.rsi/icon-up.png | Bin 0 -> 457 bytes .../Clothing/Mask/welding-gas.rsi/icon.png | Bin 0 -> 480 bytes .../Mask/welding-gas.rsi/inhand-left.png | Bin 0 -> 553 bytes .../Mask/welding-gas.rsi/inhand-right.png | Bin 0 -> 550 bytes .../Clothing/Mask/welding-gas.rsi/meta.json | 49 ++++++++++++++++++ .../welding-gas.rsi/up-equipped-MASK-vox.png | Bin 0 -> 624 bytes .../Mask/welding-gas.rsi/up-equipped-MASK.png | Bin 0 -> 539 bytes .../Mask/welding-gas.rsi/up-inhand-left.png | Bin 0 -> 461 bytes .../Mask/welding-gas.rsi/up-inhand-right.png | Bin 0 -> 474 bytes 15 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/Mask/welding-gas.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/welding-gas.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Mask/welding-gas.rsi/icon-up.png create mode 100644 Resources/Textures/Clothing/Mask/welding-gas.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Mask/welding-gas.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Mask/welding-gas.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Mask/welding-gas.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Mask/welding-gas.rsi/up-equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/welding-gas.rsi/up-equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Mask/welding-gas.rsi/up-inhand-left.png create mode 100644 Resources/Textures/Clothing/Mask/welding-gas.rsi/up-inhand-right.png diff --git a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml index 7f758a27d2..c3a07fa8e9 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml @@ -33,3 +33,32 @@ - type: HideLayerClothing slots: - Snout + +- type: entity + parent: ClothingMaskBase + id: ClothingMaskWeldingGas + name: welding gas mask + description: A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd. + components: + - type: Sprite + sprite: Clothing/Mask/welding-gas.rsi + state: icon + - type: Clothing + sprite: Clothing/Mask/welding-gas.rsi + - type: BreathMask + - type: IngestionBlocker + - type: IdentityBlocker + - type: FlashImmunity + - type: EyeProtection + - type: PhysicalComposition + materialComposition: + Steel: 200 + Glass: 100 + - type: StaticPrice + price: 100 + - type: Tag + tags: + - WhitelistChameleon + - type: HideLayerClothing + slots: + - Snout diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 9ad3214dc3..1bfb67f66a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -287,6 +287,7 @@ - PowerCellMicroreactor - PowerCellHigh - WeaponPistolCHIMP + - ClothingMaskWeldingGas - WeaponGauntletGorilla - SynthesizerInstrument - ClothingShoesBootsMagSci diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml index 8b748f3fe5..6a786f2b24 100644 --- a/Resources/Prototypes/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/Recipes/Lathes/devices.yml @@ -76,7 +76,7 @@ Steel: 100 Plastic: 200 Glass: 100 - + - type: latheRecipe id: SignallerAdvanced result: RemoteSignallerAdvanced @@ -175,6 +175,14 @@ Plasma: 1500 Uranium: 150 +- type: latheRecipe + id: ClothingMaskWeldingGas + result: ClothingMaskWeldingGas + completetime: 3 + materials: + Steel: 600 + Glass: 200 + - type: latheRecipe id: WeaponForceGun result: WeaponForceGun diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 30345a5dfc..ccc6e9c0f4 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -14,6 +14,7 @@ - BorgModuleMining - OreProcessorIndustrialMachineCircuitboard - OreBagOfHolding + - ClothingMaskWeldingGas - type: technology id: AdvancedPowercells diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..e6028f3a4c1bc09fa3f14b022b923c168fa29317 GIT binary patch literal 693 zcmV;m0!safP)Px%Z%IT!RCt{2+P`ZeK@2b zp=Hn_9=U*Nl3w(xfSVBmS8Xr(1Kt&~o2(GYjB7yhK9#fUjI;A&2Ye3@LYQi|+q|m0 zX`N2zZdKXD7n@3%Oy+)7d7FGStw2P~%!yfNW)Kngdc91#-P=5)0U#o7Hkw_?>Wx>RO`gPkIGZ6 z4=-9RqX{q`fbn>Yp9crf-yWf7GdR1uDCa%g-rkxvWz6*9-ot7IWOF%`Juk5hJ`Eyb zr4;KR;9sp4>mXpI6cf>h9))Q!J_g@<$!+5a0035y(YV`l900&zFgSEwH*w$h{ZwKFzV9cZPLs(5M@L8Zz#=eu z(P~xG_?@*75nuQFtb>4c5O5fVyxegczVCAwhH<;s{eG%pII9eiWkkfT>%u7(kH%Od7$olbVF>(PeBP;^fh-ay zh=_NpXYivugnhuz=M&$Fas+Jh0wSr!^P*L7QmX-2%-DE1gr3bX8jXyDr$oe+N@bCM z;CXnS&jA3J-7Y4RNov7Z>lLu9*Xw17h%dWc0KiGD7UvL*MkA{>Pft$)0MGL|qIT1K zcp$|U5P7{fqZRS}_}Dmltd!#4S6A_jN74?%Z#1N>l!^z#W&mvK3L%6LLI@#*5JCtc b#9RIYrsfj`+4PE300000NkvXXu0mjf8jU@K literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..5d0a7ea70d131b8cbc7b28a80507425f50119dfb GIT binary patch literal 599 zcmV-d0;v6oP)Px%5lKWrRCt{2+C6LAKo|$`e@n@32!$BDxe+Ju)PTvFE;4v187}lYbnD`PhBGll z-8@alCORGV9Q3|trY6iyrP>vSyu1VMmNYfOpR_hjcs1Tn=(VK1Le?&@YjWPCWG_v`` z%A}OCSEG?N#@J2tBse!nER#~&vu+mva9yjx?6pg6l#o(dv)9ITtp)%%>vjw0bM6nw zn-l;bj^o96dp?K0o8eoL**w9kyRY!(b)Z^ZjO9H->oiCdBBiuSDXX*08e=wgTdvBN z=h0bal~RTC72d6U0>1C#-N^~w9v_!hDi=c7FPE42d~ty^O#z^AQ^v+7y4)mD<_46V lgNTTTh=_=Yh=}N)_7hTF>~O6xcQ60|002ovPDHLkV1ho{8At#C literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/icon-up.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/icon-up.png new file mode 100644 index 0000000000000000000000000000000000000000..352e536ca9165cbcef94f785ff9c0cefee8986c0 GIT binary patch literal 457 zcmV;)0XF`LP)Px$gGod|R9J=Wl`W3zFc5&ht{$waf--}WsK8*(P!$^V6eR||M|nX`P*&v*;Xwrk zPk~K9QB|3H!79~uH=E}~dT8^Zi9Mdb%xGX_WaPIq8S+R(LfiS}a_Mca*Mr8fwYK#> zP1D|iL@SC&u-2lrMk&>*Q&kntInp$Z4&p5~0HD)3fKm#rHOu8P+GbP$P4->RKL=rq z`LR#F@+U?KKC)l0*8ohXQvhbO832#R0|4(m0H@O_*6hD4(3ZXT9`8MMT~pWf^SePQ zg|#-S3egn+xL&WZO&e8y=-Gt-gU*aZB&?Ezzh%ksc>LCcyWNh(V!`2XcsZ}Civ51i zDoFr1XW2wVLfdGzR-pNJt0du^WfK7B+>1_86x?n%oO2XK@p9Mbp0jMy<-C)x4J0BV z&+|~0Whl!s7-NFgI%utfG3I%m=Xr=7!QOlhLTmkW+Q>tk_g)?%60$67z1wcLIOlrV z96SY^&8AiE%iwi{GyB5O#hc00000NkvXXu0mjfKDg1r literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/icon.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..cdb8d4b7c7e914cd00178f2028ff57105208273e GIT binary patch literal 480 zcmV<60U!Q}P)Px$nn^@KR9J=Wl_8HJF%-vtY)%q_z*S%-h;CA|Uw|Mh2=>e>Oa&id)fzma{t|MA zG^f^&A4PH%m$73|gy4JPG8f& z0IG}J@6WG%yw4CqV2r_98}9W&^c$#oc>#F68v97Bmu%pDHoF>26^A=xsFVt$EaOjE zvRbXaG~s+cXD}GBTrSV{tEytLSTM>m05;Bblv0hKqj3uA4jyG08|OLz-utthqA1wy zc6je8isCF*=Wd+q+!DXZ$)?TSUS@H00005s$V$PaTW`agf##~=s?p^ta1`>{{| z^=qrh^J~rfUhfh*zR{=2p~ujOld1D@#HyMdXV*;Mvq|vLu5}gj+SjiZ-4Idzk?+Tj zt*sX`T0U09WUSZ8Hk)l*X)eLzl`8u2R@j7VQpf+=T{6Ev@!q{fn|F8r-EP~G7@?VM zA>-s8_%Av=pa1&joommZjnq8wxRZmyqObXH96y6Vo8ln@ozkTGwA588e@neIJtw>D zn={XAmdc_jt7_7x1{rZS{aHErt4wyd!snMySQs|!*tv3UX<1#Ib#n&-tO(rq-u%+Z zyA_iaCYX3i<)*LSY}lW$*7TcW_DsEomw)vcau@7vdS1z(;A>*C+3Z*UZfl8T7k9yJ z6 zv(nlY2+UslQEAif{GOBZwd(g>^K;i!y_;tquRq;e#q-h&gXSPFJ$=1`%F@=u&CD`# pvQzIB7cbZ4`XTPBzUcpH<}<5xEiM#24h60@?kEP)Px$;7LS5RCt{2+ObRHP#g#F@4?}6yTd`@K*4)MCj-I1pc&*8hxb>wxkhy8pu3Yp zrURja(cTTOf50Jy=#UPt0fmEu3~u7q<>#OYMH@Y9(q{O6AkZ}Ay)Um#mhS_Ih=_=Y zh=_=Yi0F~lTC&eU5Xks>T|Lh@b!M%##BnU$FqAY+r5lD4$8oI}VVcaJiU#t1A4j7R za5;8i71&-_K)c;Wr_-5u@4RH0d%fO^YpqtRF!Sf40i!6wzULwO*GF=Fjg{qPtbF;7 zKNlAzM=wtlMfkD4j$}B@zjIs{#+br;CN99!N(lgXo(IQu0RYAr7-MSp>jN({XFil! zDJ6-ua(HkciM67Xs_pZiQA$ZS4D;iy%!Q9YW_NE70C0JARZ_(2{X99DcLX9LA|fIp zA|fIpBBJSNttAM8dbCor-ZL;>c_-FNHw;Ui?_GsqRzd&0xq;)li28keTUx5DE`P12 zKX#l_=6kanoEYY|f#1JU01coqg75nPAXO|vQB8kb()j9Q{jyQXiQ~&?~07*qoM6N<$g7n$|DgXcg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/meta.json b/Resources/Textures/Clothing/Mask/welding-gas.rsi/meta.json new file mode 100644 index 0000000000..8e9b857325 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/welding-gas.rsi/meta.json @@ -0,0 +1,49 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6f5ca45e3ac06b30fb1957042214a888d8c01722. Inhands, worn sprites, and vox sprites created by EmoGarbage404 (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-up" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "up-equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, + { + "name": "up-equipped-MASK-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "up-inhand-left", + "directions": 4 + }, + { + "name": "up-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..90871d7d00628e657fa43cd41161c429bcf495c0 GIT binary patch literal 624 zcmV-$0+0QPP)Px%DoI2^RCt{2+Odk_KpY0}&*R#~msmDCf}N6nt?Z61{z1HluynzGbDdA1&4HL= zxh^)^FR>GhBff;}1I!f?&)lip#Bte$@7E0>Lo)xF3FI4qh-?i819Pr@ZNuSkdaiBb zOOcyOrPAzN`!o4!dxMA=V@$5<#u$i*iK3|F_VKRIY5+vU^m;u6LGaJD@pudX?=lE$ ztsVo zjvp$OO78k{xx6?q5fO8&-)6Hp19rjaa~L*?_U|mr5E1je)q;0_4`7!cb~+sZ#Z#j! zZtM5^c-w9P0D85;&(X+P66K_mtV*pQz)iV~Mk8O4qN$NmDwj7-r&GLbw-}AbPG%QS zFdYW|Wc2_L$8qkOtC;LaKe++P&IlAa7m#tf1hQEG?3Td%^%Z)vL6Ria)e;d?uh;kI z53(iTviiUUGvIGg6qQ88jCMz5&3?EyC%>mlcf?%_FsY({*0 ze6(H`N-6W}Px$)k#D_RCt{2+OcZmKoADt|KJ|QM6AHBV%+B%yE{^BxHoaYg$hG-FJYG)c)b4_xemn9=O6T+9MQIl#*_@ zTaSyPfHCHCtUeJD5fKp)5fKp)5z)V@Q8(vuJbtLUvssp%#c>P(D9bWE$U%hd!}<%0Ilk(asCv9)y%QR9CQ~Qxws%UXK&(WmsrUqi2=PKgwq5hG_pB3Q z={}N@w6w;4#?h1qrwx8?uH;uxf`LU@J%&=Q6X%_Kof13izHD+&*NK}eHWeoKEX!Q= z+9K@z-gS>7E}N{KQY!qjtv-5p*<;1crz&_vx7>a^!E*V{j~#D*OZ%@CtNLrVX6w{V zd%o|wo!6c1|JKaRQz&b9s{*^h{PXe*8Vo#a%wK-hGBj)zyLPK)Z&27euWM&JJJQa* zJpOxk+PRe-A$75?F4qfVdaNR+v;1Z$%Ad^1@F08t`ng{%=UzL9aIKP3R)~n}_vn+k zK^>QVm^yt^Hd%CXR^5uamV~Vb1D1X?>M^vE>%aK6?7Y^|%{P4*Gj3`XZD78k!WlPj ze)iO3>kDr=Pmr$)wq;q`qSHHlV*USnzmr0K{$#7RQd%_EZ}|*)K6Z=eQn_gYg0XsH y5$nPv_U%iukczE6|NHGWjfeVtb36V`m;ZHK^5{;je|5n4VeoYIb6Mw<&;$T8GRe{a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-inhand-right.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..1362d990110d6d49356c5d116fdad55dc9984a75 GIT binary patch literal 474 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zr+B(JhE&XX zduyZDVFwwu5B?tlTfW(EnLHu<-*_ z)SEIZLVEIyhrbUxUcRuqU-|4OSqB$5i0?6!vO8Y5X7}~lt@AgQr6u=to!EZyxv#;o zjA^O6{Di*Vdu`=ua(dHa?v@in~!{n1J&jVQ)He5RtCH?OEsk&zm z{Aaql6hHs+>{nFr^AMM+?=Rj93&yH@8uF#C`@_u={@Ie@LF(pAjilds@8A8iW)ehz zK-*&yy^nXuuMN4L&UPy6m)Uh|E1%ivY;~*l%r4p>eTUb0_E`hD{{36mbRTtM%#dDN z80u>;keRYJKHq^u_}6!VX955JiKm+WJ^uUm|G9x2`pWNX4R=-WZ;8At|5u{3!|u-g z$BA1HeR;%m`Lwsi^C(*bMI|e#-mceg%WmJ8wbg9FS_2oC*xxK$>?Hq(?}!uxMizso LtDnm{r-UW|_#4;7 literal 0 HcmV?d00001 -- 2.52.0