diff --git a/1.6/Defs/WeaponDefs/WeaponDefs_Flame.xml b/1.6/Defs/WeaponDefs/WeaponDefs_Flame.xml
index 82a2976..4f146b1 100644
--- a/1.6/Defs/WeaponDefs/WeaponDefs_Flame.xml
+++ b/1.6/Defs/WeaponDefs/WeaponDefs_Flame.xml
@@ -15,34 +15,18 @@
             <texPath>Things/Weapons/Flame/FCP_Flamer_mkI</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
-        <soundInteract>Interact_Autopistol</soundInteract>
-        <recipeMaker>
-            <researchPrerequisites>
-                <li>FCP_Research_Energy_Based_Weaponry</li>
-            </researchPrerequisites>
-            <skillRequirements>
-                <Crafting>6</Crafting>
-            </skillRequirements>
-        </recipeMaker>
-        <thingSetMakerTags>
+        <soundInteract>Interact_Autopistol</soundInteract>        <thingSetMakerTags>
             <li>RewardStandardQualitySuper</li>
         </thingSetMakerTags>
         <statBases>
             <MarketValue>980</MarketValue>
-            <WorkToMake>50000</WorkToMake>
             <Mass>5.5</Mass>
             <AccuracyTouch>0.90</AccuracyTouch>
             <AccuracyShort>0.75</AccuracyShort>
             <AccuracyMedium>0.50</AccuracyMedium>
             <AccuracyLong>0.30</AccuracyLong>
             <RangedWeapon_Cooldown>1.8</RangedWeapon_Cooldown>
-        </statBases>
-        <costList>
-            <Steel>70</Steel>
-            <ComponentIndustrial>6</ComponentIndustrial>
-            <Chemfuel>20</Chemfuel>
-        </costList>
-        <weaponTags>
+        </statBases>        <weaponTags>
             <li>FCP_Energy_Weapon</li>
             <li>FCP_Flame_Weapon</li>
         </weaponTags>
@@ -119,34 +103,18 @@
             <texPath>Things/Weapons/Flame/FCP_Flamer_mkII</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
-        <soundInteract>Interact_Autopistol</soundInteract>
-        <recipeMaker>
-            <researchPrerequisites>
-                <li>FCP_Research_Energy_Based_Weaponry</li>
-            </researchPrerequisites>
-            <skillRequirements>
-                <Crafting>7</Crafting>
-            </skillRequirements>
-        </recipeMaker>
-        <thingSetMakerTags>
+        <soundInteract>Interact_Autopistol</soundInteract>        <thingSetMakerTags>
             <li>RewardStandardQualitySuper</li>
         </thingSetMakerTags>
         <statBases>
             <MarketValue>1200</MarketValue>
-            <WorkToMake>55000</WorkToMake>
             <Mass>5.0</Mass>
             <AccuracyTouch>0.92</AccuracyTouch>
             <AccuracyShort>0.80</AccuracyShort>
             <AccuracyMedium>0.60</AccuracyMedium>
             <AccuracyLong>0.35</AccuracyLong>
             <RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
-        </statBases>
-        <costList>
-            <Steel>80</Steel>
-            <ComponentIndustrial>8</ComponentIndustrial>
-            <Chemfuel>25</Chemfuel>
-        </costList>
-        <weaponTags>
+        </statBases>        <weaponTags>
             <li>FCP_Energy_Weapon</li>
             <li>FCP_Flame_Weapon</li>
         </weaponTags>
diff --git a/1.6/Defs/WeaponDefs/WeaponDefs_Gauss.xml b/1.6/Defs/WeaponDefs/WeaponDefs_Gauss.xml
index a517216..f6b11b9 100644
--- a/1.6/Defs/WeaponDefs/WeaponDefs_Gauss.xml
+++ b/1.6/Defs/WeaponDefs/WeaponDefs_Gauss.xml
@@ -18,7 +18,6 @@
         <soundInteract>Interact_Rifle</soundInteract>
         <statBases>
             <MarketValue>1300</MarketValue>
-            <WorkToMake>55000</WorkToMake>
             <Mass>2.8</Mass>
             <AccuracyTouch>0.85</AccuracyTouch>
             <AccuracyShort>0.82</AccuracyShort>
