replaced textures in def

(haven't checked ingame for game-breaking typo yet)
CombatExtended-Continued · Sep 10, 2023 · b57b3a3 · b57b3a3
1 parent f2638cd
commit b57b3a3
Show file tree

Hide file tree

Showing 42 changed files with 45 additions and 45 deletions.
diff --git a/Defs/Ammo/Shell/100x695mmR.xml b/Defs/Ammo/Shell/100x695mmR.xml
@@ -43,7 +43,7 @@
 		<defName>Ammo_100x695mmRCannonShell_HEAT</defName>
 		<label>100x695mmR cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HEAT</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HEATFS</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -58,7 +58,7 @@
 		<defName>Ammo_100x695mmRCannonShell_HE</defName>
 		<label>100x695mmR cannon shell (HE)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HE</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -88,7 +88,7 @@
 		<defName>Bullet_100x695mmRCannonShell_HEAT</defName>
 		<label>100x695mmR cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Projectile/Cannon/HEAT</texPath>
+			<texPath>Things/Projectile/Cannon/HEATFS</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">

diff --git a/Defs/Ammo/Shell/105mmHowitzer.xml b/Defs/Ammo/Shell/105mmHowitzer.xml
@@ -78,7 +78,7 @@
 		<defName>Ammo_105mmHowitzerShell_HEAT</defName>
 		<label>105mm Howitzer shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HEAT</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HEAT</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>

diff --git a/Defs/Ammo/Shell/105x607mmR.xml b/Defs/Ammo/Shell/105x607mmR.xml
@@ -44,7 +44,7 @@
 		<defName>Ammo_105x607mmRCannonShell_HEAT</defName>
 		<label>105x607mmR cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HEAT</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HEAT</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -58,7 +58,7 @@
 		<defName>Ammo_105x607mmRCannonShell_HE</defName>
 		<label>105x607mmR cannon shell (HE)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HE</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>

diff --git a/Defs/Ammo/Shell/105x617mmR.xml b/Defs/Ammo/Shell/105x617mmR.xml
@@ -42,8 +42,8 @@
 		<defName>Ammo_105x617mmRCannonShell_HEAT</defName>
 		<label>105x617mmR cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/120mmTank/HEAT</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
+			<texPath>Things/Ammo/Cannon/Tank/HEATFS</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
 			<MarketValue>142.42</MarketValue>
@@ -58,8 +58,8 @@
 		<defName>Ammo_105x617mmRCannonShell_HE</defName>
 		<label>105x617mmR cannon shell (HE)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/120mmTank/HE</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
 			<MarketValue>156.72</MarketValue>
@@ -88,7 +88,7 @@
 		<defName>Bullet_105x617mmRCannonShell_HEAT</defName>
 		<label>105x617mmR cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Projectile/Cannon/HEAT</texPath>
+			<texPath>Things/Projectile/Cannon/HEATFS</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
@@ -120,7 +120,7 @@
 		<label>105x617mmR cannon shell (HE)</label>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
-			<texPath>Things/Projectile/Cannon/HE</texPath>
+			<texPath>Things/Projectile/Cannon/HEFS</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">

diff --git a/Defs/Ammo/Shell/120mmCannon.xml b/Defs/Ammo/Shell/120mmCannon.xml
@@ -5,7 +5,7 @@
 		<defName>Ammo120mmCannonShells</defName>
 		<label>120mm cannon shell</label>
 		<parent>AmmoShells</parent>
-		<iconPath>Things/Ammo/Cannon/120mmTank/HE</iconPath>
+		<iconPath>UI/Icons/ThingCategories/CaliberCannon</iconPath>
 	</ThingCategoryDef>
 
 	<!-- ==================== AmmoSet ========================== -->
@@ -44,8 +44,8 @@
 		<defName>Ammo_120mmCannonShell_HEAT</defName>
 		<label>120mm cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/120mmTank/HEAT</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
+			<texPath>Things/Ammo/Cannon/Tank/HEATFS</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
 			<MarketValue>149.17</MarketValue>
@@ -58,8 +58,8 @@
 		<defName>Ammo_120mmCannonShell_HE</defName>
 		<label>120mm cannon shell (HE)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/120mmTank/HE</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
 			<MarketValue>172.67</MarketValue>
@@ -87,7 +87,7 @@
 		<defName>Bullet_120mmCannonShell_HEAT</defName>
 		<label>120mm cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Projectile/Cannon/120mmTank/HEAT</texPath>
+			<texPath>Things/Projectile/Cannon/HEAT</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
@@ -118,7 +118,7 @@
 		<label>120mm cannon shell (HE)</label>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
-			<texPath>Things/Projectile/Cannon/120mmTank/HE</texPath>
+			<texPath>Things/Projectile/Cannon/HE</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">

diff --git a/Defs/Ammo/Shell/57x307mmR.xml b/Defs/Ammo/Shell/57x307mmR.xml
@@ -43,7 +43,7 @@
 		<defName>Ammo_57x307mmR_AP</defName>
 		<label>57x307mmR cartridge (AP)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/APHE</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/APHE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -57,7 +57,7 @@
 		<defName>Ammo_57x307mmR_HE</defName>
 		<label>57x307mmR cartridge (HE)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HE</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>

diff --git a/Defs/Ammo/Shell/75x350mmR.xml b/Defs/Ammo/Shell/75x350mmR.xml
@@ -42,7 +42,7 @@
 		<defName>Ammo_75x350mmR_AP</defName>
 		<label>75x350mmR cartridge (AP)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/APHE</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/APHE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -57,7 +57,7 @@
 		<defName>Ammo_75x350mmR_HE</defName>
 		<label>75x350mmR cartridge (HE)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HE</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>

diff --git a/Defs/Ammo/Shell/762x385mmRCannon.xml b/Defs/Ammo/Shell/762x385mmRCannon.xml
@@ -5,7 +5,7 @@
 		<defName>Ammo762x385mmRCannonShells</defName>
 		<label>76.2x385mmR Cannon shell</label>
 		<parent>AmmoShells</parent>
-		<iconPath>Things/Ammo/Cannon/762x385mmR/HE</iconPath>
+		<iconPath>Things/Ammo/Cannon/HE</iconPath>
 	</ThingCategoryDef>
 
 	<!-- ==================== AmmoSet ========================== -->
@@ -45,7 +45,7 @@
 		<defName>Ammo_762x385mmRCannonShell_HEAT</defName>
 		<label>76.2x385mmR Cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/762x385mmR/HEAT</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HEAT</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<statBases>
@@ -59,7 +59,7 @@
 		<defName>Ammo_762x385mmRCannonShell_HE</defName>
 		<label>76.2x385mmR Cannon shell (HE)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/762x385mmR/HE</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<statBases>
@@ -73,7 +73,7 @@
 		<defName>Ammo_762x385mmRCannonShell_EMP</defName>
 		<label>76.2x385mmR Cannon shell (EMP)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/762x385mmR/EMP</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/EMP</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<statBases>
@@ -102,7 +102,7 @@
 		<defName>Bullet_762x385mmRCannonShell_HEAT</defName>
 		<label>76.2x385mmR Cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Projectile/Cannon/762x385mmR/HE</texPath>
+			<texPath>Things/Projectile/Cannon/HEAT</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
@@ -133,7 +133,7 @@
 		<label>76.2x385mmR Cannon shell (HE)</label>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
-			<texPath>Things/Projectile/Cannon/762x385mmR/HE</texPath>
+			<texPath>Things/Projectile/Cannon/HE</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
@@ -158,7 +158,7 @@
 		<label>76.2x385mmR Cannon shell (EMP)</label>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
-			<texPath>Things/Projectile/Cannon/762x385mmR/EMP</texPath>
+			<texPath>Things/Projectile/Cannon/EMP</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">

diff --git a/Defs/Ammo/Shell/90mmCannon.xml b/Defs/Ammo/Shell/90mmCannon.xml
@@ -48,7 +48,7 @@
 		<defName>Ammo_90mmCannonShell_HEAT</defName>
 		<label>90mm cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HEAT</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HEAT</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -63,7 +63,7 @@
 		<defName>Ammo_90mmCannonShell_HE</defName>
 		<label>90mm cannon shell (HE)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HE</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -77,7 +77,7 @@
 		<defName>Ammo_90mmCannonShell_HE_TFuzed</defName>
 		<label>90mm cannon shell (HE Time-Fuzed)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HE</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -91,7 +91,7 @@
 		<defName>Ammo_90mmCannonShell_EMP</defName>
 		<label>90mm cannon shell (EMP)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/EMP</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/EMP</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>

diff --git a/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Ammo.xml b/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Ammo.xml
@@ -474,7 +474,7 @@
 							<defName>Bullet_OR_WristRocket</defName>
 							<label>wrist rocket</label>
 							<graphicData>
-								<texPath>Things/Projectile/Cannon/120mmTank/Sabot</texPath>
+								<texPath>Things/Projectile/Cannon/Sabot</texPath>
 								<graphicClass>Graphic_Single</graphicClass>
 							</graphicData>
 							<projectile Class="CombatExtended.ProjectilePropertiesCE">

diff --git a/Patches/Orassans/Ammo/MissileAmmo.xml b/Patches/Orassans/Ammo/MissileAmmo.xml
@@ -13,7 +13,7 @@
 					<defName>AmmoOrassanMissileShells</defName>
 					<label>orassan missile shell</label>
 					<parent>AmmoShells</parent>
-					<iconPath>Things/Projectile/Cannon/120mmTank/HE</iconPath>
+					<iconPath>Things/Projectile/Cannon/HE</iconPath>
 				</ThingCategoryDef>
 
 				<!-- ==================== AmmoSet ========================== -->
@@ -53,7 +53,7 @@
 					<defName>Ammo_OrassanMissileShell_HEAT</defName>
 					<label>Orassan Missile shell (HEAT)</label>
 					<graphicData>
-						<texPath>Things/Projectile/Cannon/120mmTank/HEAT</texPath>
+						<texPath>Things/Projectile/Cannon/Tank/HEAT</texPath>
 						<graphicClass>Graphic_Single</graphicClass>
 					</graphicData>
 					<statBases>
@@ -67,7 +67,7 @@
 					<defName>Ammo_OrassanMissileShell_HE</defName>
 					<label>Orassan Missile shell (HE)</label>
 					<graphicData>
-						<texPath>Things/Projectile/Cannon/120mmTank/HEAT</texPath>
+						<texPath>Things/Projectile/Cannon/Tank/HEAT</texPath>
 						<graphicClass>Graphic_Single</graphicClass>
 					</graphicData>
 					<statBases>
@@ -81,7 +81,7 @@
 					<defName>Ammo_OrassanMissileShell_APSabot</defName>
 					<label>Orassan Missile shell (AP Sabot)</label>
 					<graphicData>
-						<texPath>Things/Projectile/Cannon/120mmTank/Sabot</texPath>
+						<texPath>Things/Projectile/Cannon/Tank/Sabot</texPath>
 						<graphicClass>Graphic_Single</graphicClass>
 					</graphicData>
 					<statBases>
@@ -111,8 +111,8 @@
 					<defName>Bullet_OrassanMissileShell_HEAT</defName>
 					<label>Orassan Missile shell (HEAT)</label>
 					<graphicData>
-						<texPath>Things/Projectile/Cannon/120mmTank/HEAT</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
+						<texPath>Things/Projectile/Cannon/Tank/HEAT</texPath>
+						<graphicClass>Graphic_StackCount</graphicClass>
 					</graphicData>
 					<projectile Class="CombatExtended.ProjectilePropertiesCE">
 						<damageDef>Bullet</damageDef>
@@ -141,8 +141,8 @@
 					<defName>Bullet_OrassanMissileShell_APSabot</defName>
 					<label>Orassan Missile shell (AP Sabot)</label>
 					<graphicData>
-						<texPath>Things/Projectile/Cannon/120mmTank/Sabot</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
+						<texPath>Things/Projectile/Cannon/Tank/Sabot</texPath>
+						<graphicClass>Graphic_StackCount</graphicClass>
 					</graphicData>
 					<projectile Class="CombatExtended.ProjectilePropertiesCE">
 						<damageDef>Bullet</damageDef>
@@ -172,8 +172,8 @@
 					<label>Orassan Missile shell (HE)</label>
 					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 					<graphicData>
-						<texPath>Things/Projectile/Cannon/120mmTank/HE</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
+						<texPath>Things/Projectile/Cannon/Tank/HE</texPath>
+						<graphicClass>Graphic_StackCount</graphicClass>
 					</graphicData>
 					<projectile Class="CombatExtended.ProjectilePropertiesCE">
 						<damageDef>Bomb</damageDef>

diff --git a/Textures/Things/Ammo/Cannon/120mmTank/Canister.png b/Textures/Things/Ammo/Cannon/120mmTank/Canister.png
diff --git a/Textures/Things/Ammo/Cannon/120mmTank/HE.png b/Textures/Things/Ammo/Cannon/120mmTank/HE.png
diff --git a/Textures/Things/Ammo/Cannon/120mmTank/HEAT.png b/Textures/Things/Ammo/Cannon/120mmTank/HEAT.png
diff --git a/Textures/Things/Ammo/Cannon/120mmTank/Sabot.png b/Textures/Things/Ammo/Cannon/120mmTank/Sabot.png
diff --git a/Textures/Things/Ammo/Cannon/762x385mmR/EMP.png b/Textures/Things/Ammo/Cannon/762x385mmR/EMP.png
diff --git a/Textures/Things/Ammo/Cannon/762x385mmR/HE.png b/Textures/Things/Ammo/Cannon/762x385mmR/HE.png
diff --git a/Textures/Things/Ammo/Cannon/762x385mmR/HEAT.png b/Textures/Things/Ammo/Cannon/762x385mmR/HEAT.png
diff --git a/...s/Things/Ammo/Cannon/Flak/APHE/APHE_a.png → ...s/Things/Ammo/Cannon/Tank/APHE/APHE_a.png b/...s/Things/Ammo/Cannon/Flak/APHE/APHE_a.png → ...s/Things/Ammo/Cannon/Tank/APHE/APHE_a.png
diff --git a/...s/Things/Ammo/Cannon/Flak/APHE/APHE_b.png → ...s/Things/Ammo/Cannon/Tank/APHE/APHE_b.png b/...s/Things/Ammo/Cannon/Flak/APHE/APHE_b.png → ...s/Things/Ammo/Cannon/Tank/APHE/APHE_b.png
diff --git a/...s/Things/Ammo/Cannon/Flak/APHE/APHE_c.png → ...s/Things/Ammo/Cannon/Tank/APHE/APHE_c.png b/...s/Things/Ammo/Cannon/Flak/APHE/APHE_c.png → ...s/Things/Ammo/Cannon/Tank/APHE/APHE_c.png
diff --git a/.../Ammo/Cannon/Flak/Canister/Canister_a.png → .../Ammo/Cannon/Tank/Canister/Canister_a.png b/.../Ammo/Cannon/Flak/Canister/Canister_a.png → .../Ammo/Cannon/Tank/Canister/Canister_a.png
diff --git a/.../Ammo/Cannon/Flak/Canister/Canister_b.png → .../Ammo/Cannon/Tank/Canister/Canister_b.png b/.../Ammo/Cannon/Flak/Canister/Canister_b.png → .../Ammo/Cannon/Tank/Canister/Canister_b.png
diff --git a/.../Ammo/Cannon/Flak/Canister/Canister_c.png → .../Ammo/Cannon/Tank/Canister/Canister_c.png b/.../Ammo/Cannon/Flak/Canister/Canister_c.png → .../Ammo/Cannon/Tank/Canister/Canister_c.png
diff --git a/...res/Things/Ammo/Cannon/Flak/EMP/EMP_a.png → ...res/Things/Ammo/Cannon/Tank/EMP/EMP_a.png b/...res/Things/Ammo/Cannon/Flak/EMP/EMP_a.png → ...res/Things/Ammo/Cannon/Tank/EMP/EMP_a.png
diff --git a/...res/Things/Ammo/Cannon/Flak/EMP/EMP_b.png → ...res/Things/Ammo/Cannon/Tank/EMP/EMP_b.png b/...res/Things/Ammo/Cannon/Flak/EMP/EMP_b.png → ...res/Things/Ammo/Cannon/Tank/EMP/EMP_b.png
diff --git a/...res/Things/Ammo/Cannon/Flak/EMP/EMP_c.png → ...res/Things/Ammo/Cannon/Tank/EMP/EMP_c.png b/...res/Things/Ammo/Cannon/Flak/EMP/EMP_c.png → ...res/Things/Ammo/Cannon/Tank/EMP/EMP_c.png
diff --git a/Textures/Things/Ammo/Cannon/Flak/HE/HE_a.png → Textures/Things/Ammo/Cannon/Tank/HE/HE_a.png b/Textures/Things/Ammo/Cannon/Flak/HE/HE_a.png → Textures/Things/Ammo/Cannon/Tank/HE/HE_a.png
diff --git a/Textures/Things/Ammo/Cannon/Flak/HE/HE_b.png → Textures/Things/Ammo/Cannon/Tank/HE/HE_b.png b/Textures/Things/Ammo/Cannon/Flak/HE/HE_b.png → Textures/Things/Ammo/Cannon/Tank/HE/HE_b.png
diff --git a/Textures/Things/Ammo/Cannon/Flak/HE/HE_c.png → Textures/Things/Ammo/Cannon/Tank/HE/HE_c.png b/Textures/Things/Ammo/Cannon/Flak/HE/HE_c.png → Textures/Things/Ammo/Cannon/Tank/HE/HE_c.png
diff --git a/...s/Things/Ammo/Cannon/Flak/HEAT/HEAT_a.png → ...s/Things/Ammo/Cannon/Tank/HEAT/HEAT_a.png b/...s/Things/Ammo/Cannon/Flak/HEAT/HEAT_a.png → ...s/Things/Ammo/Cannon/Tank/HEAT/HEAT_a.png
diff --git a/...s/Things/Ammo/Cannon/Flak/HEAT/HEAT_b.png → ...s/Things/Ammo/Cannon/Tank/HEAT/HEAT_b.png b/...s/Things/Ammo/Cannon/Flak/HEAT/HEAT_b.png → ...s/Things/Ammo/Cannon/Tank/HEAT/HEAT_b.png
diff --git a/...s/Things/Ammo/Cannon/Flak/HEAT/HEAT_c.png → ...s/Things/Ammo/Cannon/Tank/HEAT/HEAT_c.png b/...s/Things/Ammo/Cannon/Flak/HEAT/HEAT_c.png → ...s/Things/Ammo/Cannon/Tank/HEAT/HEAT_c.png
diff --git a/...ings/Ammo/Cannon/Flak/HEATFS/HEATFS_a.png → ...ings/Ammo/Cannon/Tank/HEATFS/HEATFS_a.png b/...ings/Ammo/Cannon/Flak/HEATFS/HEATFS_a.png → ...ings/Ammo/Cannon/Tank/HEATFS/HEATFS_a.png
diff --git a/...ings/Ammo/Cannon/Flak/HEATFS/HEATFS_b.png → ...ings/Ammo/Cannon/Tank/HEATFS/HEATFS_b.png b/...ings/Ammo/Cannon/Flak/HEATFS/HEATFS_b.png → ...ings/Ammo/Cannon/Tank/HEATFS/HEATFS_b.png
diff --git a/...ings/Ammo/Cannon/Flak/HEATFS/HEATFS_c.png → ...ings/Ammo/Cannon/Tank/HEATFS/HEATFS_c.png b/...ings/Ammo/Cannon/Flak/HEATFS/HEATFS_c.png → ...ings/Ammo/Cannon/Tank/HEATFS/HEATFS_c.png
diff --git a/...Things/Ammo/Cannon/Flak/Sabot/Sabot_a.png → ...Things/Ammo/Cannon/Tank/Sabot/Sabot_a.png b/...Things/Ammo/Cannon/Flak/Sabot/Sabot_a.png → ...Things/Ammo/Cannon/Tank/Sabot/Sabot_a.png
diff --git a/...Things/Ammo/Cannon/Flak/Sabot/Sabot_b.png → ...Things/Ammo/Cannon/Tank/Sabot/Sabot_b.png b/...Things/Ammo/Cannon/Flak/Sabot/Sabot_b.png → ...Things/Ammo/Cannon/Tank/Sabot/Sabot_b.png
diff --git a/...Things/Ammo/Cannon/Flak/Sabot/Sabot_c.png → ...Things/Ammo/Cannon/Tank/Sabot/Sabot_c.png b/...Things/Ammo/Cannon/Flak/Sabot/Sabot_c.png → ...Things/Ammo/Cannon/Tank/Sabot/Sabot_c.png
diff --git a/Textures/Things/Projectile/Cannon/120mmTank/HE.png b/Textures/Things/Projectile/Cannon/120mmTank/HE.png
diff --git a/Textures/Things/Projectile/Cannon/120mmTank/HEAT.png b/Textures/Things/Projectile/Cannon/120mmTank/HEAT.png
diff --git a/Textures/Things/Projectile/Cannon/120mmTank/Sabot.png b/Textures/Things/Projectile/Cannon/120mmTank/Sabot.png