diff --git a/Resources/Locale/ru-RU/markings/cat.ftl b/Resources/Locale/ru-RU/markings/cat.ftl index d4511d357f..a88cc475bb 100644 --- a/Resources/Locale/ru-RU/markings/cat.ftl +++ b/Resources/Locale/ru-RU/markings/cat.ftl @@ -51,3 +51,6 @@ marking-FoxTailWaggingIMercuryI = Лисий хвост, махает. marking-TailReider207 = Волчий хвост marking-TailReider207-tail = Хвост marking-TailReider207-tailtip = Кончик + +marking-TechnoClawsEgoruch = Слуга Омниссии +marking-TechnoClawsEgoruch-claws_overlay = Клешни diff --git a/Resources/Prototypes/White/Fluff/fluff.yml b/Resources/Prototypes/White/Fluff/fluff.yml index e06bb7fda0..3d35247fc0 100644 --- a/Resources/Prototypes/White/Fluff/fluff.yml +++ b/Resources/Prototypes/White/Fluff/fluff.yml @@ -1015,3 +1015,27 @@ - type: Clothing sprite: White/Fluff/Reider207/jacket.rsi +# egoruch17 +- type: entity + parent: ClothingMaskMime + id: EgoruchClothingMaskHoly + name: фальшивая аугметика + description: Встроенный фильтр предаёт вдыхаемому воздуху аромат мира-кузницы. Неповторимое сочетание промышленных выхлопов и свинца. + suffix: fluff + components: + - type: Sprite + sprite: White/Fluff/egoruch17/mask.rsi + - type: Clothing + sprite: White/Fluff/egoruch17/mask.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: EgoruchClothingOuterMantle + name: ряса техножреца + description: Идеально подходит, чтобы скрыть слабость своей плоти! Ткань сильно наэлектризована и пахнет машинным маслом. + suffix: fluff + components: + - type: Sprite + sprite: White/Fluff/egoruch17/mantle.rsi + - type: Clothing + sprite: White/Fluff/egoruch17/mantle.rsi diff --git a/Resources/Prototypes/White/Fluff/sponsor.yml b/Resources/Prototypes/White/Fluff/sponsor.yml index f68b9e6246..58eb28ff6c 100644 --- a/Resources/Prototypes/White/Fluff/sponsor.yml +++ b/Resources/Prototypes/White/Fluff/sponsor.yml @@ -395,3 +395,16 @@ id: Reider207Jacket entity: ClothingOuterJacketReider207 sponsorOnly: true + +# egoruch17 +- type: loadout + id: Egoruch17Mask + entity: EgoruchClothingMaskHoly + sponsorOnly: true + whitelistJobs: [ AtmosphericTechnician, ChiefEngineer, SeniorEngineer, StationEngineer, TechnicalAssistant, Chaplain, ResearchDirector, SeniorResearcher, Scientist, ResearchAssistant ] + +- type: loadout + id: Egoruch17Mantle + entity: EgoruchClothingOuterMantle + sponsorOnly: true + whitelistJobs: [ AtmosphericTechnician, ChiefEngineer, SeniorEngineer, StationEngineer, TechnicalAssistant, Chaplain, ResearchDirector, SeniorResearcher, Scientist, ResearchAssistant ] diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/egoruch17_markings.yml b/Resources/Prototypes/White/Mobs/Customization/Markings/egoruch17_markings.yml new file mode 100644 index 0000000000..7468c8468a --- /dev/null +++ b/Resources/Prototypes/White/Mobs/Customization/Markings/egoruch17_markings.yml @@ -0,0 +1,8 @@ +- type: marking + id: TechnoClawsEgoruch + bodyPart: Chest + markingCategory: Overlay + sponsorOnly: false + sprites: + - sprite: White/Mobs/Customization/egoruch17_claws.rsi + state: claws_overlay diff --git a/Resources/Textures/White/Fluff/egoruch17/mantle.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/White/Fluff/egoruch17/mantle.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..9a8dd73744 Binary files /dev/null and b/Resources/Textures/White/Fluff/egoruch17/mantle.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/White/Fluff/egoruch17/mantle.rsi/icon.png b/Resources/Textures/White/Fluff/egoruch17/mantle.rsi/icon.png new file mode 100644 index 0000000000..37e8fc0c14 Binary files /dev/null and b/Resources/Textures/White/Fluff/egoruch17/mantle.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/egoruch17/mantle.rsi/meta.json b/Resources/Textures/White/Fluff/egoruch17/mantle.rsi/meta.json new file mode 100644 index 0000000000..e71fe7e24a --- /dev/null +++ b/Resources/Textures/White/Fluff/egoruch17/mantle.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "White Dream SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Fluff/egoruch17/mask.rsi/equipped-MASK.png b/Resources/Textures/White/Fluff/egoruch17/mask.rsi/equipped-MASK.png new file mode 100644 index 0000000000..af2617326d Binary files /dev/null and b/Resources/Textures/White/Fluff/egoruch17/mask.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/White/Fluff/egoruch17/mask.rsi/icon.png b/Resources/Textures/White/Fluff/egoruch17/mask.rsi/icon.png new file mode 100644 index 0000000000..a88d3c02ac Binary files /dev/null and b/Resources/Textures/White/Fluff/egoruch17/mask.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/egoruch17/mask.rsi/meta.json b/Resources/Textures/White/Fluff/egoruch17/mask.rsi/meta.json new file mode 100644 index 0000000000..717c531baa --- /dev/null +++ b/Resources/Textures/White/Fluff/egoruch17/mask.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "White Dream SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Mobs/Customization/egoruch17_claws.rsi/claws_overlay.png b/Resources/Textures/White/Mobs/Customization/egoruch17_claws.rsi/claws_overlay.png new file mode 100644 index 0000000000..1b04a2eef9 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/egoruch17_claws.rsi/claws_overlay.png differ diff --git a/Resources/Textures/White/Mobs/Customization/egoruch17_claws.rsi/meta.json b/Resources/Textures/White/Mobs/Customization/egoruch17_claws.rsi/meta.json new file mode 100644 index 0000000000..2c45c5b796 --- /dev/null +++ b/Resources/Textures/White/Mobs/Customization/egoruch17_claws.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "White Dream SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "claws_overlay", + "directions": 4 + } + ] +}