@@ -26,16 +25,6 @@
             <AccuracyLong>0.55</AccuracyLong>
             <RangedWeapon_Cooldown>1.3</RangedWeapon_Cooldown>
         </statBases>
-        <recipeMaker>
-            <researchPrerequisite>FCP_Research_Gauss_Weapons_Manufacturing</researchPrerequisite>
-            <skillRequirements>
-                <Crafting>8</Crafting>
-            </skillRequirements>
-        </recipeMaker>
-        <costList>
-            <Plasteel>35</Plasteel>
-            <ComponentSpacer>3</ComponentSpacer>
-        </costList>
         <thingSetMakerTags>
             <li>RewardStandardLowFreq</li>
             <li>RewardStandardQualitySuper</li>
@@ -98,7 +87,6 @@
         <soundInteract>Interact_Rifle</soundInteract>
         <statBases>
             <MarketValue>1700</MarketValue>
-            <WorkToMake>70000</WorkToMake>
             <Mass>4.5</Mass>
             <AccuracyTouch>0.75</AccuracyTouch>
             <AccuracyShort>0.82</AccuracyShort>
@@ -106,16 +94,6 @@
             <AccuracyLong>0.85</AccuracyLong>
             <RangedWeapon_Cooldown>1.9</RangedWeapon_Cooldown>
         </statBases>
-        <recipeMaker>
-            <researchPrerequisite>FCP_Research_Gauss_Weapons_Manufacturing</researchPrerequisite>
-            <skillRequirements>
-                <Crafting>10</Crafting>
-            </skillRequirements>
-        </recipeMaker>
-        <costList>
-            <Plasteel>60</Plasteel>
-            <ComponentSpacer>6</ComponentSpacer>
-        </costList>
         <thingSetMakerTags>
             <li>RewardStandardLowFreq</li>
             <li>RewardStandardQualitySuper</li>
@@ -179,7 +157,6 @@
         <soundInteract>Interact_Rifle</soundInteract>
         <statBases>
             <MarketValue>2400</MarketValue>
-            <WorkToMake>90000</WorkToMake>
             <Mass>8.0</Mass>
             <AccuracyTouch>0.60</AccuracyTouch>
             <AccuracyShort>0.70</AccuracyShort>
@@ -187,16 +164,6 @@
             <AccuracyLong>0.50</AccuracyLong>
             <RangedWeapon_Cooldown>3.2</RangedWeapon_Cooldown>
         </statBases>
-        <recipeMaker>
-            <researchPrerequisite>FCP_Research_Gauss_Weapons_Manufacturing</researchPrerequisite>
-            <skillRequirements>
-                <Crafting>11</Crafting>
-            </skillRequirements>
-        </recipeMaker>
-        <costList>
-            <Plasteel>90</Plasteel>
-            <ComponentSpacer>10</ComponentSpacer>
-        </costList>
         <thingSetMakerTags>
             <li>RewardStandardLowFreq</li>
             <li>RewardStandardQualitySuper</li>
@@ -254,7 +221,6 @@
         <soundInteract>Interact_Rifle</soundInteract>
         <statBases>
             <MarketValue>2600</MarketValue>
-            <WorkToMake>80000</WorkToMake>
             <Mass>5.5</Mass>
             <AccuracyTouch>0.70</AccuracyTouch>
             <AccuracyShort>0.85</AccuracyShort>
@@ -262,16 +228,6 @@
             <AccuracyLong>0.95</AccuracyLong>
             <RangedWeapon_Cooldown>2.2</RangedWeapon_Cooldown>
         </statBases>
-        <recipeMaker>
-            <researchPrerequisite>FCP_Research_Gauss_Weapons_Manufacturing</researchPrerequisite>
-            <skillRequirements>
-                <Crafting>11</Crafting>
-            </skillRequirements>
-        </recipeMaker>
-        <costList>
-            <Plasteel>70</Plasteel>
-            <ComponentSpacer>8</ComponentSpacer>
-        </costList>
         <thingSetMakerTags>
             <li>RewardStandardLowFreq</li>
             <li>RewardStandardQualitySuper</li>
diff --git a/1.6/Defs/WeaponDefs/WeaponDefs_Laser.xml b/1.6/Defs/WeaponDefs/WeaponDefs_Laser.xml
index af5804c..e130074 100644
--- a/1.6/Defs/WeaponDefs/WeaponDefs_Laser.xml
+++ b/1.6/Defs/WeaponDefs/WeaponDefs_Laser.xml
@@ -18,7 +18,6 @@
         <soundInteract>FCP_Sound_Interact_Laser_Pistol</soundInteract>
         <statBases>
             <MarketValue>800</MarketValue>
-            <WorkToMake>45000</WorkToMake>
             <Mass>3.6</Mass>
             <AccuracyTouch>0.80</AccuracyTouch>
             <AccuracyShort>0.75</AccuracyShort>
@@ -26,16 +25,6 @@
             <AccuracyLong>0.50</AccuracyLong>
             <RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
         </statBases>
-        <recipeMaker>
-            <researchPrerequisite>FCP_Research_Laser_Weapon_Manufacturing</researchPrerequisite>
-            <skillRequirements>
-                <Crafting>6</Crafting>
-            </skillRequirements>
-        </recipeMaker>
-        <costList>
-            <Plasteel>25</Plasteel>
-            <ComponentSpacer>2</ComponentSpacer>
-        </costList>
         <thingSetMakerTags>
             <li>RewardStandardLowFreq</li>
             <li>RewardStandardQualitySuper</li>
@@ -103,7 +92,6 @@
         <soundInteract>FCP_Sound_Interact_Laser_Rifle</soundInteract>
         <statBases>
             <MarketValue>1200</MarketValue>
-            <WorkToMake>65000</WorkToMake>
             <Mass>3.6</Mass>
             <AccuracyTouch>0.85</AccuracyTouch>
             <AccuracyShort>0.80</AccuracyShort>
@@ -111,16 +99,6 @@
             <AccuracyLong>0.70</AccuracyLong>
             <RangedWeapon_Cooldown>0.88</RangedWeapon_Cooldown>
         </statBases>
-        <recipeMaker>
-            <researchPrerequisite>FCP_Research_Laser_Weapon_Manufacturing</researchPrerequisite>
-            <skillRequirements>
-                <Crafting>8</Crafting>
-            </skillRequirements>
-        </recipeMaker>
-        <costList>
-            <Plasteel>25</Plasteel>
-            <ComponentSpacer>2</ComponentSpacer>
-        </costList>
         <thingSetMakerTags>
             <li>RewardStandardLowFreq</li>
             <li>RewardStandardQualitySuper</li>
@@ -188,7 +166,6 @@
         <soundInteract>FCP_Sound_Interact_Tri_Beam_Laser_Rifle</soundInteract>
         <statBases>
             <MarketValue>1400</MarketValue>
-            <WorkToMake>70000</WorkToMake>
             <Mass>3.6</Mass>
             <AccuracyTouch>0.90</AccuracyTouch>
             <AccuracyShort>0.80</AccuracyShort>
@@ -196,16 +173,6 @@
             <AccuracyLong>0.35</AccuracyLong>
             <RangedWeapon_Cooldown>1.8</RangedWeapon_Cooldown>
         </statBases>
-        <recipeMaker>
-            <researchPrerequisite>FCP_Research_Laser_Weapon_Manufacturing</researchPrerequisite>
-            <skillRequirements>
-                <Crafting>8</Crafting>
-            </skillRequirements>
-        </recipeMaker>
-        <costList>
-            <Plasteel>25</Plasteel>
-            <ComponentSpacer>2</ComponentSpacer>
-        </costList>
         <thingSetMakerTags>
             <li>RewardStandardLowFreq</li>
             <li>RewardStandardQualitySuper</li>
@@ -275,7 +242,6 @@
         <soundInteract>FCP_Sound_Interact_Laser_Rifle</soundInteract>
         <statBases>
             <MarketValue>1500</MarketValue>
-            <WorkToMake>95000</WorkToMake>
             <Mass>3.6</Mass>
             <AccuracyTouch>0.75</AccuracyTouch>
             <AccuracyShort>0.75</AccuracyShort>
@@ -283,16 +249,6 @@
             <AccuracyLong>0.50</AccuracyLong>
             <RangedWeapon_Cooldown>1.9</RangedWeapon_Cooldown>
         </statBases>
