Skip to content

Commit 6b12614

Browse files
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

0 Bytes
Binary file not shown.

Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
instrumentList:
1919
"Electro": {62: 0} #i needed generic sounding synth presets, sue me
2020
"Bubbles": {63: 0}
21+
"Tine Piano": {4: 0} # Starlight, actually give a way to access these instruments
22+
"FM Piano": {5: 0} # Starlight
2123
- type: Sprite
2224
sprite: Objects/Fun/Instruments/h_synthesizer.rsi
2325
- type: StaticPrice

Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
instrumentList:
2020
"Standard": {56: 0}
2121
"Muted": {59: 0}
22+
"Vampiric": {61: 8} # Starlight
23+
"Grand": {61: 11} # Starlight
2224
- type: Sprite
2325
sprite: Objects/Fun/Instruments/trumpet.rsi
2426

Resources/Prototypes/_Starlight/Entities/Objects/Fun/Instruments/instruments_misc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
description: A lizard had too much time on their hands when they made this.
66
components:
77
- type: Instrument
8-
program: 5
9-
bank: 1
8+
program: 0
9+
bank: 101
1010
- type: Sprite
1111
sprite: _Starlight/Objects/Fun/Instruments/wehpet.rsi
1212
state: icon

Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Melee/e_melee.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
- type: UseDelay
5454
delay: 1
5555
- type: Instrument
56-
program: 6
57-
bank: 1
56+
program: 1
57+
bank: 101
5858
allowPercussion: true
5959
- type: Reflect
6060
reflectProb: 0.75 # surpise get tasered

0 commit comments

Comments
 (0)