From 308dc88bb535114b8a061c188b513ffc39014a6c Mon Sep 17 00:00:00 2001
From: n7huntsman <halo_1100@hotmail.com>
Date: Wed, 25 Mar 2020 09:20:51 -0400
Subject: [PATCH 1/2] Further Ni'Hal patch fixes, SoS2 fix.

---
 Defs/ThingDefs_Misc/Weapons_Ranged.xml      |   6 +-
 Patches/Nihal/PawnKinds_NiHal.xml           |  22 +-
 Patches/Nihal/ThingDefs_Weapons/Weapons.xml | 467 +++++++++++---------
 Patches/Save Our Ship 2/Creatures_SOS2.xml  |   5 +-
 4 files changed, 295 insertions(+), 205 deletions(-)

diff --git a/Defs/ThingDefs_Misc/Weapons_Ranged.xml b/Defs/ThingDefs_Misc/Weapons_Ranged.xml
index 98e7649dbe..474f78c139 100644
--- a/Defs/ThingDefs_Misc/Weapons_Ranged.xml
+++ b/Defs/ThingDefs_Misc/Weapons_Ranged.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Defs>
 
-  <!-- ==================== M97 Grenade Launcher ==================== -->
+  <!-- ==================== Grenade Launcher ==================== -->
 
   <ThingDef ParentName="BaseMakeableGun">
     <defName>CE_GrenadeLauncher</defName>
-    <label>Grenade Launcher</label>
+    <label>grenade launcher</label>
     <description>A simple, locally produced break-action grenade launcher, capable of firing a variety of different projectiles.</description>
     <graphicData>
       <texPath>Things/Weapons/GrenadeLauncher</texPath>
@@ -102,7 +102,7 @@
 
   <ThingDef ParentName="BaseGunWithQuality">
     <defName>CE_ExplosiveBoltProjector</defName>
-    <label>Explosive Bolt Projector</label>
+    <label>explosive bolt projector</label>
     <description>A low-velocity, high-trajectory fire support system deployed by mechanoid Pikeman. While inaccurate and slow-firing, it remains a potent weapon against static targets.</description>
     <graphicData>
       <texPath>Things/Item/Equipment/WeaponRanged/NeedleGun</texPath>
diff --git a/Patches/Nihal/PawnKinds_NiHal.xml b/Patches/Nihal/PawnKinds_NiHal.xml
index 84ab95b2b2..b89fb17b3c 100644
--- a/Patches/Nihal/PawnKinds_NiHal.xml
+++ b/Patches/Nihal/PawnKinds_NiHal.xml
@@ -25,7 +25,7 @@
 					<shieldTags>
 					  <li>OutlanderShield</li>
 					</shieldTags>
-					<shieldChance>0.5</shieldChance>
+					<shieldChance>0.25</shieldChance>
 					<sidearms>
 					  <li>
 						<generateChance>0.5</generateChance>
@@ -41,6 +41,15 @@
 				  </li>
 				</value>
 			</li>
+			<li Class="PatchOperationReplace">
+				<xpath>/Defs/PawnKindDef[defName="NihalPeasant"]/weaponMoney</xpath>
+				<value>
+					<weaponMoney>
+					  <min>350</min>
+					  <max>800</max>
+					</weaponMoney>
+				</value>
+			</li>			
 			<li Class="PatchOperationAddModExtension">
 				<xpath>/Defs/PawnKindDef[defName="NihalSlave"]</xpath>
 				<value>
@@ -118,7 +127,7 @@
 					<shieldTags>
 					  <li>OutlanderShield</li>
 					</shieldTags>
-					<shieldChance>0.5</shieldChance>
+					<shieldChance>0.25</shieldChance>
 					<sidearms>
 					  <li>
 						<generateChance>0.5</generateChance>
@@ -134,6 +143,15 @@
 				  </li>
 				</value>
 			</li>
+			<li Class="PatchOperationAdd">
+				<xpath>/Defs/PawnKindDef[defName="NihalTownCouncilman"]</xpath>
+				<value>
+					<weaponMoney>
+					  <min>400</min>
+					  <max>800</max>
+					</weaponMoney>
+				</value>
+			</li>			
 			<li Class="PatchOperationAddModExtension">
 				<xpath>/Defs/PawnKindDef[defName="NihalSniper"]</xpath>
 				<value>
diff --git a/Patches/Nihal/ThingDefs_Weapons/Weapons.xml b/Patches/Nihal/ThingDefs_Weapons/Weapons.xml
index ad6733b5db..1966232833 100644
--- a/Patches/Nihal/ThingDefs_Weapons/Weapons.xml
+++ b/Patches/Nihal/ThingDefs_Weapons/Weapons.xml
@@ -9,10 +9,187 @@
 		<match Class="PatchOperationSequence">
 			<operations>
 
