diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml index 5f38bdca3e..c29c482dfd 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity parent: BaseHandheldInstrument id: ElectricGuitarInstrument name: electric guitar @@ -17,6 +17,11 @@ - type: Item size: 24 sprite: Objects/Fun/Instruments/eguitar.rsi + - type: Clothing + quickEquip: false + slots: + - back + sprite: Objects/Fun/Instruments/eguitar.rsi - type: Tag tags: - StringInstrument @@ -41,6 +46,11 @@ - type: Item size: 24 sprite: Objects/Fun/Instruments/bassguitar.rsi + - type: Clothing + quickEquip: false + slots: + - back + sprite: Objects/Fun/Instruments/bassguitar.rsi - type: Tag tags: - StringInstrument @@ -64,6 +74,11 @@ - type: Item size: 24 sprite: Objects/Fun/Instruments/rockguitar.rsi + - type: Clothing + quickEquip: false + slots: + - back + sprite: Objects/Fun/Instruments/rockguitar.rsi - type: Tag tags: - StringInstrument @@ -223,4 +238,4 @@ sprite: Objects/Fun/Instruments/cello.rsi - type: Tag tags: - - StringInstrument \ No newline at end of file + - StringInstrument diff --git a/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..72146d40e5 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/meta.json index 926a59eb20..831493169f 100644 --- a/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/meta.json @@ -5,18 +5,22 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Created by EmoGarbage404", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "copyright": "Created by EmoGarbage404. Back equip sprite created by RiceMar.", + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..ba9d4876a2 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json index 926a59eb20..0891477f1b 100644 --- a/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json @@ -1,22 +1,26 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Created by EmoGarbage404", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "Created by EmoGarbage404. Back equip sprite created by RiceMar.", + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..36cb11d801 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json index 7d3a373c1b..7fb73d450d 100644 --- a/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json @@ -1,30 +1,34 @@ { - "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" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331. Back equip sprite created by RiceMar.", + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] }