Skip to content

добавление музыки и изменения в категоризации музыки в прототипах #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ktrss1315 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

добавление музыки и изменения в категоризации музыки в прототипах #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
acbca9a
added two tracks and adjusted music dir for better categorization
ktrss1315 Feb 15, 2026
37cceee
added two tracks and adjusted music dir for better categorization 2
ktrss1315 Feb 15, 2026
1092d29
added two tracks and adjusted music dir for better categorization 3
ktrss1315 Feb 15, 2026
0c042dc
added two tracks and adjusted music dir for better categorization 4
ktrss1315 Feb 15, 2026
afa7571
two added tracks: reverted
ktrss1315 Feb 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...Nuclear14/Music/MUS_Patriotic_America.ogg → ...4/Music/Generic/MUS_Patriotic_America.ogg
View file
Open in desktop
File renamed without changes.
0 ...lear14/Music/MUS_Patriotic_BattleHymn.ogg → ...usic/Generic/MUS_Patriotic_BattleHymn.ogg
View file
Open in desktop
File renamed without changes.
0 ...4/Music/MUS_Patriotic_BattleHymn_mono.ogg → ...Generic/MUS_Patriotic_BattleHymn_mono.ogg
View file
Open in desktop
File renamed without changes.
0 .../_Nuclear14/Music/MUS_Patriotic_Dixie.ogg → ...r14/Music/Generic/MUS_Patriotic_Dixie.ogg
View file
Open in desktop
File renamed without changes.
0 ...clear14/Music/MUS_Patriotic_Montezuma.ogg → ...Music/Generic/MUS_Patriotic_Montezuma.ogg
View file
Open in desktop
File renamed without changes.
0 ...ar14/Music/MUS_Patriotic_Presidential.ogg → ...ic/Generic/MUS_Patriotic_Presidential.ogg
View file
Open in desktop
File renamed without changes.
0 .../_Nuclear14/Music/MUS_Patriotic_Stars.ogg → ...r14/Music/Generic/MUS_Patriotic_Stars.ogg
View file
Open in desktop
File renamed without changes.
0 ...lear14/Music/MUS_Patriotic_Washington.ogg → ...usic/Generic/MUS_Patriotic_Washington.ogg
View file
Open in desktop
File renamed without changes.
0 ..._Nuclear14/Music/MUS_Patriotic_Yankee.ogg → ...14/Music/Generic/MUS_Patriotic_Yankee.ogg
View file
Open in desktop
File renamed without changes.
0 ...s/Audio/_Nuclear14/Music/attributions.yml → ..._Nuclear14/Music/Generic/attributions.yml
View file
Open in desktop
File renamed without changes.
0 .../Audio/_Nuclear14/Music/mus_hailchief.ogg → ...Nuclear14/Music/Generic/mus_hailchief.ogg
View file
Open in desktop
File renamed without changes.
18 changes: 9 additions & 9 deletions Resources/Prototypes/_Nuclear14/Catalog/Jukebox/Standard.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,51 +139,51 @@
path:
path: /Audio/_Nuclear14/Music/Fallout3/mus_texbeneke_guy_mono.ogg

# Music - Enclave
# Music/Generic
- type: jukebox
id: PatrioticAmerica
name: Patriotic America
path:
path: /Audio/_Nuclear14/Music/MUS_Patriotic_America.ogg
path: /Audio/_Nuclear14/Music/Generic/MUS_Patriotic_America.ogg # Forge-Change

- type: jukebox
id: BattleHymn
name: Battle Hymn
path:
path: /Audio/_Nuclear14/Music/MUS_Patriotic_BattleHymn_mono.ogg
path: /Audio/_Nuclear14/Music/Generic/MUS_Patriotic_BattleHymn_mono.ogg # Forge-Change

- type: jukebox
id: PatrioticDixie
name: Patriotic Dixie
path:
path: /Audio/_Nuclear14/Music/MUS_Patriotic_Dixie.ogg
path: /Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Dixie.ogg # Forge-Change

- type: jukebox
id: PatrioticMontezuma
name: Patriotic Montezuma
path:
path: /Audio/_Nuclear14/Music/MUS_Patriotic_Montezuma.ogg
path: /Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Montezuma.ogg # Forge-Change

- type: jukebox
id: PatrioticPresidential
name: Patriotic Presidential
path:
path: /Audio/_Nuclear14/Music/MUS_Patriotic_Presidential.ogg
path: /Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Presidential.ogg # Forge-Change

- type: jukebox
id: PatrioticStars
name: Patriotic Stars
path:
path: /Audio/_Nuclear14/Music/MUS_Patriotic_Stars.ogg
path: /Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Stars.ogg # Forge-Change

- type: jukebox
id: PatrioticWashington
name: Patriotic Washington
path:
path: /Audio/_Nuclear14/Music/MUS_Patriotic_Washington.ogg
path: /Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Washington.ogg # Forge-Change

- type: jukebox
id: PatrioticYankee
name: Patriotic Yankee
path:
path: /Audio/_Nuclear14/Music/MUS_Patriotic_Yankee.ogg
path: /Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Yankee.ogg # Forge-Change
22 changes: 12 additions & 10 deletions Resources/Prototypes/_Nuclear14/audio.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,20 @@
- type: soundCollection
id: AmbienceEyebot
files:
- /Audio/_Nuclear14/Music/MUS_Patriotic_America.ogg
- /Audio/_Nuclear14/Music/MUS_Patriotic_BattleHymn.ogg
- /Audio/_Nuclear14/Music/MUS_Patriotic_BattleHymn_mono.ogg
- /Audio/_Nuclear14/Music/MUS_Patriotic_Dixie.ogg
- /Audio/_Nuclear14/Music/MUS_Patriotic_Montezuma.ogg
- /Audio/_Nuclear14/Music/MUS_Patriotic_Presidential.ogg
- /Audio/_Nuclear14/Music/MUS_Patriotic_Stars.ogg
- /Audio/_Nuclear14/Music/MUS_Patriotic_Washington.ogg
- /Audio/_Nuclear14/Music/MUS_Patriotic_Yankee.ogg
# Forge-Change-Start
- /Audio/_Nuclear14/Music/Generic/MUS_Patriotic_America.ogg
- /Audio/_Nuclear14/Music/Generic/MUS_Patriotic_BattleHymn.ogg
- /Audio/_Nuclear14/Music/Generic/MUS_Patriotic_BattleHymn_mono.ogg
- /Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Dixie.ogg
- /Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Montezuma.ogg
- /Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Presidential.ogg
- /Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Stars.ogg
- /Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Washington.ogg
- /Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Yankee.ogg
# Forge-Change-End

#- type: soundCollection
# id: AmbienceSupermarket
# files:
# - /Audio/Ambience/ambimaint1.ogg
#
#
Loading