From 8ea543226f4152dae4d9267cfe24ef661f2b3140 Mon Sep 17 00:00:00 2001
From: RickGrymes <81042907+RickGrymes@users.noreply.github.com>
Date: Fri, 20 Feb 2026 21:09:32 -0600
Subject: [PATCH] Reapply "Merge pull request #1 from AlvalorDev/main"

This reverts commit de624b628fc204f02d724b94650204aa36f1058d.
---
 .../ThingDefs_Wastelander_Apparel.xml         | 341 +++---------------
 .../ThingDefs_Wastelander_Headgear.xml        |  72 +---
 2 files changed, 77 insertions(+), 336 deletions(-)

diff --git a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Wastelander_Apparel.xml b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Wastelander_Apparel.xml
index b924082..4646275 100644
--- a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Wastelander_Apparel.xml
+++ b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Wastelander_Apparel.xml
@@ -59,7 +59,7 @@
 
 	<!-- Combat Armor Light -->
 
-	<ThingDef ParentName="ApparelBase">
+	<ThingDef ParentName="FCP_Armor_Machineable_Base">
 		<defName>FCP_Apparel_Combat_Armor_Light</defName>
 		<description>The combat armor was the standard-issue armor of the US army before the war. It is composed of armor plates made from defensive polymer attached to pieces of ballistic fibre. It offers more protection than metal armor, while being somewhat lighter. It is rare and expensive since few groups have the knowledge, and resources, to produce more and many suits are scavenged from pre-war military caches. While still rare, the light combat armor is the most available variant. It offers quite good protection while being lightweight.</description>
 		<label>Combat Armor Light</label>
@@ -68,18 +68,11 @@
 			<texPath>Things/Apparel/Wasteland_Apparel/CombatArmorLight/FCP_Combat_Armor_Chestpiece_Modular_Light</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
-		<thingCategories>
-			<li>ApparelArmor</li>
-		</thingCategories>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>5</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_CombatArmorStandard</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Steel>45</Steel>
@@ -125,7 +118,7 @@
 
 	<!-- Combat Armor Sturdy -->
 
-	<ThingDef ParentName="ApparelBase">
+	<ThingDef ParentName="FCP_Armor_Machineable_Base">
 		<defName>FCP_Apparel_Combat_Armor_Sturdy</defName>
 		<description>The combat armor was the standard-issue armor of the US army before the war. It is composed of armor plates made from defensive polymer attached to pieces of ballistic fibre. It offers more protection than metal armor, while being somewhat lighter. It is rare and expensive since few groups have the knowledge, and resources, to produce more and many suits are scavenged from pre-war military caches. Medium combat armor provides great protection, albeit it is quite heavy. It�s best suited for warriors in the midst of battle.</description>
 		<label>Combat Armor Sturdy</label>
@@ -134,18 +127,11 @@
 			<texPath>Things/Apparel/Wasteland_Apparel/CombatArmorSturdy/FCP_Combat_Armor_Chestpiece_Modular_Sturdy</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
-		<thingCategories>
-			<li>ApparelArmor</li>
-		</thingCategories>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>6</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_CombatArmorStandard</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Steel>55</Steel>
@@ -190,7 +176,7 @@
 
 	<!-- Combat Armor Heavy-->
 
-	<ThingDef ParentName="ApparelBase">
+	<ThingDef ParentName="FCP_Armor_Machineable_Base">
 		<defName>FCP_Apparel_Combat_Armor_Heavy</defName>
 		<description>The combat armor was the standard-issue armor of the US army before the war. It is composed of armor plates made from defensive polymer attached to pieces of ballistic fibre. It offers more protection than metal armor, while being somewhat lighter. It is rare and expensive since few groups have the knowledge, and resources, to produce more and many suits are scavenged from pre-war military caches. Exotic and powerful, heavy combat armor offers superior protection against all kinds of damage. Obviously, it is very heavy, but only power armor guards its wearer better against the perils of the wasteland.</description>
 		<label>Combat Armor Heavy</label>
@@ -199,18 +185,11 @@
 			<texPath>Things/Apparel/Wasteland_Apparel/CombatArmorHeavy/FCP_Combat_Armor_Chestpiece_Modular_Heavy</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
-		<thingCategories>
-			<li>ApparelArmor</li>
-		</thingCategories>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>7</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_CombatArmorStandard</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Steel>70</Steel>
@@ -255,7 +234,7 @@
 
 	<!-- Reinforced Combat Armor -->
 
-	<ThingDef ParentName="ApparelBase">
+	<ThingDef ParentName="FCP_Armor_Machineable_Base">
 		<defName>FCP_Apparel_Reinforced_Combat_Armor</defName>
 		<label>Reinforced Combat Armor</label>
 		<description>A more advanced version of the standard combat armor.</description>
@@ -264,21 +243,14 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<thingCategories>
-			<li>ApparelArmor</li>
-		</thingCategories>
 		<tradeTags>
 			<li>Armor</li>
 		</tradeTags>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>8</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_CombatArmorStandard</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Steel>80</Steel>
@@ -329,7 +301,7 @@
 
 	<!-- Reinforced Combat Armor II -->
 
-	<ThingDef ParentName="ApparelBase">
+	<ThingDef ParentName="FCP_Armor_Machineable_Base">
 		<defName>FCP_Apparel_Reinforced_Combat_Armor_II</defName>
 		<label>Reinforced Combat Armor II</label>
 		<description>An even more advanced version of the reinforced combat armor, offering more protection.</description>
@@ -338,18 +310,11 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<thingCategories>
-			<li>ApparelArmor</li>
-		</thingCategories>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>9</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_CombatArmorStandard</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Steel>90</Steel>
@@ -413,15 +378,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_MilitaryUniforms</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -483,15 +444,11 @@
 			<Insulation_Heat>2.3</Insulation_Heat>
 			<EquipDelay>3</EquipDelay>
 		</statBases>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_MilitaryUniforms</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -531,15 +488,11 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_BusinessWear</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -597,15 +550,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_BusinessWear</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -654,15 +603,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_CasualWear</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -712,15 +657,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_CasualWear</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -770,15 +711,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_MilitaryUniforms</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -833,15 +770,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_CasualWear</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -890,15 +823,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_CasualWear</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -954,15 +883,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_CasualWear</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -1017,15 +942,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_CasualWear</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -1075,15 +996,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_BusinessWear</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -1134,15 +1051,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_BusinessWear</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -1196,15 +1109,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_BusinessWear</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -1259,15 +1168,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_Costumes</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -1322,15 +1227,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_Costumes</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -1393,15 +1294,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_Costumes</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -1463,15 +1360,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_Costumes</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -1526,15 +1419,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_Costumes</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -1597,15 +1486,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_Costumes</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -1670,15 +1555,11 @@
 			<EquipDelay>3</EquipDelay>
 		</statBases>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_CasualWear</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -1716,14 +1597,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Leather_Plain>50</Leather_Plain>
@@ -1773,14 +1650,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>35</Cloth>
@@ -1829,15 +1702,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_CasualWear</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -1886,15 +1755,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_CasualWear</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -1942,14 +1807,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>35</Cloth>
@@ -1993,14 +1854,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<smeltable>false</smeltable>
 		<statBases>
@@ -2054,14 +1911,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<statBases>
 			<MaxHitPoints>120</MaxHitPoints>
@@ -2110,14 +1963,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<statBases>
 			<MaxHitPoints>120</MaxHitPoints>
@@ -2175,14 +2024,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<statBases>
 			<MaxHitPoints>120</MaxHitPoints>
@@ -2241,15 +2086,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_BusinessWear</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>25</Cloth>
@@ -2298,14 +2139,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<statBases>
 			<MaxHitPoints>120</MaxHitPoints>
@@ -2363,14 +2200,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<statBases>
 			<MaxHitPoints>120</MaxHitPoints>
@@ -2420,14 +2253,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<statBases>
 			<MaxHitPoints>120</MaxHitPoints>
@@ -2479,14 +2308,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<statBases>
 			<MaxHitPoints>120</MaxHitPoints>
@@ -2539,14 +2364,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<statBases>
 			<MaxHitPoints>120</MaxHitPoints>
@@ -2600,14 +2421,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<statBases>
 			<MaxHitPoints>120</MaxHitPoints>
@@ -2717,14 +2534,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>70</Cloth>
@@ -2773,14 +2586,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Leather_Plain>60</Leather_Plain>
@@ -2826,14 +2635,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Leather_Plain>50</Leather_Plain>
@@ -2880,14 +2685,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<statBases>
 			<MaxHitPoints>120</MaxHitPoints>
@@ -2942,14 +2743,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<statBases>
 			<MaxHitPoints>120</MaxHitPoints>
@@ -2997,14 +2794,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 			<drawSize>0.90</drawSize>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<statBases>
 			<MaxHitPoints>120</MaxHitPoints>
@@ -3042,7 +2835,7 @@
 
 	<!-- Leather Armor -->
 
-	<ThingDef ParentName="ApparelBase">
+	<ThingDef ParentName="FCP_Apparel_Makeable_Base">
 		<defName>FCP_Apparel_Leather_Armor</defName>
 		<label>Leather Armor</label>
 		<description>Leather armor is a type of armor composed of various pieces of tanned animal hide stitched together. While providing less protection than metal armor, leather armor is lighter and easier to produce.</description>
@@ -3050,15 +2843,11 @@
 			<texPath>Things/Apparel/Wasteland_Apparel/LeatherArmor/FCP_Leather_Armor</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>3</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_Armor_Production</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Leather_Plain>60</Leather_Plain>
@@ -3104,7 +2893,7 @@
 
 	<!-- Metal Armor -->
 
-	<ThingDef ParentName="ApparelBase">
+	<ThingDef ParentName="FCP_Armor_Machineable_Base">
 		<defName>FCP_Apparel_Metal_Armor</defName>
 		<label>Metal Armor</label>
 		<description>Metal armor is composed of various metal plates attached to pieces of leather. While offering superior protection compared to leather armor, it is considerably heavier and more difficult to craft. Common materials include steel, iron, and scrap metal welded together.</description>
@@ -3112,15 +2901,11 @@
 			<texPath>Things/Apparel/Wasteland_Apparel/Metal_Armor/FCP_Metal_Armor</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>4</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_Armor_Production</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Steel>40</Steel>
@@ -3175,15 +2960,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>3</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_CasualWear</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>30</Cloth>
@@ -3232,15 +3013,11 @@
 			<drawSize>0.90</drawSize>
 		</graphicData>
 		<smeltable>false</smeltable>
-		<recipeMaker Inherit="false">
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+		<recipeMaker>
 			<skillRequirements>
 				<Crafting>3</Crafting>
 			</skillRequirements>
 			<researchPrerequisite>FCP_Research_CasualWear</researchPrerequisite>
-			<recipeUsers>
-				<li>FCP_Production_Tailoring_Workbench</li>
-			</recipeUsers>
 		</recipeMaker>
 		<costList>
 			<Cloth>30</Cloth>
diff --git a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Wastelander_Headgear.xml b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Wastelander_Headgear.xml
index aa1b4e7..b1fd228 100644
--- a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Wastelander_Headgear.xml
+++ b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Wastelander_Headgear.xml
@@ -11,14 +11,12 @@
 
     <!-- Combat Armor Helmet Base -->
 
-    <ThingDef Name="FCP_Apparel_Combat_Helmet_Base" ParentName="HatMakeableBase" Abstract="true">
-        <techLevel>Industrial</techLevel>
+    <ThingDef Name="FCP_Apparel_Combat_Helmet_Base" ParentName="FCP_Armor_Helmet_Makeable_Base" Abstract="true">
         <smeltable>false</smeltable>
         <graphicData>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <recipeMaker>
-            <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>8</Crafting>
             </skillRequirements>
@@ -74,18 +72,16 @@
 
     <!-- Rivet City Security Helmet -->
 
-    <ThingDef ParentName="HatMakeableBase">
+    <ThingDef ParentName="FCP_Armor_Helmet_Makeable_Base">
         <defName>FCP_Apparel_Rivet_City_Security_Helmet</defName>
         <label>Rivet City Security Helmet</label>
         <description>A helmet worn by the security forces of Rivet City.</description>
-        <techLevel>Industrial</techLevel>
         <graphicData>
             <texPath>Things/Apparel/Wasteland_Apparel/RivetCitySecurity/Rivit_City_Security_Helmet/FCP_Rivit_City_Security_Helmet</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <smeltable>false</smeltable>
         <recipeMaker>
-            <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
             <researchPrerequisite>FCP_Research_CombatArmorStandard</researchPrerequisite>
             <skillRequirements>
                 <Crafting>8</Crafting>
@@ -126,18 +122,16 @@
 
     <!-- Combat Armor Helmet (Fallout 4) -->
 
-    <ThingDef ParentName="HatMakeableBase">
+    <ThingDef ParentName="FCP_Armor_Helmet_Makeable_Base">
         <defName>FCP_Apparel_Combat_Armor_Helmet</defName>
         <label>Modular Combat Armor Helmet</label>
         <description>The combat armor helmet is the corresponding armor piece to the combat armor set. This model displays what is possibly a headlamp, attached to the left side above the brow line.</description>
-        <techLevel>Industrial</techLevel>
         <graphicData>
             <texPath>Things/Apparel/Wasteland_Apparel/CombatArmorHelmet/FCP_Combat_Armor_Helmet_Modular</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <smeltable>false</smeltable>
         <recipeMaker>
-            <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
             <researchPrerequisite>FCP_Research_CombatArmorStandard</researchPrerequisite>
             <skillRequirements>
                 <Crafting>8</Crafting>
@@ -180,18 +174,16 @@
 
     <!-- Reinforced Combat Armor Helmet -->
 
-    <ThingDef ParentName="HatMakeableBase">
+    <ThingDef ParentName="FCP_Armor_Helmet_Makeable_Base">
         <defName>FCP_Apparel_Reinforced_Combat_Armor_Helmet</defName>
         <label>Reinforced Combat Armor Helmet</label>
         <description>The helmet is a ballistic assembly, designed to protect the wearer from projectile, bladed weapons, and blunt trauma. An integrated polarized visor protects the user's eyes from the ordinary battlefield hazards of grit and dust.</description>
-        <techLevel>Industrial</techLevel>
         <graphicData>
             <texPath>Things/Apparel/Wasteland_Apparel/ReinforcedCombatArmor/FCP_Reinforced_Combat_Armor_Helmet</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <smeltable>false</smeltable>
         <recipeMaker>
-            <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
             <researchPrerequisite>FCP_Research_CombatArmorStandard</researchPrerequisite>
             <skillRequirements>
                 <Crafting>10</Crafting>
@@ -234,18 +226,16 @@
 
     <!-- Reinforced Combat Armor Helmet Mk II-->
 
-    <ThingDef ParentName="HatMakeableBase">
+    <ThingDef ParentName="FCP_Armor_Helmet_Makeable_Base">
         <defName>FCP_Apparel_Reinforced_Combat_Armor_Helmet_Mk_II</defName>
         <label>Reinforced Combat Armor Helmet</label>
         <description>The helmet is a ballistic assembly, designed to protect the wearer from projectile, bladed weapons, and blunt trauma. An integrated polarized visor protects the user's eyes from the ordinary battlefield hazards of grit and dust. It is similar in appearance to the helmet used with the reinforced suit but is a different color.</description>
-        <techLevel>Industrial</techLevel>
         <graphicData>
             <texPath>Things/Apparel/Wasteland_Apparel/ReinforcedCombatArmorII/FCP_Reinforced_Combat_Armor_Helmet_Mk_II</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <smeltable>false</smeltable>
         <recipeMaker>
-            <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
             <researchPrerequisite>FCP_Research_CombatArmorStandard</researchPrerequisite>
             <skillRequirements>
                 <Crafting>10</Crafting>
@@ -292,10 +282,8 @@
 
     <!--Officers Cap Base -->
 
-    <ThingDef ParentName="HatMakeableBase" Name="FCP_Apparel_Officers_Cap_Base" Abstract="true">
-        <techLevel>Industrial</techLevel>
+    <ThingDef ParentName="FCP_Hat_Makeable_Base" Name="FCP_Apparel_Officers_Cap_Base" Abstract="true">
         <recipeMaker>
-            <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>5</Crafting>
             </skillRequirements>
@@ -333,18 +321,16 @@
 
     <!-- Army Helmet -->
 
-    <ThingDef ParentName="HatMakeableBase">
+    <ThingDef ParentName="FCP_Armor_Helmet_Makeable_Base">
         <defName>FCP_Apparel_Army_Helmet</defName>
         <label>Army Helmet</label>
         <description>Part of the army uniform, this helmet offers a little protection.</description>
-        <techLevel>Industrial</techLevel>
         <graphicData>
             <texPath>Things/Apparel/Wasteland_Apparel/ArmyUniform/FCP_Army_Helmet_Clean</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <smeltable>false</smeltable>
         <recipeMaker>
-            <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
             <researchPrerequisite>FCP_Research_MilitaryUniforms</researchPrerequisite>
             <skillRequirements>
                 <Crafting>6</Crafting>
@@ -385,18 +371,16 @@
 
     <!-- Radiation Suit helmet-->
 
-    <ThingDef ParentName="HatMakeableBase">
+    <ThingDef ParentName="FCP_Armor_Helmet_Makeable_Base">
         <defName>FCP_Apparel_Radiations_Suit_Helmet</defName>
         <label>Radiation Suit Helmet</label>
         <description>A helmet designed to protect the wearer from radiation exposure. Part of the radiation suit set.</description>
-        <techLevel>Industrial</techLevel>
         <graphicData>
             <texPath>Things/Apparel/Wasteland_Apparel/RadiationSuit/FCP_Radiation_Suit_Helmet</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <smeltable>false</smeltable>
         <recipeMaker>
-            <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
             <researchPrerequisite>FCP_Research_MilitaryUniforms</researchPrerequisite>
             <skillRequirements>
                 <Crafting>8</Crafting>
@@ -441,17 +425,15 @@
 
     <!-- Sheriff Hat -->
 
-    <ThingDef ParentName="HatMakeableBase">
+    <ThingDef ParentName="FCP_Hat_Makeable_Base">
         <defName>FCP_Apparel_Sheriff_Hat</defName>
         <label>Sheriff Hat</label>
         <description>Part of the sheriff duster outfit. it gives a little buff to perception.</description>
-        <techLevel>Industrial</techLevel>
         <graphicData>
             <texPath>Things/Apparel/Wasteland_Apparel/SheriffDuster/FCP_Sheriff_Hat</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <recipeMaker>
-            <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
             <researchPrerequisite>FCP_Research_CasualWear</researchPrerequisite>
             <skillRequirements>
                 <Crafting>4</Crafting>
@@ -491,17 +473,15 @@
 
     <!-- Ranger Gas Mask -->
 
-    <ThingDef ParentName="HatMakeableBase">
+    <ThingDef ParentName="FCP_Hat_Makeable_Base">
         <defName>FCP_Apparel_Gas_Ranger_Gas_Mask</defName>
         <label>Ranger Gas Mask</label>
         <description>A gas mask to go with the gas ranger outfit.</description>
-        <techLevel>Industrial</techLevel>
         <graphicData>
             <texPath>Things/Apparel/Wasteland_Apparel/GasRanger/GasRangerWhite/FCP_Rickys_Rando_Rangers_Gas_Mask_White</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <recipeMaker>
-            <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
             <researchPrerequisite>FCP_Research_CasualWear</researchPrerequisite>
             <skillRequirements>
                 <Crafting>6</Crafting>
@@ -542,7 +522,7 @@
 
     <!-- Gas Mask (Goggles) -->
 
-    <ThingDef ParentName="ApparelBase">
+    <ThingDef ParentName="FCP_Hat_Makeable_Base">
         <defName>FCP_Apparel_Gasmask_Goggles</defName>
         <description>A simple gas mask that covers the entire face, often seen worn by raiders. It is held on to the wearer by adjustable straps. It's not very protective against bullets and other physical attacks but provides medium protection against toxins and radiation.</description>
         <label>Gas Mask with Goggles</label>
@@ -551,15 +531,11 @@
             <texPath>Things/Apparel/Wasteland_Apparel/Gas_Mask_With_Goggles/FCP_Gas_Mask_With_Goggles</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
-        <recipeMaker Inherit= "false">
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+        <recipeMaker>
             <skillRequirements>
                 <Crafting>4</Crafting>
             </skillRequirements>
             <researchPrerequisite>FCP_Research_Apparel_Production</researchPrerequisite>
-            <recipeUsers>
-                <li>FCP_Production_Tailoring_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <costList>
             <Cloth>15</Cloth>
@@ -604,7 +580,7 @@
 
     <!-- Assault Gasmask -->
 
-    <ThingDef ParentName="ApparelBase">
+    <ThingDef ParentName="FCP_Hat_Makeable_Base">
         <defName>FCP_Apparel_Assault_Gas_Mask</defName>
         <description>An armored gasmask worn underneath a cloth hood. It provides decent protection against bullets and hazardous gases and similar substances and is most often worn by raiders.</description>
         <label>Assault Gasmask</label>
@@ -613,15 +589,11 @@
             <texPath>Things/Apparel/Wasteland_Apparel/Assault_Gas_Mask/FCP_Assault_Gas_Mask</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
-        <recipeMaker Inherit= "false">
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
+        <recipeMaker>
             <skillRequirements>
                 <Crafting>4</Crafting>
             </skillRequirements>
             <researchPrerequisite>FCP_Research_Apparel_Production</researchPrerequisite>
-            <recipeUsers>
-                <li>FCP_Production_Tailoring_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <costList>
             <Cloth>15</Cloth>
@@ -669,17 +641,15 @@
 
     <!-- Slave Bandana -->
 
-    <ThingDef ParentName="HatMakeableBase">
+    <ThingDef ParentName="FCP_Hat_Makeable_Base">
         <defName>FCP_Apparel_Slave_Bandana</defName>
         <label>Slave Bandana</label>
         <description>A bandana tipically worn by slaves.</description>
-        <techLevel>Industrial</techLevel>
         <graphicData>
             <texPath>Things/Apparel/Wasteland_Apparel/SlaveBandana/FCP_Slave_Bandana</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <recipeMaker>
-            <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
             <researchPrerequisite>FCP_Research_CasualWear</researchPrerequisite>
             <skillRequirements>
                 <Crafting>3</Crafting>
@@ -717,17 +687,15 @@
 
     <!-- Slave Rag Hood -->
 
-    <ThingDef ParentName="HatMakeableBase">
+    <ThingDef ParentName="FCP_Hat_Makeable_Base">
         <defName>FCP_Apparel_Slave_Rag_Hood</defName>
         <label>Slave Rag Hood</label>
         <description>A scarf used to create a hood, tipically worn by slaves.</description>
-        <techLevel>Industrial</techLevel>
         <graphicData>
             <texPath>Things/Apparel/Wasteland_Apparel/SlaveRagHood/FCP_Slave_Rag_Hood</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <recipeMaker>
-            <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
             <researchPrerequisite>FCP_Research_CasualWear</researchPrerequisite>
             <skillRequirements>
                 <Crafting>3</Crafting>
@@ -768,11 +736,10 @@
 
     <!-- Slave Scarf Hat -->
 
-    <ThingDef ParentName="HatMakeableBase">
+    <ThingDef ParentName="FCP_Hat_Makeable_Base">
         <defName>FCP_Apparel_Slave_Scarf_Hat</defName>
         <label>Slave Scarf Hat</label>
         <description>A scarf used to create a hat, tipically worn by slaves.</description>
-        <techLevel>Industrial</techLevel>
         <graphicData>
             <texPath>Things/Apparel/Wasteland_Apparel/SlaveScarfHat/FCP_Slave_Scarf_Hat</texPath>
             <graphicClass>Graphic_Single</graphicClass>
@@ -781,7 +748,6 @@
             <Cloth>15</Cloth>
         </costList>
         <recipeMaker>
-            <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
             <researchPrerequisite>FCP_Research_CasualWear</researchPrerequisite>
             <skillRequirements>
                 <Crafting>3</Crafting>
@@ -819,11 +785,10 @@
 
 	<!-- Wrapped Cap -->
 
-	<ThingDef ParentName="HatMakeableBase">
+	<ThingDef ParentName="FCP_Hat_Makeable_Base">
         <defName>FCP_Apparel_Wrapped_Cap</defName>
         <label>Wrapped Cap</label>
         <description>A simple cap made of wrapped cloth, commonly worn by wastelanders for sun protection. Lightweight and provides basic protection from the elements.</description>
-        <techLevel>Industrial</techLevel>
         <graphicData>
             <texPath>Things/Apparel/Wasteland_Apparel/Wrapped_Cap/FCP_Wrapped_Cap</texPath>
             <graphicClass>Graphic_Single</graphicClass>
@@ -832,7 +797,6 @@
             <Cloth>15</Cloth>
         </costList>
         <recipeMaker>
-            <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
             <researchPrerequisite>FCP_Research_CasualWear</researchPrerequisite>
             <skillRequirements>
                 <Crafting>2</Crafting>