diff --git a/Resources/Audio/_Nuclear14/Music/MUS_Patriotic_America.ogg b/Resources/Audio/_Nuclear14/Music/Generic/MUS_Patriotic_America.ogg similarity index 100% rename from Resources/Audio/_Nuclear14/Music/MUS_Patriotic_America.ogg rename to Resources/Audio/_Nuclear14/Music/Generic/MUS_Patriotic_America.ogg diff --git a/Resources/Audio/_Nuclear14/Music/MUS_Patriotic_BattleHymn.ogg b/Resources/Audio/_Nuclear14/Music/Generic/MUS_Patriotic_BattleHymn.ogg similarity index 100% rename from Resources/Audio/_Nuclear14/Music/MUS_Patriotic_BattleHymn.ogg rename to Resources/Audio/_Nuclear14/Music/Generic/MUS_Patriotic_BattleHymn.ogg diff --git a/Resources/Audio/_Nuclear14/Music/MUS_Patriotic_BattleHymn_mono.ogg b/Resources/Audio/_Nuclear14/Music/Generic/MUS_Patriotic_BattleHymn_mono.ogg similarity index 100% rename from Resources/Audio/_Nuclear14/Music/MUS_Patriotic_BattleHymn_mono.ogg rename to Resources/Audio/_Nuclear14/Music/Generic/MUS_Patriotic_BattleHymn_mono.ogg diff --git a/Resources/Audio/_Nuclear14/Music/MUS_Patriotic_Dixie.ogg b/Resources/Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Dixie.ogg similarity index 100% rename from Resources/Audio/_Nuclear14/Music/MUS_Patriotic_Dixie.ogg rename to Resources/Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Dixie.ogg diff --git a/Resources/Audio/_Nuclear14/Music/MUS_Patriotic_Montezuma.ogg b/Resources/Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Montezuma.ogg similarity index 100% rename from Resources/Audio/_Nuclear14/Music/MUS_Patriotic_Montezuma.ogg rename to Resources/Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Montezuma.ogg diff --git a/Resources/Audio/_Nuclear14/Music/MUS_Patriotic_Presidential.ogg b/Resources/Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Presidential.ogg similarity index 100% rename from Resources/Audio/_Nuclear14/Music/MUS_Patriotic_Presidential.ogg rename to Resources/Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Presidential.ogg diff --git a/Resources/Audio/_Nuclear14/Music/MUS_Patriotic_Stars.ogg b/Resources/Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Stars.ogg similarity index 100% rename from Resources/Audio/_Nuclear14/Music/MUS_Patriotic_Stars.ogg rename to Resources/Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Stars.ogg diff --git a/Resources/Audio/_Nuclear14/Music/MUS_Patriotic_Washington.ogg b/Resources/Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Washington.ogg similarity index 100% rename from Resources/Audio/_Nuclear14/Music/MUS_Patriotic_Washington.ogg rename to Resources/Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Washington.ogg diff --git a/Resources/Audio/_Nuclear14/Music/MUS_Patriotic_Yankee.ogg b/Resources/Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Yankee.ogg similarity index 100% rename from Resources/Audio/_Nuclear14/Music/MUS_Patriotic_Yankee.ogg rename to Resources/Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Yankee.ogg diff --git a/Resources/Audio/_Nuclear14/Music/attributions.yml b/Resources/Audio/_Nuclear14/Music/Generic/attributions.yml similarity index 100% rename from Resources/Audio/_Nuclear14/Music/attributions.yml rename to Resources/Audio/_Nuclear14/Music/Generic/attributions.yml diff --git a/Resources/Audio/_Nuclear14/Music/mus_hailchief.ogg b/Resources/Audio/_Nuclear14/Music/Generic/mus_hailchief.ogg similarity index 100% rename from Resources/Audio/_Nuclear14/Music/mus_hailchief.ogg rename to Resources/Audio/_Nuclear14/Music/Generic/mus_hailchief.ogg diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Jukebox/Standard.yml b/Resources/Prototypes/_Nuclear14/Catalog/Jukebox/Standard.yml index 29b18cfdd4f..52fdefe126f 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/Jukebox/Standard.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/Jukebox/Standard.yml @@ -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 \ No newline at end of file + path: /Audio/_Nuclear14/Music/Generic/MUS_Patriotic_Yankee.ogg # Forge-Change diff --git a/Resources/Prototypes/_Nuclear14/audio.yml b/Resources/Prototypes/_Nuclear14/audio.yml index 989d29184e2..2fda1101738 100644 --- a/Resources/Prototypes/_Nuclear14/audio.yml +++ b/Resources/Prototypes/_Nuclear14/audio.yml @@ -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 -# \ No newline at end of file +#