Merge RA music-cs.yaml and music-am.yaml with music.yaml

mods/ra/mod.yaml

@@ -111,8 +111,6 @@ TileSets:
 
 Music:
 	mods/ra/music.yaml
-	mods/ra/music-cs.yaml
-	mods/ra/music-am.yaml
 
 Movies:
 	mods/ra/movies1.yaml

mods/ra/music-am.yaml

@@ -1,8 +0,0 @@
-bog: Bog
-gloom: Gloom
-rpt: Running through Pipes (Mech Man 2)
-traction: Traction
-float_v2: Floating
-grndwire: Ground Wire
-search: The Search
-wastelnd: Wasteland

mods/ra/music-cs.yaml

@@ -1,8 +0,0 @@
-2nd_hand: The Second Hand
-backstab: Backstab
-shut_it: Shut It
-under3: Underlying Thoughts
-chaos2: Chaos
-twinmix1: Twin Cannon Remix
-vr2: Voice Rhythm 2
-araziod: Arazoid

mods/ra/music.yaml

@@ -21,3 +21,23 @@ tren226m: Trenches
 twin: Twin Cannon
 vector1a: Vector
 work226m: Workmen
+
+#Counterstrike tracks
+2nd_hand: The Second Hand
+backstab: Backstab
+shut_it: Shut It
+under3: Underlying Thoughts
+chaos2: Chaos
+twinmix1: Twin Cannon Remix
+vr2: Voice Rhythm 2
+araziod: Arazoid
+
+#Aftermath tracks
+bog: Bog
+gloom: Gloom
+rpt: Running through Pipes (Mech Man 2)
+traction: Traction
+float_v2: Floating
+grndwire: Ground Wire
+search: The Search
+wastelnd: Wasteland