diff --git a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml index b7a46f8b1a..11fb69bed1 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml @@ -67,8 +67,11 @@ - type: Instrument program: 56 - type: Sprite - sprite: Objects/Fun/Instruments/otherinstruments.rsi - state: trumpet + sprite: Objects/Fun/Instruments/trumpet.rsi + state: icon + - type: Item + size: 24 + sprite: Objects/Fun/Instruments/trumpet.rsi - type: entity name: electric guitar diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json index 7cf7f66205..2726142380 100644 --- a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json @@ -23,14 +23,6 @@ ] ] }, - { - "name": "trumpet", - "delays": [ - [ - 1 - ] - ] - }, { "name": "drum_bongo", "delays": [ diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/trumpet.png b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/trumpet.png rename to Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/icon.png diff --git a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-left.png new file mode 100644 index 0000000000..46f1698e4d Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-right.png new file mode 100644 index 0000000000..a2f41e0170 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/meta.json new file mode 100644 index 0000000000..2374ac813f --- /dev/null +++ b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331", + "states": [ + { + "name": "icon", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +}