From 9797a0d42ec810f605898bfe313a7bb4eff2875d Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Mon, 19 Jun 2023 02:14:31 +0300 Subject: [PATCH] ert and death squad gas mask (#17444) --- .../Entities/Clothing/Masks/masks.yml | 32 ++++++++++++++++++ .../Roles/Jobs/Fun/emergencyresponseteam.yml | 8 ++--- .../Roles/Jobs/Fun/misc_startinggear.yml | 2 +- .../Clothing/Mask/ert.rsi/equipped-MASK.png | Bin 0 -> 776 bytes .../Textures/Clothing/Mask/ert.rsi/icon.png | Bin 0 -> 391 bytes .../Clothing/Mask/ert.rsi/inhand-left.png | Bin 0 -> 439 bytes .../Clothing/Mask/ert.rsi/inhand-right.png | Bin 0 -> 432 bytes .../Textures/Clothing/Mask/ert.rsi/meta.json | 26 ++++++++++++++ .../Mask/squadron.rsi/equipped-MASK.png | Bin 0 -> 842 bytes .../Clothing/Mask/squadron.rsi/icon.png | Bin 0 -> 529 bytes .../Mask/squadron.rsi/inhand-left.png | Bin 0 -> 451 bytes .../Mask/squadron.rsi/inhand-right.png | Bin 0 -> 470 bytes .../Clothing/Mask/squadron.rsi/meta.json | 26 ++++++++++++++ 13 files changed, 89 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Mask/ert.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Mask/ert.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Mask/ert.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Mask/ert.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Mask/squadron.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Mask/squadron.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Mask/squadron.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Mask/squadron.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index e9329d9412..cc78985790 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -262,6 +262,38 @@ - type: Clothing sprite: Clothing/Mask/swat.rsi +- type: entity + parent: ClothingMaskGasExplorer + id: ClothingMaskGasERT + name: ert gas mask + description: The gas mask of the elite squad of the ERT. + components: + - type: Sprite + sprite: Clothing/Mask/ert.rsi + - type: Clothing + sprite: Clothing/Mask/ert.rsi + - type: FlashImmunity + - type: EyeProtection + protectionTime: 5 + +- type: entity + parent: ClothingMaskGasERT + id: ClothingMaskGasDeathSquad + name: death squad gas mask + description: A unique gas mask for the NT's most elite squad. + components: + - type: Sprite + sprite: Clothing/Mask/squadron.rsi + - type: Clothing + sprite: Clothing/Mask/squadron.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.80 + Slash: 0.80 + Piercing: 0.90 + Heat: 0.90 + - type: entity parent: ClothingMaskBase id: ClothingMaskRat diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml index b877a24cee..3dbb6c18f3 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml @@ -33,7 +33,7 @@ jumpsuit: ClothingUniformJumpsuitERTLeader back: ClothingBackpackERTLeaderFilled shoes: ClothingShoesBootsMag - mask: ClothingMaskBreath + mask: ClothingMaskGasERT eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesColorBlack outerClothing: ClothingOuterHardsuitERTLeader @@ -78,7 +78,7 @@ jumpsuit: ClothingUniformJumpsuitERTEngineer back: ClothingBackpackERTEngineerFilled shoes: ClothingShoesBootsMagAdv - mask: ClothingMaskBreath + mask: ClothingMaskGasERT eyes: ClothingEyesGlassesMeson gloves: ClothingHandsGlovesColorYellow outerClothing: ClothingOuterHardsuitERTEngineer @@ -123,7 +123,7 @@ jumpsuit: ClothingUniformJumpsuitERTSecurity back: ClothingBackpackERTSecurityFilled shoes: ClothingShoesBootsMag - mask: ClothingMaskBreath + mask: ClothingMaskGasERT eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesColorBlack outerClothing: ClothingOuterHardsuitERTSecurity @@ -169,7 +169,7 @@ jumpsuit: ClothingUniformJumpsuitERTMedic back: ClothingBackpackERTMedicalFilled shoes: ClothingShoesBootsMag - mask: ClothingMaskBreath + mask: ClothingMaskGasERT eyes: ClothingEyesHudMedical gloves: ClothingHandsGlovesColorBlack outerClothing: ClothingOuterHardsuitERTMedical diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index aae21134ad..79fb317924 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -40,7 +40,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitDeathSquad back: ClothingBackpackDuffelSyndicateAmmo - mask: ClothingMaskBreath + mask: ClothingMaskGasDeathSquad eyes: ClothingEyesGlassesSecurity ears: ClothingHeadsetAltCommand gloves: ClothingHandsGlovesCombat diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..da0578fbf0fd1ef7b57a13939d19b6d6ff0a06b3 GIT binary patch literal 776 zcmV+j1NZ!iP)Px%!bwCyRCt{2nlWzMFcgOW6hc4^h3tiqp@QI0AXx-$<=QPb=-5;A7`;Kaj?D!! zXG<2t$Pxh^WTQeTFA;$N;ie7_1fyv^~^4r3rbScWIhpGMS)l+Xv~t2@#Lu*a@R;Tf}iZcq3!7y?6ka zOeRRvG+5tz2Q*Cs#u)DI?qH1RKdrSP`rb56)3@CY&{_}1eel`=&gI*Wx4<#5|79OI zzV8F0?*cc!F$P-ee(}bbV0|wGoKVIy)ax4Yw;1)hM#i(j_hWJO_6kK&z*-Aq49c?X zcVAHyLHb@tz*-9_CG-!CEXh!s5}D3mjDeIARaJQh;KTIi6#77eF*Z1Ij4^1fgN~t> z0qga8k1^I+YkM=?qUX^ZQ%t=B2-SCe&iSD4JE!*pob#?I3M>|je(dJ`4S>xX3JKyl z2?~~T{?{Lym$rCU$Zmz4+ZkC}YfL zss~Y)Px$K}keGR9J=Wl(CA!KomufONtQ^qD_bdf?aI4*;dQ_iv2jhVGGOD`vH=|DiAPJ zIVfZbAzR1<5er{f*k(>MGY@j_o0pq_$K&z*Gn26o=6T*f*6O+z>jh)Yi=tpQn+>(o z=>*VAn|K>*{*0n1o=)aZ8vroI0K=_^)zu}4#+B!JAIC8O)9DnqcjjH!4f|JLg(w5o zTCBAwrKsL3A|kRRqtOlL#hFF9z*;Mjl!s6$#btA0m8^(AZWD-!F+YZ8(-4-SsEJWu zL9h$p3-;f8f?dG%^GcRvx4M#Pi9?vCDM~5YZA(~&tk-M8GNj$MD5Xf#RHP>gVUi@h zGwHexW6Y2VSF56m`C*RM`Xz1A1hm!@Yc0p)aWG#lm$+ILRT4R1tv(2?qUctuic5-~}M$x3#azc`XBj$2}nhR-Z%#bw?%6s4dN(U6xea&GnOV|Kqlm;knGIO)Z9O ziYz(Xqo<@=TCC6Af9kdPLf^Fwt5%6IJj&bd94KO8Kd-U>-FL^zYqu(N6SbQ8z6)pP zmPhmd{T%#E5DA>Uc0+K_tGWYwGv6qmDZ5f~*WKgt7U}uj9J7`kjQ=JWvi$J(C0qLq zZZk2=t!;_C&v?$VMLwaf)fdli1?8EWtJEm_nyEFTH;v3iLwaGq0lQ-Od-)#8o-JaJAxv$+? zFvTfy+CmL36JO?~B5SrjEU;Mftk-t^B8_$Yi!0gH4^;PmJ}nu&*Y)=mr+cjPzp7tb z-`ua`blGG_jlpx7J>M_>UcC6^JtGD7kfjQK6Fl4a?yhNk{%p?c?Mg;f^(DLp#|~8U z3pRe2J2s;-=%13{!H*R!9SdF`v%mI0KH&OSE{7X$%T}!7T7F#k!^QdWYu-1@owl}; zSX;V(l3wixhpNiX4mi*d)SPnqxJ!2P_9Zur1&mjgl)RKY@p+HFV>idGZAULvv$gqX zeOrDDC}mmMWy@?h`Fev$HCx)!t$eAGY->wz*yJB7wX|}zkJ=H@tiI^~Bkt_gtD7br SG}r-*0tQc4KbLh*2~7Z^kinw> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/meta.json b/Resources/Textures/Clothing/Mask/ert.rsi/meta.json new file mode 100644 index 0000000000..c46db45e2a --- /dev/null +++ b/Resources/Textures/Clothing/Mask/ert.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Nimfar11 (GitHub) for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..d87712442082daca23ebec61ef39b0896b91a386 GIT binary patch literal 842 zcmV-Q1GW5#P)Px&1W80eRCt{2n!#$+Kp4k=EpD9%+n_=MJq+^tQ5Z=ENnLH{J-zZmtmOyfbf5_(e;m6 zmeqg(!tr?Ad7KsX0a!)69-A z2LwTI?TPeBqra~d$I~hMO0A^tU9~8RYNZrm7!m{l)>@1)IOnLUs`oC4qNtAJm>>uk ze)`1alP6efxwyFKr0>-MS(epyc*r1n!QDr%aPEq`k6tl|USNlZy>~$~zA*-CZJWF? z=GuK9yb559A-FuEnhltpe`G6p&FuUm)oeg;dDI5d7seQpB*8g{F@~}%+wMz}q?5i^ z0UDwEKi;)PsAdE1|9IC1)+f$6thFemaL%V>-nLKn@2f*)S<2dGYXNNeBZ*B5|AP9mW2!bF8f*=TjAPD~*op*D!*4KQvv$M0c z?hN0Qey445t#$o!u^>%T(lq7eV)0i%eR7lf-UZNF*U#s3j;GVsj69xBc|M=7r3lOV z@Y^t5Mc=D!wAOW+rWj)=isIV6#ux1SRcMm@(+EwHgfI*_IXUr)!Mg(*TRKS+k|Y7Z z4iAYQzooj`^&QTe>S~wh@muWh5TK2tvC4h%w#Un|B+qlovLp;clv3W2n{xc)GcM8yIFDLG+z0x|M z31Ij9oYS41wH%ac4rwiGDy7!G4r$R^*XvvZ{A*o75ClOG1VIo4K@bE%5NAivR!s07*qoM6N<$f?IBu%K!iX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/icon.png b/Resources/Textures/Clothing/Mask/squadron.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..707d9c7c148284442182c926526a210eb593d024 GIT binary patch literal 529 zcmV+s0`C2ZP)Px$%Sl8*R9J=Wm9c8uKpe(@GHTETieyS9B?S$ot~G{2(2&8Chde_m9r_ZXL&we; zy5u_>jK;cb`ri)YR1c?^x@; z7)8ziqTOx-@bc`e(!cNS0?_aG zjha}ifubk?7GMSKNjNjD|gIOW`%nm!5yL03~4r;{>Ax%>wzm@+2-}kFZ9mfIg51e}X0WmvT(n_){d(eO721+x> zacD_d>0)+Nty@x7K~@=V6reQqJdYpA7XX4FpwsCP1OY&$mmwZK0KjB2VRrEetu=8R zGd?*Xj$;7kzdi$Im(p6dq3`>PtruJ5mpLsdx!B&O`K(EPnXh#t*3{J0{8R1#*Cx2c Tb(Gi%00000NkvXXu0mjfXs7HT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/squadron.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..70795a046567fcd668870291ee3bec5979515143 GIT binary patch literal 451 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zYdu{YLn`LH zy=CZqI6#E;LGsEZu1Q-i9lvd5VSlHzq~KhBLBR)eORLfsZ?t}JTY0cA*Q?~rlH>F2 zHSyD2`y!!8m+d_J(w9Y_c3jxKhgm=n222xrG?#u}Vtl<+<#3PT(rZ?G5$55{S=(*^Z zUaXPX6J=u_WJW4<-ZQ-7-VtB+aBtl8bE|m{6_|!(CNVQK)D<@0J9Io?{^IRBT=y58 zkbYwMJnVd+h^hSpahLLjYf{&uWXj$ptUdb6ZiVvsVvFYnv(K8fDSCdfUphtW^WNY$ z`|mFP)%SSEH|r@u(%tJluU*qvdTMjt_CGa0)GDvKEA@9Ez>2N2;tqD-S$;cqn7y;IvM~O@EhF>Cx9{AUb!z{Z*bX0Xh%n`2K4c7)w)Uc8g$71;=Qh)od-MaI9?|%kO)h*X7bZwopc{NiFHMgIL>W*8_ zo~^s=@}KihZBILKnA`3;^zk@%-7yu