From 04812d624be1a2f93345d7fb9e7a315078866e36 Mon Sep 17 00:00:00 2001
From: RickGrymes <81042907+RickGrymes@users.noreply.github.com>
Date: Thu, 8 Jan 2026 03:25:24 -0600
Subject: [PATCH] Refactor and enhance power armor paintjob definitions

Introduced abstract base ThingDefs for T-51 and T-60 power armor and helmet paintjobs to reduce duplication and improve maintainability. Moved shared stats and recipe data into these bases, and updated all paintjob variants to inherit from them. Adjusted and diversified equippedStatOffsets for individual paintjob variants to provide unique bonuses. This refactor streamlines XML structure and makes future additions easier.
---
 .../ThingDefs_Power_Armor.xml                 | 260 ++++------
 .../ThingDefs_Power_Armor_Headgear.xml        | 484 +++++-------------
 2 files changed, 216 insertions(+), 528 deletions(-)

diff --git a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml
index 0305424..79c86a1 100644
--- a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml
+++ b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml
@@ -295,15 +295,23 @@
 
 	<!--_____ T-51 Paintjobs _____-->
 
-	<!-- T-51 Hotrodder Flame Job Power Armor -->
+	<!--___ T-51 Paintjob Base ___-->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Base">
-		<defName>FCP_Apparel_T51_Hotrod_Flames_Power_Armor</defName>
+	<ThingDef ParentName="FCP_Apparel_Power_Armor_Base" Name="FCP_Apparel_T51_Paintjob_Base" Abstract="True">
 		<generateCommonality>0</generateCommonality>
-		<label>T-51 Hotrodder Flame Job Power Armor</label>
-		<description>T-51 power armor emblazoned with dazzling flame decals that turn heads and strike fear into the hearts of enemies. This iconic hot rod design brings wasteland style to the battlefield.</description>
+		<statBases>
+			<WorkToMake>2500</WorkToMake>
+			<MarketValue>3900</MarketValue>
+			<ArmorRating_Sharp>1.50</ArmorRating_Sharp>
+			<ArmorRating_Blunt>1.50</ArmorRating_Blunt>
+			<ArmorRating_Heat>1.00</ArmorRating_Heat>
+		</statBases>
+		<equippedStatOffsets>
+			<MoveSpeed>0.08</MoveSpeed>
+			<AimingDelayFactor>-0.03</AimingDelayFactor>
+			<ToxicEnvironmentResistance>0.8</ToxicEnvironmentResistance>
+		</equippedStatOffsets>
 		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Hotrodder_FlameJob</researchPrerequisite>
 			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
 			<skillRequirements>
 				<Crafting>8</Crafting>
@@ -315,21 +323,27 @@
 		<costList>
 			<FCP_Apparel_Power_Armor_T51Armor>1</FCP_Apparel_Power_Armor_T51Armor>
 		</costList>
+	</ThingDef>
+
+	<!--___ T-51 Paintjob Variants ___-->
+
+	<!-- T-51 Hotrodder Flame Job Power Armor -->
+
+	<ThingDef ParentName="FCP_Apparel_T51_Paintjob_Base">
+		<defName>FCP_Apparel_T51_Hotrod_Flames_Power_Armor</defName>
+		<label>T-51 Hotrodder Flame Job Power Armor</label>
+		<description>T-51 power armor emblazoned with dazzling flame decals that turn heads and strike fear into the hearts of enemies. This iconic hot rod design brings wasteland style to the battlefield.</description>
+		<recipeMaker>
+			<researchPrerequisite>FCP_Research_Hotrodder_FlameJob</researchPrerequisite>
+		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T51_Hotrod_Flames/FCP_T51_Hotrod_Flames_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>1</drawSize>
 		</graphicData>
-		<statBases>
-			<MarketValue>3900</MarketValue>
-			<ArmorRating_Sharp>1.50</ArmorRating_Sharp>
-			<ArmorRating_Blunt>1.50</ArmorRating_Blunt>
-			<ArmorRating_Heat>1.00</ArmorRating_Heat>
-		</statBases>
 		<equippedStatOffsets>
-			<MoveSpeed>0.08</MoveSpeed>
-			<AimingDelayFactor>-0.03</AimingDelayFactor>
-			<ToxicEnvironmentResistance>0.8</ToxicEnvironmentResistance>
+			<MoveSpeed>0.02</MoveSpeed>
+			<WorkSpeedGlobal>0.05</WorkSpeedGlobal>
 			<SocialImpact>0.10</SocialImpact>
 		</equippedStatOffsets>
 		<apparel>
@@ -339,39 +353,21 @@
 
 	<!-- T-51 Hotrodder Shark Paint Power Armor -->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Base">
+	<ThingDef ParentName="FCP_Apparel_T51_Paintjob_Base">
 		<defName>FCP_Apparel_T51_Shark_Paint_Power_Armor</defName>
-		<generateCommonality>0</generateCommonality>
 		<label>T-51 Hotrodder Shark Paint Power Armor</label>
 		<description>T-51 power armor with menacing shark teeth painted in the style of pre-war fighter planes. This aggressive paint scheme shows your enemies you mean business.</description>
 		<recipeMaker>
 			<researchPrerequisite>FCP_Research_Hotrodder_SharkPaint</researchPrerequisite>
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
-			<skillRequirements>
-				<Crafting>8</Crafting>
-			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
-		<costList>
-			<FCP_Apparel_Power_Armor_T51Armor>1</FCP_Apparel_Power_Armor_T51Armor>
-		</costList>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T51_Shark_Paint/FCP_T51_Shark_Paint_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>1</drawSize>
 		</graphicData>
-		<statBases>
-			<MarketValue>3900</MarketValue>
-			<ArmorRating_Sharp>1.50</ArmorRating_Sharp>
-			<ArmorRating_Blunt>1.50</ArmorRating_Blunt>
-			<ArmorRating_Heat>1.00</ArmorRating_Heat>
-		</statBases>
 		<equippedStatOffsets>
-			<MoveSpeed>0.08</MoveSpeed>
-			<AimingDelayFactor>-0.03</AimingDelayFactor>
-			<ToxicEnvironmentResistance>0.8</ToxicEnvironmentResistance>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeHitChance>0.05</MeleeHitChance>
 			<SocialImpact>0.08</SocialImpact>
 		</equippedStatOffsets>
 		<apparel>
@@ -381,41 +377,22 @@
 
 	<!-- T-51 Hotrodder Hotpink Power Armor -->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Base">
