From 26f809aebf10d6e2139061c4332caa9ffa76d878 Mon Sep 17 00:00:00 2001
From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Sun, 16 Jun 2024 06:27:35 -0500
Subject: [PATCH] Instruments for Musician lodouts (#29059)

* Musician Instruments to Musician lodouts

* Move instruments to their own file, fix instruments spawning on the floor, Found bug of Loadout dropping items on the floor rather than sorting inventory

* Whoops, I removed bagpipes for some reason
---
 .../en-US/preferences/loadout-groups.ftl      |   1 +
 .../Loadouts/Jobs/Civilian/musician.yml       |   2 +-
 .../Loadouts/Miscellaneous/instruments.yml    | 280 ++++++++++++++++++
 .../Prototypes/Loadouts/loadout_groups.yml    |  35 +++
 .../Prototypes/Loadouts/role_loadouts.yml     |   1 +
 .../Roles/Jobs/Civilian/musician.yml          |   2 -
 6 files changed, 318 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml

diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
index 28863268df..a107ee24f8 100644
--- a/Resources/Locale/en-US/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl
@@ -2,6 +2,7 @@
 loadout-group-trinkets = Trinkets
 loadout-group-glasses = Glasses
 loadout-group-backpack = Backpack
+loadout-group-instruments = Instruments
 
 # Command
 loadout-group-captain-head = Captain head
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
index c26da03628..486ff25d47 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
@@ -6,4 +6,4 @@
 - type: startingGear
   id: MusicianWintercoat
   equipment:
-    outerClothing: ClothingOuterWinterMusician
\ No newline at end of file
+    outerClothing: ClothingOuterWinterMusician
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml b/Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml
new file mode 100644
index 0000000000..5b7e46151f
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml
@@ -0,0 +1,280 @@
+# Instruments
+- type: loadout
+  id: Glockenspiel
+  equipment: Glockenspiel
+
+- type: startingGear
+  id: Glockenspiel
+  storage:
+    back:
+    - GlockenspielInstrument
+
+- type: loadout
+  id: MusicBox
+  equipment: MusicBox
+
+- type: startingGear
+  id: MusicBox
+  storage:
+    back:
+    - MusicBoxInstrument
+
+- type: loadout
+  id: Xylophone
+  equipment: Xylophone
+
+- type: startingGear
+  id: Xylophone
+  storage:
+    back:
+    - XylophoneInstrument
+
+- type: loadout
+  id: Microphone
+  equipment: Microphone
+
+- type: startingGear
+  id: Microphone
+  storage:
+    back:
+    - MicrophoneInstrument
+
+- type: loadout
+  id: Synthesizer
+  equipment: Synthesizer
+
+- type: startingGear
+  id: Synthesizer
+  storage:
+    back:
+    - SynthesizerInstrument
+
+- type: loadout
+  id: Kalimba
+  equipment: Kalimba
+
+- type: startingGear
+  id: Kalimba
+  storage:
+    back:
+    - KalimbaInstrument
+
+- type: loadout
+  id: Woodblock
+  equipment: Woodblock
+
+- type: startingGear
+  id: Woodblock
+  storage:
+    back:
+    - WoodblockInstrument
+
+- type: loadout
+  id: ElectricGuitar
+  equipment: ElectricGuitar
+
+- type: startingGear
+  id: ElectricGuitar
+  storage:
+    back:
+    - ElectricGuitarInstrument
+
+- type: loadout
+  id: BassGuitar
+  equipment: BassGuitar
+
+- type: startingGear
+  id: BassGuitar
+  storage:
+    back:
+    - BassGuitarInstrument
+
+- type: loadout
+  id: RockGuitar
+  equipment: RockGuitar
+
+- type: startingGear
+  id: RockGuitar
+  storage:
+    back:
+    - RockGuitarInstrument
+
+- type: loadout
+  id: AcousticGuitar
+  equipment: AcousticGuitar
+
+- type: startingGear
+  id: AcousticGuitar
+  storage:
+    back:
+    - AcousticGuitarInstrument
+
+- type: loadout
+  id: Banjo
+  equipment: Banjo
+
+- type: startingGear
+  id: Banjo
+  storage:
+    back:
+    - BanjoInstrument
+
+- type: loadout
+  id: Violin
+  equipment: Violin
+
+- type: startingGear
+  id: Violin
+  storage:
+    back:
+    - ViolinInstrument
+
+- type: loadout
+  id: Viola
+  equipment: Viola
+
+- type: startingGear
+  id: Viola
+  storage:
+    back:
+    - ViolaInstrument
+
+- type: loadout
+  id: Cello
+  equipment: Cello
+
+- type: startingGear
+  id: Cello
+  storage:
+    back:
+    - CelloInstrument
+
+- type: loadout
+  id: Trumpet
+  equipment: Trumpet
+
+- type: startingGear
+  id: Trumpet
+  storage:
+    back:
+    - TrumpetInstrument
+
+- type: loadout
+  id: Trombone
+  equipment: Trombone
+
+- type: startingGear
+  id: Trombone
+  storage:
+    back:
+    - TromboneInstrument
+
+- type: loadout
+  id: FrenchHorn
+  equipment: FrenchHorn
+
+- type: startingGear
+  id: FrenchHorn
+  storage:
+    back:
+    - FrenchHornInstrument
+
+- type: loadout
+  id: Euphonium
+  equipment: Euphonium
+
+- type: startingGear
+  id: Euphonium
+  storage:
+    back:
+    - EuphoniumInstrument
+
+- type: loadout
+  id: Saxophone
+  equipment: Saxophone
+
+- type: startingGear
+  id: Saxophone
+  storage:
+    back:
+    - SaxophoneInstrument
+
+- type: loadout
+  id: Accordion
+  equipment: Accordion
+
+- type: startingGear
+  id: Accordion
+  storage:
+    back:
+    - AccordionInstrument
+
+- type: loadout
+  id: Harmonica
+  equipment: Harmonica
+
+- type: startingGear
+  id: Harmonica
+  storage:
+    back:
+    - HarmonicaInstrument
+
+- type: loadout
+  id: Clarinet
+  equipment: Clarinet
+
+- type: startingGear
+  id: Clarinet
+  storage:
+    back:
+    - ClarinetInstrument
+
+- type: loadout
+  id: Flute
+  equipment: Flute
+
+- type: startingGear
+  id: Flute
+  storage:
+    back:
+    - FluteInstrument
+
+- type: loadout
+  id: Recorder
+  equipment: Recorder
+
+- type: startingGear
+  id: Recorder
+  storage:
+    back:
+    - RecorderInstrument
+
+- type: loadout
+  id: PanFlute
+  equipment: PanFlute
+
+- type: startingGear
+  id: PanFlute
+  storage:
+    back:
+    - PanFluteInstrument
+
+- type: loadout
+  id: Ocarina
+  equipment: Ocarina
+
+- type: startingGear
+  id: Ocarina
+  storage:
+    back:
+    - OcarinaInstrument
+
+- type: loadout
+  id: Bagpipe
+  equipment: Bagpipe
+
+- type: startingGear
+  id: Bagpipe
+  storage:
+    back:
+    - BagpipeInstrument
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 0fab367fc9..cc0aefb69c 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -436,6 +436,41 @@
   loadouts:
   - MusicianWintercoat
 
+- type: loadoutGroup
+  id: Instruments
+  name: loadout-group-instruments
+  minLimit: 0
+  maxLimit: 2
+  loadouts:
+  - Glockenspiel
+  - MusicBox
+  - Xylophone
+  - Microphone
+  - Synthesizer
+  - Kalimba
+  - Woodblock
+  - ElectricGuitar
+  - BassGuitar
+  - RockGuitar
+  - AcousticGuitar
+  - Banjo
+  - Violin
+  - Viola
+  - Cello
+  - Trumpet
+  - Trombone
+  - FrenchHorn
+  - Euphonium
+  - Saxophone
+  - Accordion
+  - Harmonica
+  - Clarinet
+  - Flute
+  - Recorder
+  - PanFlute
+  - Ocarina
+  - Bagpipe
+
 # Cargo
 - type: loadoutGroup
   id: QuartermasterHead
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index 4ff2775dfc..0e80113ce3 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -141,6 +141,7 @@
   - MusicianOuterClothing
   - Glasses
   - Trinkets
+  - Instruments
 
 # Cargo
 - type: roleLoadout
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
index 4b508c907d..58335ba52d 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
@@ -25,5 +25,3 @@
   storage:
     back:
     - BoxSurvival
-    - AcousticGuitarInstrument
-    - SaxophoneInstrument
\ No newline at end of file
-- 
2.51.2