diff --git a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml
index 8096f3b9b5..aae2b19842 100644
--- a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml
+++ b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml
@@ -184,8 +184,8 @@
 
 	<CombatExtended.AmmoCategoryDef>
 		<defName>BlasterAP</defName>
-		<label>concentrated tibanna</label>
-		<labelShort>conc.</labelShort>
+		<label>pressurized tibanna</label>
+		<labelShort>AP</labelShort>
 		<description>Energy bolts created with tibanna gas. Causes neat punctures and burns that tend to carbonize and char. Low chance of wound infection. Spun to a higher pressure to create bolts with improved penetration, at the loss of wounding potential.</description>
 	</CombatExtended.AmmoCategoryDef>
 
diff --git a/Defs/DamageDefs/Damages_LocalInjury.xml b/Defs/DamageDefs/Damages_LocalInjury.xml
index 7e631be221..a76c57f4e6 100644
--- a/Defs/DamageDefs/Damages_LocalInjury.xml
+++ b/Defs/DamageDefs/Damages_LocalInjury.xml
@@ -146,8 +146,8 @@
 		<harmsHealth>false</harmsHealth>
 		<additionalHediffs>
 			<li>
-				<hediff>Neuralizer</hediff>
-				<severityPerDamageDealt>0.9</severityPerDamageDealt>
+				<hediff>Anesthetic</hediff>
+				<severityPerDamageDealt>0.15</severityPerDamageDealt>
 				<victimSeverityScalingByInvBodySize>true</victimSeverityScalingByInvBodySize>
 			</li>
 		</additionalHediffs>
diff --git a/ModPatches/Outer Rim - Chiss Ascendancy/Defs/Outer_Rim_Chiss_Ammo.xml b/ModPatches/Outer Rim - Chiss Ascendancy/Defs/Outer_Rim_Chiss_Ammo.xml
new file mode 100644
index 0000000000..6dc6ace112
--- /dev/null
+++ b/ModPatches/Outer Rim - Chiss Ascendancy/Defs/Outer_Rim_Chiss_Ammo.xml	
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- ================== Base Beam ================== -->
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" Name="LaserBulletChiss" ParentName="BaseLaserBulletTextured" Abstract="True">
+		<graphicData>
+			<color>(3,252,169)</color>
+		</graphicData>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletChiss">
+		<defName>Bullet_ChissMaser_Pistol</defName>
+		<label>maser pistol beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>8</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>3</amount>
+				</li>
+			</secondaryDamage>
+			<empShieldBreakChance>0.2</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletChiss">
+		<defName>Bullet_ChissMaser_Carbine</defName>
+		<label>maser carbine beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>18</damageAmountBase>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>6</amount>
+				</li>
+			</secondaryDamage>
+			<empShieldBreakChance>0.5</empShieldBreakChance>
+		</projectile>
+		<lifetime>40</lifetime>
+		<beamWidth>1.2</beamWidth>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletChiss">
+		<defName>Bullet_ChissMaser_Rifle</defName>
+		<label>maser rifle beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>20</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>9</amount>
+				</li>
+			</secondaryDamage>
+			<empShieldBreakChance>0.8</empShieldBreakChance>
+		</projectile>
+		<lifetime>50</lifetime>
+		<beamWidth>1.4</beamWidth>
+	</ThingDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ChissMaser_Pistol</defName>
+		<label>Pistol Maser Beam</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_ChissMaser_Pistol</Ammo_PlasmaGasCartridge_Standard>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ChissMaser_Carbine</defName>
+		<label>Carbine Maser Beam</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_ChissMaser_Carbine</Ammo_PlasmaGasCartridge_Standard>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_ChissMaser_Rifle</defName>
+		<label>Rifle Maser Beam</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_ChissMaser_Rifle</Ammo_PlasmaGasCartridge_Standard>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml b/ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml
similarity index 81%
rename from ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml
rename to ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml
index 69609b144d..6231d4091f 100644
--- a/ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer Rim - Chiss Ascendancy/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml	
+++ b/ModPatches/Outer Rim - Chiss Ascendancy/Patches/Outer_Rim_Chiss_Ascendancy_Ranged_Weapons.xml	
@@ -15,9 +15,9 @@
 			<recoilAmount>3.0</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
-			<defaultProjectile>Bullet_BlasterPistol_Yellow</defaultProjectile>
+			<defaultProjectile>Bullet_ChissMaser_Pistol</defaultProjectile>
 			<burstShotCount>2</burstShotCount>
-			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
 			<warmupTime>0.5</warmupTime>
 			<range>12</range>
 			<soundCast>OuterRim_Shot_MaserBlasterBolt</soundCast>
@@ -36,9 +36,9 @@
 			<li>CE_OneHandedWeapon</li>
 		</weaponTags>
 		<AmmoUser>
-			<magazineSize>24</magazineSize>
+			<magazineSize>21</magazineSize>
 			<reloadTime>3.7</reloadTime>
-			<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Pistol</ammoSet>
+			<ammoSet>AmmoSet_ChissMaser_Pistol</ammoSet>
 		</AmmoUser>
 	</Operation>
 
@@ -56,10 +56,10 @@
 			<recoilAmount>1.2</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
-			<defaultProjectile>Bullet_BlasterRifle_Yellow</defaultProjectile>
+			<defaultProjectile>Bullet_ChissMaser_Carbine</defaultProjectile>
 			<warmupTime>0.75</warmupTime>
 			<range>35</range>
-			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
 			<burstShotCount>2</burstShotCount>
 			<soundCast>OuterRim_Shot_MaserBlasterBolt</soundCast>
 			<soundCastTail>GunTail_Medium</soundCastTail>
@@ -73,9 +73,9 @@
 			<aiAimMode>AimedShot</aiAimMode>
 		</FireModes>
 		<AmmoUser>
-			<magazineSize>70</magazineSize>
+			<magazineSize>60</magazineSize>
 			<reloadTime>3.84</reloadTime>
-			<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Rifle</ammoSet>
+			<ammoSet>AmmoSet_ChissMaser_Carbine</ammoSet>
 		</AmmoUser>
 	</Operation>
 
@@ -93,15 +93,15 @@
 			<recoilAmount>1.48</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
-			<defaultProjectile>Bullet_BlasterRifle_Yellow</defaultProjectile>
+			<defaultProjectile>Bullet_ChissMaser_Rifle</defaultProjectile>
 			<warmupTime>2.0</warmupTime>
 			<range>62</range>
-			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
 			<burstShotCount>2</burstShotCount>
 			<soundCast>OuterRim_Shot_MaserBlasterBolt</soundCast>
 			<soundCastTail>GunTail_Medium</soundCastTail>
 			<muzzleFlashScale>9</muzzleFlashScale>
-			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
 			<targetParams>
 				<canTargetLocations>true</canTargetLocations>
 			</targetParams>
@@ -110,9 +110,9 @@
 			<aiAimMode>AimedShot</aiAimMode>
 		</FireModes>
 		<AmmoUser>
-			<magazineSize>40</magazineSize>
+			<magazineSize>36</magazineSize>
 			<reloadTime>3.2</reloadTime>
-			<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Rifle</ammoSet>
+			<ammoSet>AmmoSet_ChissMaser_Rifle</ammoSet>
 		</AmmoUser>
 	</Operation>
 
diff --git a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml b/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml
similarity index 79%
rename from ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml
rename to ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml
index 56344fcda8..22101ff2cb 100644
--- a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml	
+++ b/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_Ammo.xml	
@@ -12,158 +12,147 @@
 
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_PlasmaGasCartridgeRed_Pistol</defName>
-		<label>Pistol Plasma Gas Cartridges (Imperial/Sith)</label>
+		<label>Pistol Blaster Bolts (Red)</label>
 		<ammoTypes>
 			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterPistol_Red</Ammo_PlasmaGasCartridge_Standard>
 			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterPistol_RedAP</Ammo_PlasmaGasCartridge_AP>
 			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterPistol_Ion</Ammo_PlasmaGasCartridge_Ion>
-			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterPistol_Stun</Ammo_PlasmaGasCartridge_Stun>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_PlasmaGasCartridgeRed_Rifle</defName>
-		<label>Rifle Plasma Gas Cartridges (Imperial/Sith)</label>
+		<label>Rifle Blaster Bolts (Red)</label>
 		<ammoTypes>
 			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterRifle_Red</Ammo_PlasmaGasCartridge_Standard>
 			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterRifle_RedAP</Ammo_PlasmaGasCartridge_AP>
 			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterRifle_Ion</Ammo_PlasmaGasCartridge_Ion>
-			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterRifle_Stun</Ammo_PlasmaGasCartridge_Stun>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_PlasmaGasCartridgeRed_Sniper</defName>
-		<label>Heavy Plasma Gas Cartridges (Imperial/Sith)</label>
+		<label>Heavy Blaster Bolts (Red)</label>
 		<ammoTypes>
 			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterSniper_Red</Ammo_PlasmaGasCartridge_Standard>
 			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterSniper_RedAP</Ammo_PlasmaGasCartridge_AP>
 			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterSniper_Ion</Ammo_PlasmaGasCartridge_Ion>
-			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterSniper_Stun</Ammo_PlasmaGasCartridge_Stun>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_PlasmaGasCartridgeGreen_Pistol</defName>
-		<label>Pistol Plasma Gas Cartridges (Rebel/Old Republic)</label>
+		<label>Pistol Blaster Bolts (Green)</label>
 		<ammoTypes>
 			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterPistol_Green</Ammo_PlasmaGasCartridge_Standard>
 			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterPistol_GreenAP</Ammo_PlasmaGasCartridge_AP>
 			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterPistol_Ion</Ammo_PlasmaGasCartridge_Ion>
-			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterPistol_Stun</Ammo_PlasmaGasCartridge_Stun>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_PlasmaGasCartridgeGreen_Rifle</defName>
-		<label>Rifle Plasma Gas Cartridges (Rebel/Old Republic)</label>
+		<label>Rifle Blaster Bolts (Green)</label>
 		<ammoTypes>
 			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterRifle_Green</Ammo_PlasmaGasCartridge_Standard>
 			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterRifle_GreenAP</Ammo_PlasmaGasCartridge_AP>
 			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterRifle_Ion</Ammo_PlasmaGasCartridge_Ion>
-			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterRifle_Stun</Ammo_PlasmaGasCartridge_Stun>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_PlasmaGasCartridgeGreen_Sniper</defName>
-		<label>Heavy Plasma Gas Cartridges (Rebel/Old Republic)</label>
+		<label>Heavy Blaster Bolts (Green)</label>
 		<ammoTypes>
 			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterSniper_Green</Ammo_PlasmaGasCartridge_Standard>
 			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterSniper_GreenAP</Ammo_PlasmaGasCartridge_AP>
 			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterSniper_Ion</Ammo_PlasmaGasCartridge_Ion>
-			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterSniper_Stun</Ammo_PlasmaGasCartridge_Stun>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_PlasmaGasCartridgeBlue_Pistol</defName>
-		<label>Plasma Gas Cartridges (Galactic Republic)</label>
+		<label>Pistol Blaster Bolts (Blue)</label>
 		<ammoTypes>
 			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterPistol_Blue</Ammo_PlasmaGasCartridge_Standard>
 			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterPistol_BlueAP</Ammo_PlasmaGasCartridge_AP>
 			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterPistol_Ion</Ammo_PlasmaGasCartridge_Ion>
-			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterPistol_Stun</Ammo_PlasmaGasCartridge_Stun>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_PlasmaGasCartridgeBlue_Rifle</defName>
-		<label>Rifle Plasma Gas Cartridges (Galactic Republic)</label>
+		<label>Rifle Blaster Bolts (Blue)</label>
 		<ammoTypes>
 			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterRifle_Blue</Ammo_PlasmaGasCartridge_Standard>
 			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterRifle_BlueAP</Ammo_PlasmaGasCartridge_AP>
 			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterRifle_Ion</Ammo_PlasmaGasCartridge_Ion>
-			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterRifle_Stun</Ammo_PlasmaGasCartridge_Stun>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_PlasmaGasCartridgeBlue_Sniper</defName>
-		<label>Heavy Plasma Gas Cartridges (Galactic Republic)</label>
+		<label>Heavy Blaster Bolts (Blue)</label>
 		<ammoTypes>
 			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterSniper_Blue</Ammo_PlasmaGasCartridge_Standard>
 			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterSniper_BlueAP</Ammo_PlasmaGasCartridge_AP>
 			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterSniper_Ion</Ammo_PlasmaGasCartridge_Ion>
-			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterSniper_Stun</Ammo_PlasmaGasCartridge_Stun>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_PlasmaGasCartridgeYellow_Pistol</defName>
-		<label>Pistol Plasma Gas Cartridges (Chiss/Mandalorian)</label>
+		<label>Pistol Blaster Bolts (Yellow)</label>
 		<ammoTypes>
 			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterPistol_Yellow</Ammo_PlasmaGasCartridge_Standard>
 			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterPistol_YellowAP</Ammo_PlasmaGasCartridge_AP>
 			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterPistol_Ion</Ammo_PlasmaGasCartridge_Ion>
-			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterPistol_Stun</Ammo_PlasmaGasCartridge_Stun>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_PlasmaGasCartridgeYellow_Rifle</defName>
-		<label>Rifle Plasma Gas Cartridges (Chiss/Mandalorian)</label>
+		<label>Rifle Blaster Bolts (Yellow)</label>
 		<ammoTypes>
 			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterRifle_Yellow</Ammo_PlasmaGasCartridge_Standard>
 			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterRifle_YellowAP</Ammo_PlasmaGasCartridge_AP>
 			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterRifle_Ion</Ammo_PlasmaGasCartridge_Ion>
-			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterRifle_Stun</Ammo_PlasmaGasCartridge_Stun>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_PlasmaGasCartridgeYellow_Sniper</defName>
-		<label>Heavy Plasma Gas Cartridges (Chiss/Mandalorian)</label>
+		<label>Heavy Blaster Bolts (Yellow)</label>
 		<ammoTypes>
 			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterSniper_Yellow</Ammo_PlasmaGasCartridge_Standard>
 			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterSniper_YellowAP</Ammo_PlasmaGasCartridge_AP>
 			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterSniper_Ion</Ammo_PlasmaGasCartridge_Ion>
-			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterSniper_Stun</Ammo_PlasmaGasCartridge_Stun>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_PlasmaGasCartridge_Scatter</defName>
-		<label>Scatterblaster Plasma Gas Cartridges</label>
+		<label>Scatterblaster Bolts</label>
 		<ammoTypes>
 			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterBolt_Scatter</Ammo_PlasmaGasCartridge_Standard>