+	<ThingDef ParentName="FCP_Apparel_T51_Paintjob_Base">
 		<defName>FCP_Apparel_T51_Hotrod_Pink_Power_Armor</defName>
-		<generateCommonality>0</generateCommonality>
 		<label>T-51 Hotrodder Hotpink Power Armor</label>
 		<description>T-51 power armor in bold, vibrant hot pink that makes a statement. This eye-catching color scheme ensures you'll never be overlooked on the battlefield.</description>
 		<recipeMaker>
 			<researchPrerequisite>FCP_Research_Hotrodder_Hotpink</researchPrerequisite>
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
-			<skillRequirements>
-				<Crafting>8</Crafting>
-			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
-		<costList>
-			<FCP_Apparel_Power_Armor_T51Armor>1</FCP_Apparel_Power_Armor_T51Armor>
-		</costList>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T51_Hotrod_Pink/FCP_T51_Hotrod_Pink_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>1</drawSize>
 		</graphicData>
-		<statBases>
-			<WorkToMake>2500</WorkToMake>
-			<MarketValue>3900</MarketValue>
-			<ArmorRating_Sharp>1.50</ArmorRating_Sharp>
-			<ArmorRating_Blunt>1.50</ArmorRating_Blunt>
-			<ArmorRating_Heat>1.00</ArmorRating_Heat>
-		</statBases>
 		<equippedStatOffsets>
-			<MoveSpeed>0.08</MoveSpeed>
-			<AimingDelayFactor>-0.03</AimingDelayFactor>
-			<ToxicEnvironmentResistance>0.8</ToxicEnvironmentResistance>
-			<SocialImpact>0.05</SocialImpact>
+			<TradePriceImprovement>0.08</TradePriceImprovement>
+			<NegotiationAbility>0.10</NegotiationAbility>
+			<SocialImpact>0.15</SocialImpact>
 		</equippedStatOffsets>
 		<apparel>
 			<wornGraphicPath>Things/Apparel/Power_Armors/T51_Hotrod_Pink/FCP_T51_Hotrod_Pink_Power_Armor</wornGraphicPath>
@@ -424,40 +401,25 @@
 
 	<!-- T-51 Abraxo Power Armor -->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Base">
+	<ThingDef ParentName="FCP_Apparel_T51_Paintjob_Base">
 		<defName>FCP_Apparel_T51_Abraxo_Power_Armor</defName>
-		<generateCommonality>0</generateCommonality>
 		<label>T-51 Power Paints Abraxo Power Armor</label>
 		<description>T-51 power armor with a paint scheme inspired by the iconic Abraxo Cleaner branding. Clean, crisp, and unmistakable - this corporate paint job brings pre-war advertising aesthetics to the wasteland.</description>
 		<recipeMaker>
 			<researchPrerequisite>FCP_Research_Power_Paints_Abraxo</researchPrerequisite>
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
-			<skillRequirements>
-				<Crafting>8</Crafting>
-			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
-		<costList>
-			<FCP_Apparel_Power_Armor_T51Armor>1</FCP_Apparel_Power_Armor_T51Armor>
-		</costList>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T51_Abraxo/FCP_T51_Abraxo_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>1</drawSize>
 		</graphicData>
 		<statBases>
-			<WorkToMake>2500</WorkToMake>
-			<MarketValue>3900</MarketValue>
-			<ArmorRating_Sharp>1.50</ArmorRating_Sharp>
-			<ArmorRating_Blunt>1.50</ArmorRating_Blunt>
-			<ArmorRating_Heat>1.00</ArmorRating_Heat>
+			<ToxicEnvironmentResistance>0.05</ToxicEnvironmentResistance>
 		</statBases>
 		<equippedStatOffsets>
-			<MoveSpeed>0.08</MoveSpeed>
-			<AimingDelayFactor>-0.03</AimingDelayFactor>
-			<ToxicEnvironmentResistance>0.8</ToxicEnvironmentResistance>
+			<MedicalTendQuality>0.08</MedicalTendQuality>
+			<MedicalSurgerySuccessChance>0.05</MedicalSurgerySuccessChance>
+			<ImmunityGainSpeed>0.08</ImmunityGainSpeed>
 			<SocialImpact>0.03</SocialImpact>
 		</equippedStatOffsets>
 		<apparel>
@@ -467,40 +429,22 @@
 
 	<!-- T-51 Sugar Bombs Power Armor -->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Base">
+	<ThingDef ParentName="FCP_Apparel_T51_Paintjob_Base">
 		<defName>FCP_Apparel_T51_Sugar_Bombs_Power_Armor</defName>
-		<generateCommonality>0</generateCommonality>
 		<label>T-51 Power Paints Sugar Bombs Power Armor</label>
 		<description>T-51 power armor with colorful Sugar Bombs cereal branding. Sweet and explosive, this playful paint scheme combines nostalgia with intimidation.</description>
 		<recipeMaker>
 			<researchPrerequisite>FCP_Research_Power_Paints_SugarBombs</researchPrerequisite>
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
-			<skillRequirements>
-				<Crafting>8</Crafting>
-			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
-		<costList>
-			<FCP_Apparel_Power_Armor_T51Armor>1</FCP_Apparel_Power_Armor_T51Armor>
-		</costList>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T51_Sugar_Bombs/FCP_T51_Sugar_Bombs_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>1</drawSize>
 		</graphicData>
-		<statBases>
-			<WorkToMake>2500</WorkToMake>
-			<MarketValue>3900</MarketValue>
-			<ArmorRating_Sharp>1.50</ArmorRating_Sharp>
-			<ArmorRating_Blunt>1.50</ArmorRating_Blunt>
-			<ArmorRating_Heat>1.00</ArmorRating_Heat>
-		</statBases>
 		<equippedStatOffsets>
-			<MoveSpeed>0.08</MoveSpeed>
-			<AimingDelayFactor>-0.03</AimingDelayFactor>
-			<ToxicEnvironmentResistance>0.8</ToxicEnvironmentResistance>
+			<RestRateMultiplier>0.08</RestRateMultiplier>
+			<EatingSpeed>0.15</EatingSpeed>
+			<CarryingCapacity>15</CarryingCapacity>
 			<SocialImpact>0.06</SocialImpact>
 		</equippedStatOffsets>
 		<apparel>
@@ -510,31 +454,10 @@
 
 	<!--_____ T-60 Paintjobs _____-->
 