-        <recipeMaker>
-            <researchPrerequisite>FCP_Research_Laser_Weapon_Manufacturing</researchPrerequisite>
-            <skillRequirements>
-                <Crafting>9</Crafting>
-            </skillRequirements>
-        </recipeMaker>
-        <costList>
-            <Plasteel>45</Plasteel>
-            <ComponentSpacer>3</ComponentSpacer>
-        </costList>
         <thingSetMakerTags>
             <li>RewardStandardLowFreq</li>
             <li>RewardStandardQualitySuper</li>
@@ -372,7 +328,6 @@
         <soundInteract>FCP_Sound_Interact_Laser_RCW</soundInteract>
         <statBases>
             <MarketValue>1100</MarketValue>
-            <WorkToMake>68000</WorkToMake>
             <Mass>1.6</Mass>
             <AccuracyTouch>0.80</AccuracyTouch>
             <AccuracyShort>0.65</AccuracyShort>
@@ -380,16 +335,6 @@
             <AccuracyLong>0.50</AccuracyLong>
             <RangedWeapon_Cooldown>1.9</RangedWeapon_Cooldown>
         </statBases>
-        <recipeMaker>
-            <researchPrerequisite>FCP_Research_Laser_Weapon_Manufacturing</researchPrerequisite>
-            <skillRequirements>
-                <Crafting>7</Crafting>
-            </skillRequirements>
-        </recipeMaker>
-        <costList>
-            <Plasteel>45</Plasteel>
-            <ComponentSpacer>3</ComponentSpacer>
-        </costList>
         <thingSetMakerTags>
             <li>RewardStandardLowFreq</li>
             <li>RewardStandardQualitySuper</li>
@@ -459,7 +404,6 @@
         <soundInteract>FCP_Sound_Interact_Recharger_Rifle</soundInteract>
         <statBases>
             <MarketValue>1250</MarketValue>
-            <WorkToMake>60000</WorkToMake>
             <Mass>2.1</Mass>
             <AccuracyTouch>0.85</AccuracyTouch>
             <AccuracyShort>0.80</AccuracyShort>
@@ -467,16 +411,6 @@
             <AccuracyLong>0.70</AccuracyLong>
             <RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
         </statBases>
-        <recipeMaker>
-            <researchPrerequisite>FCP_Research_Laser_Weapon_Manufacturing</researchPrerequisite>
-            <skillRequirements>
-                <Crafting>8</Crafting>
-            </skillRequirements>
-        </recipeMaker>
-        <costList>
-            <Plasteel>25</Plasteel>
-            <ComponentSpacer>2</ComponentSpacer>
-        </costList>
         <thingSetMakerTags>
             <li>RewardStandardLowFreq</li>
             <li>RewardStandardQualitySuper</li>
@@ -541,7 +475,6 @@
         <soundInteract>FCP_Sound_Interact_Recharger_Pistol</soundInteract>
         <statBases>
             <MarketValue>850</MarketValue>
-            <WorkToMake>55000</WorkToMake>
             <Mass>1.6</Mass>
             <AccuracyTouch>0.85</AccuracyTouch>
             <AccuracyShort>0.75</AccuracyShort>
@@ -549,16 +482,6 @@
             <AccuracyLong>0.68</AccuracyLong>
             <RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
         </statBases>
-        <recipeMaker>
-            <researchPrerequisite>FCP_Research_Laser_Weapon_Manufacturing</researchPrerequisite>
-            <skillRequirements>
-                <Crafting>8</Crafting>
-            </skillRequirements>
-        </recipeMaker>
-        <costList>
-            <Plasteel>25</Plasteel>
-            <ComponentSpacer>2</ComponentSpacer>
-        </costList>
         <thingSetMakerTags>
             <li>RewardStandardLowFreq</li>
             <li>RewardStandardQualitySuper</li>
@@ -702,7 +625,6 @@
         <soundInteract>FCP_Sound_Interact_Laser_Rifle</soundInteract>
         <statBases>
             <MarketValue>1600</MarketValue>
-            <WorkToMake>85000</WorkToMake>
             <Mass>4.0</Mass>
             <AccuracyTouch>0.70</AccuracyTouch>
             <AccuracyShort>0.70</AccuracyShort>
@@ -710,16 +632,6 @@
             <AccuracyLong>0.45</AccuracyLong>
             <RangedWeapon_Cooldown>2.0</RangedWeapon_Cooldown>
         </statBases>
