Merge pull request #4081 from Mailaender/cnc-bits-tidy

Removed some duplicates in ./mods/cnc/bits
2013-11-05 12:32:33 -08:00
parent 38668c1d8d cc94ea14ff
commit c77d360f2a
8 changed files with 1 additions and 2 deletions
--- a/mods/cnc/bits/chem.shp
+++ b/mods/cnc/bits/chem.shp
--- a/mods/cnc/bits/levelup.shp
+++ b/mods/cnc/bits/levelup.shp
--- a/mods/cnc/bits/overrides.mix
+++ b/mods/cnc/bits/overrides.mix
--- a/mods/cnc/bits/pdigits.shp
+++ b/mods/cnc/bits/pdigits.shp
--- a/mods/cnc/bits/rank.shp
+++ b/mods/cnc/bits/rank.shp
--- a/mods/cnc/bits/shadow.shp
+++ b/mods/cnc/bits/shadow.shp
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -16,7 +16,6 @@ MapFolders:
 	~^/maps/cnc

 Packages:
-	overrides.mix
 	bluetib.mix
 	speech.mix
 	conquer.mix
--- a/mods/cnc/sequences/infantry.yaml
+++ b/mods/cnc/sequences/infantry.yaml
@@ -382,7 +382,7 @@ e4:
 		Start: 16
 		Length: 4
 		Tick: 1600
-	muzzle: flame
+	muzzle: flame2
 		Start: 0
 		Length: 13
 		Facings: 8