+			<!-- Melee Tools -->
+
+		  <li Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="Gun_NihalPistol"]/tools</xpath>
+			<value>
+			  <tools>
+				<li Class="CombatExtended.ToolCE">
+				  <label>grip</label>
+				  <capacities>
+					<li>Blunt</li>
+				  </capacities>
+				  <power>2</power>
+				  <cooldownTime>1.54</cooldownTime>
+				  <chanceFactor>1.5</chanceFactor>
+				  <armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+				  <linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+				  <label>muzzle</label>
+				  <capacities>
+					<li>Poke</li>
+				  </capacities>
+				  <power>2</power>
+				  <cooldownTime>1.54</cooldownTime>
+				  <armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+				  <linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			  </tools>
+			</value>
+		  </li>
+
+		  <li Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="Gun_NihalShotgun" or defName="Gun_NihalRifle" or defName="Gun_NihalLMG" or defName="Gun_NihalSniper"  or defName="Gun_NihalThoober"  or defName="Gun_NihalCarbine"]/tools</xpath>
+			<value>
+			  <tools>
+				<li Class="CombatExtended.ToolCE">
+				  <label>stock</label>
+				  <capacities>
+					<li>Blunt</li>
+				  </capacities>
+				  <power>8</power>
+				  <cooldownTime>1.55</cooldownTime>
+				  <chanceFactor>1.5</chanceFactor>
+				  <armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+				  <linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+				  <label>barrel</label>
+				  <capacities>
+					<li>Blunt</li>
+				  </capacities>
+				  <power>5</power>
+				  <cooldownTime>2.02</cooldownTime>
+				  <armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+				  <linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+				  <label>muzzle</label>
+				  <capacities>
+					<li>Poke</li>
+				  </capacities>
+				  <power>8</power>
+				  <cooldownTime>1.55</cooldownTime>
+				  <armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+				  <linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			  </tools>
+			</value>
+		  </li>
+
+		  <li Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="Gun_NihalRocket" or defName="Gun_NihalTripleRocket"]/tools</xpath>
+			<value>
+			  <tools>
+				<li Class="CombatExtended.ToolCE">
+				  <label>barrel</label>
+				  <capacities>
+					<li>Blunt</li>
+				  </capacities>
+				  <power>10</power>
+				  <cooldownTime>2.44</cooldownTime>
+				  <armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				  <linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			  </tools>
+			</value>
+		  </li>
+
+			<!-- NiHal Bardiche -->
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="MeleeWeapon_fishytooth"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>handle</label>
+							<capacities>
+								<li>Poke</li>
+							</capacities>
+							<power>3</power>
+							<cooldownTime>1.59</cooldownTime>
+							<chanceFactor>0.10</chanceFactor>
+							<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+						</li>
+						<li Class="CombatExtended.ToolCE">
+							<label>edge</label>
+							<capacities>
+								<li>Cut</li>
+							</capacities>
+							<power>17</power>
+							<cooldownTime>3.52</cooldownTime>
+							<chanceFactor>0.30</chanceFactor>
+							<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+							<armorPenetrationSharp>0.68</armorPenetrationSharp>
+							<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+						</li>
+					</tools>
+				</value>
+			</li>
+
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="MeleeWeapon_fishytooth"]/statBases</xpath>
+				<value>
+					<Bulk>6</Bulk>
+					<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+				</value>
+			</li>
+
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="MeleeWeapon_fishytooth"]</xpath>
+				<value>
+					<equippedStatOffsets>
+						<MeleeCritChance>0.10</MeleeCritChance>
+						<MeleeParryChance>0.15</MeleeParryChance>
+						<MeleeDodgeChance>0.20</MeleeDodgeChance>	
+					</equippedStatOffsets>
+				</value>	
+			</li>
+
 			<!-- Nihal Rocket Launcher -->
 
 			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
 				<defName>Gun_NihalRocket</defName>
