diff --git a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml index b65e89e9bf..ea0085e687 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml @@ -39,6 +39,7 @@ parent: BaseHandheldInstrument id: AcousticGuitarInstrument name: acoustic guitar + description: Anyway, here's Wonderwall. components: - type: Instrument program: 25 diff --git a/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml b/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml index fc50b8aa88..abb5c66151 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml @@ -49,6 +49,18 @@ state: piano - type: Climbable +- type: entity + name: upright piano + parent: BasePlaceableInstrumentRotatable + id: UprightPianoInstrument + description: I said Piannie! + components: + - type: Instrument + program: 3 + - type: Sprite + state: piano-upright + - type: Climbable + - type: entity name: minimoog parent: BasePlaceableInstrumentRotatable @@ -67,7 +79,7 @@ description: This thing really blows! components: - type: Instrument - program: 20 + program: 19 - type: Sprite state: church-organ diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json b/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json index e84fc5bfc7..02009bec88 100644 --- a/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json @@ -23,6 +23,10 @@ "name": "piano", "directions": 4 }, + { + "name": "piano-upright", + "directions": 4 + }, { "name": "piano-broken", "directions": 4 diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/piano-upright.png b/Resources/Textures/Structures/Furniture/instruments.rsi/piano-upright.png new file mode 100644 index 0000000000..ed0f6d1efa Binary files /dev/null and b/Resources/Textures/Structures/Furniture/instruments.rsi/piano-upright.png differ diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/piano.png b/Resources/Textures/Structures/Furniture/instruments.rsi/piano.png index 545386ff33..8f5662e901 100644 Binary files a/Resources/Textures/Structures/Furniture/instruments.rsi/piano.png and b/Resources/Textures/Structures/Furniture/instruments.rsi/piano.png differ