From 01f97a8aaa8bc97b81ecb07ea23cf4ffc09a2b7c Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Fri, 5 Jul 2024 08:56:38 +0300 Subject: [PATCH] +3 berets (#306) --- .../_CP14/Entities/Clothing/Head/helmets.yml | 35 +++++++++++++++++- .../Loadouts/Jobs/Mercenary/adventurer.yml | 27 ++++++++++++++ .../_CP14/Loadouts/loadout_groups.yml | 3 ++ .../Head/Beret/purple.rsi/equipped-HELMET.png | Bin 0 -> 485 bytes .../Clothing/Head/Beret/purple.rsi/icon.png | Bin 0 -> 234 bytes .../Clothing/Head/Beret/purple.rsi/meta.json | 18 +++++++++ .../Head/Beret/red.rsi/equipped-HELMET.png | Bin 0 -> 507 bytes .../Clothing/Head/Beret/red.rsi/icon.png | Bin 0 -> 241 bytes .../Clothing/Head/Beret/red.rsi/meta.json | 18 +++++++++ .../Head/Beret/white.rsi/equipped-HELMET.png | Bin 0 -> 473 bytes .../Clothing/Head/Beret/white.rsi/icon.png | Bin 0 -> 226 bytes .../Clothing/Head/Beret/white.rsi/meta.json | 18 +++++++++ .../Shirt/Cotton/red.rsi/equipped-SHIRT.png | Bin 926 -> 931 bytes .../Clothing/Shirt/Cotton/red.rsi/icon.png | Bin 461 -> 456 bytes 14 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/meta.json diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml index 596143eeb9..a66c6ce598 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml @@ -45,4 +45,37 @@ - type: Sprite sprite: _CP14/Clothing/Head/triangularhat_golden.rsi - type: Clothing - sprite: _CP14/Clothing/Head/triangularhat_golden.rsi \ No newline at end of file + sprite: _CP14/Clothing/Head/triangularhat_golden.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadRedBeret + name: red beret + description: this is beret. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Beret/red.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Beret/red.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadPurpleBeret + name: purple beret + description: this is beret. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Beret/purple.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Beret/purple.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadWhiteBeret + name: white beret + description: this is beret. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Beret/white.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Beret/white.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/Mercenary/adventurer.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/Mercenary/adventurer.yml index d72a54739f..9b50e50e8f 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/Mercenary/adventurer.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/Mercenary/adventurer.yml @@ -108,6 +108,33 @@ equipment: head: CP14ClothingHeadTriangularHatGolden +- type: loadout + id: CP14ClothingHeadRedBeret + equipment: CP14ClothingHeadRedBeret + +- type: startingGear + id: CP14ClothingHeadRedBeret + equipment: + head: CP14ClothingHeadRedBeret + +- type: loadout + id: CP14ClothingHeadPurpleBeret + equipment: CP14ClothingHeadPurpleBeret + +- type: startingGear + id: CP14ClothingHeadPurpleBeret + equipment: + head: CP14ClothingHeadPurpleBeret + +- type: loadout + id: CP14ClothingHeadWhiteBeret + equipment: CP14ClothingHeadWhiteBeret + +- type: startingGear + id: CP14ClothingHeadWhiteBeret + equipment: + head: CP14ClothingHeadWhiteBeret + # Mask - type: loadout diff --git a/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml b/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml index 8e13f2c5e5..1806304c3f 100644 --- a/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml @@ -32,6 +32,9 @@ - CP14ClothingHeadMetalHeadband - CP14ClothingHeadTriangularHat - CP14ClothingHeadTriangularHatGolden + - CP14ClothingHeadRedBeret + - CP14ClothingHeadPurpleBeret + - CP14ClothingHeadWhiteBeret - type: loadoutGroup id: CP14TestMask diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..586fdea5228cf329c3e7db2bdcdd233d0b32ae2a GIT binary patch literal 485 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z=X<(1hE&XX zduyZD;Q$e~2m2R1TA;gBFHA?T$y@Aw$^8X8EOtES{AFR+xVyRg2TNHOM`Vj$kZP=s z;>&4ItzP6_HsQ2w+|u!X`_p?S&*xp9@N^Dai;Vls$;`cZyEkuV9q8GIK+fKoeyKhI==}zq7f1X1sae<&nm-XV|A~JrR1o(fpgMZ%kpejqdDSkzz#lzydZG4OPKGrz=`W64}VP^*dyy*YMwypnYSzgwU R4ZwI~@O1TaS?83{1ONm0;3EJ4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0903354f40ffee211d508ff417bdd69f2d098b2c GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}OFUg1Ln2z= zUQ*;^G8AZiIG=?xX>*s7!^2gps+j!_a$4}IKVY-S+rZ`D6fbgf%MR0{6LU7FNtrpG zQNMj=k2>3wAg`57v)}4PzP_YicGjzHO=;%d4~y%sKU2A-skh<#ah8NtQVmxxF?^`m z&amaKcSw>RuX*TS-m}e&PV%bSsjN=&3#IoxJs8V#S@eYS@uv6vr?;3txSLq;_w3u4 ik`rE literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/meta.json new file mode 100644 index 0000000000..e6f822d30d --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "CrystallPunk14, by Prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..28c6d969bff1c5ffdee2c7aa8ebca8d5ac9f224b GIT binary patch literal 507 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zw|crbhE&XX zduy*BlcNah17__;9U-Zor@7kN+5&C{e_-2U)1Lpx`o`C(?7Q7aeST30Lk z*X5Z`v)}W$nD{S^VXIa!EXX<*a8gn_dGAEoUy3_s-(OezRqSArp?mVGBVU>K@0_Z& zD$Vj?Zb*8D^^V!L?R5;dwJe$UPULl{6ZTi(E-<&>BKx=E7DL)3$<(%O%rE%rS>A`0 z{QjkX-2VY{K{tOcdvi`vddgk?U|Nf4jA*}PwzKdV%{#3CrEVw(rd-K5qFE_0F@aq`kk7Lj5Pj;U$%`DhF z$6>djd9sh?cpPbzJ4%^?~-~B-SL+Hxc(~6Wcrbp*Y@ReI)e_(0% tiP%e}9lx2c#s5DoGY{dEj*fpT^nV*(ZPc`jmIB5mgQu&X%Q~loCID-U@mBx< literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..225225545decd73e5901f2acdeac36b3b7da9e00 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}t36#DLn2z= zUb5yo-4W`bNA&qhFuF8%U)K0+;@MW#=Dqv?P>W5 pE04)v-+onny|b7ThvL6u%q>k;Po>jlZwES?!PC{xWt~$(69C0VVaosj literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/meta.json new file mode 100644 index 0000000000..e6f822d30d --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "CrystallPunk14, by Prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..2d84c241fa7399f8d23e730d3a8ff088058389b7 GIT binary patch literal 473 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zCwsa$hE&XX zduwmjp#%}O2jMSlZ!{^qdXw_!==FtvP246wV_7t1-}z}jii`Z5rhR^<5VH2#m#1eVNH5 z-aByZ;Vu31>t~#`Gnnsx^sB4=3*H=FhN(rIOCR05mcDNLnHr8|KMUUaE$3%g5j&^* z^?Z*mbLp?8i_aap`?K%;&q=pd?z~s@ddJ;;@$+Bv=IBZ~Jz|`3=-i>+oRY1-ru>;3 zai`&I@W%JYj(FNI1mF4o=Y(7P;pIN}86$ZjN)CEO?z&xj=8voR@~gWpJuLqDN0aL) zQ^R}dk~i5lTuXJEznDEEEfGPYO;(TU&GHUVy;frssNH&?*F>S}AuN471KCb!9xc_R$X+0Ou zKPxm+GdDMx9qLV=%Wv>)?TKcU>x$>tS^ED!m7CXr1pcki|E+Ua@#WN)@xZuZ@O1Ta JS?83{1OPK@-%tPm literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1fafb5dd481e865355782a04b21ea0aaf52993d4 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}b39!fLn2z= zUNYo576DlOtXU5%zd!wEH|6Zv+U_} zXFh7|=s3Y~vq*H0{$c%1X~}k#@oitrCf8WMDPQLEx#9CuDTb~)j1M-kGUR?|dGIg8 zSNYksPfF$UFYS<6@V?4>Nv?yIjhlJn5a literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/meta.json new file mode 100644 index 0000000000..e6f822d30d --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "CrystallPunk14, by Prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Cotton/red.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/red.rsi/equipped-SHIRT.png index 5a057d26b06638433bd281960dd767661f34271d..1db6ec9a7b930eb86b34d18c45e5b74c80a7a7d4 100644 GIT binary patch delta 895 zcmV-_1AzRV2crj&F@If2L_t(|ob8&yYT{57hJSUUAyYRar2%yzlrrG1bmOMXE4cL? zx|s)=P2a)YFt1Q%<3?sDbfnNlQ&0wn0c|i|lFTAK@fxG%#-y8`4@zo!lmFavPi~6m z2N;H77=~fqDTSm1d)20IxgLJn&pWTVHtK$(R78LNl=!|X`hTY8VYozW4A(~8ztVw; zP}5H|uvcyRZ9~JwSqZlf_Rauq&JB#GE=IPoTB7zPClm9-bE)fQqMHTGR2e38KH2McC zfJ7#uh=setcF~Kh^!3Rsj$^dkc4ki73VfmzG`nGITDD{)c^kyk9MG`{3b9 z2m15p!nIKkGdiBS=rn>&j{-O;mC>I+6-=w{50^ne$A1u~KNAkd(+V!mN*l=-SavG? zy$Sf`{CV9;gNZNP6-IUuqsL&Q8BblzgoBz^!Av;eb-P|wszmi=X!0}Rysml?fTyg# zHvt6Q?4(qNsd=brm2g)!H8}`xV|-S~_X~6!DTX52hK8ANV7c4l50NMVMDUF1034W_ z91vi+-ha_0pG4n689)&eA;Jxq7GU9S|9@}@<(0auocf>3`o=k${JLcGVHk#C7=~dOhG7_nVHk$V0p)LU<%VM(Mu;>V6O+<_IlkgDNdQg!Ej$8&M&M6qWNSxc7=~dOhGCfZ#DCIW V`o_C3vcdoW002ovPDHLkV1jT`nwJ0o delta 890 zcmV-=1BLvf2c8FzF@IP|L_t(|ob8&=YT{57#y`bf(<)M_GK>&#Q$lFnbu&xfpu2g1 zK7qR~-Sr9P0lMpIw%v6$-RU4w1_A*~CrU(OOn1`EB0aZB{L|cMIxus7AkldBJNMjw z;`soEVHk#CnE#Yq(uSRe=Fgt-rX>O(fqzaz^C!hdGk`=)Zwhyj$Hblk02*oy*Qa0nlA-_rCiWceA`jD>t_&_M>-59W zy)^n86Yw}I;O71ThH2r_7~~ELFA>p(T8jj5PzX){!+*4JbN_(HS)x5wO5gE3p*OMT z;<;g3sq{Ct_-6mi0YDqN4+I(Rj)uS}m|_!q4#)FQQWQ9zCqB3CsFEeFABH;ac%B$_ z8c!L0sUYdBEh&oFm1z$!y(!-NovIus#4yWD`XS#&foS2 z!V{3DB%e3|Buv~rxuQZ0U}-e6B&^k})^Ydbir2COAvFWSW{7xwZeq_PZjr2L=~~1W z00h1SdL3S(NsvkaO)>HUeE;4?x#!&f|DJPlL8H-V{tM%JTMdP+ zj>Qaxt;Y5C(U{Mai;DM!!K5qr$;43DYSI<-g~2H%at);73x6*HVA2&|1jhBYnsfyK z3okm!M4<}wniWPJliAV(VAL@)fpNX9MjaD?+0tXwG3hlcMYhd1ke)u>eD3epEF(U6 z0?d6flSQkLTY>a6>!{35hB&SSV9*lWUfHT)Q~_{Y$xeo>qw+ys9v8UB? zi2@o%l}!|6d2=7`y;Uh!J>DqiDkqzjB55*SO#pO;Jx(mLHw^7NJ)BZ0s&Ss zn_177GA>l|vkW9HxmI8vd{4#qEi2B+3Bb3v;VEU;Xc{yc&7a~8Fwmx22EJ{I00000 LNkvXXu0mjfXv)MD delta 422 zcmV;X0a^aY1I+`FF@J|iL_t(oh3%BFYQjJq#(xIK*h*1qh6+L!38A{Vbo32;hdx0z zN4GvfAE28L;-;mDOCX>_l!!!)Tktx_g=$+9DTNm9wNG1=E-{g6K!1u4=TiVWt@I47n2go* zo1-VdXb~nRv!;-mfZUB2t=PmG%U}zDSu=QPJcy#M1F#IXY+?;BS{=>%k%8GdPk%7M z^?bVSICqubCx2thV2fEZl6Qcs{GP5m&bgjXe=uRT&ZinUTk#yc<^UWHoxh2-Lo?0~ z5if%+VH8o+b;2l0=8YC1PySmjRUODwBykK|G;WI&bv?NivIo3q#d@b@7M7%E^Z|Ls zwG&~0^-g0GXS!5JT;vwuv3xJ?uH&O`Qd}O{uNnZp{2v=$8offHP$>Qk@14V