+				<statBases>
+					<Bulk>3.1</Bulk>
+					<Mass>1.0</Mass>
+					<SwayFactor>1.1</SwayFactor>
+					<ShotSpread>1</ShotSpread>
+					<SightsEfficiency>0.7</SightsEfficiency>
+					<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+					<WorkToMake>32000</WorkToMake>
+				</statBases>
+				<Properties>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
+					<warmupTime>3</warmupTime>
+					<range>38</range>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+					<minRange>5</minRange>
+					<soundCast>OLaunchers</soundCast>
+					<muzzleFlashScale>14</muzzleFlashScale>
+				</Properties>
+				<AmmoUser>
+					<magazineSize>1</magazineSize>
+					<reloadTime>8</reloadTime>
+					<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
+				</AmmoUser>
+				<FireModes>
+				</FireModes>
+				<weaponTags>
+					<li>NiHalMissile</li>
+				</weaponTags>
+			</li>
+
+			<!-- Nihal Triple Rocket Launcher -->
+
+			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+				<defName>Gun_NihalTripleRocket</defName>
 				<statBases>
 					<Bulk>3.1</Bulk>
 					<Mass>1.0</Mass>
@@ -47,24 +224,6 @@
 				</weaponTags>
 			</li>
 
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="Gun_NihalRocket"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>barrel</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>10</power>
-							<cooldownTime>3.66</cooldownTime>
-							<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-						</li>
-					</tools>
-				</value>
-			</li>			
-
 			<!-- Nihal Big Pistol -->
 
 			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
@@ -100,34 +259,6 @@
 				</weaponTags>
 			</li>
 
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="Gun_NihalPistol"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>grip</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>2</power>
-							<cooldownTime>1.56</cooldownTime>
-							<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>muzzle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>2</power>
-							<cooldownTime>1.54</cooldownTime>
-							<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-						</li>
-					</tools>
-				</value>
-			</li>
-
 			<!-- Nihal Shotgun -->
 
 			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
@@ -164,45 +295,6 @@
 				</weaponTags>
 			</li>
 
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="Gun_NihalShotgun"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>stock</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>8</power>
-							<cooldownTime>1.79</cooldownTime>
-							<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>barrel</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>5</power>
-							<cooldownTime>3.02</cooldownTime>
-							<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>1.63</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>muzzle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>8</power>
-							<cooldownTime>1.55</cooldownTime>
-							<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-						</li>
-					</tools>
-				</value>
-			</li>
-
-
 			<!-- Nihal Rifle -->
 
 			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
@@ -249,44 +341,6 @@
 				</weaponTags>
 			</li>
 
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="Gun_NihalRifle"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>stock</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>8</power>
-							<cooldownTime>1.79</cooldownTime>
-							<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>barrel</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>5</power>
-							<cooldownTime>3.02</cooldownTime>
-							<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>1.63</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>muzzle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>8</power>
-							<cooldownTime>1.55</cooldownTime>
-							<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-						</li>
-					</tools>
-				</value>
-			</li>
-
 			<!-- Nihal LMG -->
 
 			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
@@ -336,44 +390,6 @@
 				</weaponTags>
 			</li>
 
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="Gun_NihalLMG"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>stock</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>8</power>
-							<cooldownTime>1.79</cooldownTime>
-							<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>barrel</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>5</power>
-							<cooldownTime>3.02</cooldownTime>
-							<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>1.63</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>muzzle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>8</power>
-							<cooldownTime>1.55</cooldownTime>
-							<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-						</li>
-					</tools>
-				</value>
-			</li>
-
 			<!-- Nihal Sniper -->
 
 			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
@@ -408,45 +424,102 @@
 					<li>NiHalSniper</li>
 				</weaponTags>
 			</li>
+			
+			<!-- NiHal Thoober -->
 
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="Gun_NihalSniper"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>stock</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>8</power>
-							<cooldownTime>1.79</cooldownTime>
-							<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>barrel</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>5</power>
-							<cooldownTime>3.02</cooldownTime>
-							<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>1.63</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>muzzle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>8</power>
-							<cooldownTime>1.55</cooldownTime>
-							<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-						</li>
-					</tools>
-				</value>
+			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+				<defName>Gun_NihalCarbine</defName>
+				<statBases>
+				  <WorkToMake>14000</WorkToMake>	
+				  <SightsEfficiency>1.1</SightsEfficiency>
+				  <ShotSpread>0.16</ShotSpread>
+				  <SwayFactor>1.00</SwayFactor>
+				  <Bulk>7.31</Bulk>
+				  <Mass>2.70</Mass>
+				  <RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
+				</statBases>
+				<costList>
+				  <Plasteel>20</Plasteel>
+				  <Uranium>5</Uranium>
+				  <Steel>40</Steel>
+				  <ComponentSpacer>1</ComponentSpacer>
+				  <ComponentIndustrial>5</ComponentIndustrial>
+				</costList>				
+				<Properties>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<warmupTime>1.1</warmupTime>
+					<range>44</range>
+					<minRange>5</minRange>
+					<targetParams>
+					  <canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<soundCast>InfernoCannon_Fire</soundCast>
+					<muzzleFlashScale>14</muzzleFlashScale>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+				</Properties>
+				<AmmoUser>
+					<magazineSize>1</magazineSize>
+					<reloadTime>0.85</reloadTime>
+					<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+				</AmmoUser>
+				<FireModes>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>SuppressFire</aiAimMode>
+				</FireModes>
+				<weaponTags>
+					<li>NiHalRifle</li>
+				</weaponTags>			
 			</li>
 
