diff --git a/Resources/Locale/ru-RU/markings/cat.ftl b/Resources/Locale/ru-RU/markings/cat.ftl index 1f13aa400e..d4511d357f 100644 --- a/Resources/Locale/ru-RU/markings/cat.ftl +++ b/Resources/Locale/ru-RU/markings/cat.ftl @@ -47,3 +47,7 @@ marking-knifeCappyTail2 = Хвост Аксолотля marking-FoxEarsIMercuryI = Льсьи ушки marking-FoxTailIMercuryI = Лисий хвост marking-FoxTailWaggingIMercuryI = Лисий хвост, махает. + +marking-TailReider207 = Волчий хвост +marking-TailReider207-tail = Хвост +marking-TailReider207-tailtip = Кончик diff --git a/Resources/Prototypes/White/Fluff/fluff.yml b/Resources/Prototypes/White/Fluff/fluff.yml index 4ff042773f..3dd970363b 100644 --- a/Resources/Prototypes/White/Fluff/fluff.yml +++ b/Resources/Prototypes/White/Fluff/fluff.yml @@ -972,3 +972,15 @@ sprite: White/Fluff/antohag/hosmask.rsi - type: Clothing sprite: White/Fluff/antohag/hosmask.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterJacketReider207 + name: Куртка "Trauma Team" + description: Эта куртка, выполненная из высокотехнологичных материалов, идеально сочетает в себе практичность и эстетику. С ходом времени и сменой владельцев, её функции и предназначения были утеряны. Единственный понятный элемент – это зелёный символ, нанесённый несмываемой краской, каким-то идиотом. + suffix: fluff + components: + - type: Sprite + sprite: White/Fluff/Reider207/jacket.rsi + - type: Clothing + sprite: White/Fluff/Reider207/jacket.rsi diff --git a/Resources/Prototypes/White/Fluff/sponsor.yml b/Resources/Prototypes/White/Fluff/sponsor.yml index 827b79363d..04548efd59 100644 --- a/Resources/Prototypes/White/Fluff/sponsor.yml +++ b/Resources/Prototypes/White/Fluff/sponsor.yml @@ -1,4 +1,4 @@ -# DOOMMAX +# DOOMMAX - type: loadout id: SuitGlamorousLoadout entity: ClothingOuterSuitGlamorous @@ -374,3 +374,9 @@ id: ForgPlushieRyan entity: PlushieRyanForg sponsorOnly: true + +# Reider207 +- type: loadout + id: Reider207Jacket + entity: ClothingOuterJacketReider207 + sponsorOnly: true diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/reider207_tail.yml b/Resources/Prototypes/White/Mobs/Customization/Markings/reider207_tail.yml new file mode 100644 index 0000000000..44989069a9 --- /dev/null +++ b/Resources/Prototypes/White/Mobs/Customization/Markings/reider207_tail.yml @@ -0,0 +1,11 @@ +- type: marking + id: TailReider207 + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Human, Felinid ] + sponsorOnly: true + sprites: + - sprite: White/Mobs/Customization/reider207_tail.rsi + state: tail + - sprite: White/Mobs/Customization/reider207_tail.rsi + state: tailtip diff --git a/Resources/Textures/White/Fluff/Reider207/jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/White/Fluff/Reider207/jacket.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..b6e2dfe716 Binary files /dev/null and b/Resources/Textures/White/Fluff/Reider207/jacket.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/White/Fluff/Reider207/jacket.rsi/icon.png b/Resources/Textures/White/Fluff/Reider207/jacket.rsi/icon.png new file mode 100644 index 0000000000..571195bec8 Binary files /dev/null and b/Resources/Textures/White/Fluff/Reider207/jacket.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/Reider207/jacket.rsi/meta.json b/Resources/Textures/White/Fluff/Reider207/jacket.rsi/meta.json new file mode 100644 index 0000000000..aa20f760cd --- /dev/null +++ b/Resources/Textures/White/Fluff/Reider207/jacket.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Reider207", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Mobs/Customization/reider207_tail.rsi/meta.json b/Resources/Textures/White/Mobs/Customization/reider207_tail.rsi/meta.json new file mode 100644 index 0000000000..d46c363eb4 --- /dev/null +++ b/Resources/Textures/White/Mobs/Customization/reider207_tail.rsi/meta.json @@ -0,0 +1,103 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Reider207", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "tail", + "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 + ], + [ + 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 + ] + ] + }, + { + "name": "tailtip", + "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 + ], + [ + 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/Mobs/Customization/reider207_tail.rsi/tail.png b/Resources/Textures/White/Mobs/Customization/reider207_tail.rsi/tail.png new file mode 100644 index 0000000000..56672bddac Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/reider207_tail.rsi/tail.png differ diff --git a/Resources/Textures/White/Mobs/Customization/reider207_tail.rsi/tailtip.png b/Resources/Textures/White/Mobs/Customization/reider207_tail.rsi/tailtip.png new file mode 100644 index 0000000000..63ba33b4f0 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/reider207_tail.rsi/tailtip.png differ