-        <recipeMaker>
-            <researchPrerequisite>FCP_Research_Laser_Weapon_Manufacturing</researchPrerequisite>
-            <skillRequirements>
-                <Crafting>8</Crafting>
-            </skillRequirements>
-        </recipeMaker>
-        <costList>
-            <Plasteel>40</Plasteel>
-            <ComponentSpacer>3</ComponentSpacer>
-        </costList>
         <thingSetMakerTags>
             <li>RewardStandardLowFreq</li>
             <li>RewardStandardQualitySuper</li>
@@ -799,7 +711,6 @@
         <soundInteract>FCP_Sound_Interact_Laser_Rifle</soundInteract>
         <statBases>
             <MarketValue>1150</MarketValue>
-            <WorkToMake>58000</WorkToMake>
             <Mass>3.0</Mass>
             <AccuracyTouch>0.88</AccuracyTouch>
             <AccuracyShort>0.82</AccuracyShort>
@@ -807,16 +718,6 @@
             <AccuracyLong>0.60</AccuracyLong>
             <RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
         </statBases>
-        <recipeMaker>
-            <researchPrerequisite>FCP_Research_Laser_Weapon_Manufacturing</researchPrerequisite>
-            <skillRequirements>
-                <Crafting>7</Crafting>
-            </skillRequirements>
-        </recipeMaker>
-        <costList>
-            <Plasteel>22</Plasteel>
-            <ComponentSpacer>2</ComponentSpacer>
-        </costList>
         <thingSetMakerTags>
             <li>RewardStandardLowFreq</li>
             <li>RewardStandardQualitySuper</li>
@@ -1123,7 +1024,6 @@
         <soundInteract>FCP_Sound_Interact_Laser_Pistol</soundInteract>
         <statBases>
             <MarketValue>900</MarketValue>
-            <WorkToMake>42000</WorkToMake>
             <Mass>2.4</Mass>
             <AccuracyTouch>0.76</AccuracyTouch>
             <AccuracyShort>0.70</AccuracyShort>
@@ -1131,16 +1031,6 @@
             <AccuracyLong>0.42</AccuracyLong>
             <RangedWeapon_Cooldown>1.45</RangedWeapon_Cooldown>
         </statBases>
-        <recipeMaker>
-            <researchPrerequisite>FCP_Research_Laser_Weapon_Manufacturing</researchPrerequisite>
-            <skillRequirements>
-                <Crafting>5</Crafting>
-            </skillRequirements>
-        </recipeMaker>
-        <costList>
-            <Plasteel>22</Plasteel>
-            <ComponentSpacer>2</ComponentSpacer>
-        </costList>
         <thingSetMakerTags>
             <li>RewardStandardLowFreq</li>
             <li>RewardStandardQualitySuper</li>
diff --git a/1.6/Defs/WeaponDefs/WeaponDefs_Plasma.xml b/1.6/Defs/WeaponDefs/WeaponDefs_Plasma.xml
index 55c6f44..9683f87 100644
--- a/1.6/Defs/WeaponDefs/WeaponDefs_Plasma.xml
+++ b/1.6/Defs/WeaponDefs/WeaponDefs_Plasma.xml
@@ -22,25 +22,14 @@
 		<soundInteract>FCP_Sound_Interact_Plasma_Pistol</soundInteract>
 		<statBases>
 			<MarketValue>1200</MarketValue>
-			<WorkToMake>50000</WorkToMake>
-			<Mass>3.6</Mass>
+            <Mass>3.6</Mass>
 			<AccuracyTouch>0.80</AccuracyTouch>
 			<AccuracyShort>0.75</AccuracyShort>
 			<AccuracyMedium>0.55</AccuracyMedium>
 			<AccuracyLong>0.45</AccuracyLong>
 			<RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
 		</statBases>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Plasma_Weapons_Manufacturing</researchPrerequisite>
-			<skillRequirements>
-				<Crafting>7</Crafting>
-			</skillRequirements>
-		</recipeMaker>
-		<costList>
-			<Plasteel>25</Plasteel>
-			<ComponentSpacer>2</ComponentSpacer>
-		</costList>
-		<thingSetMakerTags>
+        <thingSetMakerTags>
 			<li>RewardStandardLowFreq</li>
 			<li>RewardStandardQualitySuper</li>
 		</thingSetMakerTags>
