From 7a9be710ac4aa3e9aabbf85f0a568bbd197c4e40 Mon Sep 17 00:00:00 2001 From: ThereDrD0 <88589686+ThereDrD0@users.noreply.github.com> Date: Thu, 21 Dec 2023 20:35:50 +0300 Subject: [PATCH] Merge pull request #589 from frosty-dev/new-new-fluff [Fluff] 6elblu fluff update --- Resources/Prototypes/White/Fluff/fluff.yml | 11 ++++++++ Resources/Prototypes/White/Fluff/sponsor.yml | 4 +-- .../equipped-OUTERCLOTHING.png | Bin 0 -> 1794 bytes .../Fluff/6elblu/white-overcoat.rsi/icon.png | Bin 0 -> 660 bytes .../6elblu/white-overcoat.rsi/inhand-left.png | Bin 0 -> 464 bytes .../white-overcoat.rsi/inhand-right.png | Bin 0 -> 462 bytes .../Fluff/6elblu/white-overcoat.rsi/meta.json | 26 ++++++++++++++++++ 7 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/White/Fluff/6elblu/white-overcoat.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/White/Fluff/6elblu/white-overcoat.rsi/icon.png create mode 100644 Resources/Textures/White/Fluff/6elblu/white-overcoat.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Fluff/6elblu/white-overcoat.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Fluff/6elblu/white-overcoat.rsi/meta.json diff --git a/Resources/Prototypes/White/Fluff/fluff.yml b/Resources/Prototypes/White/Fluff/fluff.yml index 3dc0c2c691..4ff042773f 100644 --- a/Resources/Prototypes/White/Fluff/fluff.yml +++ b/Resources/Prototypes/White/Fluff/fluff.yml @@ -604,6 +604,17 @@ - type: Sprite sprite: White/Fluff/6elblu/white-cloak.rsi +#6elblu +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterStorage6elbluOvercoat + name: Белая шинель + suffix: fluff + description: Очень удобная и приятная на ощупь шинель с меховым воротником. На нарукавных повязках виднеется эмблема NT. + components: + - type: Sprite + sprite: White/Fluff/6elblu/white-overcoat.rsi + #Serafim547 - type: entity parent: ClothingEyesBase diff --git a/Resources/Prototypes/White/Fluff/sponsor.yml b/Resources/Prototypes/White/Fluff/sponsor.yml index 9f1a447628..827b79363d 100644 --- a/Resources/Prototypes/White/Fluff/sponsor.yml +++ b/Resources/Prototypes/White/Fluff/sponsor.yml @@ -207,8 +207,8 @@ sponsorOnly: true - type: loadout - id: 6elbluGlovesLoadout - entity: ClothingHandsGlovesColorBlack + id: 6elbluOvercoatLoadout + entity: ClothingOuterStorage6elbluOvercoat sponsorOnly: true - type: loadout diff --git a/Resources/Textures/White/Fluff/6elblu/white-overcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/White/Fluff/6elblu/white-overcoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..de108d83be3c0db31fcad6e613f015c4a412d7c4 GIT binary patch literal 1794 zcmV+d2mSboP)#+EtVF$31lt0@_&YsbnxCH|82eInr7m6u;t#{a$Ir{@ko zL;d~z^%8#DQveU2nwp}4fdPt-k2lGH%a)o^sAmQIs zfPjKVU0oeDHa40MpPZbefaBZH7WV;>qt{ejj)fjzP`FT4RYff=E$i;V=*`;OCs?&;Id3bd2(hZKN= z3y?F0u8+{f@6(i(m8*gw40p_V!~r*Nj*wq#%fHiqFF`Q=AAjg4Z{QyI!N=fhC;TA= z2o_NlKj>3VC_O!$+S=M^X=zDKfyBf_O4;Kz-;9%x)Gj{+2VbEtZ(UtxcA9!2QhxD& z0o?%(4-Zpuaj{wzaNn&UNC%8xSXc;pp9PS>wg8xa`}glRuUA%9ln+1&0RYs8I|$PG zc?rY{fMu5feq5v8l}M10l(ZIW&&|!L4^{!a4xjPyadHcodMq}V3|ylgqf!F#6!`wT zwPDUqXL4djIU%BPI`puQ+ysmS|JA{Mx+^K!y#LqSpLDRm=ZN370Pw&=KabE0FCI~E zA5IU!4^&T1PF8RKUw}ARJtVL#06Z{aY#0wTG&E3k zb+sy+o14{rh~t(c#9v{|@lY`U?&GC+;xk0g6-@y){@Af&%6I@Ju2}>(0kQQmSl#jC z$3@SyEkI38jq<+iiR1stK8)2z0{VpbAN6P_fo%Z-Lt8B^ zfoWh^|8241+{O*y*~|@Nb?Ey6(mse+0XL1@4(=VdD;#db1fVEKOaO{N9XH17Q3D+9Z%`nkN5E$?sw+vj?Y0Ctj}din`>w#4`-T0fU(QNpnkEJ3JT0qHip zNPvy!@N4DDa+0Iu1gGFE5l{Soec%$g0}_Y?z|iXH=~270+1c4NHa152`T1%W2px)q z2)gmup}KbMn%NipEtd>`KqLT+&&QCr)J0+h07%V&p*#Y)AKXU?L;~=+KXLCcyZD zf&!Hg@!q>FdL(H38RAILnwEO?%8)u6yn5v)dizWRxsA%oN_y=?!@491^hHmhl|Uo_ zj;E|g&kvQ{uZH5D)I^mu5vV6O0S-7~=49{-;WQe%5c`19(NQBOCnt`-BSXZk)1b`& zPHi;sz&Sk|jLtm%WT~2ukqCrvOb;J`(f9SGZo2g4H$gMU>_RNSfqQc) zFE39eDIn^C^0TwE5sw4FdGNjiikHJ*kAp5angSed!uZwIRrMWjzp1H-+y*%G902se zNp={+kpTKoM~84+jU0jY_IB4dME>P4m=j`bW$K9q&=VE(GxL2tDgXcg literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/6elblu/white-overcoat.rsi/icon.png b/Resources/Textures/White/Fluff/6elblu/white-overcoat.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..42891e4b1a4acd51f64fc9dd9be26c5d17a1c105 GIT binary patch literal 660 zcmV;F0&D$=P)t;eY-m|`;O>~ zaS(72a1d}1pb}tK?ktb@g!1`3)oL||*yHiImCNO5^6*GT>fAvJ*cJftAFgAX&*#Ks zlZn-Cw;kbdn8{(sIOb_Y*cNaWJf&bTNPoM^t<%Sy1Kk(@~8PTT^K*9+wGDD zwghxK9Sh{c;gCrn0=q31i!>MvUdb_zd6*vxg>0R|P64ar)9I9w$s~C^9x_dnZLwI4 z5{U%m3%67*m)S=n!uAz_d^8$Sv)Lr4)5(27wOXacVnMA|i~D}R-|n*S3qXKnG8sN< zkOTdGpLe(p*a4XbKlme1KP*6yPN%6*D7^Nu``K*9WNx>cyk75{`M4%K*eal2uUlv( z!lTisLu>+{&-ca;^CV?mE*DG|Y-#~0Dp&;Mg7J9FA9jvn^im6Wr>Fz4uR{D*{Z#@s z6_b~!<~9%rP^nbntB@;@7}(~k7O)KxfFSMldMpN60lT&csRSUeSJP{`TyhMcg#ZBK znj)kU0N}U*96gGVq@0Z5gIxpl6*L+RZYAg>D1k^MqFqjP1^lH_seeuY*MOtP?kknb z{sbTc5NJ|@QR$F=Xz?z<4sm;V4Fy7O7zUFAXwerDTG$q_US6}=Ecc}tK?H#QUIfUa uf(K?(od@x*hv&ZptPA-pe6PRaec&(7X-9|!Qo=s~00000gDhy9N7*0%N07)#L-B39%{`Ib;STYjiZ;F`XBA3k) z%kpDM@ui=skxoMYx{bTi7^i(XuTtOty|(`5sio&l3;z^$Jx{(G7Bodqbi$;qQ#T*+ z?Wh%B$t3)8^?@UQ{_eRjTaT&cP@T}vl&mD#z5A!7F=mEde)WsXVp56RbDdow4XXL` zYghjIytVMp-^DM!ng7Ua+RDG~&o4oKyZ*Qq9BxJOM1%Ar>6L41n>RFMl$V8wUqAl+ z?dEH3nH~+d|1@YzZmeIRu^=trzLsPfc!Cbg`IKY0v4GGVQq3gtqtz z%8Ux`Ob&f44KkbzmO>0gDhy9N7*0%N07;|=AF$}l_Ijz_r+a#n-{qE?J>qMgRnGgr zpa1ZN=;Y7_|1UG1JT;fD_lT&TEWp2S>Rr`@^gF)4Zkkt3PGFbczV=*1^~%}3ix|u^ zC*Mfl_tyGF?;f|qN3ZOv+|2x_<>wK*YtnJaE1wCSEpH5BU(&aZF|1qnr1v^TyP5U< zYlV+rl&rk_?d5ILRk8ur2d=z)d;a9>+pEL*op8Gs=8=l>CJC=^^CYKKL_72>vYRV* zUFhEC|HgW;OnY6PxxdN~n{f2Z`7?V}8~09{@iYIT*256?C+kmEXh|>na(kCTePB|5 zFw>`uKRG6~BKOZ