diff --git a/Resources/Audio/MidiCustom/space-station-14.sf2 b/Resources/Audio/MidiCustom/space-station-14.sf2 index cdcfab1aab..1167d3bf8b 100644 Binary files a/Resources/Audio/MidiCustom/space-station-14.sf2 and b/Resources/Audio/MidiCustom/space-station-14.sf2 differ diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index e91a4c53e3..56b213cde3 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/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 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 53993e826f..2e70209f55 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml index 665eedea50..8d4f7166fd 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml @@ -16,6 +16,8 @@ - AccordionInstrument - HarmonicaInstrument - TromboneInstrument + - FrenchHornInstrument + - EuphoniumInstrument - SaxophoneInstrument - BanjoInstrument - GlockenspielInstrument diff --git a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml index c1f45ab5f1..957ea64dba 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml b/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml index 0ae142426f..809d509aea 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 2ad4343a49..8826d10649 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -390,6 +390,7 @@ - FunPlushies - FunArtSupplies - FunInstruments + - FunBrass - FunBoardGames - MaterialSteel - MaterialGlass diff --git a/Resources/Textures/Objects/Fun/Instruments/euphonium.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/euphonium.rsi/icon.png new file mode 100644 index 0000000000..8cbdec57ed Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/euphonium.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/euphonium.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/euphonium.rsi/inhand-left.png new file mode 100644 index 0000000000..61f4dbed54 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/euphonium.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/euphonium.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/euphonium.rsi/inhand-right.png new file mode 100644 index 0000000000..7ed49386df Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/euphonium.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/euphonium.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/euphonium.rsi/meta.json new file mode 100644 index 0000000000..a0ebc9c369 --- /dev/null +++ b/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 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/Instruments/frenchhorn.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/frenchhorn.rsi/icon.png new file mode 100644 index 0000000000..1b08fc9422 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/frenchhorn.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/frenchhorn.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/frenchhorn.rsi/inhand-left.png new file mode 100644 index 0000000000..0403635578 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/frenchhorn.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/frenchhorn.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/frenchhorn.rsi/inhand-right.png new file mode 100644 index 0000000000..6ca0d4532a Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/frenchhorn.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/frenchhorn.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/frenchhorn.rsi/meta.json new file mode 100644 index 0000000000..a0ebc9c369 --- /dev/null +++ b/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 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/icon.png index 31b08e78f0..8935226b10 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/icon.png and b/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/inhand-left.png index e517ae4541..9eae6f1392 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/inhand-left.png and b/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/inhand-right.png index b27538920b..7ccd6bcc1a 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/inhand-right.png and b/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/meta.json index 96e5157f93..29b5afaa77 100644 --- a/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/meta.json +++ b/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" diff --git a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/icon.png index 769a11aa56..062fd2887a 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/icon.png and b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-left.png index 46f1698e4d..af5bc5e634 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-left.png and b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-right.png index a2f41e0170..748dc80c97 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-right.png and b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/meta.json index 96e5157f93..2a55a73b9a 100644 --- a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/meta.json +++ b/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" diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json b/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json index 02009bec88..b1fd779ad5 100644 --- a/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json +++ b/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 diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/tuba.png b/Resources/Textures/Structures/Furniture/instruments.rsi/tuba.png new file mode 100644 index 0000000000..103cc29609 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/instruments.rsi/tuba.png differ