+			<!-- NiHal Carbine -->
+
+			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+				<defName>Gun_NihalCarbine</defName>
+				<statBases>
+					<Mass>2.7</Mass>
+					<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.00</SightsEfficiency>
+					<ShotSpread>0.06</ShotSpread>
+					<SwayFactor>1.05</SwayFactor>
+					<Bulk>5.50</Bulk>
+					<WorkToMake>42000</WorkToMake>
+				</statBases>
+				<costList>
+					<Uranium>5</Uranium>
+					<Steel>80</Steel>
+					<Plasteel>80</Plasteel>
+					<ComponentSpacer>1</ComponentSpacer>
+					<ComponentIndustrial>5</ComponentIndustrial>
+				</costList>
+				<Properties>
+					<recoilAmount>1.2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+					<warmupTime>1</warmupTime>
+					<range>50</range>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<burstShotCount>3</burstShotCount>
+					<soundCast>ORifle</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</Properties>
+				<AmmoUser>
+					<magazineSize>24</magazineSize>
+					<reloadTime>3</reloadTime>
+					<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+				</AmmoUser>
+				<FireModes>
+					<aiAimMode>AimedShot</aiAimMode>
+				</FireModes>
+				<weaponTags>
+					<li>NiHalRifle</li>
+				</weaponTags>
+			</li>
+			
 			</operations>		
 		</match>
 	</Operation>
diff --git a/Patches/Save Our Ship 2/Creatures_SOS2.xml b/Patches/Save Our Ship 2/Creatures_SOS2.xml
index d312e8ebf6..d1bd0110e7 100644
--- a/Patches/Save Our Ship 2/Creatures_SOS2.xml	
+++ b/Patches/Save Our Ship 2/Creatures_SOS2.xml	
@@ -243,7 +243,7 @@
 		<xpath>Defs/ThingDef[@Name="BaseShuttle"]</xpath>
 		<value>
 			<li Class="CombatExtended.RacePropertiesExtensionCE">
-				<bodyShape>QuadrupedLow</bodyShape>
+				<bodyShape>Vehicle</bodyShape>
 			</li>
 		</value>
 	</li>
@@ -300,13 +300,12 @@
 		<value>
 			<tools>
 				<li Class="CombatExtended.ToolCE">
-					<label>head</label>
+					<label>hull</label>
 					<capacities>
 						<li>Blunt</li>
 					</capacities>
 					<power>35</power>
 					<cooldownTime>3.51</cooldownTime>
-					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
 					<armorPenetrationSharp>0</armorPenetrationSharp>
 					<armorPenetrationBlunt>15</armorPenetrationBlunt>
 					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>

From dd8c3afd94bd3d04c0f98c960daf172e35ee62cc Mon Sep 17 00:00:00 2001
From: n7huntsman <halo_1100@hotmail.com>
Date: Wed, 25 Mar 2020 09:28:18 -0400
Subject: [PATCH 2/2] Swap in Luizi's new weapon textures.

---
 .../Item/Equipment/WeaponRanged/LMG.png       | Bin 0 -> 4448 bytes
 Textures/Things/Weapons/GrenadeLauncher.png   | Bin 1458 -> 4676 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 Textures/Things/Item/Equipment/WeaponRanged/LMG.png

diff --git a/Textures/Things/Item/Equipment/WeaponRanged/LMG.png b/Textures/Things/Item/Equipment/WeaponRanged/LMG.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e4bc6495fd197964a669f1245dd8834f4a34805
GIT binary patch
literal 4448
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

literal 0
HcmV?d00001