+			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterSniper_Red</Ammo_PlasmaGasCartridge_AP>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterBolt_ScatterIon</Ammo_PlasmaGasCartridge_Ion>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_PlasmaGasCartridge_DualShot</defName>
-		<label>Dual Shot Plasma Gas Cartridges</label>
+		<label>Dual Shot Blaster Bolts (Red)</label>
 		<ammoTypes>
 			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterBolt_DualShot</Ammo_PlasmaGasCartridge_Standard>
 			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterBolt_DualShotAP</Ammo_PlasmaGasCartridge_AP>
 			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterBolt_DualShotIon</Ammo_PlasmaGasCartridge_Ion>
-			<Ammo_PlasmaGasCartridge_Stun>Bullet_BlasterBolt_DualShotStun</Ammo_PlasmaGasCartridge_Stun>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_PlasmaGasCartridgeIon_Pistol</defName>
-		<label>Ionized Pistol Plasma Gas Cartridges</label>
+		<label>Ionized Pistol Blaster Bolts</label>
 		<ammoTypes>
 			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterPistol_Ion</Ammo_PlasmaGasCartridge_Ion>
 		</ammoTypes>
@@ -171,7 +160,7 @@
 
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_PlasmaGasCartridgeIon_Rifle</defName>
-		<label>Ionized Rifle Plasma Gas Cartridges</label>
+		<label>Ionized Rifle Blaster Bolts</label>
 		<ammoTypes>
 			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterRifle_Ion</Ammo_PlasmaGasCartridge_Ion>
 		</ammoTypes>
@@ -179,12 +168,86 @@
 
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_PlasmaGasCartridgeIon_Sniper</defName>
-		<label>Heavy Ionized Plasma Gas Cartridges</label>
+		<label>Heavy Ionized Blaster Bolts</label>
 		<ammoTypes>
 			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterSniper_Ion</Ammo_PlasmaGasCartridge_Ion>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeIonOnly_Pistol</defName>
+		<label>Pistol Ion Blasts</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterPistol_IonOnly</Ammo_PlasmaGasCartridge_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeIonOnly_Rifle</defName>
+		<label>Rifle Ion Blasts</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterRifle_IonOnly</Ammo_PlasmaGasCartridge_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeIonOnly_Sniper</defName>
+		<label>Heavy Ion Blasts</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterSniper_IonOnly</Ammo_PlasmaGasCartridge_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeStun_Pistol</defName>
+		<label>Nonlethal Pistol Blaster Bolts</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterPistol_Stun</Ammo_PlasmaGasCartridge_Standard>
+			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterPistol_Stun</Ammo_PlasmaGasCartridge_AP>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterPistol_Stun</Ammo_PlasmaGasCartridge_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeStun_Rifle</defName>
+		<label>Nonlethal Rifle Blaster Bolts</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterRifle_Stun</Ammo_PlasmaGasCartridge_Standard>
+			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterRifle_Stun</Ammo_PlasmaGasCartridge_AP>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterRifle_Stun</Ammo_PlasmaGasCartridge_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaGasCartridgeStun_Sniper</defName>
+		<label>Heavy Nonlethal Blaster Bolts</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_BlasterSniper_Stun</Ammo_PlasmaGasCartridge_Standard>
+			<Ammo_PlasmaGasCartridge_AP>Bullet_BlasterSniper_Stun</Ammo_PlasmaGasCartridge_AP>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_BlasterSniper_Stun</Ammo_PlasmaGasCartridge_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_TL50ConcussionBlast</defName>
+		<label>Concussion Blast</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_TL50_ConcussionBlast</Ammo_PlasmaGasCartridge_Standard>
+			<Ammo_PlasmaGasCartridge_AP>Bullet_TL50_ConcussionBlast</Ammo_PlasmaGasCartridge_AP>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_TL50_ConcussionBlast</Ammo_PlasmaGasCartridge_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_AmbanDisintegrator</defName>
+		<label>Disintegrator Blast</label>
+		<ammoTypes>
+			<Ammo_PlasmaGasCartridge_Standard>Bullet_AmbanDisintegrator</Ammo_PlasmaGasCartridge_Standard>
+			<Ammo_PlasmaGasCartridge_AP>Bullet_AmbanDisintegrator</Ammo_PlasmaGasCartridge_AP>
+			<Ammo_PlasmaGasCartridge_Ion>Bullet_AmbanDisintegrator</Ammo_PlasmaGasCartridge_Ion>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
 	<!-- ================== Ammo ================== -->
 
 	<ThingDef Class="CombatExtended.AmmoDef" Name="PlasmaGasCartridgeBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
@@ -215,8 +278,8 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="PlasmaGasCartridgeBase">
 		<defName>Ammo_PlasmaGasCartridge_AP</defName>
-		<description>Plasma gas ammo used by advanced blaster designs. A concentrated high-pressure refinement process produces plasma bolts capable of piercing hardened armour more effectively.</description>
-		<label>Plasma Gas Cartridges (Conc.)</label>
+		<description>Plasma gas ammo used by advanced blaster designs. A concentrated high-pressure refinement process produces plasma bolts capable of piercing hardened armour more effectively, at the cost of slightly reduced lethality.</description>
+		<label>Plasma Gas Cartridges (AP)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/MediumConc</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -228,7 +291,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="PlasmaGasCartridgeBase">
 		<defName>Ammo_PlasmaGasCartridge_Ion</defName>
-		<description>Plasma gas ammo used by advanced blaster designs. Specialized particle induction causes ionization effects on bolt impacts, increasing effectiveness against mechanical targets.</description>
+		<description>Plasma gas ammo used by advanced blaster designs. Specialized particle induction causes ionization effects on bolt impacts, increasing effectiveness against mechanical targets at the cost of reduced effectiveness against organics.</description>
 		<label>Plasma Gas Cartridges (Ion)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/MediumIon</texPath>
@@ -239,19 +302,6 @@
 		<cookOffProjectile>Bullet_BlasterPistol_Ion</cookOffProjectile>
 	</ThingDef>
 
-	<ThingDef Class="CombatExtended.AmmoDef" ParentName="PlasmaGasCartridgeBase">
-		<defName>Ammo_PlasmaGasCartridge_Stun</defName>
-		<description>Plasma gas ammo used by advanced blaster designs. Modulated energy pulse emission generates a non-lethal pulse that can disable organics, but is highly ineffective against mechanical targets.</description>
-		<label>Plasma Gas Cartridges (Stun)</label>
-		<graphicData>
-			<texPath>Things/Ammo/Charged/MediumTox</texPath>
-			<graphicClass>Graphic_StackCount</graphicClass>
-		</graphicData>
-		<ammoClass>BlasterStun</ammoClass>
-		<generateAllowChance>0</generateAllowChance>
-		<cookOffProjectile>Bullet_BlasterPistol_Stun</cookOffProjectile>
-	</ThingDef>
-
 	<!-- ================== Projectiles ================== -->
 
 	<ThingDef Name="BaseBlasterBolt" ParentName="BaseBulletCE" Abstract="true">
@@ -259,85 +309,82 @@
 		<graphicData>
 			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>102</speed>
 			<damageDef>OuterRim_Blaster</damageDef>
-			<speed>122</speed>
 			<dropsCasings>false</dropsCasings>
 		</projectile>
 	</ThingDef>
 
 	<ThingDef Name="BaseBlasterBolt_Pistol" ParentName="BaseBlasterBolt" Abstract="true">
 		<graphicData>
-			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>0.8</drawSize>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageAmountBase>14</damageAmountBase>
-			<armorPenetrationBlunt>2</armorPenetrationBlunt>
 			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<armorPenetrationBlunt>2</armorPenetrationBlunt>
 		</projectile>
 	</ThingDef>
 
 	<ThingDef Name="BaseBlasterBolt_PistolAP" ParentName="BaseBlasterBolt" Abstract="true">
 		<graphicData>
