forked from DeltaV-Station/Delta-v
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Musician Loadouts (DeltaV-Station#1108)
# Description Fixes DeltaV-Station#1103 This PR removes the default saxophone and acoustic guitar that the Musician spawns with. Instead the Musician now has a selection of 3 free picks of *almost* any instrument in the game. The only instruments not included in his list are the Supersynth, DAW, and admeme items such as the "Musical Lung" and "Fingerless Frets". There's a few instruments leftover for the Clown that will be given to the clown in his own separate PR. To make sure the musicians can also take large instruments, this PR also takes a feature from Frontier, that of "InstrumentFlatpacks", and adds them to the musician loadouts. So Musicians can take for instance a Minimoog flatpack if they so desire. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog :cl: - add: Musicians can now select for free, any 3 instruments in the game with their loadout. This now includes things like Piano flatpacks. The only instruments not included are the Sypersynth, DAW, and "Admeme Instruments". - remove: Musicians no longer spawn with a Saxophone and Acoustic guitar by default. You pick which instruments you spawn with in your loadouts now.
- Loading branch information
Showing
10 changed files
with
753 additions
and
182 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
121 changes: 121 additions & 0 deletions
121
Resources/Prototypes/Entities/Objects/Devices/instrumentFlatpacks.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| - type: entity | ||
| parent: BaseFlatpack | ||
| id: InstrumentFlatpack | ||
| name: instrument flatpack | ||
| description: A flatpack used for constructing something. | ||
| categories: | ||
| - hideSpawnMenu | ||
| components: | ||
| - type: Item | ||
| size: Normal | ||
| - type: Sprite | ||
| layers: | ||
| - state: service_music | ||
|
|
||
| - type: entity | ||
| parent: InstrumentFlatpack | ||
| id: PianoFlatpack | ||
| name: piano flatpack | ||
| description: A flatpack used for constructing a piano. | ||
| components: | ||
| - type: Flatpack | ||
| entity: PianoInstrument | ||
|
|
||
| - type: entity | ||
| parent: InstrumentFlatpack | ||
| id: UprightPianoFlatpack | ||
| name: upright piano flatpack | ||
| description: A flatpack used for constructing an upright piano. | ||
| components: | ||
| - type: Flatpack | ||
| entity: UprightPianoInstrument | ||
|
|
||
| - type: entity | ||
| parent: InstrumentFlatpack | ||
| id: VibraphoneFlatpack | ||
| name: vibraphone flatpack | ||
| description: A flatpack used for constructing a vibraphone. | ||
| components: | ||
| - type: Flatpack | ||
| entity: VibraphoneInstrument | ||
|
|
||
| - type: entity | ||
| parent: InstrumentFlatpack | ||
| id: MarimbaFlatpack | ||
| name: marimba flatpack | ||
| description: A flatpack used for constructing a marimba. | ||
| components: | ||
| - type: Flatpack | ||
| entity: MarimbaInstrument | ||
|
|
||
| - type: entity | ||
| parent: InstrumentFlatpack | ||
| id: ChurchOrganFlatpack | ||
| name: church organ flatpack | ||
| description: A flatpack used for constructing a church organ. | ||
| components: | ||
| - type: Flatpack | ||
| entity: ChurchOrganInstrument | ||
|
|
||
| - type: entity | ||
| parent: InstrumentFlatpack | ||
| id: TubaFlatpack | ||
| name: tuba flatpack | ||
| description: A flatpack used for constructing a tuba. | ||
| components: | ||
| - type: Flatpack | ||
| entity: TubaInstrument | ||
|
|
||
| - type: entity | ||
| parent: InstrumentFlatpack | ||
| id: HarpFlatpack | ||
| name: harp flatpack | ||
| description: A flatpack used for constructing a harp. | ||
| components: | ||
| - type: Flatpack | ||
| entity: HarpInstrument | ||
|
|
||
| - type: entity | ||
| parent: InstrumentFlatpack | ||
| id: TimpaniFlatpack | ||
| name: timpani flatpack | ||
| description: A flatpack used for constructing a timpani. | ||
| components: | ||
| - type: Flatpack | ||
| entity: TimpaniInstrument | ||
|
|
||
| - type: entity | ||
| parent: InstrumentFlatpack | ||
| id: TaikoFlatpack | ||
| name: taiko flatpack | ||
| description: A flatpack used for constructing a taiko. | ||
| components: | ||
| - type: Flatpack | ||
| entity: TaikoInstrument | ||
|
|
||
| - type: entity | ||
| parent: InstrumentFlatpack | ||
| id: ContrabassFlatpack | ||
| name: contrabass flatpack | ||
| description: A flatpack used for constructing a contrabass. | ||
| components: | ||
| - type: Flatpack | ||
| entity: ContrabassInstrument | ||
|
|
||
| - type: entity | ||
| parent: InstrumentFlatpack | ||
| id: MinimoogFlatpack | ||
| name: minimoog flatpack | ||
| description: A flatpack used for constructing a minimoog. | ||
| components: | ||
| - type: Flatpack | ||
| entity: MinimoogInstrument | ||
|
|
||
| - type: entity | ||
| parent: InstrumentFlatpack | ||
| id: TomDrumsFlatpack | ||
| name: tom drums flatpack | ||
| description: A flatpack used for constructing a tom drums set. | ||
| components: | ||
| - type: Flatpack | ||
| entity: TomDrumsInstrument |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.