diff --git a/Defs/ThingDefs_Buildings/Buildings_Turrets.xml b/Defs/ThingDefs_Buildings/Buildings_Turrets.xml
index 7f4ad4fe28..e6cf56747e 100644
--- a/Defs/ThingDefs_Buildings/Buildings_Turrets.xml
+++ b/Defs/ThingDefs_Buildings/Buildings_Turrets.xml
@@ -201,6 +201,12 @@
 	<researchPrerequisites>
 	  <li>CE_HeavyTurret</li>
 	</researchPrerequisites>
+	<modExtensions>
+	  <li Class="CombatExtended.NonSnapTurretExtension">
+		<speed>0.8</speed>
+		<angleWeightMultiplier>1.1</angleWeightMultiplier>
+	  </li>
+	</modExtensions>	
   </ThingDef>
 
   <!--=============== Medium Turret ===============-->
@@ -251,6 +257,12 @@
 	  <li>GunTurrets</li>
 	  <li>PrecisionRifling</li>
 	</researchPrerequisites>
+	<modExtensions>
+	  <li Class="CombatExtended.NonSnapTurretExtension">
+		<speed>0.8</speed>
+		<angleWeightMultiplier>1.1</angleWeightMultiplier>
+	  </li>
+	</modExtensions>	
   </ThingDef>
 
   <!--=============== KPV ===============-->
@@ -299,6 +311,12 @@
 			<li>PrecisionRifling</li>
 		</researchPrerequisites>
 		<minifiedDef>MinifiedThing</minifiedDef>
+		<modExtensions>
+		<li Class="CombatExtended.NonSnapTurretExtension">
+			<speed>0.5</speed>
+			<angleWeightMultiplier>1.5</angleWeightMultiplier>
+		</li>
+		</modExtensions>		
 	</ThingDef>
 
   <!--=============== M240B ===============-->
@@ -344,6 +362,12 @@
 	  <li Class="CombatExtended.CompProperties_FireArc">
 	  </li>
 	</comps>
+	<modExtensions>
+	  <li Class="CombatExtended.NonSnapTurretExtension">
+		<speed>0.8</speed>
+		<angleWeightMultiplier>1.1</angleWeightMultiplier>
+	  </li>
+	</modExtensions>
   </ThingDef>
 
   <!--=============== AGS-30 ===============-->
@@ -386,6 +410,12 @@
 	  <li>CE_Launchers</li>
 	</researchPrerequisites>
 	<minifiedDef>MinifiedThing</minifiedDef>
+	<modExtensions>
+	  <li Class="CombatExtended.NonSnapTurretExtension">
+		<speed>0.8</speed>
+		<angleWeightMultiplier>1.1</angleWeightMultiplier>
+	  </li>
+	</modExtensions>	
   </ThingDef>
 
   <!--=============== Flak cannon ===============-->
@@ -457,14 +487,12 @@
 		<multiplier>0.66</multiplier>
 	  </li>
 	</damageMultipliers>
-
 	<comps>
 	  <li Class="CombatExtended.CompProperties_FireArc">
 		<spanRange>10~135</spanRange>
 		<maxSpanDeviation>135</maxSpanDeviation>
 	  </li>
 	</comps>
-
 	<modExtensions>
 	  <li Class="CombatExtended.NonSnapTurretExtension">
 		<speed>0.2</speed>
diff --git a/Patches/Core/ThingDefs_Buildings/Buildings_Security.xml b/Patches/Core/ThingDefs_Buildings/Buildings_Security.xml
index fd893f5d35..3aa8715e43 100644
--- a/Patches/Core/ThingDefs_Buildings/Buildings_Security.xml
+++ b/Patches/Core/ThingDefs_Buildings/Buildings_Security.xml
@@ -273,6 +273,16 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Turret_Autocannon"]</xpath>
+		<value>
+			<li Class="CombatExtended.NonSnapTurretExtension">
+				<speed>0.5</speed>
+				<angleWeightMultiplier>1.5</angleWeightMultiplier>
+			</li>
+		</value>
+	</Operation>
+
 	<!-- ========== Foam Turret ========== -->
 
 	<Operation Class="PatchOperationReplace">
@@ -382,6 +392,16 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Turret_RocketswarmLauncher"]</xpath>
+		<value>
+			<li Class="CombatExtended.NonSnapTurretExtension">
+				<speed>0.5</speed>
+				<angleWeightMultiplier>1.5</angleWeightMultiplier>
+			</li>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationRemove">
 		<xpath>Defs/ThingDef[defName="Gun_RocketswarmLauncher"]/statBases/AccuracyTouch
 			| Defs/ThingDef[defName="Gun_RocketswarmLauncher"]/statBases/AccuracyShort
@@ -589,6 +609,16 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Turret_Mortar"]</xpath>
+		<value>
+			<li Class="CombatExtended.NonSnapTurretExtension">
+				<speed>0.5</speed>
+				<angleWeightMultiplier>1.5</angleWeightMultiplier>
+			</li>
+		</value>
+	</Operation>
+
 	<!-- ========== Traps ========== -->
 
 	<Operation Class="PatchOperationAdd">
diff --git a/Royalty/Patches/ThingDefs_Buildings/Buildings_Mechanoid.xml b/Royalty/Patches/ThingDefs_Buildings/Buildings_Mechanoid.xml
index 3473518cf9..c611d73a41 100644
--- a/Royalty/Patches/ThingDefs_Buildings/Buildings_Mechanoid.xml
+++ b/Royalty/Patches/ThingDefs_Buildings/Buildings_Mechanoid.xml
@@ -185,6 +185,16 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Turret_AutoChargeBlaster"]</xpath>
+		<value>
+			<li Class="CombatExtended.NonSnapTurretExtension">
+				<speed>0.5</speed>
+				<angleWeightMultiplier>1.5</angleWeightMultiplier>
+			</li>
+		</value>
+	</Operation>
+
 	<!-- ========== Auto Inferno Turret ========== -->
 
 	<Operation Class="PatchOperationReplace">
@@ -245,6 +255,16 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Turret_AutoInferno"]</xpath>
+		<value>
+			<li Class="CombatExtended.NonSnapTurretExtension">
+				<speed>0.35</speed>
+				<angleWeightMultiplier>1.75</angleWeightMultiplier>
+			</li>
+		</value>
+	</Operation>
+
 	<!-- ========== Auto Mortar ========== -->
 
 	<!-- Auto Mortar Base -->
@@ -289,6 +309,16 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Turret_AutoMortar"]</xpath>
+		<value>
+			<li Class="CombatExtended.NonSnapTurretExtension">
+				<speed>0.8</speed>
+				<angleWeightMultiplier>1.1</angleWeightMultiplier>
+			</li>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Turret_AutoMortar"]/comps</xpath>
 		<value>