-			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>0.8</drawSize>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageAmountBase>11</damageAmountBase>
-			<armorPenetrationBlunt>3</armorPenetrationBlunt>
 			<armorPenetrationSharp>18</armorPenetrationSharp>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
 		</projectile>
 	</ThingDef>
 
 	<ThingDef Name="BaseBlasterBolt_Rifle" ParentName="BaseBlasterBolt" Abstract="true">
 		<graphicData>
-			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1</drawSize>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>151</speed>
 			<damageAmountBase>18</damageAmountBase>
-			<armorPenetrationBlunt>3</armorPenetrationBlunt>
 			<armorPenetrationSharp>22</armorPenetrationSharp>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
 		</projectile>
 	</ThingDef>
 
 	<ThingDef Name="BaseBlasterBolt_RifleAP" ParentName="BaseBlasterBolt" Abstract="true">
 		<graphicData>
-			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1</drawSize>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>151</speed>
 			<damageAmountBase>12</damageAmountBase>
+			<armorPenetrationSharp>28</armorPenetrationSharp>
 			<armorPenetrationBlunt>4</armorPenetrationBlunt>
-			<armorPenetrationSharp>33</armorPenetrationSharp>
 		</projectile>
 	</ThingDef>
 
 	<ThingDef Name="BaseBlasterBolt_Sniper" ParentName="BaseBlasterBolt" Abstract="true">
 		<graphicData>
-			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.2</drawSize>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<speed>175</speed>
+			<speed>178</speed>
 			<damageAmountBase>30</damageAmountBase>
+			<armorPenetrationSharp>33</armorPenetrationSharp>
 			<armorPenetrationBlunt>4</armorPenetrationBlunt>
-			<armorPenetrationSharp>20</armorPenetrationSharp>
 		</projectile>
 	</ThingDef>
 
 	<ThingDef Name="BaseBlasterBolt_SniperAP" ParentName="BaseBlasterBolt" Abstract="true">
 		<graphicData>
-			<texPath>Things/Projectile/Charged/ChargeShot</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1.2</drawSize>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<speed>175</speed>
+			<speed>178</speed>
 			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>40</armorPenetrationSharp>
 			<armorPenetrationBlunt>6</armorPenetrationBlunt>
-			<armorPenetrationSharp>36</armorPenetrationSharp>
 		</projectile>
 	</ThingDef>
 
@@ -345,8 +392,6 @@
 		<defName>Bullet_BlasterPistol_Red</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -354,8 +399,6 @@
 		<defName>Bullet_BlasterPistol_RedAP</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -363,8 +406,6 @@
 		<defName>Bullet_BlasterRifle_Red</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -372,8 +413,6 @@
 		<defName>Bullet_BlasterRifle_RedAP</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -381,8 +420,6 @@
 		<defName>Bullet_BlasterSniper_Red</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -390,8 +427,6 @@
 		<defName>Bullet_BlasterSniper_RedAP</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -399,8 +434,6 @@
 		<defName>Bullet_BlasterPistol_Green</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -408,8 +441,6 @@
 		<defName>Bullet_BlasterPistol_GreenAP</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -417,8 +448,6 @@
 		<defName>Bullet_BlasterRifle_Green</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -426,8 +455,6 @@
 		<defName>Bullet_BlasterRifle_GreenAP</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -435,8 +462,6 @@
 		<defName>Bullet_BlasterSniper_Green</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -444,8 +469,6 @@
 		<defName>Bullet_BlasterSniper_GreenAP</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Green</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -453,8 +476,6 @@
 		<defName>Bullet_BlasterPistol_Blue</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -462,8 +483,6 @@
 		<defName>Bullet_BlasterPistol_BlueAP</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -471,8 +490,6 @@
 		<defName>Bullet_BlasterRifle_Blue</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -480,8 +497,6 @@
 		<defName>Bullet_BlasterRifle_BlueAP</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -489,8 +504,6 @@
 		<defName>Bullet_BlasterSniper_Blue</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -498,8 +511,6 @@
 		<defName>Bullet_BlasterSniper_BlueAP</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -507,8 +518,6 @@
 		<defName>Bullet_BlasterPistol_Yellow</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -516,8 +525,6 @@
 		<defName>Bullet_BlasterPistol_YellowAP</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -525,8 +532,6 @@
 		<defName>Bullet_BlasterRifle_Yellow</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -534,8 +539,6 @@
 		<defName>Bullet_BlasterRifle_YellowAP</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -543,8 +546,6 @@
 		<defName>Bullet_BlasterSniper_Yellow</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -552,8 +553,6 @@
 		<defName>Bullet_BlasterSniper_YellowAP</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 	</ThingDef>
 
@@ -561,8 +560,6 @@
 		<defName>Bullet_BlasterPistol_Ion</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageAmountBase>4</damageAmountBase>
@@ -580,8 +577,6 @@
 		<defName>Bullet_BlasterRifle_Ion</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageAmountBase>6</damageAmountBase>
@@ -599,8 +594,6 @@
 		<defName>Bullet_BlasterSniper_Ion</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageAmountBase>7</damageAmountBase>
@@ -618,13 +611,12 @@
 		<defName>Bullet_BlasterPistol_Stun</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/Proj_StunPulse</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>0.8</drawSize>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>Neuralizer</damageDef>
 			<damageAmountBase>1</damageAmountBase>
-			<speed>80</speed>
+			<speed>20</speed>
 		</projectile>
 	</ThingDef>
 
@@ -632,13 +624,11 @@
 		<defName>Bullet_BlasterRifle_Stun</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/Proj_StunPulse</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>Neuralizer</damageDef>
-			<damageAmountBase>1</damageAmountBase>
-			<speed>90</speed>
+			<damageAmountBase>1.5</damageAmountBase>
+			<speed>25</speed>
 		</projectile>
 	</ThingDef>
 
@@ -646,13 +636,12 @@
 		<defName>Bullet_BlasterSniper_Stun</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/Proj_StunPulse</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>1.2</drawSize>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>Neuralizer</damageDef>
-			<damageAmountBase>1</damageAmountBase>
-			<speed>100</speed>
+			<damageAmountBase>2</damageAmountBase>
+			<speed>30</speed>
 		</projectile>
 	</ThingDef>
 
@@ -660,29 +649,48 @@
 		<defName>Bullet_BlasterBolt_Scatter</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>0.85</drawSize>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageAmountBase>8</damageAmountBase>
-			<armorPenetrationBlunt>1</armorPenetrationBlunt>
 			<armorPenetrationSharp>9</armorPenetrationSharp>
+			<armorPenetrationBlunt>1</armorPenetrationBlunt>
 			<pelletCount>12</pelletCount>
 			<spreadMult>15</spreadMult>
 		</projectile>
 	</ThingDef>
 
+	<ThingDef ParentName="BaseBlasterBolt">
+		<defName>Bullet_BlasterBolt_ScatterIon</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
+			<drawSize>0.9</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>4</damageAmountBase>
+			<secondaryDamage>
+				<li>
+					<def>EMP</def>
+					<amount>12</amount>
+				</li>
+			</secondaryDamage>
+			<empShieldBreakChance>0.66</empShieldBreakChance>
+			<armorPenetrationSharp>14</armorPenetrationSharp>
+			<armorPenetrationBlunt>1</armorPenetrationBlunt>
+			<pelletCount>6</pelletCount>
+			<spreadMult>7.5</spreadMult>
+		</projectile>
+	</ThingDef>
+
 	<ThingDef ParentName="BaseBlasterBolt_Rifle">
 		<defName>Bullet_BlasterBolt_DualShot</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageAmountBase>18</damageAmountBase>
