Commit 6b12614
authored
Weh-no-more (#5505)
## Short description
Fixes how the bank/program for the "Weh" and marriage axe instruments
would override base instrument sounds, causing any midi that uses
electric piano 2 to end up being full of Wehs.
Also adds the previously inaccessible Electric Piano 1 and 2 soundfonts
to the Synthesizer + 2 cool brass ones I found to the Trumpet.
## Why we need to add this
The Weh one quite literally made a ton of midis entirely unusable on
Starlight.
## Media (Video/Screenshots)
Weh no more
[Content.Client_3LouUQFjBw.webm](https://github.com/user-attachments/assets/3a694e4a-98ad-4fd8-8148-2cb6166faf5a)
Electric Piano 1
[Content.Client_4CMWEBzF9x.webm](https://github.com/user-attachments/assets/4f271028-e790-47f2-af65-74bcd69334db)
Electric Piano 2
[Content.Client_mKNHObB7Tq.webm](https://github.com/user-attachments/assets/3f41a934-eb7b-4ae3-a438-dad3a47cf05f)
Electric Piano 1+2
[Content.Client_RH1RukBmwb.webm](https://github.com/user-attachments/assets/60dbd565-3d5d-4aaf-953b-2c3f009bb314)
Both of the new trumpet ones
[Content.Client_Vn6HK8XsLJ.webm](https://github.com/user-attachments/assets/d3fc960a-fe11-4021-b0b5-31e53d9dc650)
One of the new Brasses + one of the Electric Pianos, pretty good, no?
[Content.Client_0ZajjdGW8p.webm](https://github.com/user-attachments/assets/9dfa3903-500e-45f0-8a8b-30e98d4c4ee3)
## Checks
- [X] I do not require assistance to complete the PR.
- [X] Before posting/requesting review of a PR, I have verified that the
changes work.
- [X] I have added screenshots/videos of the changes, or this PR does
not change in-game mechanics.
- [X] I affirm that my changes are licensed under the [MIT
License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT)
and grant permission for use in this repository under its conditions.
**Changelog**
:cl: wonderfulnewworld
- add: Added 2 new instrument styles to the Synthesizer, Tine Piano and
FM Piano.
- add: Added 2 new instrument styles to the Trumpet, Vampiric and Grand.
- fix: Midis will no longer "Weh".1 parent e6c9d6c commit 6b12614
5 files changed
Lines changed: 8 additions & 4 deletions
File tree
- Resources
- Audio/MidiCustom/_Starlight
- Prototypes
- Entities/Objects/Fun/Instruments
- _Starlight/Entities/Objects
- Fun/Instruments
- Weapons/Melee
Binary file not shown.
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
| 22 | + | |
21 | 23 | | |
22 | 24 | | |
23 | 25 | | |
| |||
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
| 23 | + | |
22 | 24 | | |
23 | 25 | | |
24 | 26 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
9 | | - | |
| 8 | + | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | | - | |
57 | | - | |
| 56 | + | |
| 57 | + | |
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
| |||
0 commit comments