Night At The Orchestra [All the Instruments] (#9364)

Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

@@ -15,7 +15,7 @@
   id: FunBrass
   description: "Bring some jazz to the station with the brass ensemble. Contains a variety of brass instruments for the whole station to play."
   icon:
-    sprite: Structures/Furniture/instruments.rsi
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
     state: tuba
   product: CrateFunBrass
   cost: 3500

Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml

@@ -24,8 +24,20 @@
       - XylophoneInstrument
       - BikeHornInstrument
       - RecorderInstrument
+      - FluteInstrument
+      - ClarinetInstrument
+      - CelloInstrument
+      - KalimbaInstrument
+      - MicrophoneInstrument
+      - BassGuitarInstrument
+      - OcarinaInstrument
+      - PanFluteInstrument
     chance: 0.95
     rarePrototypes:
       - SynthesizerInstrument
       - GunpetInstrument
+      - BagpipeInstrument
+      - RockGuitarInstrument
+      - MusicBoxInstrument
+      - ViolaInstrument
     rareChance: 0.05

Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml

@@ -0,0 +1,78 @@
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: BaseHandheldInstrument
+  description: That's an instrument.
+  components:
+  - type: Sprite
+    netsync: false
+  - type: Instrument
+  - type: ActivatableUI
+    inHandsOnly: true
+    singleUser: true
+    verbText: verb-instrument-openui
+    key: enum.InstrumentUiKey.Key
+  - type: UserInterface
+    interfaces:
+    - key: enum.InstrumentUiKey.Key
+      type: InstrumentBoundUserInterface
+  - type: Item
+    size: 24
+
+#These are for instruments that are larger, can't be picked up, or have collision
+- type: entity
+  name: baseinstrument
+  id: BasePlaceableInstrument
+  parent: BaseStructureDynamic
+  abstract: true
+  components:
+  - type: Instrument
+  - type: ActivatableUI
+    allowSpectator: false # otherwise they can play client-side music
+    inHandsOnly: false
+    singleUser: true
+    requireHands: true
+    verbText: verb-instrument-openui
+    key: enum.InstrumentUiKey.Key
+  - type: InteractionOutline
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: UserInterface
+    interfaces:
+    - key: enum.InstrumentUiKey.Key
+      type: InstrumentBoundUserInterface
+  - type: Fixtures
+    fixtures:
+    - shape:
+        !type:PhysShapeCircle
+        radius: 0.45
+      mass: 50
+      mask:
+      - Impassable
+      - HighImpassable
+      - MidImpassable
+      layer:
+      - Opaque
+      - HighImpassable
+      - MidImpassable
+      - BulletImpassable
+
+- type: entity
+  parent: BasePlaceableInstrument
+  id: BasePlaceableInstrumentRotatable
+  name: baseinstrumentrotatable
+  abstract: true
+  components:
+  - type: Rotatable
+    rotateWhileAnchored: true

Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml

@@ -0,0 +1,76 @@
+- type: entity
+  parent: BaseHandheldInstrument
+  id: TrumpetInstrument
+  name: trumpet
+  description: The favorite instrument of jazz musicians and egotistical middle schoolers.
+  components:
+  - type: Instrument
+    program: 56
+  - type: SwappableInstrument
+    instrumentList:
+      "Standard": {56: 0}
+      "Muted": {59: 0}
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/trumpet.rsi
+    state: icon
+  - type: Item
+    size: 24
+    sprite: Objects/Fun/Instruments/trumpet.rsi
+  - type: Tag
+    tags:
+    - BrassInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: TromboneInstrument
+  name: trombone
+  description: Everyone's favorite sliding brass instrument.
+  components:
+  - type: Instrument
+    program: 57
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/trombone.rsi
+    state: icon
+  - type: Item
+    size: 48
+    sprite: Objects/Fun/Instruments/trombone.rsi
+  - type: Tag
+    tags:
+    - BrassInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: FrenchHornInstrument
+  name: french horn
+  description: The fact that holding it involves using your hand to muffle it may suggest something about its sound.
+  components:
+  - type: Instrument
+    program: 60
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/frenchhorn.rsi
+    state: icon
+  - type: Item
+    size: 48
+    sprite: Objects/Fun/Instruments/frenchhorn.rsi
+  - type: Tag
+    tags:
+    - BrassInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: EuphoniumInstrument
+  name: euphonium
+  description: A baby tuba? A Baritone? Whatever it is, it's a pretty cool mess of pipes.
+  components:
+  - type: Instrument
+    program: 3
+    bank: 1
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/euphonium.rsi
+    state: icon
+  - type: Item
+    size: 48
+    sprite: Objects/Fun/Instruments/euphonium.rsi
+  - type: Tag
+    tags:
+    - BrassInstrument

Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml

@@ -0,0 +1,127 @@
+- type: entity
+  parent: BaseHandheldInstrument
+  id: MusicalLungInstrument
+  name: musical lung
+  description: The spiritual and magical lung of a former opera singer. Though, to be honest, the vocal chords make the performance.
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Human/organs.rsi
+    state: lung-l
+  - type: Instrument
+    program: 121
+  - type: Item
+    size: 10
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: SeashellInstrument
+  name: seashell
+  description: For laying down the shoreline beat.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/otherinstruments.rsi
+    state: seashell
+  - type: Instrument
+    program: 122
+  - type: Item
+    size: 10
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: BirdToyInstrument
+  name: bird whistle
+  description: A delightful little whistle in the shape of a bird. It sings beautifully.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/otherinstruments.rsi
+    state: birdtoy
+  - type: Instrument
+    program: 123
+  - type: Item
+    size: 5
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: PhoneInstrument
+  name: red phone
+  description: Should anything ever go wrong...
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/otherinstruments.rsi
+    state: red_phone
+  - type: EmitSoundOnLand
+    sound:
+       path: /Audio/Items/ring.ogg
+  - type: Instrument
+    program: 124
+  - type: Item
+    size: 10
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: HelicopterInstrument
+  name: toy helicopter
+  description: Ch-ka-ch-ka-ch-ka-ch-ka-ch-ka-ch-ka...
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/otherinstruments.rsi
+    state: helicopter
+  - type: Instrument
+    program: 125
+  - type: Item
+    size: 10
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: CannedApplauseInstrument
+  name: canned applause
+  description: Seems like someone already used it all up...
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/otherinstruments.rsi
+    state: cannedapplause
+  - type: Instrument
+    program: 126
+  - type: Item
+    size: 5
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: GunpetInstrument
+  name: gunpet
+  description: Why do you need to examine this? Is it not self-explanatory?
+  components:
+  - type: Instrument
+    program: 127
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/gunpet.rsi
+    state: icon
+  - type: Item
+    size: 15
+    sprite: Objects/Fun/Instruments/gunpet.rsi
+  - type: Tag
+    tags:
+    - BrassInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: BikeHornInstrument
+  name: gilded bike horn
+  description: An exquisitely decorated bike horn, capable of honking in a variety of notes.
+  components:
+  - type: Instrument
+    program: 1
+    bank: 1
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/bike_horn.rsi
+    state: icon
+  - type: Tag
+    tags:
+    - BrassInstrument #Go figure.
+  - type: Item
+    sprite: Objects/Fun/Instruments/bike_horn.rsi
+    size: 10
+  - type: Clothing
+    sprite: Objects/Fun/Instruments/bike_horn.rsi
+    slots: [Belt]
+    quickEquip: false

Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml

@@ -0,0 +1,139 @@
+- type: entity
+  parent: BaseHandheldInstrument
+  id: GlockenspielInstrument
+  name: glockenspiel
+  components:
+  - type: Instrument
+    program: 9
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/glockenspiel.rsi
+    state: icon
+  - type: Item
+    size: 24
+    sprite: Objects/Fun/Instruments/glockenspiel.rsi
+  - type: Tag
+    tags:
+    - PercussionInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: MusicBoxInstrument
+  name: music box
+  description: Playing this makes you feel safe from scary animatronics.
+  components:
+  - type: Instrument
+    program: 10
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/musicbox.rsi
+    state: icon
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: XylophoneInstrument
+  name: xylophone
+  description: Rainbow colored glockenspiel.
+  components:
+  - type: Instrument
+    program: 13
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: xylophone
+  - type: Tag
+    tags:
+    - PercussionInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: MicrophoneInstrument
+  name: microphone
+  description: Perfect for singing your heart out.
+  components:
+  - type: Instrument
+    program: 52
+  - type: SwappableInstrument
+    instrumentList:
+      "Aah": {52: 0}
+      "Ooh": {53: 0}
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/microphone.rsi
+    state: icon
+  - type: Item
+    size: 10
+    sprite: Objects/Fun/Instruments/microphone.rsi
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: SynthesizerInstrument
+  name: synthesizer
+  components:
+  - type: Instrument
+    program: 62
+  - type: SwappableInstrument
+    instrumentList:
+      "Electro": {62: 0} #i needed generic sounding synth presets, sue me
+      "Bubbles": {63: 0}
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
+    state: icon
+  - type: Item
+    size: 24
+    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
+  - type: Tag
+    tags:
+    - KeyedInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: KalimbaInstrument
+  name: kalimba
+  description: The power of a piano right at your thumbs.
+  components:
+  - type: Instrument
+    program: 108
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/kalimba.rsi
+    state: icon
+  - type: Tag
+    tags:
+    - KeyedInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: WoodblockInstrument
+  name: woodblock
+  description: If you listen to this enough it'll start driving itself into your mind.
+  components:
+  - type: Instrument
+    program: 115
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/woodblock.rsi
+    state: icon
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: ReverseCymbalsInstrument
+  name: reverse cymbals
+  description: I think you have it the wrong way around?
+  components:
+  - type: Instrument
+    program: 119
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/reversecymbal.rsi
+    state: icon
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: SuperSynthesizerInstrument
+  name: super synthesizer
+  description: Blasting the ghetto with Touhou MIDIs since 2020.
+  components:
+  - type: Instrument
+    allowPercussion: true
+    allowProgramChange: true
+    respectMidiLimits: false
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
+    state: icon
+  - type: Item
+    size: 24
+    sprite: Objects/Fun/Instruments/h_synthesizer.rsi

Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml

@@ -0,0 +1,195 @@
+- type: entity
+  parent: BaseHandheldInstrument
+  id: ElectricGuitarInstrument
+  name: electric guitar
+  description: Now this makes you feel like a rock star!
+  components:
+  - type: Instrument
+    program: 27
+  - type: SwappableInstrument
+    instrumentList:
+      "Clean": {27: 0}
+      "Jazz": {25: 0}
+      "Muted": {28: 0}
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/eguitar.rsi
+    state: icon
+  - type: Item
+    size: 24
+    sprite: Objects/Fun/Instruments/eguitar.rsi
+  - type: Tag
+    tags:
+    - StringInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: BassGuitarInstrument
+  name: bass guitar
+  description: You feel really cool holding this. Shame you're the only one that thinks that.
+  components:
+  - type: Instrument
+    program: 33
+  - type: SwappableInstrument
+    instrumentList:
+      "Fingered": {33: 0}
+      "Pick": {34: 0}
+      "Slap": {36: 0}
+      "Slap (XTra Funky)": {37: 0}
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/bassguitar.rsi
+    state: icon
+  - type: Item
+    size: 24
+    sprite: Objects/Fun/Instruments/bassguitar.rsi
+  - type: Tag
+    tags:
+    - StringInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: RockGuitarInstrument
+  name: rock guitar
+  description: What an axe!
+  components:
+  - type: Instrument
+    program: 29
+  - type: SwappableInstrument
+    instrumentList:
+      "Overdrive": {29: 0}
+      "Distortion": {30: 0}
+      "Harmonics": {31: 0}
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/rockguitar.rsi
+    state: icon
+  - type: Item
+    size: 24
+    sprite: Objects/Fun/Instruments/rockguitar.rsi
+  - type: Tag
+    tags:
+    - StringInstrument
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 4
+        Slash: 8
+  - type: Wieldable
+  - type: IncreaseDamageOnWield #they don't call it an axe for nothing
+    modifiers:
+      flatReductions:
+        Blunt: -2
+        Slash: -6
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: AcousticGuitarInstrument
+  name: acoustic guitar
+  description: Anyway, here's Wonderwall.
+  components:
+  - type: Instrument
+    program: 24
+  - type: SwappableInstrument
+    instrumentList:
+      "Nylon": {24: 0}
+      "Steel": {25: 0}
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/guitar.rsi
+    state: icon
+  - type: Tag
+    tags:
+    - StringInstrument
+  - type: Item
+    sprite: Objects/Fun/Instruments/guitar.rsi
+    size: 24
+  - type: Clothing
+    quickEquip: false
+    slots:
+    - back
+    sprite: Objects/Fun/Instruments/guitar.rsi
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: GuitarlessFretsInstrument
+  name: guitarless frets
+  description: who even needs a body?
+  suffix: Admeme #the sound is awful
+  components:
+  - type: Instrument
+    program: 120
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/guitarlessfrets.rsi
+    state: icon
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: BanjoInstrument
+  name: banjo
+  components:
+  - type: Instrument
+    program: 105
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/banjo.rsi
+    state: icon
+  - type: Item
+    size: 24
+    sprite: Objects/Fun/Instruments/banjo.rsi
+  - type: Tag
+    tags:
+    - StringInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: ViolinInstrument
+  name: violin
+  description: The favorite of musical virtuosos and bluegrass bands.
+  components:
+  - type: Instrument
+    program: 40
+  - type: SwappableInstrument
+    instrumentList:
+      "Classical": {40: 0}
+      "Bluegrass": {110: 0}
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/violin.rsi
+    state: icon
+  - type: Item
+    size: 24
+    sprite: Objects/Fun/Instruments/violin.rsi
+  - type: Tag
+    tags:
+    - StringInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: ViolaInstrument
+  name: viola
+  description: Like a violin, but worse.
+  components:
+  - type: Instrument
+    program: 41
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/viola.rsi
+    state: icon
+  - type: Item
+    size: 24
+    sprite: Objects/Fun/Instruments/viola.rsi
+  - type: Tag
+    tags:
+    - StringInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: CelloInstrument
+  name: cello
+  description: The nerds call these violoncellos.
+  components:
+  - type: Instrument
+    program: 42
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/cello.rsi
+    state: icon
+  - type: Item
+    size: 48
+    sprite: Objects/Fun/Instruments/cello.rsi
+  - type: Tag
+    tags:
+    - StringInstrument

Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml

@@ -1,63 +1,4 @@
 - type: entity
-  name: baseinstrument
-  id: BasePlaceableInstrument
-  parent: BaseStructureDynamic
-  abstract: true
-  components:
-  - type: Instrument
-  - type: ActivatableUI
-    allowSpectator: false # otherwise they can play client-side music
-    inHandsOnly: false
-    singleUser: true
-    requireHands: true
-    verbText: verb-instrument-openui
-    key: enum.InstrumentUiKey.Key
-  - type: InteractionOutline
-  - type: Sprite
-    sprite: Structures/Furniture/instruments.rsi
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 50
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: UserInterface
-    interfaces:
-    - key: enum.InstrumentUiKey.Key
-      type: InstrumentBoundUserInterface
-  - type: Fixtures
-    fixtures:
-    - shape:
-        !type:PhysShapeCircle
-        radius: 0.45
-      mass: 50
-      mask:
-      - Impassable
-      - HighImpassable
-      - MidImpassable
-      layer:
-      - Opaque
-      - HighImpassable
-      - MidImpassable
-      - BulletImpassable
-  - type: Transform
-    anchored: true
-
-- type: entity
-  parent: BasePlaceableInstrument
-  id: BasePlaceableInstrumentRotatable
-  name: baseinstrumentrotatable
-  abstract: true
-  components:
-  - type: Rotatable
-    rotateWhileAnchored: true
-
-- type: entity
   name: piano
   parent: BasePlaceableInstrumentRotatable
   id: PianoInstrument
@@ -82,15 +23,25 @@
   - type: Climbable
 
 - type: entity
-  name: minimoog
+  name: vibraphone
+  id: VibraphoneInstrument
   parent: BasePlaceableInstrumentRotatable
-  id: MinimoogInstrument
-  description: This is a minimoog, like a space piano, but more spacey!
+  description: Good vibes all around.
   components:
   - type: Instrument
-    program: 81
+    program: 11
   - type: Sprite
-    state: minimoog
+    state: vibraphone
+
+- type: entity
+  name: marimba
+  id: MarimbaInstrument
+  parent: BasePlaceableInstrumentRotatable
+  components:
+  - type: Instrument
+    program: 12
+  - type: Sprite
+    state: marimba
 
 - type: entity
   name: church organ
@@ -105,7 +56,7 @@
 
 - type: entity
   name: tuba
-  parent: BasePlaceableInstrumentRotatable
+  parent: BasePlaceableInstrument
   id: TubaInstrument
   description: The big daddy of the brass family. Standing next to its majesty makes you feel insecure.
   components:
@@ -114,6 +65,86 @@
   - type: Sprite
     state: tuba
 
+- type: entity
+  id: HarpInstrument
+  parent: BasePlaceableInstrument
+  name: harp
+  description: Plucking at the strings cuts your fingers, but at least the music is pretty.
+  components:
+  - type: Instrument
+    program: 46
+  - type: Sprite
+    state: harp
+
+- type: entity
+  id: TimpaniInstrument
+  parent: BasePlaceableInstrumentRotatable
+  name: timpani
+  description: It goes BOOM BOOM BOOM BOOM!
+  components:
+  - type: Instrument
+    program: 47
+  - type: Sprite
+    state: timpani
+
+- type: entity
+  id: TaikoInstrument
+  parent: BasePlaceableInstrumentRotatable
+  name: taiko
+  description: A large drum. Looking at it fills you with the urge to slap it.
+  components:
+  - type: Instrument
+    program: 116
+  - type: Sprite
+    state: taiko
+
+- type: entity
+  id: ContrabassInstrument
+  parent: BasePlaceableInstrument
+  name: contrabass
+  description: Perfect for laying down a nice jazzy beat.
+  components:
+  - type: Instrument
+    program: 43
+  - type: Sprite
+    state: contrabass
+  - type: Fixtures
+    fixtures:
+    - shape:
+        !type:PhysShapeCircle
+        radius: 0.30
+      mass: 50
+      mask:
+      - Impassable
+      - HighImpassable
+      - MidImpassable
+      layer:
+      - Opaque
+      - HighImpassable
+      - MidImpassable
+      - BulletImpassable
+
+- type: entity
+  name: minimoog
+  parent: BasePlaceableInstrumentRotatable
+  id: MinimoogInstrument
+  description: This is a minimoog, like a space piano, but more spacey!
+  components:
+  - type: Instrument
+    program: 81
+  - type: Sprite
+    state: minimoog
+
+- type: entity
+  id: TomDrumsInstrument
+  parent: BasePlaceableInstrumentRotatable
+  name: tom drums
+  description: Where'd the rest of the kit go?
+  components:
+  - type: Instrument
+    program: 117
+  - type: Sprite
+    state: toms
 
 - type: entity
   parent: BasePlaceableInstrument

Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml

@@ -0,0 +1,178 @@
+- type: entity
+  parent: BaseHandheldInstrument
+  id: SaxophoneInstrument
+  name: saxophone
+  description: An instrument. You could probably grind this into raw jazz.
+  components:
+  - type: Instrument
+    program: 66
+  - type: SwappableInstrument
+    instrumentList:
+      "Soprano": {64: 0}
+      "Alto": {65: 0}
+      "Tenor": {66: 0}
+      "Baritone": {67: 0}
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/saxophone.rsi
+    state: icon
+  - type: Item
+    size: 24
+    sprite: Objects/Fun/Instruments/saxophone.rsi
+  - type: Tag
+    tags:
+    - WoodwindInstrument
+  - type: Extractable
+    grindableSolutionName: sax
+  - type: SolutionContainerManager
+    solutions:
+      sax:
+        reagents:
+          - ReagentId: Saxoite
+            Quantity: 10
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: AccordionInstrument
+  name: accordion
+  components:
+  - type: Instrument
+    program: 21
+  - type: SwappableInstrument
+    instrumentList:
+      "Standard": {21: 0}
+      "Tango": {23: 0}
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/accordion.rsi
+    state: icon
+  - type: Item
+    size: 24
+    sprite: Objects/Fun/Instruments/accordion.rsi
+  - type: Tag
+    tags:
+    - KeyedInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: HarmonicaInstrument
+  name: harmonica
+  components:
+  - type: Instrument
+    program: 22
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/harmonica.rsi
+    state: icon
+  - type: Item
+    size: 10
+    sprite: Objects/Fun/Instruments/harmonica.rsi
+  - type: Tag
+    tags:
+    - WoodwindInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: ClarinetInstrument
+  name: clarinet
+  description: Skweedward tintacklays.
+  components:
+  - type: Instrument
+    program: 71
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/clarinet.rsi
+    state: icon
+  - type: Item
+    size: 20
+    sprite: Objects/Fun/Instruments/clarinet.rsi
+  - type: Tag
+    tags:
+    - WoodwindInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: FluteInstrument
+  name: flute
+  description: Reaching new heights of being horrifyingly shrill.
+  components:
+  - type: Instrument
+    program: 73
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/flute.rsi
+    state: icon
+  - type: Item
+    size: 20
+    sprite: Objects/Fun/Instruments/flute.rsi
+  - type: Tag
+    tags:
+    - WoodwindInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: RecorderInstrument
+  name: recorder
+  description: Comes in various colors of fashionable plastic!
+  components:
+  - type: Instrument
+    program: 74
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/recorder.rsi
+    state: icon
+  - type: Item
+    size: 24
+    sprite: Objects/Fun/Instruments/recorder.rsi
+  - type: Tag
+    tags:
+    - WoodwindInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: PanFluteInstrument
+  name: pan flute
+  description: Perfect for luring ancient mythical beings to dance with you.
+  components:
+  - type: Instrument
+    program: 75
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/panflute.rsi
+    state: icon
+  - type: Item
+    size: 15
+    sprite: Objects/Fun/Instruments/panflute.rsi
+  - type: Tag
+    tags:
+    - WoodwindInstrument
+
+#if you change this to some cringe-ass zelda reference so help me god i will shoot you dead.
+- type: entity
+  parent: BaseHandheldInstrument
+  id: OcarinaInstrument
+  name: ocarina
+  description: Good for playing lullabies.
+  components:
+  - type: Instrument
+    program: 79
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/ocarina.rsi
+    state: icon
+  - type: Item
+    size: 15
+    sprite: Objects/Fun/Instruments/ocarina.rsi
+  - type: Tag
+    tags:
+    - WoodwindInstrument
+
+- type: entity
+  parent: BaseHandheldInstrument
+  id: BagpipeInstrument
+  name: bagpipe
+  description: Pairs nicely with a kilt.
+  components:
+  - type: Instrument
+    program: 109
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/bagpipes.rsi
+    state: icon
+  - type: Item
+    size: 48
+    sprite: Objects/Fun/Instruments/bagpipes.rsi
+  - type: Tag
+    tags:
+    - WoodwindInstrument

Resources/Prototypes/Entities/Objects/Fun/instruments.yml

@@ -1,394 +0,0 @@
-- type: entity
-  abstract: true
-  parent: BaseItem
-  id: BaseHandheldInstrument
-  description: That's an instrument.
-  components:
-  - type: Sprite
-    netsync: false
-  - type: Instrument
-  - type: ActivatableUI
-    inHandsOnly: true
-    singleUser: true
-    verbText: verb-instrument-openui
-    key: enum.InstrumentUiKey.Key
-  - type: UserInterface
-    interfaces:
-    - key: enum.InstrumentUiKey.Key
-      type: InstrumentBoundUserInterface
-  - type: Item
-    size: 24
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: SynthesizerInstrument
-  name: synthesizer
-  components:
-  - type: Instrument
-    program: 62
-  - type: SwappableInstrument
-    instrumentList:
-      "Electro": {62: 0} #i needed generic sounding synth presets, sue me
-      "Bubbles": {63: 0}
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
-    state: icon
-  - type: Item
-    size: 24
-    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
-  - type: Tag
-    tags:
-    - KeyedInstrument
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: AcousticGuitarInstrument
-  name: acoustic guitar
-  description: Anyway, here's Wonderwall.
-  components:
-  - type: Instrument
-    program: 24
-  - type: SwappableInstrument
-    instrumentList:
-      "Nylon": {24: 0}
-      "Steel": {25: 0}
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/guitar.rsi
-    state: icon
-  - type: Tag
-    tags:
-    - StringInstrument
-  - type: Item
-    sprite: Objects/Fun/Instruments/guitar.rsi
-    size: 24
-  - type: Clothing
-    quickEquip: false
-    slots:
-    - back
-    sprite: Objects/Fun/Instruments/guitar.rsi
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: ViolinInstrument
-  name: violin
-  components:
-  - type: Instrument
-    program: 40
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/violin.rsi
-    state: icon
-  - type: Item
-    size: 24
-    sprite: Objects/Fun/Instruments/violin.rsi
-  - type: Tag
-    tags:
-    - StringInstrument
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: TrumpetInstrument
-  name: trumpet
-  description: The favorite instrument of jazz musicians and egotistical middle schoolers.
-  components:
-  - type: Instrument
-    program: 56
-  - type: SwappableInstrument
-    instrumentList:
-      "Standard": {56: 0}
-      "Muted": {59: 0}
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/trumpet.rsi
-    state: icon
-  - type: Item
-    size: 24
-    sprite: Objects/Fun/Instruments/trumpet.rsi
-  - type: Tag
-    tags:
-    - BrassInstrument
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: GunpetInstrument
-  name: gunpet
-  description: Why do you need to examine this? Is it not self-explanatory?
-  components:
-  - type: Instrument
-    program: 127
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/gunpet.rsi
-    state: icon
-  - type: Item
-    size: 24
-    sprite: Objects/Fun/Instruments/gunpet.rsi
-  - type: Tag
-    tags:
-    - BrassInstrument
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: ElectricGuitarInstrument
-  name: electric guitar
-  components:
-  - type: Instrument
-    program: 27
-  - type: SwappableInstrument
-    instrumentList:
-      "Clean": {27: 0}
-      "Jazz": {25: 0}
-      "Muted": {28: 0}
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/eguitar.rsi
-    state: icon
-  - type: Item
-    size: 24
-    sprite: Objects/Fun/Instruments/eguitar.rsi
-  - type: Tag
-    tags:
-    - StringInstrument
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: AccordionInstrument
-  name: accordion
-  components:
-  - type: Instrument
-    program: 21
-  - type: SwappableInstrument
-    instrumentList:
-      "Standard": {21: 0}
-      "Tango": {23: 0}
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/accordion.rsi
-    state: icon
-  - type: Item
-    size: 24
-    sprite: Objects/Fun/Instruments/accordion.rsi
-  - type: Tag
-    tags:
-    - KeyedInstrument
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: HarmonicaInstrument
-  name: harmonica
-  components:
-  - type: Instrument
-    program: 22
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/harmonica.rsi
-    state: icon
-  - type: Item
-    size: 10
-    sprite: Objects/Fun/Instruments/harmonica.rsi
-  - type: Tag
-    tags:
-    - WoodwindInstrument
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: RecorderInstrument
-  name: recorder
-  components:
-  - type: Instrument
-    program: 74
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/recorder.rsi
-    state: icon
-  - type: Item
-    size: 24
-    sprite: Objects/Fun/Instruments/recorder.rsi
-  - type: Tag
-    tags:
-    - WoodwindInstrument
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: TromboneInstrument
-  name: trombone
-  description: Everyone's favorite sliding brass instrument.
-  components:
-  - type: Instrument
-    program: 57
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/trombone.rsi
-    state: icon
-  - type: Item
-    size: 48
-    sprite: Objects/Fun/Instruments/trombone.rsi
-  - type: Tag
-    tags:
-    - BrassInstrument
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: EuphoniumInstrument
-  name: euphonium
-  description: A baby tuba? A Baritone? Whatever it is, it's a pretty cool mess of pipes.
-  components:
-  - type: Instrument
-    program: 3
-    bank: 1
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/euphonium.rsi
-    state: icon
-  - type: Item
-    size: 48
-    sprite: Objects/Fun/Instruments/euphonium.rsi
-  - type: Tag
-    tags:
-    - BrassInstrument
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: FrenchHornInstrument
-  name: french horn
-  description: The fact that holding it involves using your hand to muffle it may suggest something about its sound.
-  components:
-  - type: Instrument
-    program: 60
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/frenchhorn.rsi
-    state: icon
-  - type: Item
-    size: 48
-    sprite: Objects/Fun/Instruments/frenchhorn.rsi
-  - type: Tag
-    tags:
-    - BrassInstrument
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: SaxophoneInstrument
-  name: saxophone
-  description: An instrument. You could probably grind this into raw jazz.
-  components:
-  - type: Instrument
-    program: 66
-  - type: SwappableInstrument
-    instrumentList:
-      "Soprano": {64: 0}
-      "Alto": {65: 0}
-      "Tenor": {66: 0}
-      "Baritone": {67: 0}
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/saxophone.rsi
-    state: icon
-  - type: Item
-    size: 24
-    sprite: Objects/Fun/Instruments/saxophone.rsi
-  - type: Tag
-    tags:
-    - WoodwindInstrument
-  - type: Extractable
-    grindableSolutionName: sax
-  - type: SolutionContainerManager
-    solutions:
-      sax:
-        reagents:
-          - ReagentId: Saxoite
-            Quantity: 10
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: GlockenspielInstrument
-  name: glockenspiel
-  components:
-  - type: Instrument
-    program: 9
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/glockenspiel.rsi
-    state: icon
-  - type: Item
-    size: 24
-    sprite: Objects/Fun/Instruments/glockenspiel.rsi
-  - type: Tag
-    tags:
-    - PercussionInstrument
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: BanjoInstrument
-  name: banjo
-  components:
-  - type: Instrument
-    program: 105
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/banjo.rsi
-    state: icon
-  - type: Item
-    size: 24
-    sprite: Objects/Fun/Instruments/banjo.rsi
-  - type: Tag
-    tags:
-    - StringInstrument
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: BikeHornInstrument
-  name: gilded bike horn
-  description: An exquisitely decorated bike horn, capable of honking in a variety of notes.
-  components:
-  - type: Instrument
-    program: 1
-    bank: 1
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/bike_horn.rsi
-    state: icon
-  - type: Tag
-    tags:
-    - BrassInstrument #Go figure.
-  - type: Item
-    sprite: Objects/Fun/Instruments/bike_horn.rsi
-    size: 24
-  - type: Clothing
-    sprite: Objects/Fun/Instruments/bike_horn.rsi
-    slots: [Belt]
-    quickEquip: false
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: SuperSynthesizerInstrument
-  name: super synthesizer
-  description: Blasting the ghetto with Touhou MIDIs since 2020.
-  components:
-  - type: Instrument
-    allowPercussion: true
-    allowProgramChange: true
-    respectMidiLimits: false
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
-    state: icon
-  - type: Item
-    size: 24
-    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: XylophoneInstrument
-  name: xylophone
-  description: Rainbow colored glockenspiel.
-  components:
-  - type: Instrument
-    program: 13
-  - type: Sprite
-    sprite: Structures/Furniture/instruments.rsi
-    state: xylophone
-  - type: Tag
-    tags:
-    - PercussionInstrument
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: PhoneInstrument
-  name: red phone
-  description: Should anything ever go wrong...
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/otherinstruments.rsi
-    state: red_phone
-  - type: EmitSoundOnLand
-    sound:
-       path: /Audio/Items/ring.ogg
-  - type: Instrument
-    program: 124
-

Resources/Textures/Objects/Fun/Instruments/bagpipes.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "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
+    }
+  ]
+}

Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "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
+    }
+  ]
+}

