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 0000000000..62ea925117 Binary files /dev/null and b/Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/equipped-HELMET.png differ 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 0000000000..5d3d0f9659 Binary files /dev/null and b/Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/inhand-left.png b/Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/inhand-left.png new file mode 100644 index 0000000000..d0b1d74a04 Binary files /dev/null and b/Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/inhand-left.png differ 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 0000000000..741829210c Binary files /dev/null and b/Resources/Textures/White/Fluff/Zerkor_Pomidor/tiara.rsi/inhand-right.png differ 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 0000000000..eecb967ef9 Binary files /dev/null and b/Resources/Textures/White/Ghosts/caypennow-ghost.rsi/animated.png differ 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 + ] + ] + } + ] +}