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 0000000000..662ecc6897 Binary files /dev/null and b/Resources/Textures/White/Fluff/IMercuryI/hair.rsi/hair_mercury.png differ 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 0000000000..d4a5daed42 Binary files /dev/null and b/Resources/Textures/White/Fluff/IMercuryI/suit.rsi/equipped-OUTERCLOTHING.png differ 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 0000000000..ef7b6bf14a Binary files /dev/null and b/Resources/Textures/White/Fluff/IMercuryI/suit.rsi/icon.png differ 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 0000000000..3392f825bb Binary files /dev/null and b/Resources/Textures/White/Fluff/IMercuryI/tie.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/White/Fluff/IMercuryI/tie.rsi/icon.png b/Resources/Textures/White/Fluff/IMercuryI/tie.rsi/icon.png new file mode 100644 index 0000000000..52744d4c44 Binary files /dev/null and b/Resources/Textures/White/Fluff/IMercuryI/tie.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/IMercuryI/tie.rsi/inhand-left.png b/Resources/Textures/White/Fluff/IMercuryI/tie.rsi/inhand-left.png new file mode 100644 index 0000000000..e1e8ddc318 Binary files /dev/null and b/Resources/Textures/White/Fluff/IMercuryI/tie.rsi/inhand-left.png differ 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 0000000000..cd72b59c16 Binary files /dev/null and b/Resources/Textures/White/Fluff/IMercuryI/tie.rsi/inhand-right.png differ 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 0000000000..c25d66b6df Binary files /dev/null and b/Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/icon.png b/Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/icon.png new file mode 100644 index 0000000000..eaf10941b5 Binary files /dev/null and b/Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/icon.png differ 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 0000000000..8f3c431c75 Binary files /dev/null and b/Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/inhand-left.png differ 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 0000000000..2f537e4c80 Binary files /dev/null and b/Resources/Textures/White/Fluff/IMercuryI/uniform.rsi/inhand-right.png differ 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 + } + ] +}