-	<!-- T-60 Hotrodder Flame Job Power Armor -->
+	<!--___ T-60 Paintjob Base ___-->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Base">
-		<defName>FCP_Apparel_T60_Hotrod_Flames_Power_Armor</defName>
+	<ThingDef ParentName="FCP_Apparel_Power_Armor_Base" Name="FCP_Apparel_T60_Paintjob_Base" Abstract="True">
 		<generateCommonality>0</generateCommonality>
-		<label>T-60 Hotrodder Flame Job Power Armor</label>
-		<description>T-60 power armor emblazoned with dazzling flame decals that turn heads and strike fear into the hearts of enemies. This iconic hot rod design brings wasteland style to the battlefield.</description>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Hotrodder_FlameJob</researchPrerequisite>
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
-			<skillRequirements>
-				<Crafting>8</Crafting>
-			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
-		</recipeMaker>
-		<costList>
-			<FCP_Apparel_Power_Armor_T60Armor>1</FCP_Apparel_Power_Armor_T60Armor>
-		</costList>
-		<graphicData>
-			<texPath>Things/Apparel/Power_Armors/T60_Hotrod_Flames/FCP_T60_Hotrod_Flames_Power_Armor_Hulk_south</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-			<drawSize>1</drawSize>
-		</graphicData>
 		<statBases>
 			<WorkToMake>2500</WorkToMake>
 			<MarketValue>4100</MarketValue>
@@ -546,6 +469,40 @@
 			<MoveSpeed>0.10</MoveSpeed>
 			<AimingDelayFactor>-0.04</AimingDelayFactor>
 			<ToxicEnvironmentResistance>0.9</ToxicEnvironmentResistance>
+		</equippedStatOffsets>
+		<recipeMaker>
+			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+			<skillRequirements>
+				<Crafting>8</Crafting>
+			</skillRequirements>
+			<recipeUsers>
+				<li>FCP_Production_Armor_Workbench</li>
+			</recipeUsers>
+		</recipeMaker>
+		<costList>
+			<FCP_Apparel_Power_Armor_T60Armor>1</FCP_Apparel_Power_Armor_T60Armor>
+		</costList>
+	</ThingDef>
+
+	<!--___ T-60 Paintjob Variants ___-->
+
+	<!-- T-60 Hotrodder Flame Job Power Armor -->
+
+	<ThingDef ParentName="FCP_Apparel_T60_Paintjob_Base">
+		<defName>FCP_Apparel_T60_Hotrod_Flames_Power_Armor</defName>
+		<label>T-60 Hotrodder Flame Job Power Armor</label>
+		<description>T-60 power armor emblazoned with dazzling flame decals that turn heads and strike fear into the hearts of enemies. This iconic hot rod design brings wasteland style to the battlefield.</description>
+		<recipeMaker>
+			<researchPrerequisite>FCP_Research_Hotrodder_FlameJob</researchPrerequisite>
+		</recipeMaker>
+		<graphicData>
+			<texPath>Things/Apparel/Power_Armors/T60_Hotrod_Flames/FCP_T60_Hotrod_Flames_Power_Armor_Hulk_south</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>1</drawSize>
+		</graphicData>
+		<equippedStatOffsets>
+			<MoveSpeed>0.03</MoveSpeed>
+			<WorkSpeedGlobal>0.08</WorkSpeedGlobal>
 			<SocialImpact>0.15</SocialImpact>
 		</equippedStatOffsets>
 		<apparel>
@@ -555,40 +512,22 @@
 
 	<!-- T-60 Hotrodder Shark Paint Power Armor -->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Base">
+	<ThingDef ParentName="FCP_Apparel_T60_Paintjob_Base">
 		<defName>FCP_Apparel_T60_Shark_Paint_Power_Armor</defName>
-		<generateCommonality>0</generateCommonality>
 		<label>T-60 Hotrodder Shark Paint Power Armor</label>
 		<description>T-60 power armor with menacing shark teeth painted in the style of pre-war fighter planes. This aggressive paint scheme shows your enemies you mean business.</description>
 		<recipeMaker>
 			<researchPrerequisite>FCP_Research_Hotrodder_SharkPaint</researchPrerequisite>
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
-			<skillRequirements>
-				<Crafting>8</Crafting>
-			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
-		<costList>
-			<FCP_Apparel_Power_Armor_T60Armor>1</FCP_Apparel_Power_Armor_T60Armor>
-		</costList>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T60_Shark_Paint/FCP_T60_Shark_Paint_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>1</drawSize>
 		</graphicData>
-		<statBases>
-			<WorkToMake>2500</WorkToMake>
-			<MarketValue>4100</MarketValue>
-			<ArmorRating_Sharp>2.00</ArmorRating_Sharp>
-			<ArmorRating_Blunt>2.00</ArmorRating_Blunt>
-			<ArmorRating_Heat>1.30</ArmorRating_Heat>
-		</statBases>
 		<equippedStatOffsets>
-			<MoveSpeed>0.10</MoveSpeed>
-			<AimingDelayFactor>-0.04</AimingDelayFactor>
-			<ToxicEnvironmentResistance>0.9</ToxicEnvironmentResistance>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeHitChance>0.08</MeleeHitChance>
+			<PainShockThreshold>0.05</PainShockThreshold>
 			<SocialImpact>0.12</SocialImpact>
 		</equippedStatOffsets>
 		<apparel>
@@ -598,45 +537,26 @@
 
 	<!-- T-60 Hotrodder Hotpink Power Armor -->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Base">
+	<ThingDef ParentName="FCP_Apparel_T60_Paintjob_Base">
 		<defName>FCP_Apparel_T60_Hotrod_Pink_Power_Armor</defName>
-		<generateCommonality>0</generateCommonality>
 		<label>T-60 Hotrodder Hotpink Power Armor</label>
 		<description>T-60 power armor in bold, vibrant hot pink that makes a statement. This eye-catching color scheme ensures you'll never be overlooked on the battlefield.</description>
 		<recipeMaker>
 			<researchPrerequisite>FCP_Research_Hotrodder_Hotpink</researchPrerequisite>
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
-			<skillRequirements>
-				<Crafting>8</Crafting>
-			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
-		<costList>
-			<FCP_Apparel_Power_Armor_T60Armor>1</FCP_Apparel_Power_Armor_T60Armor>
-		</costList>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T60_Hotrod_Pink/FCP_T60_Hotrod_Pink_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>1</drawSize>
 		</graphicData>