-			<armorPenetrationBlunt>3</armorPenetrationBlunt>
 			<armorPenetrationSharp>22</armorPenetrationSharp>
+			<armorPenetrationBlunt>3</armorPenetrationBlunt>
 			<pelletCount>2</pelletCount>
 			<spreadMult>4</spreadMult>
 		</projectile>
@@ -692,13 +700,11 @@
 		<defName>Bullet_BlasterBolt_DualShotAP</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Red</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageAmountBase>12</damageAmountBase>
-			<armorPenetrationBlunt>4</armorPenetrationBlunt>
 			<armorPenetrationSharp>33</armorPenetrationSharp>
+			<armorPenetrationBlunt>4</armorPenetrationBlunt>
 			<pelletCount>2</pelletCount>
 			<spreadMult>4</spreadMult>
 		</projectile>
@@ -708,8 +714,6 @@
 		<defName>Bullet_BlasterBolt_DualShotIon</defName>
 		<graphicData>
 			<texPath>OuterRim/Projectile/BlasterBolt_Blue</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageAmountBase>7</damageAmountBase>
@@ -725,20 +729,88 @@
 		</projectile>
 	</ThingDef>
 
+	<ThingDef ParentName="BaseBlasterBolt">
+		<defName>Bullet_TL50_ConcussionBlast</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/ProtonBall</texPath>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>25</speed>
+			<damageAmountBase>20</damageAmountBase>
+			<armorPenetrationSharp>36</armorPenetrationSharp>
+			<armorPenetrationBlunt>6</armorPenetrationBlunt>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>31</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>3.5</explosiveRadius>
+				<explosionSound>Explosion_EMP</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Sniper">
+		<defName>Bullet_AmbanDisintegrator</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/BlasterBolt_Yellow</texPath>
+			<drawSize>1.5</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Vaporize</damageDef>
+			<damageAmountBase>100</damageAmountBase>
+			<armorPenetrationSharp>60</armorPenetrationSharp>
+			<armorPenetrationBlunt>6</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Pistol">
+		<defName>Bullet_BlasterPistol_IonOnly</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/ProtonBall</texPath>
+			<drawSize>0.2</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<damageDef>EMP</damageDef>
+			<empShieldBreakChance>1</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
 	<ThingDef ParentName="BaseBlasterBolt_Rifle">
-		<defName>Bullet_BlasterBolt_DualShotStun</defName>
+		<defName>Bullet_BlasterRifle_IonOnly</defName>
 		<graphicData>
-			<texPath>OuterRim/Projectile/Proj_StunPulse</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>TransparentPostLight</shaderType>
+			<texPath>OuterRim/Projectile/ProtonBall</texPath>
+			<drawSize>0.35</drawSize>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<damageDef>Neuralizer</damageDef>
-			<damageAmountBase>1</damageAmountBase>
-			<speed>90</speed>
-			<pelletCount>2</pelletCount>
-			<spreadMult>4</spreadMult>
+			<damageAmountBase>20</damageAmountBase>
+			<damageDef>EMP</damageDef>
+			<empShieldBreakChance>1</empShieldBreakChance>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseBlasterBolt_Sniper">
+		<defName>Bullet_BlasterSniper_IonOnly</defName>
+		<graphicData>
+			<texPath>OuterRim/Projectile/ProtonBall</texPath>
+			<drawSize>0.5</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<damageDef>EMP</damageDef>
+			<empShieldBreakChance>1</empShieldBreakChance>
 		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>25</damageAmountBase>
+				<explosiveDamageType>EMP</explosiveDamageType>
+				<explosiveRadius>2.5</explosiveRadius>
+				<explosionSound>Explosion_EMP</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
 	</ThingDef>
 
 	<!-- ==================== Droid/Vambrace Minirockets ========================== -->
@@ -1161,7 +1233,7 @@
 	<RecipeDef ParentName="ChargeAmmoRecipeBase">
 		<defName>MakeAmmo_PlasmaGasCartridge_Ion</defName>
 		<label>make Plasma Gas Cartridges (Ion) x500</label>
-		<description>Craft 500 PlasmaGas Cartridges (Ion).</description>
+		<description>Craft 500 Plasma Gas Cartridges (Ion).</description>
 		<jobString>Making Plasma Gas Cartridges (Ion).</jobString>
 		<ingredients>
 			<li>
@@ -1205,51 +1277,4 @@
 		<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
 	</RecipeDef>
 
-	<RecipeDef ParentName="ChargeAmmoRecipeBase">
-		<defName>MakeAmmo_PlasmaGasCartridge_Stun</defName>
-		<label>make Plasma Gas Cartridges (Stun) x500</label>
-		<description>Craft 500 PlasmaGas Cartridges (Stun).</description>
-		<jobString>Making Plasma Gas Cartridges (Stun).</jobString>
-		<ingredients>
-			<li>
-				<filter>
-					<thingDefs>
-						<li>OuterRim_Durasteel</li>
-					</thingDefs>
-				</filter>
-				<count>30</count>
-			</li>
-			<li>
-				<filter>
-					<thingDefs>
-						<li>OuterRim_Tibanna</li>
-					</thingDefs>
-				</filter>
-				<count>60</count>
-			</li>
-			<li>
-				<filter>
-					<thingDefs>
-						<li>OuterRim_ComponentHypertech</li>
-					</thingDefs>
-				</filter>
-				<count>3</count>
-			</li>
-		</ingredients>
-		<fixedIngredientFilter>
-			<thingDefs>
-				<li>OuterRim_Durasteel</li>
-				<li>OuterRim_Tibanna</li>
-				<li>OuterRim_ComponentHypertech</li>
-			</thingDefs>
-		</fixedIngredientFilter>
-		<recipeUsers Inherit="False">
-			<li>OuterRim_HypertechFabricator</li>
-		</recipeUsers>
-		<products>
-			<Ammo_PlasmaGasCartridge_Stun>500</Ammo_PlasmaGasCartridge_Stun>
-		</products>
-		<researchPrerequisite>OuterRim_HypertechFabrication</researchPrerequisite>
-	</RecipeDef>
-
 </Defs>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_GrenadeRecipes.xml b/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_GrenadeRecipes.xml
similarity index 100%
rename from ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_GrenadeRecipes.xml
rename to ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_GrenadeRecipes.xml
diff --git a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_TurretAmmo.xml b/ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_TurretAmmo.xml
similarity index 100%
rename from ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_TurretAmmo.xml
rename to ModPatches/Outer Rim - Core/Defs/Outer_Rim_Core_TurretAmmo.xml
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Apparel.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Apparel.xml
similarity index 100%
rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Apparel.xml
rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Apparel.xml
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Armour.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Armour.xml
similarity index 100%
rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Armour.xml
rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Armour.xml
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Grenades.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Grenades.xml
similarity index 100%
rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Grenades.xml
rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Grenades.xml
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Jetpacks.xml
similarity index 100%
rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml
rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Jetpacks.xml
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Materials.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Materials.xml
similarity index 100%
rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Materials.xml
rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Materials.xml
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Melee_Weapons.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Melee_Weapons.xml
similarity index 100%
rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Melee_Weapons.xml
rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Melee_Weapons.xml
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Mines.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Mines.xml
similarity index 100%
rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Mines.xml
rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Mines.xml
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Pawnkinds.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Pawnkinds.xml
similarity index 100%
rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Pawnkinds.xml
rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Pawnkinds.xml
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Ranged_Weapons.xml
similarity index 86%
rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml
rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Ranged_Weapons.xml
index bc2d392096..12d4867eeb 100644
--- a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Ranged_Weapons.xml	
+++ b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Ranged_Weapons.xml	
@@ -109,13 +109,6 @@
 			<aiAimMode>AimedShot</aiAimMode>
 		</FireModes>
 	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="OuterRim_BARMST12Scattergun"]/description</xpath>