@@ -106,25 +95,14 @@
 		</graphicData>
 		<soundInteract>FCP_Sound_Interact_Plasma_Rifle</soundInteract>
 		<statBases>			<MarketValue>1900</MarketValue>			<MarketValue>1600</MarketValue>
-			<WorkToMake>70000</WorkToMake>
-			<Mass>4.2</Mass>
+            <Mass>4.2</Mass>
 			<AccuracyTouch>0.85</AccuracyTouch>
 			<AccuracyShort>0.80</AccuracyShort>
 			<AccuracyMedium>0.70</AccuracyMedium>
 			<AccuracyLong>0.60</AccuracyLong>
 			<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
 		</statBases>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Plasma_Weapons_Manufacturing</researchPrerequisite>
-			<skillRequirements>
-				<Crafting>8</Crafting>
-			</skillRequirements>
-		</recipeMaker>
-		<costList>
-			<Plasteel>35</Plasteel>
-			<ComponentSpacer>3</ComponentSpacer>
-		</costList>
-		<thingSetMakerTags>
+        <thingSetMakerTags>
 			<li>RewardStandardLowFreq</li>
 			<li>RewardStandardQualitySuper</li>
 		</thingSetMakerTags>
@@ -191,25 +169,14 @@
 		<soundInteract>FCP_Sound_Interact_Multiplas_Rifle</soundInteract>
 		<statBases>
 			<MarketValue>1800</MarketValue>
-			<WorkToMake>85000</WorkToMake>
-			<Mass>4.5</Mass>
+            <Mass>4.5</Mass>
 			<AccuracyTouch>0.80</AccuracyTouch>
 			<AccuracyShort>0.65</AccuracyShort>
 			<AccuracyMedium>0.35</AccuracyMedium>
 			<AccuracyLong>0.10</AccuracyLong>
 			<RangedWeapon_Cooldown>1.7</RangedWeapon_Cooldown>
 		</statBases>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Plasma_Weapons_Manufacturing</researchPrerequisite>
-			<skillRequirements>
-				<Crafting>9</Crafting>
-			</skillRequirements>
-		</recipeMaker>
-		<costList>
-			<Plasteel>40</Plasteel>
-			<ComponentSpacer>4</ComponentSpacer>
-		</costList>
-		<thingSetMakerTags>
+        <thingSetMakerTags>
 			<li>RewardStandardLowFreq</li>
 			<li>RewardStandardQualitySuper</li>
 		</thingSetMakerTags>
@@ -280,26 +247,14 @@
 		</graphicData>
 		<equippedAngleOffset>45</equippedAngleOffset>
 		<soundInteract>FCP_Sound_Interact_Plasma_Rifle</soundInteract>
-		<statBases>
-			<WorkToMake>90000</WorkToMake>
-			<Mass>3.6</Mass>
+		<statBases>			<Mass>3.6</Mass>
 			<AccuracyTouch>0.70</AccuracyTouch>
 			<AccuracyShort>0.80</AccuracyShort>
 			<AccuracyMedium>0.65</AccuracyMedium>
 			<AccuracyLong>0.60</AccuracyLong>
 			<RangedWeapon_Cooldown>1.9</RangedWeapon_Cooldown>
 		</statBases>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Plasma_Weapons_Manufacturing</researchPrerequisite>
-			<skillRequirements>
-				<Crafting>9</Crafting>
-			</skillRequirements>
-		</recipeMaker>
-		<costList>
-			<Plasteel>45</Plasteel>
-			<ComponentSpacer>3</ComponentSpacer>
-		</costList>
-		<thingSetMakerTags>
+        <thingSetMakerTags>
 			<li>RewardStandardLowFreq</li>
 			<li>RewardStandardQualitySuper</li>
 		</thingSetMakerTags>
@@ -374,25 +329,14 @@
 		<soundInteract>FCP_Sound_Interact_Plasma_Pistol</soundInteract>
 		<statBases>
 			<MarketValue>1300</MarketValue>
-			<WorkToMake>55000</WorkToMake>
-			<Mass>3.2</Mass>
+            <Mass>3.2</Mass>
 			<AccuracyTouch>0.85</AccuracyTouch>
 			<AccuracyShort>0.78</AccuracyShort>
 			<AccuracyMedium>0.60</AccuracyMedium>
 			<AccuracyLong>0.48</AccuracyLong>
 			<RangedWeapon_Cooldown>1.3</RangedWeapon_Cooldown>
 		</statBases>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Plasma_Weapons_Manufacturing</researchPrerequisite>
-			<skillRequirements>
-				<Crafting>8</Crafting>
-			</skillRequirements>
-		</recipeMaker>
-		<costList>
-			<Plasteel>28</Plasteel>
-			<ComponentSpacer>3</ComponentSpacer>
-		</costList>
-		<thingSetMakerTags>
+        <thingSetMakerTags>
 			<li>RewardStandardLowFreq</li>
 			<li>RewardStandardQualitySuper</li>
 		</thingSetMakerTags>
@@ -460,25 +404,14 @@
 		<soundInteract>FCP_Sound_Interact_Plasma_Rifle</soundInteract>
 		<statBases>
 			<MarketValue>2000</MarketValue>
-			<WorkToMake>80000</WorkToMake>
-			<Mass>4.8</Mass>
+            <Mass>4.8</Mass>
 			<AccuracyTouch>0.65</AccuracyTouch>
 			<AccuracyShort>0.75</AccuracyShort>
 			<AccuracyMedium>0.60</AccuracyMedium>
 			<AccuracyLong>0.55</AccuracyLong>
 			<RangedWeapon_Cooldown>2.0</RangedWeapon_Cooldown>
 		</statBases>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Plasma_Weapons_Manufacturing</researchPrerequisite>
-			<skillRequirements>
-				<Crafting>8</Crafting>
-			</skillRequirements>
-		</recipeMaker>
-		<costList>
-			<Plasteel>40</Plasteel>
-			<ComponentSpacer>3</ComponentSpacer>
-		</costList>
-		<thingSetMakerTags>
+        <thingSetMakerTags>
 			<li>RewardStandardLowFreq</li>
 			<li>RewardStandardQualitySuper</li>
 		</thingSetMakerTags>
@@ -549,25 +482,14 @@
 		<soundInteract>FCP_Sound_Interact_Plasma_Pistol</soundInteract>
 		<statBases>
 			<MarketValue>1400</MarketValue>
-			<WorkToMake>65000</WorkToMake>
-			<Mass>3.0</Mass>
+            <Mass>3.0</Mass>
 			<AccuracyTouch>0.90</AccuracyTouch>
 			<AccuracyShort>0.85</AccuracyShort>
 			<AccuracyMedium>0.70</AccuracyMedium>
 			<AccuracyLong>0.58</AccuracyLong>
 			<RangedWeapon_Cooldown>1.1</RangedWeapon_Cooldown>
 		</statBases>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Plasma_Weapons_Manufacturing</researchPrerequisite>
-			<skillRequirements>
-				<Crafting>9</Crafting>
-			</skillRequirements>
-		</recipeMaker>
-		<costList>
-			<Plasteel>32</Plasteel>
-			<ComponentSpacer>4</ComponentSpacer>
-		</costList>
-		<thingSetMakerTags>
+        <thingSetMakerTags>
 			<li>RewardStandardLowFreq</li>
 			<li>RewardStandardQualitySuper</li>
 		</thingSetMakerTags>
@@ -634,25 +556,14 @@
 		<soundInteract>FCP_Sound_Interact_Plasma_Rifle</soundInteract>
 		<statBases>
 			<MarketValue>1700</MarketValue>
-			<WorkToMake>80000</WorkToMake>
-			<Mass>4.0</Mass>
+            <Mass>4.0</Mass>
 			<AccuracyTouch>0.88</AccuracyTouch>
 			<AccuracyShort>0.85</AccuracyShort>
 			<AccuracyMedium>0.75</AccuracyMedium>
 			<AccuracyLong>0.65</AccuracyLong>
 			<RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
 		</statBases>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Plasma_Weapons_Manufacturing</researchPrerequisite>
-			<skillRequirements>
-				<Crafting>10</Crafting>
-			</skillRequirements>
-		</recipeMaker>
-		<costList>
-			<Plasteel>42</Plasteel>
-			<ComponentSpacer>4</ComponentSpacer>
-		</costList>
-		<thingSetMakerTags>
+        <thingSetMakerTags>
 			<li>RewardStandardLowFreq</li>
 			<li>RewardStandardQualitySuper</li>
 		</thingSetMakerTags>
@@ -727,7 +638,7 @@
 		<soundInteract>FCP_Sound_Interact_Plasma_Rifle</soundInteract>
 		<statBases>
 			<MarketValue>2200</MarketValue>
-			<Mass>3.8</Mass>
+            <Mass>3.8</Mass>
 			<AccuracyTouch>0.92</AccuracyTouch>
 			<AccuracyShort>0.88</AccuracyShort>
 			<AccuracyMedium>0.80</AccuracyMedium>
@@ -804,10 +715,10 @@
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<soundInteract>FCP_Sound_Interact_Plasma_Rifle</soundInteract>
+		<smeltable>true</smeltable>
 		<statBases>
 			<MarketValue>2400</MarketValue>
-			<WorkToMake>120000</WorkToMake>
-			<Mass>6.5</Mass>
+            <Mass>6.5</Mass>
 			<AccuracyTouch>0.75</AccuracyTouch>
 			<AccuracyShort>0.70</AccuracyShort>
 			<AccuracyMedium>0.55</AccuracyMedium>
@@ -822,9 +733,17 @@
 			<Gold>15</Gold>
 		</costList>
 		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Plasma_Weapons_Manufacturing</researchPrerequisite>
+			<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+			<workSkill>Crafting</workSkill>
+			<effectWorking>Smith</effectWorking>
+			<soundWorking>Recipe_Machining</soundWorking>
+			<recipeUsers>
+				<li>FCP_Production_Fabrication_Workbench</li>
+			</recipeUsers>
+			<unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
+			<researchPrerequisite>PrecisionRifling</researchPrerequisite>
 			<skillRequirements>
-				<Crafting>11</Crafting>
+				<Crafting>12</Crafting>
 			</skillRequirements>
 		</recipeMaker>
 		<smeltProducts>
diff --git a/1.6/Defs/WeaponDefs/WeaponDefs_Pulse.xml b/1.6/Defs/WeaponDefs/WeaponDefs_Pulse.xml
index d1ed402..16d002c 100644
--- a/1.6/Defs/WeaponDefs/WeaponDefs_Pulse.xml
+++ b/1.6/Defs/WeaponDefs/WeaponDefs_Pulse.xml
@@ -18,7 +18,6 @@
         <soundInteract>Interact_Autopistol</soundInteract>
         <statBases>
             <MarketValue>2400</MarketValue>
-            <WorkToMake>75000</WorkToMake>
             <Mass>2.8</Mass>
             <AccuracyTouch>0.88</AccuracyTouch>
             <AccuracyShort>0.82</AccuracyShort>
@@ -26,16 +25,6 @@
             <AccuracyLong>0.52</AccuracyLong>
             <RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
         </statBases>
-        <recipeMaker>
-            <researchPrerequisite>FCP_Research_Energy_Based_Weaponry</researchPrerequisite>
-            <skillRequirements>
-                <Crafting>10</Crafting>
-            </skillRequirements>
-        </recipeMaker>
-        <costList>
-            <Plasteel>40</Plasteel>
-            <ComponentSpacer>5</ComponentSpacer>
-        </costList>
         <thingSetMakerTags>
             <li>RewardStandardLowFreq</li>
             <li>RewardStandardQualitySuper</li>
@@ -105,7 +94,6 @@
         <soundInteract>Interact_ChargeRifle</soundInteract>
         <statBases>
             <MarketValue>2800</MarketValue>
-            <WorkToMake>95000</WorkToMake>
             <Mass>4.5</Mass>
             <AccuracyTouch>0.85</AccuracyTouch>
             <AccuracyShort>0.88</AccuracyShort>
@@ -113,16 +101,6 @@
             <AccuracyLong>0.72</AccuracyLong>
             <RangedWeapon_Cooldown>1.8</RangedWeapon_Cooldown>
         </statBases>
-        <recipeMaker>
-            <researchPrerequisite>FCP_Research_Energy_Based_Weaponry</researchPrerequisite>
-            <skillRequirements>
-                <Crafting>11</Crafting>
-            </skillRequirements>
-        </recipeMaker>
-        <costList>
-            <Plasteel>60</Plasteel>
-            <ComponentSpacer>8</ComponentSpacer>
-        </costList>
         <thingSetMakerTags>
             <li>RewardStandardLowFreq</li>
             <li>RewardStandardQualitySuper</li>