-		<statBases>
-			<WorkToMake>2500</WorkToMake>
-			<MarketValue>4100</MarketValue>
-			<ArmorRating_Sharp>2.00</ArmorRating_Sharp>
-			<ArmorRating_Blunt>2.00</ArmorRating_Blunt>
-			<ArmorRating_Heat>1.30</ArmorRating_Heat>
-		</statBases>
 		<equippedStatOffsets>
-			<MoveSpeed>0.10</MoveSpeed>
-			<AimingDelayFactor>-0.04</AimingDelayFactor>
-			<ToxicEnvironmentResistance>0.9</ToxicEnvironmentResistance>
-			<SocialImpact>0.08</SocialImpact>
+			<TradePriceImprovement>0.12</TradePriceImprovement>
+			<NegotiationAbility>0.15</NegotiationAbility>
+			<SocialImpact>0.20</SocialImpact>
 		</equippedStatOffsets>
 		<apparel>
 			<wornGraphicPath>Things/Apparel/Power_Armors/T60_Hotrod_Pink/FCP_T60_Hotrod_Pink_Power_Armor</wornGraphicPath>
 		</apparel>
 	</ThingDef>
 
-</Defs>
+</Defs>
\ No newline at end of file
diff --git a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor_Headgear.xml b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor_Headgear.xml
index 42fc952..185d217 100644
--- a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor_Headgear.xml
+++ b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor_Headgear.xml
@@ -243,16 +243,40 @@
 
 	<!--_____ T-51 Paintjob Helmets _____-->
 
-	<!-- T-51 Hotrodder Flame Job Helmet -->
+	<!--___ T-51 Helmet Paintjob Base ___-->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Helmet_Base">
-		<defName>FCP_Apparel_T51_Hotrod_Flames_Power_Armor_Helmet</defName>
+	<ThingDef ParentName="FCP_Apparel_Power_Armor_Helmet_Base" Name="FCP_Apparel_T51_Helmet_Paintjob_Base" Abstract="True">
 		<generateCommonality>0</generateCommonality>
-		<label>T-51 Hotrodder Flame Job Helmet</label>
-		<description>A T-51 power armor helmet emblazoned with dazzling flame decals. This iconic hot rod design turns heads on the battlefield.</description>
 		<techLevel>Industrial</techLevel>
+		<smeltable>false</smeltable>
+		<statBases>
+			<WorkToMake>1200</WorkToMake>
+			<MaxHitPoints>80</MaxHitPoints>
+			<Mass>0.8</Mass>
+			<MarketValue>1100</MarketValue>
+			<ArmorRating_Sharp>1.30</ArmorRating_Sharp>
+			<ArmorRating_Blunt>1.30</ArmorRating_Blunt>
+			<ArmorRating_Heat>1.00</ArmorRating_Heat>
+			<Insulation_Heat>2</Insulation_Heat>
+			<EquipDelay>2.5</EquipDelay>
+		</statBases>
+		<equippedStatOffsets>
+			<ToxicEnvironmentResistance>0.9</ToxicEnvironmentResistance>
+			<MoveSpeed>-0.3</MoveSpeed>
+			<AimingDelayFactor>-0.02</AimingDelayFactor>
+		</equippedStatOffsets>
+		<apparel>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+				<li>FullHead</li>
+			</bodyPartGroups>
+			<layers>
+				<li>Overhead</li>
+			</layers>
+			<useDeflectMetalEffect>true</useDeflectMetalEffect>
+			<developmentalStageFilter>Adult</developmentalStageFilter>
+		</apparel>
 		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Hotrodder_FlameJob</researchPrerequisite>
 			<unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
 			<skillRequirements>
 				<Crafting>6</Crafting>
@@ -264,329 +288,168 @@
 		<costList>
 			<FCP_Apparel_Power_Armor_T51_Helmet>1</FCP_Apparel_Power_Armor_T51_Helmet>
 		</costList>
+		<comps>
+			<li Class="FCP.Core.CompProperties_LabelColored">
+				<rarity>Rare</rarity>
+			</li>
+			<li Class="RangerRick_PowerArmor.CompProperties_ApparelRequirement">
+				<requiredApparels>
+					<li>FCP_Apparel_Power_Armor_Frame</li>
+				</requiredApparels>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!--___ T-51 Helmet Paintjob Variants ___-->
+
+	<!-- T-51 Hotrodder Flame Job Helmet -->
+
+	<ThingDef ParentName="FCP_Apparel_T51_Helmet_Paintjob_Base">
+		<defName>FCP_Apparel_T51_Hotrod_Flames_Power_Armor_Helmet</defName>
+		<label>T-51 Hotrodder Flame Job Helmet</label>
+		<description>A T-51 power armor helmet emblazoned with dazzling flame decals. This iconic hot rod design turns heads on the battlefield.</description>
+		<recipeMaker>
+			<researchPrerequisite>FCP_Research_Hotrodder_FlameJob</researchPrerequisite>
+		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armor_Headgear/T51_Hotrod_Flames_Helmet/FCP_T51_Hotrod_Flames_Power_Armor_Helmet_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
-		<smeltable>false</smeltable>
-		<statBases>
-			<MaxHitPoints>80</MaxHitPoints>
-			<Mass>0.8</Mass>
-			<MarketValue>1100</MarketValue>
-			<ArmorRating_Sharp>1.30</ArmorRating_Sharp>
-			<ArmorRating_Blunt>1.30</ArmorRating_Blunt>
-			<ArmorRating_Heat>1.00</ArmorRating_Heat>
-			<Insulation_Heat>2</Insulation_Heat>
-			<EquipDelay>2.5</EquipDelay>
-		</statBases>
 		<equippedStatOffsets>
-			<ToxicEnvironmentResistance>0.9</ToxicEnvironmentResistance>
-			<MoveSpeed>-0.3</MoveSpeed>
-			<AimingDelayFactor>-0.02</AimingDelayFactor>
+			<ShootingAccuracyPawn>0.03</ShootingAccuracyPawn>
 			<SocialImpact>0.08</SocialImpact>
 		</equippedStatOffsets>
 		<apparel>
-			<bodyPartGroups>
-				<li>UpperHead</li>
-				<li>FullHead</li>
-			</bodyPartGroups>
 			<wornGraphicPath>Things/Apparel/Power_Armor_Headgear/T51_Hotrod_Flames_Helmet/FCP_T51_Hotrod_Flames_Power_Armor_Helmet</wornGraphicPath>