-		<value>
-			<description>The BARM-ST12 scattergun was a type of pump-action scatterblaster, the blaster equivalent of a shotgun. It lacks the ability to make use of concentrated or ionized blaster cells, but can fire a spread of micro-blasts that are almost as powerful as individual pistol bolts - at the cost of consuming a lot of energy (and tibanna) to do so.</description>
-		</value>
-	</Operation>
 	
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_BARMST12Scattergun</defName>
@@ -278,6 +271,39 @@
 		</weaponTags>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_K16BryarBlaster"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to overcharged shots</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>24</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Sniper</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>3.0</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterSniper_Yellow</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<range>16</range>
+					<soundCast>OuterRim_Shot_DLT19DBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+					<ammoConsumedPerShotCount>6</ammoConsumedPerShotCount>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>Snapshot</aiAimMode>
+					<aimedBurstShotCount>1</aimedBurstShotCount>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_IonRifle</defName>
 		<statBases>
@@ -292,7 +318,7 @@
 			<recoilAmount>1.45</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
-			<defaultProjectile>Bullet_BlasterRifle_Ion</defaultProjectile>
+			<defaultProjectile>Bullet_BlasterRifle_IonOnly</defaultProjectile>
 			<warmupTime>1</warmupTime>
 			<range>55</range>
 			<soundCast>OuterRim_Shot_DLT19DBlasterBolt</soundCast>
@@ -309,7 +335,7 @@
 		<AmmoUser>
 			<magazineSize>20</magazineSize>
 			<reloadTime>3.7</reloadTime>
-			<ammoSet>AmmoSet_PlasmaGasCartridgeIon_Rifle</ammoSet>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeIonOnly_Rifle</ammoSet>
 		</AmmoUser>
 	</Operation>
 
@@ -327,7 +353,7 @@
 			<recoilAmount>1.48</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
-			<defaultProjectile>Bullet_BlasterSniper_Ion</defaultProjectile>
+			<defaultProjectile>Bullet_BlasterSniper_IonOnly</defaultProjectile>
 			<warmupTime>2</warmupTime>
 			<range>62</range>
 			<soundCast>OuterRim_Shot_DLT19DBlasterBolt</soundCast>
@@ -344,7 +370,7 @@
 		<AmmoUser>
 			<magazineSize>15</magazineSize>
 			<reloadTime>3.7</reloadTime>
-			<ammoSet>AmmoSet_PlasmaGasCartridgeIon_Sniper</ammoSet>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeIonOnly_Sniper</ammoSet>
 		</AmmoUser>
 	</Operation>
 
@@ -362,7 +388,7 @@
 			<recoilAmount>1.2</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
-			<defaultProjectile>Bullet_BlasterPistol_Ion</defaultProjectile>
+			<defaultProjectile>Bullet_BlasterPistol_IonOnly</defaultProjectile>
 			<warmupTime>0.75</warmupTime>
 			<range>44</range>
 			<soundCast>OuterRim_Shot_DLT19DBlasterBolt</soundCast>
@@ -378,7 +404,7 @@
 		<AmmoUser>
 			<magazineSize>21</magazineSize>
 			<reloadTime>2.5</reloadTime>
-			<ammoSet>AmmoSet_PlasmaGasCartridgeIon_Pistol</ammoSet>
+			<ammoSet>AmmoSet_PlasmaGasCartridgeIonOnly_Pistol</ammoSet>
 		</AmmoUser>
 	</Operation>
 
@@ -453,6 +479,37 @@
 		</AmmoUser>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_BlasterCarbine"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>42</magazineSize>
+					<reloadTime>3.36</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Rifle</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>1.2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterRifle_Stun</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<range>22</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_T21RepeatingBlaster</defName>
 		<statBases>
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Turrets.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Turrets.xml
similarity index 100%
rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Turrets.xml
rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Turrets.xml
diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Vambraces.xml b/ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Vambraces.xml
similarity index 100%
rename from ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Vambraces.xml
rename to ModPatches/Outer Rim - Core/Patches/Outer_Rim_Core_Vambraces.xml
diff --git a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Armour.xml b/ModPatches/Outer Rim - Droid Depot/Patches/Outer_Rim_Droid_Armour.xml
similarity index 100%
rename from ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Armour.xml
rename to ModPatches/Outer Rim - Droid Depot/Patches/Outer_Rim_Droid_Armour.xml
diff --git a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Droids.xml b/ModPatches/Outer Rim - Droid Depot/Patches/Outer_Rim_Droid_Droids.xml
similarity index 100%
rename from ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Droids.xml
rename to ModPatches/Outer Rim - Droid Depot/Patches/Outer_Rim_Droid_Droids.xml
diff --git a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Jetpacks.xml b/ModPatches/Outer Rim - Droid Depot/Patches/Outer_Rim_Droid_Jetpacks.xml
similarity index 100%
rename from ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Jetpacks.xml
rename to ModPatches/Outer Rim - Droid Depot/Patches/Outer_Rim_Droid_Jetpacks.xml
diff --git a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_MountedWeapons.xml b/ModPatches/Outer Rim - Droid Depot/Patches/Outer_Rim_Droid_MountedWeapons.xml
similarity index 100%
rename from ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_MountedWeapons.xml
rename to ModPatches/Outer Rim - Droid Depot/Patches/Outer_Rim_Droid_MountedWeapons.xml
diff --git a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Apparel.xml b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer_Rim_Galactic_Empire_Apparel.xml
similarity index 100%
rename from ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Apparel.xml
rename to ModPatches/Outer Rim - Galactic Empire/Patches/Outer_Rim_Galactic_Empire_Apparel.xml
diff --git a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Pawnkinds.xml b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer_Rim_Galactic_Empire_Pawnkinds.xml
similarity index 100%
rename from ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Pawnkinds.xml
rename to ModPatches/Outer Rim - Galactic Empire/Patches/Outer_Rim_Galactic_Empire_Pawnkinds.xml
diff --git a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml
similarity index 80%
rename from ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml
rename to ModPatches/Outer Rim - Galactic Empire/Patches/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml
index b85a58bcfc..c56c3b67da 100644
--- a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml	
+++ b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml	
@@ -190,6 +190,37 @@
 		</AmmoUser>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_E11BlasterRifle"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>70</magazineSize>
+					<reloadTime>3.7</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Rifle</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>1.2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterRifle_Stun</defaultProjectile>
+					<warmupTime>1.25</warmupTime>
+					<range>22</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_E11DBlasterRifle</defName>
 		<statBases>
@@ -228,6 +259,37 @@
 		</AmmoUser>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_E11DBlasterRifle"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>70</magazineSize>
+					<reloadTime>3.7</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Rifle</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>1.2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterRifle_Stun</defaultProjectile>
+					<warmupTime>1.44</warmupTime>
+					<range>23</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_E22BlasterRifle</defName>
 		<statBases>
@@ -391,6 +453,37 @@
 			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
 		</AmmoUser>
 	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_TL50HeavyRepeaterBlaster"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to concussion blast mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>400</magazineSize>