diff --git a/Textures/Things/Weapons/GrenadeLauncher.png b/Textures/Things/Weapons/GrenadeLauncher.png
index a9b9b2bdfed1075f83bd169a5dc77a70edb7cb89..33997291916c7eabb6323a6a9df3f8038ed23a70 100644
GIT binary patch
literal 4676
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
ZZdwVh@eRzwLw{=_K>ei-s6oXB@*i$5Xs!SN

literal 1458
zcma)6`#;kQ0R0Zr%wu7buz5uDh}$LVBiwCym$mB^QbwLJ*DEQHysiwxC6AI2DP-lb
zx#ThOxaC75@*G0R+ZZvXyZ(ZEe>mrS&iUc|aDF&s0^UL#DhCAsK-|jG)RwQ9pMVJS
zxzaCqiZ7s0TMHaO?N?aj8zCR84Hf`uGDHvD!F(?gWa%6V01_QP0Ya!-#{vM@!panD
zA8~y(-|f=XTkxLCNL|Nng}1lDh68Wm=y9hj=~YtIvS}v$$Hd=lz}Q{+`MZJi-R2i$
zm`RPPB1hatY^+wzE8Wcf;b|EUS8T5=4JrMCc+E#6qQ7yWqvcNt?uQ}Pz90TWW7~e|
z<QA`Ry697FbF-NFR}ed?3yx`a{}p`n52s6@PI(zS;6I`euEVHDjb*(~j<2G+a;P8)
zPD*}d4e2kOs-;B|C<e*qh4taW)$_%!P-oDCDA=R6)h>e|<FB*bQ|ot?<tR_OHV}d8
z%Ie=;M`A<emZe3XE@q*n$U=>1rs2T*#itKupbSY;=Wg++Oj8LKxu&$kgYMf7uG;k3
zOy;Md$E2x(I_JW6GhH==bcBf!o=((EGj>7e=OD~Eh1{z65YX10xU7BnYINXu{zc#W
z8Mjf>!%=0<epaPVU*c4ZFI>6rlsx1Cy%|1&;mvJ__-MDYmHyson&IR<Z=YjZ`hSK9
zCmc=fauh1w+&+&A-ss!Zjm{~z)!4~Ci+;x{X|Pi)8aI!bUxKWRwkC8SH0ev={QXe8
z3h-U>tg4JObIS%cgnW_xiI&DQ6h`(K7VoD92EAboK0<1wZce(;RdZ&`E5%rl8lXv^
zvAl)r{ito|Pa=JZ?6)YKR}aRUxaH>N>bg+H#3V35X}Kz~y$N~lQ2|jlk0l%!BK6r1
zH5m(A?enS`CVD?cjKW&6%VXTKwWXX_FUxMUYubZ&zj5BqcP{yq&rPl;?)Z$?Q330i
z@Nk**yBQtZ>}7?>W)%L3N6|zNuO5LBSh-N}k1C*z!=w3q+%4ZJfq*1v6z`ZFh6Rq#
z_eH7|xVl^$9!ZdC>^?buCb2%nMtku`jaO9@S)JgaSweu!VAawOP@w(m=M&?VeIqL<
z69NkYglz(%M^oO|&2TYQm(*KAW-h6y3%GX77j55d2D}FK1S{^@o{si+p=Q>TwBvr!
zUPS0C7UV&|j3Z;tE!lIvs!-aFOEN2+9bSpE(<vgoZpDw0yuH1N-r-3%uxLi)=*Dpe
z%pN_m$l<0U6+D5GmltuLpqQkzI<ocYa><h&1Cuv=?v*zvJ)ilFNu8;aIXF`R-H_~7
z3^b1|PdeEG%%AwSI{W)khu9MT3#TwwCPEJy+7eF$G2IuOyh`b746_iQ)W3{Mpv)_N
z)trd{I?XLpKhy}7kwAM79e(p|^cA5cTHo6fU-i+GGtQrFMsMj@mO$3<ZIBdkwn0R;
zRkztAP81Z>=o%oTrf^P?c-dSv%ZjdwsvL@_BXyZ0h;6%RgiUta9GvTC>S;e!CVagQ
z%o5NzHEH#l)s;9Dp+{P<fP+%WhTvSkwaq7m?oeh5B`TGd5iE$aJ5t!TT&>e8!TEex
z$$3NOJ&q`HWaL#S!%_@>kZE?YQlI2>jr&RsQ+Eu&LMKP!`lp$rjH?Uwp3tuzS__Bh
zMG8uRQl$pdT3Uy2VCu&!Nm@FI*8Xy~+;xxX4;qZaFvC4m^|NK97w1TfLhOcpzJ#pV
zwR$K;6Yyd`8Z4vEX$9pF+ZOhq?T6@rLgwLaiR27=WgmX_5Jm*mg2B6TtmUO|(&JD}
zz;0v1o;f+Y3g93cr*G0aOwiGJ9r{W}U{O&~g%kC5Ot?n0Wvr{%9RwvtNPM8jcO`q9
rn^*b89`s$>xlm}`;(r|z0XPIZ*w#s2e8wg5e-^MZ!<$lZ#Q1*!6PT;p