Brass Instruments (#7291)

Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

@@ -10,6 +10,18 @@
   category: Fun
   group: market
 
+- type: cargoProduct
+  name: "brass instrument ensemble crate"
+  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
+    state: tuba
+  product: CrateFunBrass
+  cost: 3500
+  category: Fun
+  group: market
+
 - type: cargoProduct
   name: "art supplies"
   id: FunArtSupplies

Resources/Prototypes/Catalog/Fills/Crates/fun.yml

@@ -63,6 +63,25 @@
       - id: BikeHornInstrument
         amount: 1
 
+- type: entity
+  id: CrateFunBrass
+  name: brass instrument ensemble crate
+  description: Bring some jazz to the station with the brass ensemble. Contains a variety of brass instruments for the whole station to play.
+  parent: CrateGenericSteel
+  components:
+  - type: StorageFill
+    contents:
+      - id: TrumpetInstrument
+        amount: 3
+      - id: TromboneInstrument
+        amount: 3
+      - id: FrenchHornInstrument
+        amount: 2
+      - id: EuphoniumInstrument
+        amount: 1
+      - id: TubaInstrument
+        amount: 1
+
 - type: entity
   id: CrateFunArtSupplies
   name: art supplies

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

@@ -16,6 +16,8 @@
       - AccordionInstrument
       - HarmonicaInstrument
       - TromboneInstrument
+      - FrenchHornInstrument
+      - EuphoniumInstrument
       - SaxophoneInstrument
       - BanjoInstrument
       - GlockenspielInstrument

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

@@ -78,6 +78,7 @@
   parent: BaseHandheldInstrument
   id: TrumpetInstrument
   name: trumpet
+  description: The favorite instrument of jazz musicians and egotistical middle schoolers.
   components:
   - type: Instrument
     program: 56
@@ -181,6 +182,7 @@
   parent: BaseHandheldInstrument
   id: TromboneInstrument
   name: trombone
+  description: Everyone's favorite sliding brass instrument.
   components:
   - type: Instrument
     program: 57
@@ -188,12 +190,49 @@
     sprite: Objects/Fun/Instruments/trombone.rsi
     state: icon
   - type: Item
-    size: 24
+    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

Resources/Prototypes/Entities/Structures/Furniture/instruments.yml

@@ -85,6 +85,18 @@
   - type: Sprite
     state: church-organ
 
+- type: entity
+  name: tuba
+  parent: BasePlaceableInstrumentRotatable
+  id: TubaInstrument
+  description: The big daddy of the brass family. Standing next to its majesty makes you feel insecure.
+  components:
+  - type: Instrument
+    program: 58
+  - type: Sprite
+    state: tuba
+
+
 - type: entity
   parent: BasePlaceableInstrument
   id: DawInstrument

Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml

@@ -390,6 +390,7 @@
       - FunPlushies
       - FunArtSupplies
       - FunInstruments
+      - FunBrass
       - FunBoardGames
       - MaterialSteel
       - MaterialGlass

Resources/Textures/Objects/Fun/Instruments/euphonium.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/frenchhorn.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/trombone.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": "Sprites by EmoGarbage404",
   "states": [
     {
       "name": "icon"

Resources/Textures/Objects/Fun/Instruments/trumpet.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": "Sprites by EmoGarbage",
   "states": [
     {
       "name": "icon"

Resources/Textures/Structures/Furniture/instruments.rsi/meta.json

@@ -39,6 +39,10 @@
       "name": "xylophone-broken",
       "directions": 4
     },
+    {
+      "name": "tuba",
+      "directions": 1
+    },
     {
       "name": "daw-base",
       "directions": 1