From a66f9d976f2f979f838784a5a4482b82561aab96 Mon Sep 17 00:00:00 2001 From: Ed Date: Wed, 10 Apr 2024 21:31:39 +0300 Subject: [PATCH] fix eyes + armor --- .../Entities/Clothing/OuterClothing/cloak.yml | 17 +++++++++++++++++ .../_CP14/Roles/Jobs/Mercenary/adventurer.yml | 12 ++++++++++-- .../Prototypes/_CP14/Species/tiefling.yml | 2 +- .../equipped-OUTERCLOTHING.png | Bin 0 -> 1755 bytes .../OuterClothing/redguardarmor.rsi/icon.png | Bin 0 -> 775 bytes .../OuterClothing/redguardarmor.rsi/meta.json | 18 ++++++++++++++++++ .../Mobs/Customization/eyes.rsi/no_eyes.png | Bin 4683 -> 483 bytes 7 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/cloak.yml create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/redguardarmor.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/redguardarmor.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/OuterClothing/redguardarmor.rsi/meta.json diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/cloak.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/cloak.yml new file mode 100644 index 0000000000..093d7b22a0 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/cloak.yml @@ -0,0 +1,17 @@ +- type: entity + parent: ClothingOuterStorageBase + id: CPClothingOuterArmoredCloak + name: бронированная накидка + description: Огромные металлические наплечники дают дополнительную защиту от отрубания головы. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/redguardarmor.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/redguardarmor.rsi + - type: Armor #same as regular sec armor + modifiers: + coefficients: + Blunt: 0.70 + Slash: 0.70 + Piercing: 0.70 + Heat: 0.80 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml index a3a61a2e8d..2ad6884482 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml @@ -3,6 +3,14 @@ name: job-name-adventurer description: job-description-adventurer playTimeTracker: JobAdventurer - startingGear: CargoTechGear #TODO replace + startingGear: CPTestGear icon: "JobIconCargoTechnician" #TODO replace - supervisors: job-supervisors-everyone \ No newline at end of file + supervisors: job-supervisors-everyone + +- type: startingGear + id: CPTestGear + equipment: + outerClothing: CPClothingOuterArmoredCloak + innerClothingSkirt: ClothingUniformJumpskirtCargo + satchel: ClothingBackpackSatchelCargoFilled + duffelbag: ClothingBackpackDuffelCargoFilled \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Species/tiefling.yml b/Resources/Prototypes/_CP14/Species/tiefling.yml index b83afcbd91..0bc4b13e38 100644 --- a/Resources/Prototypes/_CP14/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Species/tiefling.yml @@ -67,7 +67,7 @@ - type: humanoidBaseSprite id: CPMobTieflingEyes baseSprite: - sprite: Mobs/Customization/eyes.rsi + sprite: _CP14/Mobs/Customization/eyes.rsi state: eyes - type: humanoidBaseSprite diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/redguardarmor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/redguardarmor.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..7b7b1f9cb08c74a998cc406947a5fe956b33f6b6 GIT binary patch literal 1755 zcmV<11|<23P)Px*l}SWFRCt{2nn6e-R~X0tQ#WCpOEDW51w)7oTaql6z#ekh>#_veg{);kibp*Z zmU=9Or3lhv7hw77Z;b?O8V7HIzKx@owS*souTPhFNNBCc9oqmdQrL^ z6OSI!rR7D0v@k^bo1dMbAuWuh zSi4>gU|n_0ph|%tTYC?mX8=K;pFg`-E}>jMN8EcCMp)w$#;}{XJDqMY>oanjd7P); zpp0|GM+a#;1^Flw7(mTg=33(yewoWj&nMaWnklZ=O3;jeQ zUKs!o9}6LSa3--|d@KY2AYK_S^b;w$bA0K+XV%swr9jNV7q=wVza8xUWN}MM?i@oY zkgl&_#}$xSTbHH+BQ#`DK$OYimX!Vj^xek~NbMi?>;zN$hf)fM{C}-hMd`?Ze^|Nj zZ0X2=R;xDYAR@zd1*G;5rPhv!p`&zUTo6tSz3JLyaZ9?)-~rPKTf^ULRIpIrYb$@D zzK7SS@N4t4GgKrDc3c5Wfmk%cLrJ#w9^0M)Bn%z*R4?zG7&=xwRg`PZ3S1@%0H4Ay zbI1!n|A3&+kA?Ccf)$Gsu9wWHP%iN>%p7=TZQWLe?Fz6ekbd=&vhcIwslw+OKulHP z^9*3cQ$^6{htD&>H$jaE(CgR%G&|y@9WV5g3+?9AA*v}VRzH4lq<|<>ff33Kz-To<>BzvU z!^qQh1!UINrOetorUD}uJnEb}MB5pom!02D(e-Pvm39NRyM9%$7~dKK8SJ`sFCc=j z0km4R?FPh(e^_y>fD>Bx8cy%G!|@8ZDTw#e_eQ6Un5L**x67?`^#M%^bXa~(ia1n2 zl+^yAgaGK{h7nc|WWXzf92`QcRlyvv)7_`A0d5OyrZvmoXhbLUV0>W%r1lRbO|3RX zg4Wq4hK^Jpogtguseo+i;gvx?ntP9a%I!$I(CFgg;^N}s;^N}s;_|=4X`#eT;8aK9 zPe_(#vMW5er+VqOUhC^;X(t)2#T23^(vA*9V$ldsd`vugNDuOVBk1$<{6M?HiK}K? zuSxOIK?;D&9*sQU$s21yhX_Jvg7dR8w6*F2KvPO8dvGRQ$N9iiV1#B5&LnG^%nD1% ziPjVe8Gxn8fKRIc0OH=eNYrJXoapC?FoVg6kA+Ox-n#&rvr(+5Lj>VhphyY;Ok*T> zj`h*w5N@O0SGp{V)S3D5nL0s#yiI8p(0FJZX~m<*N+AYPg0FDH9Q z$q5^Pg&Aw{K@Q+Xcs3rO+vO5Qooe8aZTb(MjRz>v&B0sC;;cG~<|iHP1DGId=@|=! zIbDa(Gtl=?7#|&^)|!OT$OC@QT2?3OhlEpOnYDGv>RGM%|D0|*#6-RSuK<(5WM0t4 zVOrjCZm>uSe6ulqT0x>NV_UCD{oVmuVe%4n8Plf~`jLPT(!9w&wlvWuSc@mGnpW`MntPE+KL4WKFJuJ5J? x&#)Q+08f|qjX8CQvaPx%!AV3xR9J=Wl`&`&aTvvaHN7;sRKz224YZVm!;%yVferyFI92J;p#%ydElv(D zy0{2ZDlRU%I5-tW1feZ}| zG`+E5Rx*O^@_tj^N&tFe!|17W{hc!jut#r0Po?=%{f;7g=vRUb++49hu4*!bMtm?v zSc?+YqQnPdmeVR61=wE@)}rXCG(+nfOvn+0X|P-@G;qgiJ~UZHtZ$(Ie8*me6I?xD z?|))z2jTSrkcfo2Xm&N6L?jG=@cNk8+G(jdxJ+Pvb**EnFJy(cc9<*W2?hMF1p($t zd2YY|#MgroufJ_O-UP=9Bu7WAf#f)IrF{LFFbxWM^BA{~HxZ`MAYvdn?s^j(Ct#b2 z=}E#`l$qHFY)T%+OoN=%C_4{=o`uBs@Khh?ckzY;`|JS;9P)SI8#gjtbcacKcKa(b>@`eza<(F2c?IHe6TG49%kWq}ut%FgZf>FlgfP?VpR znUl)EpfPc?DRU{K*|8ATdq8zko-U3d5v^|zGBN^rO$z_l=Xp4QnD5yH6c`xY85eW_ OISihzelF{r5}E+l5*{4@ literal 4683 zcmeHLYg7~077n2D5WKz+m*VXhP_R15x-rEG@n&h+0s3uTP{XpjKV@;GPMHxNiTr*6lwgYbJBf+56jj ze|w+3a*`Vn7VP9O#eqhnIY~l-BEh#mb=!>s&k`cJjYhNXNsEd$MxrK2rzcfJ5)K(x z>Tn1*6Dk_b-12y5?AFeij@iF073arE>~inNtu8sXc8*_gWoy-K(aU|?4o2~|Ta8{d zwl||l^6ZG;l3ttKlAYU|PhE@TA6Rah>EmyYfVe_=Es3)U>Vyo7n< z)w(^}%!&l{Bj((;Bb(n=?O(w;dfKjMsl+_-ak71LXvnM1;?Uwf7h2}0yiT!y?elw2 zbnf2p4fNL)tz=hDyHmZ-S)XiW;4HlW>d|e@$@zzSri|5o)UE+3RM?#lPd*{b4o+O* z*=8$RSQYcULR8(@u*xZKC$#hAyQ@VZa^bzAb$efYBZpU4?k3Wb$hyZo_GGWy!4C8vp0Jy-ApBQP`PJQ@w~4eEHriK zSkD$DsS#6tZM$N5RcQBxJfd8(WBQo$Z_gBElk)b0O08&Gg+TT9tbGf{?!W1>_rdc= zwu$u%p_VtBo!=-n$JK6vTxR5C+8vtxUD}9Od2*S~dF-|Ide^)SXPz9aJN*2L6tY#< z_>0qv0*)oyLqP@0{^MwGmoX(ba^IzbO?H_^T7quRjAvu44>Z_>=_k#KyXz{uJ7GWO zIlHzn?i@a9{O4lFq!R9#hNb0S&H3U*gzRcriC7w2T1lVb0{=5QH?(|LblATZU%Yr| znW3k%qyEzE(jOZZ>4*flx#Y&OnA$?81}C|fqgwMY_Qk2hmJ8aGT`AbG-H0e#fc49qMf}D;qD$;&<`Wum3u!vSsV>r;Us9VR_0AyIZpVfWPwJ#7J1R zWkY7FY;AMr^nm0&YQzQ!+vR`D+KSJ$t++HRevG~*sdS@kpQ8t_z{x=Y6?l|0(vF6% z8t|M6A%m!(ZzLf=ED z=gRjT`DID_?B~wC4sXB7n)J@RzR$XE)PeegS+1$$TWK__EFv&4LJ}DGzW71O7pCWl zLTde8>*Y=P8;%Qa2GmUtOgRR9e#djsoHf~vi`C6F_ZpdMMM&gw*O52Yto`ikMYb;S zvD2214CuD0yZW=_s(Ahzd8B&W-I`>-w%cFcsG7hRLLN6#^p->NTDd{-x{V~LwR<>yb9>Dum;UGFGM z4}W)7w=m|ie$NABYjltUv3|?KU}s+R`lgaR1wHV!{onew+zsCrI&+EhM%QOIGaP>I zS=(3BrM=X6FKhS2Fj|dE>$}NTb5Hu0qOHH3tGq3=dUNH>j_W-nH*;5bWJs0 zjmwQ`(l#50DWk?CmhB$=v}xk}8UKE}@u%-;j<>9^npd;bYC~xl(^Db`VyWLk?I0*H4&1g$7N|@QCM0cCQ#D-d>wquLI9w_jVNT+ zBxwyovxsiN6@qtann{N&BF01!Jz5$81(JFk;xf1l1Qwf#R5sn$0rJr+Rl>-ic>@q& zB%-U0MxBt!G?`2c6Nf?Snl#ia3Q7r}yfAMzK;yy~;?0J+N;VJn zR)QhU=kPFug(&$b#{#9qg!4$f1_kLPG-y1|)M?`_3l!nPfC!0*&Svymwai2$p+*%@ z0DFMYDoK;!gK!j~!DU92;*-VavAH~i&th}D5ic*^2cgBd-T-QmLS-QgPCqi07$FD; zP>WKP3IHq`AR1wy9!HI&K8hrhM0Cmph|;taIONlxmJq@KBvw*2KT!2DJh^|=zX_5E z%Mt`x3Rj3?{YDIEDz3B`0($*Rm>Si_<6wsml+^oq;!o0rsCX(a%Ee&;Tg8XDAi=P= z!VBb#g$h_+n39hv`ZGR=ZXi`g6RO7p;z6V!8c;%(Xdur4GG~44jY*ADOd()@BRrVJ ziDDr_gd^mz>CAy(nbe+sAFU7bfB5jR2n=ZgK(BueG#AjTn1jt~fG>)|zwjE!!(V6t zKo1-FBz}kK8m8-$82BXN;p!Tu>ysGxB;n!e`oGcT@Zq?FYr!ud6FAI7c9_e+L1>gB zG&qRXM}3N`4}wz@&0ZI>)Ig(+o