diff --git a/Resources/Locale/ru-RU/_white/fluff/korzinka_.ftl b/Resources/Locale/ru-RU/_white/fluff/korzinka_.ftl new file mode 100644 index 0000000000..c311f22e15 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/fluff/korzinka_.ftl @@ -0,0 +1,5 @@ +marking-Korzinka__dogears = Собачьи уши +marking-Korzinka__dogears-dogears = Основной + +marking-Korzinka__dogtail = Собачий хвост +marking-Korzinka__dogtail-dogtail = Основной diff --git a/Resources/Prototypes/_White/Fluff/fluff.yml b/Resources/Prototypes/_White/Fluff/fluff.yml index 0edfa0e7f2..7886765ed9 100644 --- a/Resources/Prototypes/_White/Fluff/fluff.yml +++ b/Resources/Prototypes/_White/Fluff/fluff.yml @@ -1235,3 +1235,34 @@ sprites: - sprite: White/Fluff/Feda_Plevajecki/shark.rsi state: shark + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitAOI + name: Униформа АоИ + suffix: fluff + description: Форма соответствует стандартам современных военных подразделений, предназначенных для боевых действий в засушливых и пустынных условиях. + components: + - type: Sprite + sprite: White/Fluff/Feda_Plevajecki/sho_form.rsi + - type: Clothing + sprite: White/Fluff/Feda_Plevajecki/sho_form.rsi + +# Korzinka_ +- type: marking + id: Korzinka__dogears + bodyPart: HeadTop + markingCategory: HeadTop + sponsorOnly: true + sprites: + - sprite: White/Fluff/Korzinka_/dogears.rsi + state: dogears + +- type: marking + id: Korzinka__dogtail + bodyPart: Tail + markingCategory: Tail + sponsorOnly: true + sprites: + - sprite: White/Fluff/Korzinka_/dogtail.rsi + state: dogtail diff --git a/Resources/Prototypes/_White/Fluff/sponsor.yml b/Resources/Prototypes/_White/Fluff/sponsor.yml index 225c30822e..e10ae9c1ef 100644 --- a/Resources/Prototypes/_White/Fluff/sponsor.yml +++ b/Resources/Prototypes/_White/Fluff/sponsor.yml @@ -469,3 +469,9 @@ id: IMercuryITie entity: ClothingNeckTieIMercuryI sponsorOnly: true + +# Feda_Plevajecki +- type: sponsorLoadout + id: Feda_PlevajeckiJumpsuit + entity: ClothingUniformJumpsuitAOI + sponsorOnly: true diff --git a/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..11b9231c3f Binary files /dev/null and b/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/icon.png b/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/icon.png new file mode 100644 index 0000000000..9d7b9a17d5 Binary files /dev/null and b/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/inhand-left.png b/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/inhand-left.png new file mode 100644 index 0000000000..0f1c206fda Binary files /dev/null and b/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/inhand-right.png b/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/inhand-right.png new file mode 100644 index 0000000000..e5c1288048 Binary files /dev/null and b/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/meta.json b/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/meta.json new file mode 100644 index 0000000000..605553daa2 --- /dev/null +++ b/Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Delikoo", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Fluff/Korzinka_/dogears.rsi/dogears.png b/Resources/Textures/White/Fluff/Korzinka_/dogears.rsi/dogears.png new file mode 100644 index 0000000000..874681cee3 Binary files /dev/null and b/Resources/Textures/White/Fluff/Korzinka_/dogears.rsi/dogears.png differ diff --git a/Resources/Textures/White/Fluff/Korzinka_/dogears.rsi/meta.json b/Resources/Textures/White/Fluff/Korzinka_/dogears.rsi/meta.json new file mode 100644 index 0000000000..71b5cd7188 --- /dev/null +++ b/Resources/Textures/White/Fluff/Korzinka_/dogears.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "copyright": "Provided by SHO", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dogears", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + } + ] +} diff --git a/Resources/Textures/White/Fluff/Korzinka_/dogtail.rsi/dogtail.png b/Resources/Textures/White/Fluff/Korzinka_/dogtail.rsi/dogtail.png new file mode 100644 index 0000000000..ffa6cbb6ed Binary files /dev/null and b/Resources/Textures/White/Fluff/Korzinka_/dogtail.rsi/dogtail.png differ diff --git a/Resources/Textures/White/Fluff/Korzinka_/dogtail.rsi/meta.json b/Resources/Textures/White/Fluff/Korzinka_/dogtail.rsi/meta.json new file mode 100644 index 0000000000..055d0cd223 --- /dev/null +++ b/Resources/Textures/White/Fluff/Korzinka_/dogtail.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "copyright": "Provided by SHO", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dogtail", + "directions": 4, + "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 + ] + ] + } + ] +}