From 0edab0f1e2438464a734ac7f9bddd8d232681cf4 Mon Sep 17 00:00:00 2001 From: Valtos Date: Sat, 12 Oct 2024 22:32:07 +0300 Subject: [PATCH] FUCKERS (#732) --- Resources/Locale/ru-RU/markings/cat.ftl | 2 + Resources/Prototypes/_White/Fluff/fluff.yml | 37 ++++++++++++++++++ Resources/Prototypes/_White/Fluff/sponsor.yml | 16 ++++++++ .../Markings/imercuryi-parts.yml | 9 +++++ .../Fluff/IMercuryI/hair.rsi/hair_mercury.png | Bin 0 -> 943 bytes .../White/Fluff/IMercuryI/hair.rsi/meta.json | 15 +++++++ .../suit.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 665 bytes .../White/Fluff/IMercuryI/suit.rsi/icon.png | Bin 0 -> 378 bytes .../White/Fluff/IMercuryI/suit.rsi/meta.json | 18 +++++++++ .../Fluff/IMercuryI/tie.rsi/equipped-NECK.png | Bin 0 -> 247 bytes .../White/Fluff/IMercuryI/tie.rsi/icon.png | Bin 0 -> 333 bytes .../Fluff/IMercuryI/tie.rsi/inhand-left.png | Bin 0 -> 243 bytes .../Fluff/IMercuryI/tie.rsi/inhand-right.png | Bin 0 -> 243 bytes .../White/Fluff/IMercuryI/tie.rsi/meta.json | 26 ++++++++++++ .../uniform.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 803 bytes .../Fluff/IMercuryI/uniform.rsi/icon.png | Bin 0 -> 383 bytes .../IMercuryI/uniform.rsi/inhand-left.png | Bin 0 -> 478 bytes .../IMercuryI/uniform.rsi/inhand-right.png | Bin 0 -> 484 bytes .../Fluff/IMercuryI/uniform.rsi/meta.json | 26 ++++++++++++ 19 files changed, 149 insertions(+) create mode 100644 Resources/Textures/White/Fluff/IMercuryI/hair.rsi/hair_mercury.png create mode 100644 Resources/Textures/White/Fluff/IMercuryI/hair.rsi/meta.json create mode 100644 Resources/Textures/White/Fluff/IMercuryI/suit.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/White/Fluff/IMercuryI/suit.rsi/icon.png create mode 100644 Resources/Textures/White/Fluff/IMercuryI/suit.rsi/meta.json create mode 100644 Resources/Textures/White/Fluff/IMercuryI/tie.rsi/equipped-NECK.png create mode 100644 Resources/Textures/White/Fluff/IMercuryI/tie.rsi/icon.png create mode 100644 Resources/Textures/White/Fluff/IMercuryI/tie.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Fluff/IMercuryI/tie.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Fluff/IMercuryI/tie.rsi/meta.json create mode 100644 Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/icon.png create mode 100644 Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/meta.json diff --git a/Resources/Locale/ru-RU/markings/cat.ftl b/Resources/Locale/ru-RU/markings/cat.ftl index cfc1eec382..df4c21bd98 100644 --- a/Resources/Locale/ru-RU/markings/cat.ftl +++ b/Resources/Locale/ru-RU/markings/cat.ftl @@ -61,3 +61,5 @@ marking-TechnoClawsEgoruch-claws_overlay = Клешни marking-CatTailMarginal = Хвост леопарда marking-CatTailMarginal-m_waggingtail_leopard_primary = Хвост marking-CatTailMarginal-m_waggingtail_leopard_tertiary = Цвет хвоста + +marking-IMercuryIHair = Полуночный мираж diff --git a/Resources/Prototypes/_White/Fluff/fluff.yml b/Resources/Prototypes/_White/Fluff/fluff.yml index 67d5624465..55a27e5b4e 100644 --- a/Resources/Prototypes/_White/Fluff/fluff.yml +++ b/Resources/Prototypes/_White/Fluff/fluff.yml @@ -1185,3 +1185,40 @@ sprites: - sprite: White/Fluff/DoxXxoM/hair.rsi state: hair_allthefuzz + +# IMercuryI +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitIMercuryI + suffix: fluff + name: Изумрудная загадка + description: Выражает Доминирующий черный оттенок, яркие зеленые акценты и атмосферу таинственности, окружающую как одежду так и ее обладателя. + components: + - type: Sprite + sprite: White/Fluff/IMercuryI/uniform.rsi + - type: Clothing + sprite: White/Fluff/IMercuryI/uniform.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterIMercuryI + name: Зеленый Авангард + description: Может похвастается изысканным дизайном и обтекаемым силуэтом который дополняет любое телосложение. + suffix: fluff + components: + - type: Sprite + sprite: White/Fluff/IMercuryI/suit.rsi + - type: Clothing + sprite: White/Fluff/IMercuryI/suit.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckTieIMercuryI + name: Диагональ + description: На нем смелый асимметричный узор который кажется смещается и меняется в зависимости от угла, под которым на него смотрят. + suffix: fluff + components: + - type: Sprite + sprite: White/Fluff/IMercuryI/tie.rsi + - type: Clothing + sprite: White/Fluff/IMercuryI/tie.rsi diff --git a/Resources/Prototypes/_White/Fluff/sponsor.yml b/Resources/Prototypes/_White/Fluff/sponsor.yml index db4429cc88..225c30822e 100644 --- a/Resources/Prototypes/_White/Fluff/sponsor.yml +++ b/Resources/Prototypes/_White/Fluff/sponsor.yml @@ -453,3 +453,19 @@ id: RitokaCloak entity: ClothingOuterCloakRitoka sponsorOnly: true + +# IMercuryI +- type: sponsorLoadout + id: IMercuryIJumpsuit + entity: ClothingUniformJumpsuitIMercuryI + sponsorOnly: true + +- type: sponsorLoadout + id: IMercuryISuit + entity: ClothingOuterIMercuryI + sponsorOnly: true + +- type: sponsorLoadout + id: IMercuryITie + entity: ClothingNeckTieIMercuryI + sponsorOnly: true diff --git a/Resources/Prototypes/_White/Mobs/Customization/Markings/imercuryi-parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/imercuryi-parts.yml index 84ecfc11fa..f40a0f80d9 100644 --- a/Resources/Prototypes/_White/Mobs/Customization/Markings/imercuryi-parts.yml +++ b/Resources/Prototypes/_White/Mobs/Customization/Markings/imercuryi-parts.yml @@ -28,3 +28,12 @@ sprites: - sprite: White/Mobs/Customization/imercuryi.rsi state: fox_tail_wagging + +- type: marking + id: IMercuryIHair + bodyPart: Hair + markingCategory: Hair + sponsorOnly: true + sprites: + - sprite: White/Fluff/IMercuryI/hair.rsi + state: hair_mercury diff --git a/Resources/Textures/White/Fluff/IMercuryI/hair.rsi/hair_mercury.png b/Resources/Textures/White/Fluff/IMercuryI/hair.rsi/hair_mercury.png new file mode 100644 index 0000000000000000000000000000000000000000..662ecc6897cd5d633d206d97bde6651346eaa10c GIT binary patch literal 943 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1=2l#}z3JD1TnbOkIoSdAcvn@nLMWZSWH2hf&{aG0q8JU@xSy)&^L`2xw z*n%q!#Kgqd+1bU##by0j`S|!GB_+AIxI8Kiq@<*{xw(0Hd1Yl~Rc(ajrbgu`)VJd-(>CnG#F0mxv(^cU1q!f zY2Jxqrt5Bw>Ky;}sjRXQHUE22vbts8>q>tW!I)W3wApl@!OTNXc@A+}U!2cl=YCJv^W4&B z`dMNZ=iYSuugSHHXV#DKIO#H#8w(davz@5IysL|CQN`bicV~9KKEG@-3rng(z-%e~ zb+1dL?r=Oa{5m7H*G66A!+p+zzsH3do0)d(d%c=TvHMYBYQ1;-)r$!q172$FZ`;ly z%E5N(GsnV5jQ)=%c(Ag?m&M#a$gO$g(ZPtjkuNv*9c@0&vqk(``5M0u6;C$@dfmRI zziTE}=K)6-PWFjD3^VT4Hoi+^4W6p>C|O*U@rGCQ0|$l=p50A)b_x@;RFr-_XZdm5 zwTZ#jv65#}edF!mpo1p%M>=J8+Nz44QJb%Hm0h3volhh8C5b&c9^!K%SsW{31a>sm zXg6QydaCC#4PLlOD*}AtW%pVJ2P2aJtV<%>9_&=eyKZMDou&%wLHZE1_i>N x#uoN!AEMUqziQvrkX_@X_Ji;Lo&=fy492rrW+YT}R{#?(gQu&X%Q~loCIH|+fPw%3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/IMercuryI/hair.rsi/meta.json b/Resources/Textures/White/Fluff/IMercuryI/hair.rsi/meta.json new file mode 100644 index 0000000000..a889e63a65 --- /dev/null +++ b/Resources/Textures/White/Fluff/IMercuryI/hair.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "REBOLUTION228", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "hair_mercury", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Fluff/IMercuryI/suit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/White/Fluff/IMercuryI/suit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..d4a5daed42f46d5947f27793f02c31b961b7ae1e GIT binary patch literal 665 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0p2l#}z8X6l)NJyGnn=9z@sHv;jhbj5_`|Xr)%+88cZ(*OuC-(i~M~Cam zR__IVD^|AbK9DEj=(WLsZ++H{gDn#|H~sKE@W;6%P@}MG=#q;ZIj_(KB_QZz+c`KAN&K%yGi` zecw1j{fho9`mMo|azSq4smh5T*ERsf_zd0Odgv*v57@ffBjfXg=TDgAFS5*P_^|ZA b(@)%~DLLm1KdS2iqm;qZ)z4*}Q$iB}OfL^3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/IMercuryI/suit.rsi/icon.png b/Resources/Textures/White/Fluff/IMercuryI/suit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ef7b6bf14a45c6cfe6f784530a641d68b169d787 GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik_0(?ST<>lqn)YT*;Bn^!X?ZcG({QVSkd3bsG%&pBs>xEstto$l8oeLH1 z9E_Y}!uLV+KB|(0{|FHoE#!CmD099}nctjR6 zFz_7)VaDV6D^h@h^F3W0LoEE?_Fd#_R^V~<))oY};>E&j-hDG=Z#vHAZ+~$7)dyV6o0tFOkma zTFsH|^R3AFlK_w5Oa{A5^^*BMn(hf5mZhKLR!rEOJiYjSEobWEwSNS>CJKMb$os;` v=)&M|ws&&x3DNlFKO=WM5-iJWiMp@2)i-TP&JP8kQyDy6{an^LB{Ts5gcOOd literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/IMercuryI/suit.rsi/meta.json b/Resources/Textures/White/Fluff/IMercuryI/suit.rsi/meta.json new file mode 100644 index 0000000000..c700c32c70 --- /dev/null +++ b/Resources/Textures/White/Fluff/IMercuryI/suit.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "REBOLUTION228", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/White/Fluff/IMercuryI/tie.rsi/equipped-NECK.png b/Resources/Textures/White/Fluff/IMercuryI/tie.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..3392f825bb532616c8f81f84de45438a3e3203ff GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zN=QiZ3h)~H%4%wA0mYub{^A3qSWANZg8u^n!|!c;!9W4d0*}aI z1_o|n5N2eUHAey{nBeK+7!u+B_NpZpgChs)#mGJXXG$OR*teiWEwr=InBVHt#?uT8 zds+`joUz|ycsun$_f0+K`ZHzR^9}eI4lpx(U|_Ieos#kW@uvf;TA5BUuNLFd;9nD^ hQ+r4Q=(+=M7;fFMzc^>LN)ym722WQ%mvv4FO#owm2JwdgA4vCzh})dXZaF&TQK33cZ=*64o1Uy)wcJvoH%#e?6X-=5+Ij- zq}e6r$~xwvkh=#MJ!4+Ubv$6Y_FQa%jQE?z1-ou?^9Y<_PdqQ`@IOrM??g_O`AQL70(Y)*K0-V27uRV@O5Z+gpZQOojri7ZkQJo{qheT=BoV zf-gEZNT*RX@#Z1^_og#H8T+i7$pqBFuwkpt>+Mqm(~9G7?SB1l*EX%wIqwpg?cU#7 zrL+9$y6sXwS<{O7)gNrMi=L`#Y7WxD!0>1GmEDc^3M_Z2f6ZG^zJqaPIrDPQz0xma h=P~>)XW$4w#s8(2@4Z|2QINwKJYD@<);T3K0RT((RJ#BG literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/IMercuryI/tie.rsi/inhand-right.png b/Resources/Textures/White/Fluff/IMercuryI/tie.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..cd72b59c1663f296e5d09080e6e6efe7d94f5ccf GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QL70(Y)*K0-V27uRV@O5Z+gpl!Oojri7uphLE0k|8;CWXs zc&?Gvcw1B1F3z*n%NFmO(eqj#sGfmAa$D~IBNi&!%byD6?|NL>o9PqgcX|u!o_Nz` zhLM)bS8tzHv@6n5_p;uDefCLGlczF+bup}2xZU00ZSj|!y|zuMVjs5KHtB#^dJg>z b40R!=#5Mo(y-%~Y2ixK4>gTe~DWM4fG<{Fc literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/IMercuryI/tie.rsi/meta.json b/Resources/Textures/White/Fluff/IMercuryI/tie.rsi/meta.json new file mode 100644 index 0000000000..bc2659bdf3 --- /dev/null +++ b/Resources/Textures/White/Fluff/IMercuryI/tie.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "REBOLUTION228", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..c25d66b6df17991e1132178bd1033cd86c4af0c2 GIT binary patch literal 803 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~q1o(uws;Q}S@^FfXi0bO;^7He{$;s*J>dMK>si~=nh>9>WGqQ2AGO;l7 z@bCx<3U+jK6&II^ONz-W%A1&)7#JAXhbie>$=QWUscWe_I68#Z3oGdI=<6G5YHCW$ zN&_tkR_-YWQVJzOe!>6o1BRFw>9;_&oCO|{#S9F5he4R}c>anM1_mYtPZ!6K2=}+s z9tN#85NN#_;1L}?Wr64(t@r<@&ExgHyTsEfwEphPnT;vclloOl(zeg4Uupe-FX1lR ziVlri3!R-!-;vHp%$w&GUd?REyxnV4x zGn1>-bte8?#L)0|S#DIPP}9k5l~0!#k^^VeygZe$GS_UyUB!f#{GS-i95om?wieD_ z-MiWRB^N{FG$V)9J$xFe0W30s-`1x$xVm>nGB)I2H+ry$MCKp6&f7Ni z3q5+)=zdp$rGa0hf8XyZ1`E%>W1ae4nSF+J`>)$ir9@s_DEvL)ZNQFSzR3y4UmerT zlFwszd3*S6!-|Ukh7H~Ik`Jm`)@n4@6f1PyZnj{S?AA*C!2DOp;C%dUtv&8o-NrPQ_59UL7(>xC6`d4Pr;lapEkq$Em${DS{u2MlM0^sw{xzr+WY^@E?wG@w5{Ut z)Q#=shyo5%z8F5-ILZ7mmQkDtYO!05B7i}w?rT^K4Z<3^Li?&`x^m|96#jPEj ymp9plo%B&w=}~-Cru8IXVn}9-a-HLepPcrWf}6K5eC-8vCxfS}pUXO@geCwJgNsA} literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/inhand-left.png b/Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8f3c431c75e22a937860f4452a5075fdc6db8b34 GIT binary patch literal 478 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~;1^9%xa`JGBh=}Uy>B`B;si~=nh>9>WGcvI-^6>Cys}O8_!RPz_thZc(LA!(Q=I#10dD92> zIHxfAK6%4NP7dK24L_0(mOlJjy+oA#!GfYprI=REDV}Zu7VSa zN~OITqwpD4X7L|v@owr;^=dB;_n+`=EMOISz?pH$=j3PZt|u zZGG8$IF!_GA7>I(Ghj?)5*ASV5fmVIi7TQ!fU6?-0%rw?F24}hSkC^|Kjp5Yb^-$H kR=nklVtnj=u+WAg;G)78&qol`;+03o@u5C8xG literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/inhand-right.png b/Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2f537e4c801775a31c5c1fcd9c330baf160994c3 GIT binary patch literal 484 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~;1^9%xa`JGBh=}Uy>B`B;si~=nh>9>WGcvI-3JMB#baWLLm-6uNh)as; zTglmnDVdm>7#JAHE6Rt~3p+SEsB5VMjhUZxZU&GND+%%o{*MhXFkU+F1gL_uz$3Dl zfr0NZ2s0kfUy%ZIAg8B`V@QPi+i9nTniY6ln;mmsGe>{@U%!oln8t|{9;-8`{zb~tBW2BTy`|5S$1>h(etTd&!4?CZgCaau{1ty zW5Tj6r&-Jc8o4AyS2P43j4X(pk#iy|{*2y^Zxc6cbP0l+XkKg&xD_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/meta.json b/Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/meta.json new file mode 100644 index 0000000000..a4b758a465 --- /dev/null +++ b/Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "REBOLUTION228", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}