Resources/Textures/Objects/Fun/Instruments/cello.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Hyenh and EmoGarbage404",
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Fun/Instruments/clarinet.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Hyenh and EmoGarbage404",
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331",
+  "copyright": "Created by EmoGarbage404",
   "states": [
     {
       "name": "icon"

Resources/Textures/Objects/Fun/Instruments/flute.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Hyenh and EmoGarbage404",
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Fun/Instruments/guitarlessfrets.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by Hyenh",
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Fun/Instruments/kalimba.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "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
+    }
+  ]
+}

Resources/Textures/Objects/Fun/Instruments/microphone.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by EmoGarbage",
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Fun/Instruments/musicbox.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Hyenh and EmoGarbage404",
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Fun/Instruments/ocarina.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "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
+    }
+  ]
+}

Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json

@@ -11,7 +11,10 @@
       "name": "bike_horn"
     },
     {
-      "name": "red_phone"
+      "name": "birdtoy"
+    },
+    {
+      "name": "cannedapplause"
     },
     {
       "name": "drum"
@@ -21,6 +24,15 @@
     },
     {
       "name": "drum_makeshift"
+    },
+    {
+      "name": "helicopter"
+    },
+    {
+      "name": "red_phone"
+    },
+    {
+      "name": "seashell"
     }
   ]
 }

Resources/Textures/Objects/Fun/Instruments/panflute.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "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
+    }
+  ]
+}

Resources/Textures/Objects/Fun/Instruments/recorder.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331",
+  "copyright": "Created by EmoGarbage404",
   "states": [
     {
       "name": "icon"

Resources/Textures/Objects/Fun/Instruments/reversecymbal.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by EmoGarbage",
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "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"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331, daw-base/display from /tg/staiton at commit https://github.com/tgstation/tgstation/commit/ebcf2ab180037d400a7e8ac7a2ba011a0f03edf3",
+  "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331, daw-base/display from /tg/staiton at commit https://github.com/tgstation/tgstation/commit/ebcf2ab180037d400a7e8ac7a2ba011a0f03edf3, harp.png, timpani.png and contrabass.png by Hyenh, tuba.png by EmoGarbage404",
   "states": [
     {
       "name": "minimoog",
@@ -40,8 +40,32 @@
       "directions": 4
     },
     {
-      "name": "tuba",
-      "directions": 1
+      "name": "harp",
+    },
+    {
+      "name": "contrabass",
+    },
+    {
+      "name": "taiko"
+    },
+    {
+      "name": "timpani",
+	  "directions": 4
+    },
+    {
+      "name": "toms",
+	  "directions": 4
+    },
+    {
+      "name": "marimba",
+	  "directions": 4
+    },
+    {
+      "name": "vibraphone",
+	  "directions": 4
+    },
+    {
+      "name": "tuba"
     },
     {
       "name": "daw-base",