-			<layers>
-				<li>Overhead</li>
-			</layers>
-			<useDeflectMetalEffect>true</useDeflectMetalEffect>
-			<developmentalStageFilter>Adult</developmentalStageFilter>
 		</apparel>
-		<comps>
-			<li Class="FCP.Core.CompProperties_LabelColored">
-				<rarity>Rare</rarity>
-			</li>
-			<li Class="RangerRick_PowerArmor.CompProperties_ApparelRequirement">
-				<requiredApparels>
-					<li>FCP_Apparel_Power_Armor_Frame</li>
-				</requiredApparels>
-			</li>
-		</comps>
 	</ThingDef>
 
 	<!-- T-51 Hotrodder Shark Paint Helmet -->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Helmet_Base">
+	<ThingDef ParentName="FCP_Apparel_T51_Helmet_Paintjob_Base">
 		<defName>FCP_Apparel_T51_Shark_Paint_Power_Armor_Helmet</defName>
-		<generateCommonality>0</generateCommonality>
 		<label>T-51 Hotrodder Shark Paint Helmet</label>
 		<description>A T-51 power armor helmet with menacing shark teeth painted in the style of pre-war fighter planes.</description>
-		<techLevel>Industrial</techLevel>
 		<recipeMaker>
 			<researchPrerequisite>FCP_Research_Hotrodder_SharkPaint</researchPrerequisite>
-			<unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
-			<skillRequirements>
-				<Crafting>6</Crafting>
-			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
-		<costList>
-			<FCP_Apparel_Power_Armor_T51_Helmet>1</FCP_Apparel_Power_Armor_T51_Helmet>
-		</costList>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armor_Headgear/T51_Shark_Paint_Helmet/FCP_T51_Shark_Paint_Power_Armor_Helmet_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
-		<smeltable>false</smeltable>
-		<statBases>
-			<MaxHitPoints>80</MaxHitPoints>
-			<Mass>0.8</Mass>
-			<MarketValue>1100</MarketValue>
-			<ArmorRating_Sharp>1.30</ArmorRating_Sharp>
-			<ArmorRating_Blunt>1.30</ArmorRating_Blunt>
-			<ArmorRating_Heat>1.00</ArmorRating_Heat>
-			<Insulation_Heat>2</Insulation_Heat>
-			<EquipDelay>2.5</EquipDelay>
-		</statBases>
 		<equippedStatOffsets>
-			<ToxicEnvironmentResistance>0.9</ToxicEnvironmentResistance>
-			<MoveSpeed>-0.3</MoveSpeed>
-			<AimingDelayFactor>-0.02</AimingDelayFactor>
+			<MeleeDodgeChance>0.02</MeleeDodgeChance>
+			<ShootingAccuracyPawn>0.02</ShootingAccuracyPawn>
 			<SocialImpact>0.06</SocialImpact>
 		</equippedStatOffsets>
 		<apparel>
-			<bodyPartGroups>
-				<li>UpperHead</li>
-				<li>FullHead</li>
-			</bodyPartGroups>
 			<wornGraphicPath>Things/Apparel/Power_Armor_Headgear/T51_Shark_Paint_Helmet/FCP_T51_Shark_Paint_Power_Armor_Helmet</wornGraphicPath>
-			<layers>
-				<li>Overhead</li>
-			</layers>
-			<useDeflectMetalEffect>true</useDeflectMetalEffect>
-			<developmentalStageFilter>Adult</developmentalStageFilter>
 		</apparel>
-		<comps>
-			<li Class="FCP.Core.CompProperties_LabelColored">
-				<rarity>Rare</rarity>
-			</li>
-			<li Class="RangerRick_PowerArmor.CompProperties_ApparelRequirement">
-				<requiredApparels>
-					<li>FCP_Apparel_Power_Armor_Frame</li>
-				</requiredApparels>
-			</li>
-		</comps>
 	</ThingDef>
 
     <!-- T-51 Hotrodder Hotpink Helmet -->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Helmet_Base">
+	<ThingDef ParentName="FCP_Apparel_T51_Helmet_Paintjob_Base">
 		<defName>FCP_Apparel_T51_Hotrod_Pink_Power_Armor_Helmet</defName>
-		<generateCommonality>0</generateCommonality>
 		<label>T-51 Hotrodder Hotpink Helmet</label>
 		<description>A T-51 power armor helmet in bold, vibrant hot pink. This eye-catching color scheme ensures you'll never be overlooked.</description>
-		<techLevel>Industrial</techLevel>
 		<recipeMaker>
 			<researchPrerequisite>FCP_Research_Hotrodder_Hotpink</researchPrerequisite>
-			<unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
-			<skillRequirements>
-				<Crafting>6</Crafting>
-			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
-		<costList>
-			<FCP_Apparel_Power_Armor_T51_Helmet>1</FCP_Apparel_Power_Armor_T51_Helmet>
-		</costList>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armor_Headgear/T51_Hotrod_Pink_Helmet/FCP_T51_Hotrod_Pink_Power_Armor_Helmet_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
-		<smeltable>false</smeltable>
-		<statBases>
-			<MaxHitPoints>80</MaxHitPoints>
-			<Mass>0.8</Mass>
-			<MarketValue>1100</MarketValue>
-			<ArmorRating_Sharp>1.30</ArmorRating_Sharp>
-			<ArmorRating_Blunt>1.30</ArmorRating_Blunt>
-			<ArmorRating_Heat>1.00</ArmorRating_Heat>
-			<Insulation_Heat>2</Insulation_Heat>
-			<EquipDelay>2.5</EquipDelay>
-		</statBases>
 		<equippedStatOffsets>
-			<ToxicEnvironmentResistance>0.9</ToxicEnvironmentResistance>
-			<MoveSpeed>-0.3</MoveSpeed>
-			<AimingDelayFactor>-0.02</AimingDelayFactor>
-			<SocialImpact>0.03</SocialImpact>
+			<NegotiationAbility>0.05</NegotiationAbility>
+			<SocialImpact>0.12</SocialImpact>
 		</equippedStatOffsets>
 		<apparel>
-			<bodyPartGroups>
-				<li>UpperHead</li>
-				<li>FullHead</li>
-			</bodyPartGroups>
 			<wornGraphicPath>Things/Apparel/Power_Armor_Headgear/T51_Hotrod_Pink_Helmet/FCP_T51_Hotrod_Pink_Power_Armor_Helmet</wornGraphicPath>