+					<reloadTime>9.5</reloadTime>
+					<ammoSet>AmmoSet_TL50ConcussionBlast</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>7.0</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_TL50_ConcussionBlast</defaultProjectile>
+					<warmupTime>5</warmupTime>
+					<range>32</range>
+					<soundCast>OuterRim_Turret_ProtonTorpedo</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>15</muzzleFlashScale>
+					<ammoConsumedPerShotCount>100</ammoConsumedPerShotCount>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
 	
 	<!-- === D72 Flamethrower === -->
 	<Operation Class="PatchOperationRemove">
diff --git a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Scenario.xml b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer_Rim_Galactic_Empire_Scenario.xml
similarity index 100%
rename from ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Scenario.xml
rename to ModPatches/Outer Rim - Galactic Empire/Patches/Outer_Rim_Galactic_Empire_Scenario.xml
diff --git a/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Apparel.xml b/ModPatches/Outer Rim - Galactic Republic/Patches/Outer_Rim_Galactic_Republic_Apparel.xml
similarity index 100%
rename from ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Apparel.xml
rename to ModPatches/Outer Rim - Galactic Republic/Patches/Outer_Rim_Galactic_Republic_Apparel.xml
diff --git a/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Pawnkinds.xml b/ModPatches/Outer Rim - Galactic Republic/Patches/Outer_Rim_Galactic_Republic_Pawnkinds.xml
similarity index 100%
rename from ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Pawnkinds.xml
rename to ModPatches/Outer Rim - Galactic Republic/Patches/Outer_Rim_Galactic_Republic_Pawnkinds.xml
diff --git a/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml b/ModPatches/Outer Rim - Galactic Republic/Patches/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml
similarity index 72%
rename from ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml
rename to ModPatches/Outer Rim - Galactic Republic/Patches/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml
index d0a9f64d85..b5d99d485e 100644
--- a/ModPatches/Outer Rim - Galactic Republic/Patches/Outer Rim - Galactic Republic/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml	
+++ b/ModPatches/Outer Rim - Galactic Republic/Patches/Outer_Rim_Galactic_Republic_Ranged_Weapons.xml	
@@ -78,6 +78,38 @@
 		</AmmoUser>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DC17mCarbine"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to grenade launcher</underBarrelLabel>
+				<propsUnderBarrel>
+					<magazineSize>1</magazineSize>
+					<reloadTime>2.2</reloadTime>
+					<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>3.28</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_40x46mmGrenade_HEDP</defaultProjectile>
+					<warmupTime>1.1</warmupTime>
+					<range>44</range>
+					<minRange>5</minRange>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<soundCast>InfernoCannon_Fire</soundCast>
+					<muzzleFlashScale>14</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_DC15ACarbine</defName>
 		<statBases>
@@ -115,6 +147,37 @@
 		</AmmoUser>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DC15ACarbine"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>42</magazineSize>
+					<reloadTime>3.36</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Rifle</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>1.2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterRifle_Stun</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<range>22</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_DC15ARifle</defName>
 		<statBases>
@@ -153,6 +216,37 @@
 		</AmmoUser>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DC15ARifle"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>160</magazineSize>
+					<reloadTime>7.5</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Rifle</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>1.16</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterRifle_Stun</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<range>28</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_DC15xSniperRifle</defName>
 		<statBases>
diff --git a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Apparel.xml b/ModPatches/Outer Rim - Mandalore/Patches/Outer_Rim_Mandalorian_Apparel.xml
similarity index 100%
rename from ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Apparel.xml
rename to ModPatches/Outer Rim - Mandalore/Patches/Outer_Rim_Mandalorian_Apparel.xml
diff --git a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Melee_Weapons.xml b/ModPatches/Outer Rim - Mandalore/Patches/Outer_Rim_Mandalorian_Melee_Weapons.xml
similarity index 100%
rename from ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Melee_Weapons.xml
rename to ModPatches/Outer Rim - Mandalore/Patches/Outer_Rim_Mandalorian_Melee_Weapons.xml
diff --git a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Pawnkinds.xml b/ModPatches/Outer Rim - Mandalore/Patches/Outer_Rim_Mandalorian_Pawnkinds.xml
similarity index 100%
rename from ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Pawnkinds.xml
rename to ModPatches/Outer Rim - Mandalore/Patches/Outer_Rim_Mandalorian_Pawnkinds.xml
diff --git a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Ranged_Weapons.xml b/ModPatches/Outer Rim - Mandalore/Patches/Outer_Rim_Mandalorian_Ranged_Weapons.xml
similarity index 55%
rename from ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Ranged_Weapons.xml
rename to ModPatches/Outer Rim - Mandalore/Patches/Outer_Rim_Mandalorian_Ranged_Weapons.xml
index 7257d59450..f5db96a314 100644
--- a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Ranged_Weapons.xml	
+++ b/ModPatches/Outer Rim - Mandalore/Patches/Outer_Rim_Mandalorian_Ranged_Weapons.xml	
@@ -39,6 +39,36 @@
 			<li>CE_OneHandedWeapon</li>
 		</weaponTags>
 	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_WESTAR35Blaster"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>24</magazineSize>
+					<reloadTime>3.84</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Pistol</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>3</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterPistol_Stun</defaultProjectile>
+					<warmupTime>1</warmupTime>
+					<range>12</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
 	
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_WESTAR34Blaster</defName>
@@ -78,6 +108,36 @@
 			<li>CE_OneHandedWeapon</li>
 		</weaponTags>
 	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_WESTAR34Blaster"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>24</magazineSize>
+					<reloadTime>3.84</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Pistol</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>3</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterPistol_Stun</defaultProjectile>
+					<warmupTime>1</warmupTime>
+					<range>12</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
 	
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_WESTAR18Blaster</defName>
@@ -117,6 +177,36 @@
 			<li>CE_OneHandedWeapon</li>
 		</weaponTags>
 	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_WESTAR18Blaster"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>24</magazineSize>
+					<reloadTime>3.84</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Pistol</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>3</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterPistol_Stun</defaultProjectile>
+					<warmupTime>1</warmupTime>
+					<range>12</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
 	
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_IB94BlasterPistol</defName>
@@ -156,6 +246,36 @@
 			<li>CE_OneHandedWeapon</li>
 		</weaponTags>
 	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_IB94BlasterPistol"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>24</magazineSize>
+					<reloadTime>3.84</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Pistol</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>3</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterPistol_Stun</defaultProjectile>
+					<warmupTime>1</warmupTime>
+					<range>12</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
 	
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_EE13BlasterPistol</defName>
@@ -193,6 +313,36 @@
 			<li>SpacerGun</li>
 		</weaponTags>
 	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_EE13BlasterPistol"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>42</magazineSize>
+					<reloadTime>3.36</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Pistol</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>1.2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterPistol_Stun</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<range>22</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
 	
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_GALAAR15Blaster</defName>
@@ -235,6 +385,37 @@
 			<li>SpacerGun</li>
 		</weaponTags>
 	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_GALAAR15Blaster"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>70</magazineSize>
+					<reloadTime>5.6</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Rifle</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>1.2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterRifle_Stun</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<range>22</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
 	
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_EE13SniperRifle</defName>
@@ -317,6 +498,37 @@
 			<li>SpacerGun</li>
 		</weaponTags>
 	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_EE13BlasterRifle"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>120</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Rifle</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>1.45</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterRifle_Stun</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<range>28</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
 	
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_EE3BlasterCarbine</defName>
@@ -359,6 +571,37 @@
 			<li>SpacerGun</li>
 		</weaponTags>
 	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_EE3BlasterCarbine"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>84</magazineSize>
