From 00abdba123b28683465e6cb470529ea3bfa7413c Mon Sep 17 00:00:00 2001 From: Kotovskiy34 Date: Mon, 22 May 2023 19:56:46 +0300 Subject: [PATCH] MEOW --- Resources/Prototypes/White/Fluff/fluff.yml | 18 +++++------ .../{inhands-left.png => inhand-left.png} | Bin .../{inhands-right.png => inhand-right.png} | Bin .../Derderiot/super-synthesizer.rsi/meta.json | 28 ++++++++++++------ 4 files changed, 28 insertions(+), 18 deletions(-) rename Resources/Textures/White/Fluff/Derderiot/super-synthesizer.rsi/{inhands-left.png => inhand-left.png} (100%) rename Resources/Textures/White/Fluff/Derderiot/super-synthesizer.rsi/{inhands-right.png => inhand-right.png} (100%) diff --git a/Resources/Prototypes/White/Fluff/fluff.yml b/Resources/Prototypes/White/Fluff/fluff.yml index b6374e9afc..c10e5e5cc6 100644 --- a/Resources/Prototypes/White/Fluff/fluff.yml +++ b/Resources/Prototypes/White/Fluff/fluff.yml @@ -201,20 +201,20 @@ - type: Sprite sprite: White/Fluff/deadman1740/gray.rsi -# Dederiot +# Derderiot - type: entity parent: BaseHandheldInstrument - id: SuperSynthesizerInstrumentDederiot + id: SuperSynthesizerInstrumentDerderiot name: супер синтезатор - description: Выглядит модно. Да. + description: Выглядит модно. Прямиком из 80-ых! Да! components: - - type: Sprite - sprite: White/Fluff/Dederiot/super_synthesizer.rsi - state: icon - - type: Item - size: 20 - sprite: White/Fluff/Dederiot/super_synthesizer.rsi - type: Instrument allowPercussion: true allowProgramChange: true respectMidiLimits: false + - type: Sprite + sprite: /White/Fluff/Derderiot/super-synthesizer.rsi + state: icon + - type: Item + size: 24 + sprite: /White/Fluff/Derderiot/super-synthesizer.rsi diff --git a/Resources/Textures/White/Fluff/Derderiot/super-synthesizer.rsi/inhands-left.png b/Resources/Textures/White/Fluff/Derderiot/super-synthesizer.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/White/Fluff/Derderiot/super-synthesizer.rsi/inhands-left.png rename to Resources/Textures/White/Fluff/Derderiot/super-synthesizer.rsi/inhand-left.png diff --git a/Resources/Textures/White/Fluff/Derderiot/super-synthesizer.rsi/inhands-right.png b/Resources/Textures/White/Fluff/Derderiot/super-synthesizer.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/White/Fluff/Derderiot/super-synthesizer.rsi/inhands-right.png rename to Resources/Textures/White/Fluff/Derderiot/super-synthesizer.rsi/inhand-right.png diff --git a/Resources/Textures/White/Fluff/Derderiot/super-synthesizer.rsi/meta.json b/Resources/Textures/White/Fluff/Derderiot/super-synthesizer.rsi/meta.json index 5bcd1817b7..a3aa84b382 100644 --- a/Resources/Textures/White/Fluff/Derderiot/super-synthesizer.rsi/meta.json +++ b/Resources/Textures/White/Fluff/Derderiot/super-synthesizer.rsi/meta.json @@ -1,12 +1,22 @@ -{"version": 1, +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord user 319426185702539266", - - "size": {"x": 32, "y": 32}, + "copyright": "Created by Discord User 319426185702539266", "states": [ - {"name": "inhand-left", - "directions": 4}, - {"name": "inhand-right", - "directions": 4}, - {"name": "icon"}] + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] }