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 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z;wvd z#WAE}&f8grdAAKj+Ww0;IqSF@Y=G9Qz8_wHRn&rAEYTNQuZGx5E={Vv~yDE?!$A8s+8dwRQn`vJoZ z|5N2H_Pu9b{GQ2tzad-H>$;D}W+c?=GtUV)W_;zf)W_`-Uw643+kEhQa^cr+T&{r! zqPUZJPHlQq9v>*;_$$u+Koqy8>KFcAos$8xgl3*g=xLlH6dGE|{^0PJ=OVuxnhnh? zih2w));9MooX+_AYgNDDwaDyh<2#F<*~`pvwY>J+&js(Tmw#uT^Ld>HmyTF> z-J55Bc^l43b8$YhL#q zcU?4+&!n$n51jT?zB52Gbpq!->jO`pEuF&9uxeGoho1~5+gTVk{Mzzq?j`Pzp*fFs z7-Z}-ua${le%=<&QN zv6lb4Y~mUkx;VAd^7-5;LZ37E5+?WE*PZs^Dj(k!$%7Kj zL0r$DKi_bzZ=TZgIpsZuG5dEPdvl$KU$d`5q($KFyZMv;M@~lxy^iT;^IvYR-;&9> SCYgbOfx*+&&t;ucLK6Up;AeyY literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/icon.png b/Resources/Textures/Clothing/Mask/ert.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ca2cf982ca4db36cdffa308000ad15428f643ff8 GIT binary patch literal 391 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V083! zaSVxQeLH1i*C7WH*M9FVL7_#y9V|_;IoofBo&MYP*J6Jn_vtIY87Cdm5-VXBhAm)n7`=#?CG-`jz9kR$9VEa{%4i83M@vR!n z*P_;J)mXaXp0<+GCY8k(d7mGh>ALekl=j3a?E#ucQ;QR)uIaGP6Yl6Vv~NqhEHG{1 ziq61z#|_*MxWC=6Zi+qd^|RNsl_bLN?rzgq>Tx+_ zi8@!}B$d6!FL&`JpP9fJzIsvD&&0lKzf^NCvTV5~oUMEOaiKxH-t-+&qM<^T2~XDF x@O@;L^Zj{vzWuJo<7#)b48K*_$n`%K-+XhT4e!(E91IK$44$rjF6*2UngFA@tZ@JU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/ert.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..637f21f5d0d3b4eba7e891df48f5141f695ca2c5 GIT binary patch literal 439 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z*y+% z;uumf=k2Y9*@qoO*gmXZEXv*(BFkY@VS z#fqs0+ny}d`S3R+=;PC0oyPAOUEn~u;{D>Xd1Yz$o6}}|x3hYlcklSK)W|lS(-WTm zR8iI0+O+5UMG0nx6Q6CamGTNUez%k3Yd<<+Pu{5ow+QTd{|p#i!I0&L zzc1O^Z*ZH5VQy_p5sYmJAFG44$rjF6*2UngELhzC-{3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/ert.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d4f1028610a279f310f818a798d93c9755ee9e13 GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z?kLf z;uumf=k2Y%S%(coSRYKD#KY8V%jtM+olADLrdJ}u zUOLB*E)BE1|ERuLMOybelM5V}M`Rz4Pv0?ptJ$5|-xJ@sPOnY&5t_W={`+RbXYcmB zUdVmz)`BTck<%7xaGCfrFBMs{^lbOP<6m6Ku704p|MO|d=)JDLuQ=Uf zo&Qz++WO{x9jD7CJ8BG`%k24n@%Q4zC+`_4u!k&F@SEV-#&>s3k44ofy`glX=O&z|7+5 z;uumf=k2V6Syvn+j@Rqv&E>egz=_G0=VO2qKcn`P2D?W62i#wD_q;s0SpUM}<#x^P zwpyp>c{y$p^^y{se$y*G;$X#umbLTLZm$v9FRznh_U6z2_ot^P&iLQ(p?>qluleR_~Fcz=x*~8Xmu# zqR-CG;#lyu^NZ)={p&@JU)KEXwRXw-*sU5}SxZF{C4^WQuSNA3T0CE|YSnkWjzuf_ z9?wwVkf{50ka<(G`83$L7tOx4z@KKc#MYZsFR}zeO7re1k8UJbjw>%(n>Sl9cjbGKY8owZCNS)=RGt-Z&@-~0~EnDpl|hwr2o10G9D z%a2_LcQZ>xTX_miQeiy6$KNTpf9bAUUuDnDew8)-#mDG39|RWkF5Y;m_T#qWr#Gpb zFFv(Ng~xeH&>Pzt{sYr)z58l~&-CQJd^{Ywnwm&#E7vHGf}Uy7lz8 zXFJR{n{+Lz`e&@XtDNgXmcIJC)q5{lE#OS}{%6kRxpTM5Ov&QQ)XmmfdTk$H=EbP% ouVa}1WXC!Rupps4^Zg8p`P-y_)RlKLFfcH9y85}Sb4q9e09$UB%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 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U_9;V z;usRq`gZEZtlJJU$Lfu;F0gi`c&Vzg@-AIx+U9g&!okVyHqM%|zl0V#A3rC#>ly2& zlylrAoCi01YOd|(R}?V(kf4ZchnYcEDU zw%~IOe6UN;iDOF8)puL3sZDz}-y#3aMElC_{lyWy;!Y3V%Ou&>_usqm+nVu|@H^9U zA7>Z49hTevkkS5g_?6c${5DZs+$uynej zoGrtF6r;qlkDO~w3uTP$EEW5b8J_L8V@{iXDQf$|_rJT>ibp@0ZmFxe^TxepKi7EH k&0Jrqd<_)P!S5KZtL->aI^_l@0|Nttr>mdKI;Vst0BEP|AOHXW 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!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z*y_) z;uumf=j|;+@52EitPhe`CUH&La_RVOD+~KOr6mRD@(T(+m|I$vzIdbcgWJl3eYsvG zXO9agk_ox2Q1rlP8-bitN$}EYlfr1gG!@=3Ot5# z{YTG5zw}~_%$_J4^B^-)q4S>M759$#vWI))uAf`YbEv>HBr}Pbp`os@`QD-90rMAc z-{HEy;Dq!O%jaR|14T^jABek@H(Zmt79~^mE@AD_Uv?{$&lg)fH<*3atWDALi~Z6m zTA%j@zuA9x@vpweJHA;@36kz!?|JQ-#?n)p^S1w~`Jq;M)m^E-0|8cSofUVm`yOxJ zY!~^5@9%G|UHnS<$G(0AjtR>$*V;9``1->vw3cP7&IB8qq!s} saM3;EEg!>^-yCaI?z$^1`u~*qP|R{;!Kx%q1_lNOPgg&ebxsLQ0E`#NVE_OC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/squadron.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d1ecbf982a50e28aead09f2e40b802cb81bd4de6 GIT binary patch literal 470 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z&OFv z#WAE}&f8mt{!E4vY!AYljwu_;NX+uvvBT`0m6e6@2W}aeKfZnE&a6}W$HaE{fJ4NK zi5}AJ%${qSFDg8&66klB{5`U2`aRS9s+YR=*#!h)VC{k_MZ3>!&|5ks+B{z~f8qRW z%~XNe1>(ow)!7_-TCgMRUh^8xrBk{Waa_$3EtEMd!JMso$;5U0?Xxxc*KfVuR{gpp zAb+cY1W(cDX`9uyT=VeHQ?z?7vH#n}3F01V?H%{zw@u!oa7^M#w5~+*gk_pruHAcX zY|g-t_1QfnE!5-*uhwSuE6>C(J3SW5H<9|=ckR}l=X?J%XsT|xW}$2AoXxA5YN)yW zL{xX&diHGHWtab)e`*P)Ncx$BOpcz*l#hxz_Y@%R7dhI2ezcRF?Zo)7zk zoOYybmh_2JLI5roj;Eh&?%jHzrTC5KM^1=&^czWr28+Jys}8<5&abSwIe%VbpgeD7 zTT0Qs@3zc#(zy%*Y3CcxAN$`RP|a3jX187O8;^+ImU)ayi*(|@ecO0<_OgAm85kHC NJYD@<);T3K0RTa*$T0u_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json b/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json new file mode 100644 index 0000000000..c46db45e2a --- /dev/null +++ b/Resources/Textures/Clothing/Mask/squadron.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 + } + ] +}