-			<layers>
-				<li>Overhead</li>
-			</layers>
-			<useDeflectMetalEffect>true</useDeflectMetalEffect>
-			<developmentalStageFilter>Adult</developmentalStageFilter>
 		</apparel>
-		<comps>
-			<li Class="FCP.Core.CompProperties_LabelColored">
-				<rarity>Rare</rarity>
-			</li>
-			<li Class="RangerRick_PowerArmor.CompProperties_ApparelRequirement">
-				<requiredApparels>
-					<li>FCP_Apparel_Power_Armor_Frame</li>
-				</requiredApparels>
-			</li>
-		</comps>
 	</ThingDef>
 
 	<!-- T-51 Abraxo Helmet -->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Helmet_Base">
+	<ThingDef ParentName="FCP_Apparel_T51_Helmet_Paintjob_Base">
 		<defName>FCP_Apparel_T51_Abraxo_Power_Armor_Helmet</defName>
-		<generateCommonality>0</generateCommonality>
 		<label>T-51 Power Paints Abraxo Helmet</label>
 		<description>A T-51 power armor helmet with Abraxo Cleaner branding. Clean, crisp, and unmistakable corporate aesthetics.</description>
-		<techLevel>Industrial</techLevel>
 		<recipeMaker>
 			<researchPrerequisite>FCP_Research_Power_Paints_Abraxo</researchPrerequisite>
-			<unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
-			<skillRequirements>
-				<Crafting>6</Crafting>
-			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
-		<costList>
-			<FCP_Apparel_Power_Armor_T51_Helmet>1</FCP_Apparel_Power_Armor_T51_Helmet>
-		</costList>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armor_Headgear/T51_Abraxo_Helmet/FCP_T51_Abraxo_Power_Armor_Helmet_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
-		<smeltable>false</smeltable>
-		<statBases>
-			<WorkToMake>1200</WorkToMake>
-			<MaxHitPoints>80</MaxHitPoints>
-			<Mass>0.8</Mass>
-			<MarketValue>1100</MarketValue>
-			<ArmorRating_Sharp>1.30</ArmorRating_Sharp>
-			<ArmorRating_Blunt>1.30</ArmorRating_Blunt>
-			<ArmorRating_Heat>1.00</ArmorRating_Heat>
-			<Insulation_Heat>2</Insulation_Heat>
-			<EquipDelay>2.5</EquipDelay>
-		</statBases>
 		<equippedStatOffsets>
-			<ToxicEnvironmentResistance>0.9</ToxicEnvironmentResistance>
-			<MoveSpeed>-0.3</MoveSpeed>
-			<AimingDelayFactor>-0.02</AimingDelayFactor>
+			<MedicalTendSpeed>0.10</MedicalTendSpeed>
+			<ImmunityGainSpeed>0.05</ImmunityGainSpeed>
 			<SocialImpact>0.01</SocialImpact>
 		</equippedStatOffsets>
 		<apparel>
-			<bodyPartGroups>
-				<li>UpperHead</li>
-				<li>FullHead</li>
-			</bodyPartGroups>
 			<wornGraphicPath>Things/Apparel/Power_Armor_Headgear/T51_Abraxo_Helmet/FCP_T51_Abraxo_Power_Armor_Helmet</wornGraphicPath>
-			<layers>
-				<li>Overhead</li>
-			</layers>
-			<useDeflectMetalEffect>true</useDeflectMetalEffect>
-			<developmentalStageFilter>Adult</developmentalStageFilter>
 		</apparel>
-		<comps>
-			<li Class="FCP.Core.CompProperties_LabelColored">
-				<rarity>Rare</rarity>
-			</li>
-			<li Class="RangerRick_PowerArmor.CompProperties_ApparelRequirement">
-				<requiredApparels>
-					<li>FCP_Apparel_Power_Armor_Frame</li>
-				</requiredApparels>
-			</li>
-		</comps>
 	</ThingDef>
 
 	<!-- T-51 Sugar Bombs Helmet -->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Helmet_Base">
+	<ThingDef ParentName="FCP_Apparel_T51_Helmet_Paintjob_Base">
 		<defName>FCP_Apparel_T51_Sugar_Bombs_Power_Armor_Helmet</defName>
-		<generateCommonality>0</generateCommonality>
 		<label>T-51 Power Paints Sugar Bombs Helmet</label>
 		<description>A T-51 power armor helmet with colorful Sugar Bombs cereal branding. Sweet and explosive nostalgia.</description>
-		<techLevel>Industrial</techLevel>
 		<recipeMaker>
 			<researchPrerequisite>FCP_Research_Power_Paints_SugarBombs</researchPrerequisite>
-			<unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
-			<skillRequirements>
-				<Crafting>6</Crafting>
-			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
-		<costList>
-			<FCP_Apparel_Power_Armor_T51_Helmet>1</FCP_Apparel_Power_Armor_T51_Helmet>
-		</costList>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armor_Headgear/T51_Sugar_Bombs_Helmet/FCP_T51_Sugar_Bombs_Power_Armor_Helmet_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
-		<smeltable>false</smeltable>
-		<statBases>
-			<WorkToMake>1200</WorkToMake>
-			<MaxHitPoints>80</MaxHitPoints>
-			<Mass>0.8</Mass>
-			<MarketValue>1100</MarketValue>
-			<ArmorRating_Sharp>1.30</ArmorRating_Sharp>
-			<ArmorRating_Blunt>1.30</ArmorRating_Blunt>
-			<ArmorRating_Heat>1.00</ArmorRating_Heat>
-			<Insulation_Heat>2</Insulation_Heat>
-			<EquipDelay>2.5</EquipDelay>
-		</statBases>
 		<equippedStatOffsets>
-			<ToxicEnvironmentResistance>0.9</ToxicEnvironmentResistance>
-			<MoveSpeed>-0.3</MoveSpeed>
-			<AimingDelayFactor>-0.02</AimingDelayFactor>
+			<ShootingAccuracyPawn>0.04</ShootingAccuracyPawn>
+			<EatingSpeed>0.10</EatingSpeed>
 			<SocialImpact>0.04</SocialImpact>
 		</equippedStatOffsets>
 		<apparel>
-			<bodyPartGroups>
-				<li>UpperHead</li>
-				<li>FullHead</li>
-			</bodyPartGroups>
 			<wornGraphicPath>Things/Apparel/Power_Armor_Headgear/T51_Sugar_Bombs_Helmet/FCP_T51_Sugar_Bombs_Power_Armor_Helmet</wornGraphicPath>
