From 74f2b327ccde10cd51b96d37a06e3d2b8cae59b5 Mon Sep 17 00:00:00 2001 From: withoutcode333 <66198468+withoutcode333@users.noreply.github.com> Date: Sun, 11 May 2025 14:06:22 +0500 Subject: [PATCH] fluff (#952) (#286) * fluff * ++ (cherry picked from commit 29acb069ac68cf23e00a5e9add8cec53eea8cb1b) --- Resources/Prototypes/_White/Fluff/fluff.yml | 13 ++++++ Resources/Prototypes/_White/Fluff/sponsor.yml | 6 +++ .../_White/Ghosts/custom_ghosts.yml | 6 +-- .../tiara.rsi/equipped-HELMET.png | Bin 0 -> 534 bytes .../Fluff/Zerkor_Pomidor/tiara.rsi/icon.png | Bin 0 -> 582 bytes .../Zerkor_Pomidor/tiara.rsi/inhand-left.png | Bin 0 -> 504 bytes .../Zerkor_Pomidor/tiara.rsi/inhand-right.png | Bin 0 -> 501 bytes .../Fluff/Zerkor_Pomidor/tiara.rsi/meta.json | 26 ++++++++++++ .../Ghosts/caypennow-ghost.rsi/animated.png | Bin 0 -> 3681 bytes .../Ghosts/caypennow-ghost.rsi/meta.json | 38 ++++++++++++++++++ 10 files changed, 86 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/icon.png create mode 100644 Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/meta.json create mode 100644 Resources/Textures/White/Ghosts/caypennow-ghost.rsi/animated.png create mode 100644 Resources/Textures/White/Ghosts/caypennow-ghost.rsi/meta.json diff --git a/Resources/Prototypes/_White/Fluff/fluff.yml b/Resources/Prototypes/_White/Fluff/fluff.yml index 7886765ed9..2482c4d26d 100644 --- a/Resources/Prototypes/_White/Fluff/fluff.yml +++ b/Resources/Prototypes/_White/Fluff/fluff.yml @@ -1266,3 +1266,16 @@ sprites: - sprite: White/Fluff/Korzinka_/dogtail.rsi state: dogtail + +# Zerkor_Pomidor +- type: entity + parent: ClothingHeadBase + id: ClothingHeadTiara + name: Аметистовая тиара + suffix: fluff + description: От данной тиары излучается едва уловимая аура, которая вызывает покалывание в пальцах при касании. На макушке и по краям тиары инкрустированы отполированные кристаллы фиолетового цвета, от которых идёт лёгкое свечение. Пахнет лесной прогулкой. + components: + - type: Sprite + sprite: White/Fluff/Zerkor_Pomidor/tiara.rsi + - type: Clothing + sprite: White/Fluff/Zerkor_Pomidor/tiara.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_White/Fluff/sponsor.yml b/Resources/Prototypes/_White/Fluff/sponsor.yml index 667d5a0a27..c6239022dc 100644 --- a/Resources/Prototypes/_White/Fluff/sponsor.yml +++ b/Resources/Prototypes/_White/Fluff/sponsor.yml @@ -480,3 +480,9 @@ id: ClothingNeckCloakRaincoat entity: ClothingNeckCloakRaincoat sponsorOnly: true + +# Zerkor_Pomidor +- type: sponsorLoadout + id: Zerkor_PomidorTiara + entity: ClothingHeadTiara + sponsorOnly: true \ No newline at end of file diff --git a/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml index 0f5e6c3fa5..a0d3be648b 100644 --- a/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml +++ b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml @@ -143,10 +143,10 @@ - type: customGhost id: caypennow-ghost ckey: CaypenNow - sprite: White/Ghosts/hitpanda_ghost.rsi + sprite: White/Ghosts/caypennow-ghost.rsi alpha: 0.8 - ghostName: Undefined - ghostDescription: Полыхает... + ghostName: Type is Undefined + ghostDescription: Null size: 1, 1 - type: customGhost diff --git a/Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/equipped-HELMET.png b/Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..62ea925117e261430e2eeb87b419c5a6dd43837a GIT binary patch literal 534 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zFL=5*hE&XX zd&@BUwu1!QgYSDnC!DM}DHLe4jq6bL0^bAOysgbSY}F^^C*<+pTDm5ddEVC4k{9|0 z3)i(Ld6mp%(v_RDM5gSLU?4|Gj@6diL-@ z|C#I4m6v2{Jv+$1zFg0CPK-?S-pg%ME?M+7-`c^q{+2`e1)=5a>1igikAAP#Kk>OH z@b)S#vxkq~n%>%c@6kTn*Scx@ZC^XSsnsqq1sap}*lHU;>#pW$6M|;FTc8SLXFcBa z^#S8)QHDGGcS>VbJe8R2jnu`DEAcol-Ws>Mp|r$GcJgz}nCq?Ar1~B&xc`3r)L5^B zt{i_(R9t0qyPUZ2_Ph0BKLS_U$15R$U+d5AKA1XB@P^B?ATQ0}wE21;lowB_nzm=^ zdG-$bJ$Lr^$Uk&3sd|}VOA8dLZP$(iz@R%U-#_Kk&2NvarUd!F(yWo5CpRbeOUsQ-Z;o#jM1YI>bxbci&)l~9 S(-jSjXa-MLKbLh*2~7aX?evcT literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/icon.png b/Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5d3d0f9659db5bc6a25ee0c8d4da2575d9a95953 GIT binary patch literal 582 zcmV-M0=fN(P)Px%07*naR9J=WlD%u&P!z?Fnout$1c5LH(+HzxNWdcAGzy#|=+NPTw+@G~xN zFEFnAOPl{Sz@i}Ix(~~;Q2wE(&E@&{k;C)6RJW>et^ksDyDg^EDO6R(hQEbcS;y}7 zKCbVBbPaJFL(??$dcC!3=L#T^k4c;8$i9JfCVrIw*&y0P$F#9L9iU+B(@7AK}E`;sYT7k_K@Iqu-d6^Z(mxSD_M z)(+?8^UdEgm#p)jlX6yh>6UrV6|GMwpAZRrJ@x3#gFD~uk9k=6n=eqr_n3L^S=S9W zs$ElK=I;qV_Vwhc@MEPNcb6Y2Z@w0l!e05Lk0opGrU^l}qSosaxij5#tb6u^(cPNi z$E+Rie{&oTFyYd@z0*$cY}#e1 zLqcYMXPgpr&GqH0Jr+Ixy@Gl_lzg0N9oHU|wNmDJbI-XondS!Yq6>2-I_(-;V zb8)8uPyL+te>iM%zAl{N_4L!_sP5aB-Fw`W*Sy{T@b85K5|iD&BxTqS9Ph+ rn@6#p_r-s`dGP1I&%BO~jLP|oO?Pm;jPI)lMkRx%tDnm{r-UW|OGoJw literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/inhand-right.png b/Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..741829210ca8dd2d54208681e0c94006e64a2993 GIT binary patch literal 501 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z*L%7+hE&XX zd&}PYu!98Khv!yobG*dGo2U3maolD7-=oXHp4a+KTV=cVw<}jeU)0R@URc+nG>wlh z>AYuv)fF$d^NvwVyj*>QCO$WR>NM&5y@K-7znNTMfQ2E*Yj@6{_-6`Y`7CuQ@6FgR zM0H1A_}s)=q#UR^Wh{H z!#$z$Sn;=I(LgKx_4-{U+OA1V&ib(4M2dH|3TMpqRztSF#|tjMTq0$^J*7_TgYs+9 z)e=3wXXfv<*Z#2h4u66Y5{NRC3jcx3Q&^>bP0l+XkKWg^{9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/meta.json b/Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/meta.json new file mode 100644 index 0000000000..5e72accf24 --- /dev/null +++ b/Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "PARSEC FLUFF", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Ghosts/caypennow-ghost.rsi/animated.png b/Resources/Textures/White/Ghosts/caypennow-ghost.rsi/animated.png new file mode 100644 index 0000000000000000000000000000000000000000..eecb967ef9bf6564b5b0e1fecb9478612a8eee40 GIT binary patch literal 3681 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Ghosts/caypennow-ghost.rsi/meta.json b/Resources/Textures/White/Ghosts/caypennow-ghost.rsi/meta.json new file mode 100644 index 0000000000..d633d7b09d --- /dev/null +++ b/Resources/Textures/White/Ghosts/caypennow-ghost.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "papa", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "animated", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +}