diff --git a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Apparel.xml b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Apparel.xml
index 174f7eec55..8a2f35803e 100644
--- a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Apparel.xml	
+++ b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Apparel.xml	
@@ -3,7 +3,7 @@
 
 	<!-- Common armor properties -->
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[@Name="AC_HuntersHelmet"]/apparel</xpath>
+		<xpath>Defs/ThingDef[@Name="AC_ApparelArmorHelmetChrysalisMakeableBase"]/apparel</xpath>
 		<value>
 			<immuneToToxGasExposure>true</immuneToToxGasExposure>
 			<parentTagDef>ApparelHead</parentTagDef>
@@ -11,7 +11,7 @@
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[@Name="AC_HuntersHelmet"]/apparel/layers</xpath>
+		<xpath>Defs/ThingDef[@Name="AC_ApparelArmorHelmetChrysalisMakeableBase"]/apparel/layers</xpath>
 		<value>
 			<li>OnHead</li>
 			<li>StrappedHead</li>
@@ -19,23 +19,32 @@
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[@Name="AC_HuntersArmourBase"]/apparel/bodyPartGroups</xpath>
+		<xpath>Defs/ThingDef[@Name="AC_ApparelArmorChrysalisMakeableBase"]/apparel/bodyPartGroups</xpath>
 		<value>
 			<li>Hands</li>
 			<li>Feet</li>
 		</value>
 	</Operation>
 
+	<!-- some of Chrysalis stats are here Chrysalis Helmet Base -->
+
 	<Operation Class="PatchOperationRemove">
 		<xpath>Defs/ThingDef[
-			defName="AC_Apparel_OverseerHelmet" or
-			defName="VFEU_Apparel_ProtectorHelmet" or
+			defName="AC_Apparel_ChrysalisHelmet" or
 			defName="AC_Apparel_FusilierHelmet"]/statBases/VEF_RangedCooldownFactor</xpath>
 	</Operation>
 
-	<!-- Overseer Helmet -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[
+			@Name="AC_ApparelArmorChrysalisMakeableBase" or
+			defName="AC_Apparel_FusilierArmor" or
+			defName="AC_EnviroSuit" or
+			defName="AC_Apparel_HayabusaArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<!-- Chrysalis Helmet -->
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/statBases</xpath>
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/statBases</xpath>
 		<value>
 			<Bulk>5</Bulk>
 			<WornBulk>1</WornBulk>
@@ -43,154 +52,77 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/statBases/Flammability</xpath>
-		<value>
-			<Flammability>0</Flammability>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/statBases/MaxHitPoints</xpath>
-		<value>
-			<MaxHitPoints>250</MaxHitPoints>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/statBases/Mass</xpath>
-		<value>
-			<Mass>3.0</Mass>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/statBases/ArmorRating_Sharp</xpath>
-		<value>
-			<ArmorRating_Sharp>16</ArmorRating_Sharp>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/statBases/ArmorRating_Blunt</xpath>
-		<value>
-			<ArmorRating_Blunt>36</ArmorRating_Blunt>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationAddModExtension">
-		<xpath>Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]</xpath>
-		<value>
-			<li Class="CombatExtended.PartialArmorExt">
-				<stats>
-					<li>
-						<ArmorRating_Sharp>0.75</ArmorRating_Sharp>
-						<parts>
-							<li>Eye</li>
-						</parts>
-					</li>
-					<li>
-						<ArmorRating_Blunt>0.75</ArmorRating_Blunt>
-						<parts>
-							<li>Eye</li>
-						</parts>
-					</li>
-				</stats>
-			</li>
-		</value>
-	</Operation>
-
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/equippedStatOffsets</xpath>
-		<value>
-			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
-			<SmokeSensitivity>-1</SmokeSensitivity>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/statBases</xpath>
 		<value>
-			<ShootingAccuracyPawn>4</ShootingAccuracyPawn>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/costList/Plasteel</xpath>
-		<value>
-			<Plasteel>50</Plasteel>
+			<ArmorRating_Sharp>19</ArmorRating_Sharp>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/costList</xpath>
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/statBases</xpath>
 		<value>
-			<DevilstrandCloth>25</DevilstrandCloth>
+			<ArmorRating_Blunt>43</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
-	<!-- Protector Helmet -->
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases</xpath>
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/statBases</xpath>
 		<value>
-			<Bulk>5</Bulk>
-			<WornBulk>1</WornBulk>
-			<NightVisionEfficiency_Apparel>0.7</NightVisionEfficiency_Apparel>
+			<Flammability>0</Flammability>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/Flammability</xpath>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/statBases</xpath>
 		<value>
-			<Flammability>0</Flammability>
+			<Mass>3.0</Mass>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/MaxHitPoints</xpath>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/statBases</xpath>
 		<value>
-			<MaxHitPoints>275</MaxHitPoints>
+			<MaxHitPoints>250</MaxHitPoints>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/Mass</xpath>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]</xpath>
 		<value>
-			<Mass>3.0</Mass>
+			<costList />
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/ArmorRating_Sharp</xpath>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/costList</xpath>
 		<value>
-			<ArmorRating_Sharp>20</ArmorRating_Sharp>
+			<Plasteel>75</Plasteel>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/ArmorRating_Blunt</xpath>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/costList</xpath>
 		<value>
-			<ArmorRating_Blunt>45</ArmorRating_Blunt>
+			<DevilstrandCloth>25</DevilstrandCloth>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAddModExtension">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]</xpath>
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]</xpath>
 		<value>
 			<li Class="CombatExtended.PartialArmorExt">
 				<stats>
 					<li>
-						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
 						<parts>
 							<li>Eye</li>
-							<li>Nose</li>
 						</parts>
 					</li>
 					<li>
-						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
 						<parts>
 							<li>Eye</li>
-							<li>Nose</li>
 						</parts>
 					</li>
 				</stats>
@@ -199,87 +131,75 @@
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/equippedStatOffsets</xpath>
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/equippedStatOffsets</xpath>
 		<value>
 			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
 			<SmokeSensitivity>-1</SmokeSensitivity>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
-		<value>
-			<ShootingAccuracyPawn>2.5</ShootingAccuracyPawn>
-		</value>
-	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/costList/ComponentSpacer</xpath>
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/equippedStatOffsets/AimingDelayFactor</xpath>
 		<value>
-			<ComponentSpacer>2</ComponentSpacer>
+			<AimingDelayFactor>-0.1</AimingDelayFactor>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/costList/Plasteel</xpath>
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
 		<value>
-			<Plasteel>75</Plasteel>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
 		</value>
 	</Operation>
 
+	<!-- Chrysalis Armor -->
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/costList</xpath>
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]</xpath>
 		<value>
-			<DevilstrandCloth>30</DevilstrandCloth>
+			<statBases />
 		</value>
 	</Operation>
 
-	<!-- Protector Armor -->
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases</xpath>
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/statBases</xpath>
 		<value>
 			<Bulk>100</Bulk>
 			<WornBulk>15</WornBulk>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/Flammability</xpath>
-		<value>
 			<Flammability>0</Flammability>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/MaxHitPoints</xpath>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/statBases</xpath>
 		<value>
 			<MaxHitPoints>600</MaxHitPoints>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/Mass</xpath>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/statBases</xpath>
 		<value>
-			<Mass>50</Mass>
+			<Mass>60</Mass>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/ArmorRating_Sharp</xpath>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/statBases</xpath>
 		<value>
-			<ArmorRating_Sharp>24</ArmorRating_Sharp>
+			<ArmorRating_Sharp>22</ArmorRating_Sharp>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/ArmorRating_Blunt</xpath>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/statBases</xpath>
 		<value>
-			<ArmorRating_Blunt>56</ArmorRating_Blunt>
+			<ArmorRating_Blunt>58.5</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAddModExtension">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]</xpath>
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]</xpath>
 		<value>
 			<li Class="CombatExtended.PartialArmorExt">
 				<stats>
@@ -325,37 +245,52 @@
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/equippedStatOffsets</xpath>
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]</xpath>
 		<value>
-			<CarryWeight>80</CarryWeight>
-			<CarryBulk>10</CarryBulk>
+			<equippedStatOffsets />
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>90</CarryWeight>
+			<CarryBulk>15</CarryBulk>
+			<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
 			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList/ComponentSpacer</xpath>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]</xpath>
+		<value>
+			<costList />
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/costList</xpath>
 		<value>
 			<ComponentSpacer>5</ComponentSpacer>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList/Plasteel</xpath>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/costList</xpath>
 		<value>
-			<Plasteel>200</Plasteel>
+			<Plasteel>225</Plasteel>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList/Uranium</xpath>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/costList</xpath>
 		<value>
 			<Uranium>50</Uranium>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList</xpath>
+		<xpath>Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/costList</xpath>
 		<value>
 			<DevilstrandCloth>60</DevilstrandCloth>
 		</value>
@@ -365,8 +300,8 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases</xpath>
 		<value>
-			<Bulk>6</Bulk>
-			<WornBulk>1</WornBulk>
+			<Bulk>8</Bulk>
+			<WornBulk>2</WornBulk>
 			<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
 		</value>
 	</Operation>
@@ -388,61 +323,44 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/Mass</xpath>
 		<value>
-			<Mass>6.6</Mass>
+			<Mass>8</Mass>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/ArmorRating_Sharp</xpath>
 		<value>
-			<ArmorRating_Sharp>25</ArmorRating_Sharp>
+			<ArmorRating_Sharp>24</ArmorRating_Sharp>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/ArmorRating_Blunt</xpath>
 		<value>
-			<ArmorRating_Blunt>56</ArmorRating_Blunt>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationAddModExtension">
-		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]</xpath>
-		<value>
-			<li Class="CombatExtended.PartialArmorExt">
-				<stats>
-					<li>
-						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
-						<parts>
-							<li>Eye</li>
-							<li>Nose</li>
-						</parts>
-					</li>
-					<li>
-						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
-						<parts>
-							<li>Eye</li>
-							<li>Nose</li>
-						</parts>
-					</li>
-				</stats>
-			</li>
+			<ArmorRating_Blunt>65</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/equippedStatOffsets</xpath>
 		<value>
-			<AimingAccuracy>0.20</AimingAccuracy>
+			<AimingAccuracy>0.30</AimingAccuracy>
 			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
 			<SmokeSensitivity>-1</SmokeSensitivity>
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/equippedStatOffsets/AimingDelayFactor</xpath>
+		<value>
+			<AimingDelayFactor>-0.25</AimingDelayFactor>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
 		<value>
-			<ShootingAccuracyPawn>5</ShootingAccuracyPawn>
+			<ShootingAccuracyPawn>3</ShootingAccuracyPawn>
 		</value>
 	</Operation>
 
@@ -456,14 +374,14 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/costList/Plasteel</xpath>
 		<value>
-			<Plasteel>115</Plasteel>
+			<Plasteel>140</Plasteel>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/costList</xpath>
 		<value>
-			<DevilstrandCloth>35</DevilstrandCloth>
+			<DevilstrandCloth>30</DevilstrandCloth>
 		</value>
 	</Operation>
 
@@ -471,14 +389,8 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases</xpath>
 		<value>
-			<Bulk>100</Bulk>
-			<WornBulk>15</WornBulk>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/Flammability</xpath>
-		<value>
+			<Bulk>130</Bulk>
+			<WornBulk>20</WornBulk>
 			<Flammability>0</Flammability>
 		</value>
 	</Operation>
@@ -493,21 +405,21 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/Mass</xpath>
 		<value>
-			<Mass>80</Mass>
+			<Mass>100</Mass>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/ArmorRating_Sharp</xpath>
 		<value>
-			<ArmorRating_Sharp>30</ArmorRating_Sharp>
+			<ArmorRating_Sharp>33</ArmorRating_Sharp>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/ArmorRating_Blunt</xpath>
 		<value>
-			<ArmorRating_Blunt>68</ArmorRating_Blunt>
+			<ArmorRating_Blunt>85</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
@@ -517,13 +429,13 @@
 			<li Class="CombatExtended.PartialArmorExt">
 				<stats>
 					<li>
-						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
 						<parts>
 							<li>Neck</li>
 						</parts>
 					</li>
 					<li>
-						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
 						<parts>
 							<li>Neck</li>
 						</parts>
@@ -541,13 +453,13 @@
 						</parts>
 					</li>
 					<li>
-						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<ArmorRating_Sharp>0.85</ArmorRating_Sharp>
 						<parts>
 							<li>Hand</li>
 						</parts>
 					</li>
 					<li>
-						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<ArmorRating_Blunt>0.85</ArmorRating_Blunt>
 						<parts>
 							<li>Hand</li>
 						</parts>
@@ -576,7 +488,7 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/costList/Plasteel</xpath>
 		<value>
-			<Plasteel>270</Plasteel>
+			<Plasteel>300</Plasteel>
 		</value>
 	</Operation>
 
@@ -594,6 +506,106 @@
 		</value>
 	</Operation>
 
+	<!-- Enviro Suit Helmet (copied sos2 suit stats) -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_EnviroSuitHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.40</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AC_EnviroSuitHelmet"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AC_EnviroSuitHelmet"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_EnviroSuitHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_EnviroSuitHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>150</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_EnviroSuitHelmet"]/statBases/Mass</xpath>
+		<value>
+			<Mass>2.6</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_EnviroSuitHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_EnviroSuitHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_EnviroSuitHelmet"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<!-- Enviro Suit -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_EnviroSuit"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_EnviroSuit"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_EnviroSuit"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_EnviroSuit"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_EnviroSuit"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
 	<!-- Cuirassier Belt -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="AC_CuirassierBelt"]/statBases</xpath>
@@ -610,7 +622,6 @@
 		</value>
 	</Operation>
 
-	<!-- Dragoon armor and jump wings require Royalty -->
 	<Operation Class="PatchOperationFindMod">
 		<mods>
 			<li>Royalty</li>
@@ -622,44 +633,47 @@
 				<li Class="PatchOperationAdd">
 					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases</xpath>
 					<value>
-						<Bulk>6</Bulk>
+						<Bulk>5</Bulk>
 						<WornBulk>1</WornBulk>
+						<Flammability>0</Flammability>
 						<NightVisionEfficiency_Apparel>0.75</NightVisionEfficiency_Apparel>
 					</value>
 				</li>
 
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/Flammability</xpath>
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]</xpath>
 					<value>
-						<Flammability>0</Flammability>
+						<li Class="CombatExtended.ApparelDefExtension">
+							<isRadioPack>true</isRadioPack>
+						</li>
 					</value>
 				</li>
 
 				<li Class="PatchOperationReplace">
 					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/MaxHitPoints</xpath>
 					<value>
-						<MaxHitPoints>300</MaxHitPoints>
+						<MaxHitPoints>225</MaxHitPoints>
 					</value>
 				</li>
 
 				<li Class="PatchOperationReplace">
 					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/Mass</xpath>
 					<value>
-						<Mass>6.6</Mass>
+						<Mass>4</Mass>
 					</value>
 				</li>
 
 				<li Class="PatchOperationReplace">
 					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/ArmorRating_Sharp</xpath>
 					<value>
-						<ArmorRating_Sharp>28</ArmorRating_Sharp>
+						<ArmorRating_Sharp>14.4</ArmorRating_Sharp>
 					</value>
 				</li>
 
 				<li Class="PatchOperationReplace">
 					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/ArmorRating_Blunt</xpath>
 					<value>
-						<ArmorRating_Blunt>62</ArmorRating_Blunt>
+						<ArmorRating_Blunt>31.2</ArmorRating_Blunt>
 					</value>
 				</li>
 
@@ -705,29 +719,27 @@
 				<li Class="PatchOperationReplace">
 					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/costList/Plasteel</xpath>
 					<value>
-						<Plasteel>125</Plasteel>
+						<Plasteel>65</Plasteel>
 					</value>
 				</li>
 
 				<li Class="PatchOperationAdd">
 					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/costList</xpath>
 					<value>
-						<DevilstrandCloth>35</DevilstrandCloth>
+						<DevilstrandCloth>20</DevilstrandCloth>
 					</value>
 				</li>
 
 				<!-- Dragoon Armor -->
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/equippedStatOffsets/MoveSpeed</xpath>
+				</li>
+
 				<li Class="PatchOperationAdd">
 					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases</xpath>
 					<value>
-						<Bulk>100</Bulk>
+						<Bulk>80</Bulk>
 						<WornBulk>15</WornBulk>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/Flammability</xpath>
-					<value>
 						<Flammability>0</Flammability>
 					</value>
 				</li>
@@ -735,28 +747,28 @@
 				<li Class="PatchOperationReplace">
 					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/MaxHitPoints</xpath>
 					<value>
-						<MaxHitPoints>700</MaxHitPoints>
+						<MaxHitPoints>500</MaxHitPoints>
 					</value>
 				</li>
 
 				<li Class="PatchOperationReplace">
 					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/Mass</xpath>
 					<value>
-						<Mass>80</Mass>
+						<Mass>40</Mass>
 					</value>
 				</li>
 
 				<li Class="PatchOperationReplace">
 					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/ArmorRating_Sharp</xpath>
 					<value>
-						<ArmorRating_Sharp>32</ArmorRating_Sharp>
+						<ArmorRating_Sharp>19.2</ArmorRating_Sharp>
 					</value>
 				</li>
 
 				<li Class="PatchOperationReplace">
 					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/ArmorRating_Blunt</xpath>
 					<value>
-						<ArmorRating_Blunt>75</ArmorRating_Blunt>
+						<ArmorRating_Blunt>40.8</ArmorRating_Blunt>
 					</value>
 				</li>
 
@@ -809,8 +821,9 @@
 				<li Class="PatchOperationAdd">
 					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/equippedStatOffsets</xpath>
 					<value>
-						<CarryWeight>100</CarryWeight>
-						<CarryBulk>20</CarryBulk>
+						<CarryWeight>60</CarryWeight>
+						<CarryBulk>10</CarryBulk>
+						<MoveSpeed>0.5</MoveSpeed>
 						<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
 					</value>
 				</li>
@@ -825,21 +838,14 @@
 				<li Class="PatchOperationReplace">
 					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList/Plasteel</xpath>
 					<value>
-						<Plasteel>275</Plasteel>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList/Uranium</xpath>
-					<value>
-						<Uranium>90</Uranium>
+						<Plasteel>185</Plasteel>
 					</value>
 				</li>
 
 				<li Class="PatchOperationAdd">
 					<xpath>Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList</xpath>
 					<value>
-						<DevilstrandCloth>75</DevilstrandCloth>
+						<DevilstrandCloth>65</DevilstrandCloth>
 					</value>
 				</li>
 
@@ -851,6 +857,7 @@
 						<WornBulk>3</WornBulk>
 					</value>
 				</li>
+
 				<li Class="PatchOperationReplace">
 					<xpath>Defs/ThingDef[defName="AC_Apparel_WingJump"]/statBases/JumpRange</xpath>
 					<value>
@@ -862,4 +869,246 @@
 		</match>
 	</Operation>
 
+	<!-- Hayabusa Helmet ported stats from Spartan Armory Patch -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/apparel</xpath>
+		<value>
+			<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			<parentTagDef>ApparelHead</parentTagDef>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+			<NightVisionEfficiency_Apparel>0.6</NightVisionEfficiency_Apparel>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>240</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Eye</li>
+							<li>Nose</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>30</DevilstrandCloth>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+		<value>
+			<PsychicSensitivity>-0.08</PsychicSensitivity>
+			<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+			<MeleeHitChance>0.15</MeleeHitChance>
+			<MeleeCritChance>0.35</MeleeCritChance>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/equippedStatOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>2.5</ShootingAccuracyPawn>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/equippedStatOffsets/AimingDelayFactor</xpath>
+		<value>
+			<AimingDelayFactor>-0.2</AimingDelayFactor>
+		</value>
+	</Operation>
+
+	<!-- Hayabusa Armor -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/apparel/bodyPartGroups</xpath>
+		<value>
+			<li>Hands</li>
+			<li>Feet</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/statBases</xpath>
+		<value>
+			<Bulk>106.7</Bulk>
+			<WornBulk>16</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/statBases/Flammability</xpath>
+		<value>
+			<Flammability>0</Flammability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/statBases/MaxHitPoints</xpath>
+		<value>
+			<MaxHitPoints>1200</MaxHitPoints>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/statBases/Mass</xpath>
+		<value>
+			<Mass>53.3</Mass>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<ArmorRating_Sharp>0.80</ArmorRating_Sharp>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.80</ArmorRating_Blunt>
+						<parts>
+							<li>Neck</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.90</ArmorRating_Sharp>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.90</ArmorRating_Blunt>
+						<parts>
+							<li>Arm</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Sharp>0.70</ArmorRating_Sharp>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+					<li>
+						<ArmorRating_Blunt>0.70</ArmorRating_Blunt>
+						<parts>
+							<li>Hand</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/equippedStatOffsets/CarryingCapacity</xpath>
+		<value>
+			<CarryWeight>88.1</CarryWeight>
+			<CarryBulk>10.7</CarryBulk>
+			<MeleeHitChance>0.05</MeleeHitChance>
+			<MeleeCritChance>0.1</MeleeCritChance>
+			<MeleeParryChance>0.3</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/equippedStatOffsets/ToxicEnvironmentResistance</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.5</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/equippedStatOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/costList</xpath>
+		<value>
+			<DevilstrandCloth>100</DevilstrandCloth>
+		</value>
+	</Operation>
+
 </Patch>
\ No newline at end of file
diff --git a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Hediff.xml b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Hediff.xml
new file mode 100644
index 0000000000..947c5b28ff
--- /dev/null
+++ b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Hediff.xml	
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/HediffDef[defName="AC_PainProtection"]/stages/li/statFactors</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/HediffDef[defName="AC_PainProtection"]/stages/li</xpath>
+			<value>
+				<statFactors />
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="AC_PainProtection"]/stages/li/statFactors</xpath>
+		<value>
+			<Suppressability>0.5</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="AC_RogianArmBlade"]/comps/li[@Class="AlteredCarbon.HediffCompProperties_MeleeWeapon"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>25</power>
+					<armorPenetrationBlunt>2.16</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.87</armorPenetrationSharp>
+					<cooldownTime>2</cooldownTime>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+					<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>blade</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>3.6</armorPenetrationSharp>
+					<cooldownTime>2</cooldownTime>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+					<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
+					<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Royalty</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/HediffDef[defName="AC_RogianArmBlade_Mono"]/comps/li[@Class="AlteredCarbon.HediffCompProperties_MeleeWeapon"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>edge</label>
+							<capacities>
+								<li>Cut</li>
+							</capacities>
+							<power>25</power>
+							<cooldownTime>1.5</cooldownTime>
+							<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+							<armorPenetrationSharp>13.5</armorPenetrationSharp>
+							<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+							<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							<soundMeleeHit>MeleeHit_MonoSword</soundMeleeHit>
+							<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+						</li>
+						<li Class="CombatExtended.ToolCE">
+							<label>point</label>
+							<capacities>
+								<li>Stab</li>
+							</capacities>
+							<power>12</power>
+							<cooldownTime>1.5</cooldownTime>
+							<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+							<armorPenetrationSharp>18.75</armorPenetrationSharp>
+							<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+							<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							<soundMeleeHit>MeleeHit_MonoSword</soundMeleeHit>
+							<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+						</li>
+					</tools>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/HediffDef[defName="AC_RogianArmBlade_Plasma"]/comps/li[@Class="AlteredCarbon.HediffCompProperties_MeleeWeapon"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>edge</label>
+							<capacities>
+								<li>Cut</li>
+							</capacities>
+							<power>25</power>
+							<extraMeleeDamages>
+								<li>
+									<def>Flame</def>
+									<amount>5</amount>
+									<chance>0.3</chance>
+								</li>
+							</extraMeleeDamages>
+							<cooldownTime>2</cooldownTime>
+							<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							<armorPenetrationBlunt>3.06</armorPenetrationBlunt>
+							<armorPenetrationSharp>18</armorPenetrationSharp>
+							<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+							<soundMeleeHit>MeleeHit_PlasmaSword</soundMeleeHit>
+							<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+						</li>
+						<li Class="CombatExtended.ToolCE">
+							<label>point</label>
+							<capacities>
+								<li>Stab</li>
+							</capacities>
+							<power>12</power>
+							<extraMeleeDamages>
+								<li>
+									<def>Flame</def>
+									<amount>3</amount>
+									<chance>0.2</chance>
+								</li>
+							</extraMeleeDamages>
+							<cooldownTime>2</cooldownTime>
+							<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+							<armorPenetrationSharp>24</armorPenetrationSharp>
+							<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+							<soundMeleeHit>MeleeHit_PlasmaSword</soundMeleeHit>
+							<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+						</li>
+					</tools>
+				</value>
+			</li>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/HediffDef[defName="AC_RogianArmBlade_Zeus"]/comps/li[@Class="AlteredCarbon.HediffCompProperties_MeleeWeapon"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>edge</label>
+							<capacities>
+								<li>Cut</li>
+							</capacities>
+							<power>25</power>
+							<extraMeleeDamages>
+								<li>
+									<def>EMP</def>
+									<amount>5</amount>
+								</li>
+							</extraMeleeDamages>
+							<cooldownTime>2</cooldownTime>
+							<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							<armorPenetrationBlunt>4.06</armorPenetrationBlunt>
+							<armorPenetrationSharp>18</armorPenetrationSharp>
+							<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+							<soundMeleeHit>MeleeHit_ZeusHammer</soundMeleeHit>
+							<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+						</li>
+						<li Class="CombatExtended.ToolCE">
+							<label>point</label>
+							<capacities>
+								<li>Stab</li>
+							</capacities>
+							<power>12</power>
+							<extraMeleeDamages>
+								<li>
+									<def>EMP</def>
+									<amount>5</amount>
+								</li>
+							</extraMeleeDamages>
+							<cooldownTime>2</cooldownTime>
+							<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+							<armorPenetrationSharp>24</armorPenetrationSharp>
+							<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+							<soundMeleeHit>MeleeHit_ZeusHammer</soundMeleeHit>
+							<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+						</li>
+					</tools>
+				</value>
+			</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Empire</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/HediffDef[defName="AC_RogianArmBlade_Toxblade"]/comps/li[@Class="AlteredCarbon.HediffCompProperties_MeleeWeapon"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>edge</label>
+							<capacities>
+								<li>Cut</li>
+							</capacities>
+							<power>14</power>
+							<cooldownTime>1.4</cooldownTime>
+							<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							<armorPenetrationBlunt>4.06</armorPenetrationBlunt>
+							<armorPenetrationSharp>9</armorPenetrationSharp>
+							<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+							<soundMeleeHit>Interact_MonoSword</soundMeleeHit>
+							<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+						</li>
+						<li Class="CombatExtended.ToolCE">
+							<label>point</label>
+							<capacities>
+								<li>VFEE_StabToxblade</li>
+							</capacities>
+							<power>14</power>
+							<cooldownTime>1.4</cooldownTime>
+							<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+							<armorPenetrationBlunt>0.9</armorPenetrationBlunt>
+							<armorPenetrationSharp>13</armorPenetrationSharp>
+							<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
+							<soundMeleeHit>Interact_MonoSword</soundMeleeHit>
+							<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
+						</li>
+					</tools>
+				</value>
+			</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Weapons.xml b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Weapons.xml
index 07e1bf6bea..f4d162e61f 100644
--- a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Weapons.xml	
+++ b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Weapons.xml	
@@ -43,128 +43,6 @@
 		</weaponTags>
 	</Operation>
 
-	<!-- === Charge Incursionar === -->
-	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
-		<defName>AC_Gun_ChargeIncursionar</defName>
-		<statBases>
-			<WorkToMake>55000</WorkToMake>
-			<Mass>6</Mass>
-			<Bulk>11.50</Bulk>
-			<SwayFactor>1.25</SwayFactor>
-			<ShotSpread>0.10</ShotSpread>
-			<SightsEfficiency>1.15</SightsEfficiency>
-			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-		</statBases>
-		<costList>
-			<Steel>20</Steel>
-			<Chemfuel>10</Chemfuel>
-			<ComponentIndustrial>2</ComponentIndustrial>
-			<Plasteel>70</Plasteel>
-			<ComponentSpacer>3</ComponentSpacer>
-		</costList>
-		<Properties>
-			<recoilAmount>1.46</recoilAmount>
-			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-			<hasStandardCommand>true</hasStandardCommand>
-			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
-			<warmupTime>1.0</warmupTime>
-			<range>55</range>
-			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
-			<burstShotCount>6</burstShotCount>
-			<soundCast>Shot_ChargeRifle</soundCast>
-			<soundCastTail>GunTail_Medium</soundCastTail>
-			<muzzleFlashScale>9</muzzleFlashScale>
-		</Properties>
-		<AmmoUser>
-			<magazineSize>30</magazineSize>
-			<reloadTime>4</reloadTime>
-			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
-		</AmmoUser>
-		<FireModes>
-			<aimedBurstShotCount>3</aimedBurstShotCount>
-			<aiUseBurstMode>TRUE</aiUseBurstMode>
-			<aiAimMode>AimedShot</aiAimMode>
-		</FireModes>
-		<weaponTags>
-			<li>CE_AI_AR</li>
-			<li>AdvancedGun</li>
-		</weaponTags>
-	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="AC_Gun_ChargeIncursionar"]/comps</xpath>
-		<value>
-			<li Class="CombatExtended.CompProperties_UnderBarrel">
-				<standardLabel>switch to rifle mode</standardLabel>
-				<underBarrelLabel>switch to shotgun mode</underBarrelLabel>
-				<propsUnderBarrel>
-					<magazineSize>4</magazineSize>
-					<reloadOneAtATime>true</reloadOneAtATime>
-					<reloadTime>0.85</reloadTime>
-					<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
-				</propsUnderBarrel>
-				<verbPropsUnderBarrel>
-					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
-					<warmupTime>0.6</warmupTime>
-					<burstShotCount>1</burstShotCount>
-					<range>20</range>
-					<recoilAmount>2.75</recoilAmount>
-					<soundCast>AC_Shot_ChargeShotgun</soundCast>
-					<soundCastTail>GunTail_Heavy</soundCastTail>
-					<muzzleFlashScale>9</muzzleFlashScale>
-				</verbPropsUnderBarrel>
-				<propsFireModesUnderBarrel>
-					<aiAimMode>Snapshot</aiAimMode>
-				</propsFireModesUnderBarrel>
-			</li>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationRemove">
-		<xpath>Defs/ThingDef[defName="AC_Gun_ChargeIncursionar"]/comps/li[@Class="MVCF.Comps.CompProperties_VerbProps"]</xpath>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName = "AC_Gun_ChargeIncursionar"]/tools</xpath>
-		<value>
-			<tools>
-				<li Class="CombatExtended.ToolCE">
-					<label>stock</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>8</power>
-					<cooldownTime>1.55</cooldownTime>
-					<chanceFactor>1.5</chanceFactor>
-					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-				</li>
-				<li Class="CombatExtended.ToolCE">
-					<label>barrel</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>5</power>
-					<cooldownTime>2.02</cooldownTime>
-					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
-					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-				</li>
-				<li Class="CombatExtended.ToolCE">
-					<label>muzzle</label>
-					<capacities>
-						<li>Poke</li>
-					</capacities>
-					<power>8</power>
-					<cooldownTime>1.55</cooldownTime>
-					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-				</li>
-			</tools>
-		</value>
-	</Operation>
-
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="AC_Gun_Autorevolver"]/tools</xpath>
 		<value>