-			<layers>
-				<li>Overhead</li>
-			</layers>
-			<useDeflectMetalEffect>true</useDeflectMetalEffect>
-			<developmentalStageFilter>Adult</developmentalStageFilter>
 		</apparel>
-		<comps>
-			<li Class="FCP.Core.CompProperties_LabelColored">
-				<rarity>Rare</rarity>
-			</li>
-			<li Class="RangerRick_PowerArmor.CompProperties_ApparelRequirement">
-				<requiredApparels>
-					<li>FCP_Apparel_Power_Armor_Frame</li>
-				</requiredApparels>
-			</li>
-		</comps>
 	</ThingDef>
 
 	<!--_____ T-60 Paintjob Helmets _____-->
 
-	<!-- T-60 Hotrodder Flame Job Helmet -->
+	<!--___ T-60 Helmet Paintjob Base ___-->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Helmet_Base">
-		<defName>FCP_Apparel_T60_Hotrod_Flames_Power_Armor_Helmet</defName>
+	<ThingDef ParentName="FCP_Apparel_Power_Armor_Helmet_Base" Name="FCP_Apparel_T60_Helmet_Paintjob_Base" Abstract="True">
 		<generateCommonality>0</generateCommonality>
-		<label>T-60 Hotrodder Flame Job Helmet</label>
-		<description>A T-60 power armor helmet emblazoned with dazzling flame decals. This iconic hot rod design turns heads on the battlefield.</description>
 		<techLevel>Industrial</techLevel>
+		<smeltable>false</smeltable>
+		<statBases>
+			<WorkToMake>1200</WorkToMake>
+			<MaxHitPoints>80</MaxHitPoints>
+			<Mass>0.8</Mass>
+			<MarketValue>1200</MarketValue>
+			<ArmorRating_Sharp>1.45</ArmorRating_Sharp>
+			<ArmorRating_Blunt>1.45</ArmorRating_Blunt>
+			<ArmorRating_Heat>1.30</ArmorRating_Heat>
+			<Insulation_Heat>2</Insulation_Heat>
+			<EquipDelay>2</EquipDelay>
+		</statBases>
+		<equippedStatOffsets>
+			<ToxicEnvironmentResistance>1.0</ToxicEnvironmentResistance>
+			<AimingDelayFactor>-0.03</AimingDelayFactor>
+		</equippedStatOffsets>
+		<apparel>
+			<bodyPartGroups>
+				<li>UpperHead</li>
+				<li>FullHead</li>
+			</bodyPartGroups>
+			<layers>
+				<li>Overhead</li>
+			</layers>
+			<useDeflectMetalEffect>true</useDeflectMetalEffect>
+			<developmentalStageFilter>Adult</developmentalStageFilter>
+		</apparel>
 		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Hotrodder_FlameJob</researchPrerequisite>
 			<unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
 			<skillRequirements>
 				<Crafting>6</Crafting>
@@ -598,181 +461,86 @@
 		<costList>
 			<FCP_Apparel_Power_Armor_T60_Helmet>1</FCP_Apparel_Power_Armor_T60_Helmet>
 		</costList>
+		<comps>
+			<li Class="FCP.Core.CompProperties_LabelColored">
+				<rarity>Rare</rarity>
+			</li>
+			<li Class="RangerRick_PowerArmor.CompProperties_ApparelRequirement">
+				<requiredApparels>
+					<li>FCP_Apparel_Power_Armor_Frame</li>
+				</requiredApparels>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!--___ T-60 Helmet Paintjob Variants ___-->
+
+	<!-- T-60 Hotrodder Flame Job Helmet -->
+
+	<ThingDef ParentName="FCP_Apparel_T60_Helmet_Paintjob_Base">
+		<defName>FCP_Apparel_T60_Hotrod_Flames_Power_Armor_Helmet</defName>
+		<label>T-60 Hotrodder Flame Job Helmet</label>
+		<description>A T-60 power armor helmet emblazoned with dazzling flame decals. This iconic hot rod design turns heads on the battlefield.</description>
+		<recipeMaker>
+			<researchPrerequisite>FCP_Research_Hotrodder_FlameJob</researchPrerequisite>
+		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armor_Headgear/T60_Hotrod_Flames_Helmet/FCP_T60_Hotrod_Flames_Power_Armor_Helmet_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
-		<smeltable>false</smeltable>
-		<statBases>
-			<WorkToMake>1200</WorkToMake>
-			<MaxHitPoints>80</MaxHitPoints>
-			<Mass>0.8</Mass>
-			<MarketValue>1200</MarketValue>
-			<ArmorRating_Sharp>1.45</ArmorRating_Sharp>
-			<ArmorRating_Blunt>1.45</ArmorRating_Blunt>
-			<ArmorRating_Heat>1.30</ArmorRating_Heat>
-			<Insulation_Heat>2</Insulation_Heat>
-			<EquipDelay>2</EquipDelay>
-		</statBases>
 		<equippedStatOffsets>
-			<ToxicEnvironmentResistance>1.0</ToxicEnvironmentResistance>
-			<AimingDelayFactor>-0.03</AimingDelayFactor>
+			<ShootingAccuracyPawn>0.05</ShootingAccuracyPawn>
+			<AimingDelayFactor>-0.01</AimingDelayFactor>
 			<SocialImpact>0.12</SocialImpact>
 		</equippedStatOffsets>
 		<apparel>
-			<bodyPartGroups>
-				<li>UpperHead</li>
-				<li>FullHead</li>
-			</bodyPartGroups>
 			<wornGraphicPath>Things/Apparel/Power_Armor_Headgear/T60_Hotrod_Flames_Helmet/FCP_T60_Hotrod_Flames_Power_Armor_Helmet</wornGraphicPath>
-			<layers>
-				<li>Overhead</li>
-			</layers>
-			<useDeflectMetalEffect>true</useDeflectMetalEffect>
-			<developmentalStageFilter>Adult</developmentalStageFilter>
 		</apparel>
-		<comps>
-			<li Class="FCP.Core.CompProperties_LabelColored">
-				<rarity>Rare</rarity>
-			</li>
-			<li Class="RangerRick_PowerArmor.CompProperties_ApparelRequirement">
-				<requiredApparels>
-					<li>FCP_Apparel_Power_Armor_Frame</li>
-				</requiredApparels>
-			</li>
-		</comps>
 	</ThingDef>
 
 	<!-- T-60 Hotrodder Shark Paint Helmet -->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Helmet_Base">
+	<ThingDef ParentName="FCP_Apparel_T60_Helmet_Paintjob_Base">
 		<defName>FCP_Apparel_T60_Shark_Paint_Power_Armor_Helmet</defName>
-		<generateCommonality>0</generateCommonality>
 		<label>T-60 Hotrodder Shark Paint Helmet</label>
 		<description>A T-60 power armor helmet with menacing shark teeth painted in the style of pre-war fighter planes.</description>
-		<techLevel>Industrial</techLevel>
 		<recipeMaker>
 			<researchPrerequisite>FCP_Research_Hotrodder_SharkPaint</researchPrerequisite>
-			<unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
-			<skillRequirements>
-				<Crafting>6</Crafting>
-			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
-		<costList>
-			<FCP_Apparel_Power_Armor_T60_Helmet>1</FCP_Apparel_Power_Armor_T60_Helmet>
-		</costList>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armor_Headgear/T60_Shark_Paint_Helmet/FCP_T60_Shark_Paint_Power_Armor_Helmet_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
-		<smeltable>false</smeltable>
-		<statBases>
-			<WorkToMake>1200</WorkToMake>
-			<MaxHitPoints>80</MaxHitPoints>
-			<Mass>0.8</Mass>
-			<MarketValue>1200</MarketValue>
-			<ArmorRating_Sharp>1.45</ArmorRating_Sharp>
-			<ArmorRating_Blunt>1.45</ArmorRating_Blunt>
-			<ArmorRating_Heat>1.30</ArmorRating_Heat>
-			<Insulation_Heat>2</Insulation_Heat>
-			<EquipDelay>2</EquipDelay>
-		</statBases>
 		<equippedStatOffsets>
-			<ToxicEnvironmentResistance>1.0</ToxicEnvironmentResistance>
-			<AimingDelayFactor>-0.03</AimingDelayFactor>
+			<MeleeDodgeChance>0.04</MeleeDodgeChance>
+			<ShootingAccuracyPawn>0.04</ShootingAccuracyPawn>
 			<SocialImpact>0.10</SocialImpact>
 		</equippedStatOffsets>
 		<apparel>
-			<bodyPartGroups>
-				<li>UpperHead</li>
-				<li>FullHead</li>
-			</bodyPartGroups>
 			<wornGraphicPath>Things/Apparel/Power_Armor_Headgear/T60_Shark_Paint_Helmet/FCP_T60_Shark_Paint_Power_Armor_Helmet</wornGraphicPath>
-			<layers>
-				<li>Overhead</li>
-			</layers>
-			<useDeflectMetalEffect>true</useDeflectMetalEffect>
-			<developmentalStageFilter>Adult</developmentalStageFilter>
 		</apparel>
-		<comps>
-			<li Class="FCP.Core.CompProperties_LabelColored">
-				<rarity>Rare</rarity>
-			</li>
-			<li Class="RangerRick_PowerArmor.CompProperties_ApparelRequirement">
-				<requiredApparels>
-					<li>FCP_Apparel_Power_Armor_Frame</li>
-				</requiredApparels>
-			</li>
-		</comps>
 	</ThingDef>
 
 	<!-- T-60 Hotrodder Hotpink Helmet -->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Helmet_Base">
+	<ThingDef ParentName="FCP_Apparel_T60_Helmet_Paintjob_Base">
 		<defName>FCP_Apparel_T60_Hotrod_Pink_Power_Armor_Helmet</defName>
-		<generateCommonality>0</generateCommonality>
 		<label>T-60 Hotrodder Hotpink Helmet</label>
 		<description>A T-60 power armor helmet in bold, vibrant hot pink. This eye-catching color scheme ensures you'll never be overlooked.</description>
-		<techLevel>Industrial</techLevel>
 		<recipeMaker>
 			<researchPrerequisite>FCP_Research_Hotrodder_Hotpink</researchPrerequisite>
-			<unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
-			<skillRequirements>
-				<Crafting>6</Crafting>
-			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
-		<costList>
-			<FCP_Apparel_Power_Armor_T60_Helmet>1</FCP_Apparel_Power_Armor_T60_Helmet>
-		</costList>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armor_Headgear/T60_Hotrod_Pink_Helmet/FCP_T60_Hotrod_Pink_Power_Armor_Helmet_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
-		<smeltable>false</smeltable>
-		<statBases>
-			<WorkToMake>1200</WorkToMake>
-			<MaxHitPoints>80</MaxHitPoints>
-			<Mass>0.8</Mass>
-			<MarketValue>1200</MarketValue>
-			<ArmorRating_Sharp>1.45</ArmorRating_Sharp>
-			<ArmorRating_Blunt>1.45</ArmorRating_Blunt>
-			<ArmorRating_Heat>1.30</ArmorRating_Heat>
-			<Insulation_Heat>2</Insulation_Heat>
-			<EquipDelay>2</EquipDelay>
-		</statBases>
 		<equippedStatOffsets>
-			<ToxicEnvironmentResistance>1.0</ToxicEnvironmentResistance>
-			<AimingDelayFactor>-0.03</AimingDelayFactor>
-			<SocialImpact>0.06</SocialImpact>
+			<NegotiationAbility>0.10</NegotiationAbility>
+			<SocialImpact>0.15</SocialImpact>
 		</equippedStatOffsets>
 		<apparel>
-			<bodyPartGroups>
-				<li>UpperHead</li>
-				<li>FullHead</li>
-			</bodyPartGroups>
 			<wornGraphicPath>Things/Apparel/Power_Armor_Headgear/T60_Hotrod_Pink_Helmet/FCP_T60_Hotrod_Pink_Power_Armor_Helmet</wornGraphicPath>
-			<layers>
-				<li>Overhead</li>
-			</layers>
-			<useDeflectMetalEffect>true</useDeflectMetalEffect>
-			<developmentalStageFilter>Adult</developmentalStageFilter>
 		</apparel>
-		<comps>
-			<li Class="FCP.Core.CompProperties_LabelColored">
-				<rarity>Rare</rarity>
-			</li>
-			<li Class="RangerRick_PowerArmor.CompProperties_ApparelRequirement">
-				<requiredApparels>
-					<li>FCP_Apparel_Power_Armor_Frame</li>
-				</requiredApparels>
-			</li>
-		</comps>
 	</ThingDef>
 
 </Defs>