+					<reloadTime>4</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Rifle</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>1.2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterRifle_Stun</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<range>22</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
 	
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_AmbanSniperRifle</defName>
@@ -400,4 +643,35 @@
 		</weaponTags>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_AmbanSniperRifle"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to disintegrate mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>3</magazineSize>
+					<reloadTime>4.5</reloadTime>
+					<ammoSet>AmmoSet_AmbanDisintegrator</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>12</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_AmbanDisintegrator</defaultProjectile>
+					<warmupTime>3.2</warmupTime>
+					<range>21</range>
+					<soundCast>OuterRim_Shot_DisintigratorBolt</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>15</muzzleFlashScale>
+					<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
 </Patch>
\ No newline at end of file
diff --git a/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Apparel.xml b/ModPatches/Outer Rim - Old Republic/Patches/Outer_Rim_Old_Republic_Apparel.xml
similarity index 100%
rename from ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Apparel.xml
rename to ModPatches/Outer Rim - Old Republic/Patches/Outer_Rim_Old_Republic_Apparel.xml
diff --git a/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Pawnkinds.xml b/ModPatches/Outer Rim - Old Republic/Patches/Outer_Rim_Old_Republic_Pawnkinds.xml
similarity index 100%
rename from ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Pawnkinds.xml
rename to ModPatches/Outer Rim - Old Republic/Patches/Outer_Rim_Old_Republic_Pawnkinds.xml
diff --git a/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Ranged_Weapons.xml b/ModPatches/Outer Rim - Old Republic/Patches/Outer_Rim_Old_Republic_Ranged_Weapons.xml
similarity index 85%
rename from ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Ranged_Weapons.xml
rename to ModPatches/Outer Rim - Old Republic/Patches/Outer_Rim_Old_Republic_Ranged_Weapons.xml
index 8c410dce54..a253cfffe5 100644
--- a/ModPatches/Outer Rim - Old Republic/Patches/Outer Rim - Old Republic/Outer_Rim_Old_Republic_Ranged_Weapons.xml	
+++ b/ModPatches/Outer Rim - Old Republic/Patches/Outer_Rim_Old_Republic_Ranged_Weapons.xml	
@@ -117,6 +117,37 @@
 		</AmmoUser>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_OldRepublicRifle"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>100</magazineSize>
+					<reloadTime>3.7</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Rifle</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>1.2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterRifle_Stun</defaultProjectile>
+					<warmupTime>1</warmupTime>
+					<range>28</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_SithRifle</defName>
 		<statBases>
@@ -155,6 +186,37 @@
 		</AmmoUser>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_SithRifle"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>100</magazineSize>
+					<reloadTime>3.7</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Rifle</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>1.2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterRifle_Stun</defaultProjectile>
+					<warmupTime>1</warmupTime>
+					<range>28</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_OldRepublicSniper</defName>
 		<statBases>
diff --git a/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Apparel.xml b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer_Rim_Rebel_Apparel.xml
similarity index 100%
rename from ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Apparel.xml
rename to ModPatches/Outer Rim - Rebel Alliance/Patches/Outer_Rim_Rebel_Apparel.xml
diff --git a/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Pawnkinds.xml b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer_Rim_Rebel_Pawnkinds.xml
similarity index 100%
rename from ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Pawnkinds.xml
rename to ModPatches/Outer Rim - Rebel Alliance/Patches/Outer_Rim_Rebel_Pawnkinds.xml
diff --git a/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Ranged_Weapons.xml b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer_Rim_Rebel_Ranged_Weapons.xml
similarity index 67%
rename from ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Ranged_Weapons.xml
rename to ModPatches/Outer Rim - Rebel Alliance/Patches/Outer_Rim_Rebel_Ranged_Weapons.xml
index b06f2b42ae..2394cc3ab5 100644
--- a/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Ranged_Weapons.xml	
+++ b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer_Rim_Rebel_Ranged_Weapons.xml	
@@ -99,6 +99,37 @@
 		</AmmoUser>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DH17Pistol"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>70</magazineSize>
+					<reloadTime>5.6</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Rifle</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>1.2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterRifle_Stun</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<range>22</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="OuterRim_DH17Rifle"]/description</xpath>
 		<value>
@@ -141,6 +172,37 @@
 		</AmmoUser>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_DH17Rifle"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>40</magazineSize>
+					<reloadTime>3.2</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Rifle</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>1.48</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterRifle_Stun</defaultProjectile>
+					<warmupTime>4</warmupTime>
+					<range>31</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_A280Blaster</defName>
 		<statBases>
@@ -161,7 +223,7 @@
 			<soundCast>OuterRim_Shot_E11BlasterBolt</soundCast>
 			<soundCastTail>GunTail_Medium</soundCastTail>
 			<muzzleFlashScale>9</muzzleFlashScale>
-			<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
+			<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
 			<targetParams>
 				<canTargetLocations>true</canTargetLocations>
 			</targetParams>
@@ -170,11 +232,42 @@
 			<aiAimMode>AimedShot</aiAimMode>
 		</FireModes>
 		<AmmoUser>
-			<magazineSize>20</magazineSize>
+			<magazineSize>70</magazineSize>
 			<reloadTime>1.6</reloadTime>
 			<ammoSet>AmmoSet_PlasmaGasCartridgeGreen_Rifle</ammoSet>
 		</AmmoUser>
 	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_A280Blaster"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>70</magazineSize>
+					<reloadTime>1.6</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Rifle</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>1.2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterRifle_Stun</defaultProjectile>
+					<warmupTime>2</warmupTime>
+					<range>28</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
 	
 	<!-- === HH12 RL === -->
 
diff --git a/ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Melee_Weapons.xml b/ModPatches/Outer Rim - Seperatists/Patches/Outer_Rim_Seperatist_Melee_Weapons.xml
similarity index 100%
rename from ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Melee_Weapons.xml
rename to ModPatches/Outer Rim - Seperatists/Patches/Outer_Rim_Seperatist_Melee_Weapons.xml
diff --git a/ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Ranged_Weapons.xml b/ModPatches/Outer Rim - Seperatists/Patches/Outer_Rim_Seperatist_Ranged_Weapons.xml
similarity index 76%
rename from ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Ranged_Weapons.xml
rename to ModPatches/Outer Rim - Seperatists/Patches/Outer_Rim_Seperatist_Ranged_Weapons.xml
index 6ad1a53e37..7f4ef105e4 100644
--- a/ModPatches/Outer Rim - Seperatists/Patches/Outer Rim - Seperatists/Outer_Rim_Seperatist_Ranged_Weapons.xml	
+++ b/ModPatches/Outer Rim - Seperatists/Patches/Outer_Rim_Seperatist_Ranged_Weapons.xml	
@@ -77,6 +77,37 @@
 			<ammoSet>AmmoSet_PlasmaGasCartridgeRed_Rifle</ammoSet>
 		</AmmoUser>
 	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="OuterRim_E5Blaster"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to standard mode</standardLabel>
+				<underBarrelLabel>switch to stun mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>70</magazineSize>
+					<reloadTime>5.6</reloadTime>
+					<ammoSet>AmmoSet_PlasmaGasCartridgeStun_Rifle</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>1.2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_BlasterRifle_Stun</defaultProjectile>
+					<warmupTime>1.5</warmupTime>
+					<range>22</range>
+					<soundCast>OuterRim_Shot_SonicBlasterBolt</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>12</muzzleFlashScale>
+					<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
 	
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>OuterRim_E5sSniperRifle</defName>