diff --git a/items/armor/fieldscience/fieldscientist.head b/items/armor/fieldscience/fieldscientist.head
@@ -0,0 +1,66 @@
+{
+  "itemName" : "fieldscientisthead",
+  "inventoryIcon" : "icons.png:head",
+  "dropCollision" : [-4.0, -3.0, 4.0, 3.0],
+  "maxStack" : 1,
+  "rarity" : "Common",
+  "description" : "Spared no expense. Provides light in the darkness.",
+  "shortdescription" : "Haptic Goggles",
+  "tooltipKind" : "armor",
+
+  "maleFrames" : "head.png",
+  "femaleFrames" : "head.png",
+  "mask" : "mask.png",
+
+  "statusEffects" : [
+      {
+        "stat" : "protection",
+        "amount" : 12
+      },
+      {
+        "stat" : "maxEnergy",
+        "amount" : 70
+      },
+
+      "headlamp"
+
+  ],
+
+  "colorOptions" : [
+    /* GREY */
+    { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555555", "6f2919" : "303030" },
+    /* BLACK */
+    { "ffca8a" : "838383", "e0975c" : "555555", "a85636" : "383838", "6f2919" : "151515" },
+    /* GREY */
+    { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555555", "6f2919" : "303030" },
+    /* WHITE */
+    { "ffca8a" : "e6e6e6", "e0975c" : "b6b6b6", "a85636" : "7b7b7b", "6f2919" : "373737" },
+    /* RED */
+    { "ffca8a" : "f4988c", "e0975c" : "d93a3a", "a85636" : "932625", "6f2919" : "601119" },
+    /* ORANGE */
+    { "ffca8a" : "ffd495", "e0975c" : "ea9931", "a85636" : "af4e00", "6f2919" : "6e2900" },
+    /* YELLOW */
+    { "ffca8a" : "ffffa7", "e0975c" : "e2c344", "a85636" : "a46e06", "6f2919" : "642f00" },
+    /* GREEN */
+    { "ffca8a" : "b2e89d", "e0975c" : "51bd3b", "a85636" : "247824", "6f2919" : "144216" },
+    /* BLUE */
+    { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" },
+    /* PURPLE */
+    { "ffca8a" : "d29ce7", "e0975c" : "a451c4", "a85636" : "6a2284", "6f2919" : "320c40" },
+    /* PINK */
+    { "ffca8a" : "eab3db", "e0975c" : "d35eae", "a85636" : "97276d", "6f2919" : "59163f" },
+    /* BROWN */
+    { "ffca8a" : "ccae7c", "e0975c" : "a47844", "a85636" : "754c23", "6f2919" : "472b13" }
+    /*
+    { "ffca8a" : "d4c398", "e0975c" : "bda67a", "a85636" : "9c7f54", "6f2919" : "755937" },
+    { "ffca8a" : "d5595f", "e0975c" : "a32c2c", "a85636" : "71291b", "6f2919" : "4c1e10" },
+    { "ffca8a" : "46b3e8", "e0975c" : "1a7bb5", "a85636" : "0e427e", "6f2919" : "072655" },
+    { "ffca8a" : "b0e944", "e0975c" : "78b618", "a85636" : "3f7f0d", "6f2919" : "255606" },
+    { "ffca8a" : "eef055", "e0975c" : "d3bb1c", "a85636" : "9c8011", "6f2919" : "644807" },
+    { "ffca8a" : "fd8d30", "e0975c" : "ca6705", "a85636" : "8c5d00", "6f2919" : "5c4400" },
+    { "ffca8a" : "c260ff", "e0975c" : "931ad0", "a85636" : "710587", "6f2919" : "52015b" },
+    { "ffca8a" : "717171", "e0975c" : "505050", "a85636" : "363636", "6f2919" : "181818" },
+    { "ffca8a" : "e6e9ea", "e0975c" : "c6d2d4", "a85636" : "97abac", "6f2919" : "627677" }
+*/
+  ]
+}
diff --git a/items/armor/fieldscience/fieldscientist.legs b/items/armor/fieldscience/fieldscientist.legs
@@ -0,0 +1,65 @@
+{
+  "itemName" : "fieldscientistlegs",
+  "inventoryIcon" : "icons.png:pants",
+  "dropCollision" : [-4.0, -3.0, 4.0, 3.0],
+  "maxStack" : 1,
+  "rarity" : "Common",
+  "description" : "Elite science gear. This piece alters gravity around it.",
+  "shortdescription" : "Field Science Coat",
+  "tooltipKind" : "armor",
+
+  "maleFrames" : "pants.png",
+  "femaleFrames" : "pants.png",
+
+  "statusEffects" : [
+    {
+      "stat" : "protection",
+      "amount" : 16
+    },
+    {
+      "stat" : "maxEnergy",
+      "amount" : 70
+    },
+
+    "lowgrav"
+
+  ],
+
+  "colorOptions" : [
+    /* GREY */
+    { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555555", "6f2919" : "303030" },
+    /* BLACK */
+    { "ffca8a" : "838383", "e0975c" : "555555", "a85636" : "383838", "6f2919" : "151515" },
+    /* GREY */
+    { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555555", "6f2919" : "303030" },
+    /* WHITE */
+    { "ffca8a" : "e6e6e6", "e0975c" : "b6b6b6", "a85636" : "7b7b7b", "6f2919" : "373737" },
+    /* RED */
+    { "ffca8a" : "f4988c", "e0975c" : "d93a3a", "a85636" : "932625", "6f2919" : "601119" },
+    /* ORANGE */
+    { "ffca8a" : "ffd495", "e0975c" : "ea9931", "a85636" : "af4e00", "6f2919" : "6e2900" },
+    /* YELLOW */
+    { "ffca8a" : "ffffa7", "e0975c" : "e2c344", "a85636" : "a46e06", "6f2919" : "642f00" },
+    /* GREEN */
+    { "ffca8a" : "b2e89d", "e0975c" : "51bd3b", "a85636" : "247824", "6f2919" : "144216" },
+    /* BLUE */
+    { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" },
+    /* PURPLE */
+    { "ffca8a" : "d29ce7", "e0975c" : "a451c4", "a85636" : "6a2284", "6f2919" : "320c40" },
+    /* PINK */
+    { "ffca8a" : "eab3db", "e0975c" : "d35eae", "a85636" : "97276d", "6f2919" : "59163f" },
+    /* BROWN */
+    { "ffca8a" : "ccae7c", "e0975c" : "a47844", "a85636" : "754c23", "6f2919" : "472b13" }
+    /*
+    { "ffca8a" : "d4c398", "e0975c" : "bda67a", "a85636" : "9c7f54", "6f2919" : "755937" },
+    { "ffca8a" : "d5595f", "e0975c" : "a32c2c", "a85636" : "71291b", "6f2919" : "4c1e10" },
+    { "ffca8a" : "46b3e8", "e0975c" : "1a7bb5", "a85636" : "0e427e", "6f2919" : "072655" },
+    { "ffca8a" : "b0e944", "e0975c" : "78b618", "a85636" : "3f7f0d", "6f2919" : "255606" },
+    { "ffca8a" : "eef055", "e0975c" : "d3bb1c", "a85636" : "9c8011", "6f2919" : "644807" },
+    { "ffca8a" : "fd8d30", "e0975c" : "ca6705", "a85636" : "8c5d00", "6f2919" : "5c4400" },
+    { "ffca8a" : "c260ff", "e0975c" : "931ad0", "a85636" : "710587", "6f2919" : "52015b" },
+    { "ffca8a" : "717171", "e0975c" : "505050", "a85636" : "363636", "6f2919" : "181818" },
+    { "ffca8a" : "e6e9ea", "e0975c" : "c6d2d4", "a85636" : "97abac", "6f2919" : "627677" }
+*/
+  ]
+}
diff --git a/items/armor/fieldscience/fsleeve.png b/items/armor/fieldscience/fsleeve.png
diff --git a/items/armor/fieldscience/head.png b/items/armor/fieldscience/head.png
diff --git a/items/armor/fieldscience/icons.png b/items/armor/fieldscience/icons.png
diff --git a/...amplain's conflicted copy 2015-02-13).png → items/armor/fieldscience/mask.png b/...amplain's conflicted copy 2015-02-13).png → items/armor/fieldscience/mask.png
diff --git a/items/armor/fieldscience/pants.png b/items/armor/fieldscience/pants.png
diff --git a/items/armor/irradiumarmor/irradiumarmor.chest b/items/armor/irradiumarmor/irradiumarmor.chest
@@ -23,7 +23,7 @@
   "statusEffects" : [
     {
       "stat" : "protection",
-      "amount" : 70
+      "amount" : 130
     },
 
     {

diff --git a/items/armor/irradiumarmor/irradiumarmor.legs b/items/armor/irradiumarmor/irradiumarmor.legs
@@ -14,7 +14,7 @@
   "statusEffects" : [
     {
       "stat" : "protection",
-      "amount" : 70
+      "amount" : 90
     },
 
     {

diff --git a/items/armor/other/ff_diamondarmor/ff_diamondarmor.chest b/items/armor/other/ff_diamondarmor/ff_diamondarmor.chest
@@ -24,9 +24,13 @@
       "stat" : "protection",
       "amount" : 180
     },
+    {
+      "stat" : "maxEnergy",
+      "amount" : 90
+    },
     {
       "stat" : "maxHealth",
-      "amount" : 300
+      "amount" : 50
     }
   ],
 

diff --git a/items/armor/other/ff_diamondarmor/ff_diamondarmor.head b/items/armor/other/ff_diamondarmor/ff_diamondarmor.head
@@ -14,12 +14,15 @@
   "statusEffects" : [
     {
       "stat" : "protection",
-      "level" : 35,
       "amount" : 100
     },
     {
       "stat" : "maxEnergy",
-      "amount" : 280
+      "amount" : 90
+    },
+    {
+      "stat" : "maxHealth",
+      "amount" : 50
     }
   ],
 

diff --git a/items/armor/other/ff_diamondarmor/ff_diamondarmor.legs b/items/armor/other/ff_diamondarmor/ff_diamondarmor.legs
@@ -16,10 +16,13 @@
       "stat" : "protection",
       "amount" : 60
     },
-
+    {
+      "stat" : "maxHealth",
+      "amount" : 50
+    },
     {
       "stat" : "energyRegen",
-      "amount" : 2.8
+      "amount" : 1.40
     }
   ],
 

diff --git a/items/armor/other/ff_slimearmor/ff_slimearmor.chest b/items/armor/other/ff_slimearmor/ff_slimearmor.chest
@@ -28,7 +28,7 @@
 
     {
       "stat" : "maxEnergy",
-      "amount" : 50
+      "amount" : 35
     },
 
     {

diff --git a/items/armor/scienceparka/sciencefu.chest b/items/armor/scienceparka/sciencefu.chest
@@ -27,7 +27,7 @@
       },
       {
         "stat" : "protection",
-        "amount" : 115
+        "amount" : 165
       },
     "ffextremecoldimmunityicon",
     {

diff --git a/items/armor/scienceparka/sciencefu.legs b/items/armor/scienceparka/sciencefu.legs
@@ -18,7 +18,7 @@
         },
         {
           "stat" : "protection",
-          "amount" : 100
+          "amount" : 120
         },
       "ffextremecoldimmunityicon",
       {

diff --git a/items/generic/crafting/ff_plastic.item b/items/generic/crafting/ff_plastic.item
@@ -4,5 +4,5 @@
   "inventoryIcon" : "ff_plastic.png",
   "description" : "Synthetic vinyl compound enhanced through science!",
   "shortdescription" : "Advanced Plastic",
-  "learnBlueprintsOnPickup" : [ "ff_bubblegun", "mineralpistollite", "mineralcannonlite", "ff_gasmask", "ff_divingmaskhead" ]
+  "learnBlueprintsOnPickup" : [ "goggles1", "goggles2", "hydrotubematerial", "ff_bubblegun", "mineralpistollite", "mineralcannonlite", "ff_gasmask", "ff_divingmaskhead" ]
 }
diff --git a/items/generic/crafting/ff_silicon.item b/items/generic/crafting/ff_silicon.item
@@ -4,5 +4,5 @@
   "inventoryIcon" : "ff_silicon.png",
   "description" : "This resource has many uses.",
   "shortdescription" : "Silicon",
-  "learnBlueprintsOnPickup" : [ "siliconspear", "crystallineblade" ]
+  "learnBlueprintsOnPickup" : [ "fieldscientisthead", "fieldscientistlegs", "fieldscientistchest", "siliconspear", "crystallineblade" ]
 }
diff --git a/items/generic/crafting/helium3cannister.item b/items/generic/crafting/helium3cannister.item
@@ -0,0 +1,8 @@
+{
+  "itemName" : "helium3cannister",
+  "rarity" : "Uncommon",
+  "inventoryIcon" : "helium3cannister.png",
+  "description" : "A very useful gaz that can be used in old fusion reactors.",
+  "shortdescription" : "Helium 3 cannister",
+  "learnBlueprintsOnPickup" : [ "" ]
+}
diff --git a/items/generic/crafting/helium3cannister.png b/items/generic/crafting/helium3cannister.png
diff --git a/items/generic/crafting/xenostation/nervebundle1.item b/items/generic/crafting/xenostation/nervebundle1.item
@@ -4,5 +4,5 @@
   "inventoryIcon" : "nervebundle1.png",
   "description" : "Nerve Bundle research.",
   "shortdescription" : "Nerve Bundle I",
-  "learnBlueprintsOnPickup" : [ "nervebundle2", "firegene", "shockgene", "toxicgene", "coldgene" ]
+  "learnBlueprintsOnPickup" : [ "nervebundle2", "firegene", "shockgene", "toxicgene", "coldgene", "voidgene" ]
 }
diff --git a/items/generic/crafting/xenostation/voidgene.item b/items/generic/crafting/xenostation/voidgene.item
@@ -0,0 +1,7 @@
+{
+  "itemName" : "voidgene",
+  "rarity" : "legendary",
+  "inventoryIcon" : "voidgene.png",
+  "description" : "Mysterious interdimensional genetic material.",
+  "shortdescription" : "Void Gene"
+}
diff --git a/items/generic/crafting/xenostation/voidgene.png b/items/generic/crafting/xenostation/voidgene.png
diff --git a/items/generic/produce/littlerascal.consumable b/items/generic/produce/littlerascal.consumable
@@ -8,12 +8,12 @@
   "effects" : [ [
 
       {
-        "effect" : "maxhealthboost",
+        "effect" : "maxHealth",
         "amount" : 60,
         "duration" : 40
       },
       {
-        "effect" : "maxenergyboost",
+        "effect" : "maxEnergy",
         "amount" : 60,
         "duration" : 40
       }

diff --git a/...es/biscorn/biscornseedicon (Chris DeChamplain's conflicted copy 2015-02-13).png b/...es/biscorn/biscornseedicon (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...es/gazelemon/gazelemonseed (Chris DeChamplain's conflicted copy 2015-02-13).png b/...es/gazelemon/gazelemonseed (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...es/leafshell/leafshellseed (Chris DeChamplain's conflicted copy 2015-02-13).png b/...es/leafshell/leafshellseed (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...toxplant/thornitoxseedicon (Chris DeChamplain's conflicted copy 2015-02-13).png b/...toxplant/thornitoxseedicon (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...es/vextongue/vextongueseed (Chris DeChamplain's conflicted copy 2015-02-13).png b/...es/vextongue/vextongueseed (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...es/wubstem/wubstemseedicon (Chris DeChamplain's conflicted copy 2015-02-13).png b/...es/wubstem/wubstemseedicon (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/.../prototyper/prototypericon (Chris DeChamplain's conflicted copy 2015-02-13).png b/.../prototyper/prototypericon (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...c/storage/genecabinetright (Chris DeChamplain's conflicted copy 2015-02-13).png b/...c/storage/genecabinetright (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/.../storage2/genestorageright (Chris DeChamplain's conflicted copy 2015-02-13).png b/.../storage2/genestorageright (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...me/penum/penumbrachesticon (Chris DeChamplain's conflicted copy 2015-02-13).png b/...me/penum/penumbrachesticon (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...me/stone/ff_stonechesticon (Chris DeChamplain's conflicted copy 2015-02-13).png b/...me/stone/ff_stonechesticon (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...pecific/bioworld/bioplant4 (Chris DeChamplain's conflicted copy 2015-02-13).png b/...pecific/bioworld/bioplant4 (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/objects/scienceoutpost/guidestorage/guidestorage.frames b/objects/scienceoutpost/guidestorage/guidestorage.frames
@@ -0,0 +1,19 @@
+{
+
+  "frameGrid" : {
+    "size" : [32, 40],
+    "dimensions" : [1, 9],
+    "names" : [
+      [ "default" ],
+      [ "red" ],
+      [ "blue" ],
+      [ "green" ],
+      [ "yellow" ],
+      [ "orange" ],
+      [ "pink" ],
+      [ "black" ],
+      [ "white" ]
+    ]
+
+  }
+}
diff --git a/objects/scienceoutpost/guidestorage/guidestorage.object b/objects/scienceoutpost/guidestorage/guidestorage.object
@@ -0,0 +1,38 @@
+{
+  "objectName" : "guidestorage",
+  "rarity" : "Common",
+  "objectType" : "container",
+  "category" : "storage",
+  "description" : "A treasure trove of scientific knowledge.",
+  "shortdescription" : "Nerdy Bookcase",
+  "race" : "generic",
+  "price" : 1000,
+
+  "inventoryIcon" : "guidestorageicon.png",
+  "orientations" : [
+    {
+      "dualImage" : "guidestorage.png:<color>",
+      "imagePosition" : [-16, 0],
+      "frames" : 1,
+      "animationCycle" : 1.0,
+
+      "spaceScan" : 0.1,
+      "anchors" : [ "bottom" ],
+      "collision" : "platform"
+
+    }
+  ],
+
+  "openSounds" : [ "/sfx/objects/bookcase_open.wav" ],
+  "closeSounds" : [ "/sfx/objects/bookcase_close.wav" ],
+  "slotCount" : 16,
+  "uiConfig" : "/interface/chests/chest%slots%.config",
+  "frameCooldown" : 5,
+  "autoCloseCooldown" : 3600,
+
+  "scripts" : [ "/objects/scripts/autofill.lua" ],
+  "scriptDelta" : 240,
+
+  "autofillContents" : [ {"name" : "ffguide", "count" : 1, "parameters" : {}},{"name" : "ffguide2", "count" : 1, "parameters" : {}},{"name" : "ffguide3", "count" : 1, "parameters" : {}} ]
+
+}
diff --git a/objects/scienceoutpost/guidestorage/guidestorage.png b/objects/scienceoutpost/guidestorage/guidestorage.png
diff --git a/objects/scienceoutpost/guidestorage/guidestorageicon.png b/objects/scienceoutpost/guidestorage/guidestorageicon.png
diff --git a/...nd/techbush1/techbush1icon (Chris DeChamplain's conflicted copy 2015-02-13).png b/...nd/techbush1/techbush1icon (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...nd/techbush4/techbush4icon (Chris DeChamplain's conflicted copy 2015-02-13).png b/...nd/techbush4/techbush4icon (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...nd/techbush6/techbush6icon (Chris DeChamplain's conflicted copy 2015-02-13).png b/...nd/techbush6/techbush6icon (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/.../divider/bloodstone/base/1 (Chris DeChamplain's conflicted copy 2015-02-13).png b/.../divider/bloodstone/base/1 (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/.../divider/irradiated/base/1 (Chris DeChamplain's conflicted copy 2015-02-13).png b/.../divider/irradiated/base/1 (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/.../divider/slimeworld/base/1 (Chris DeChamplain's conflicted copy 2015-02-13).png b/.../divider/slimeworld/base/1 (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/.../tile/spacewreckage/base/1 (Chris DeChamplain's conflicted copy 2015-02-13).png b/.../tile/spacewreckage/base/1 (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...round/rocklarge/rocklarge1 (Chris DeChamplain's conflicted copy 2015-02-13).png b/...round/rocklarge/rocklarge1 (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...orative/elder/eldergrass19 (Chris DeChamplain's conflicted copy 2015-02-13).png b/...orative/elder/eldergrass19 (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...test/foliage/flowery2/mid1 (Chris DeChamplain's conflicted copy 2015-02-13).png b/...test/foliage/flowery2/mid1 (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...oliage/nofoliagevine/base1 (Chris DeChamplain's conflicted copy 2015-02-13).png b/...oliage/nofoliagevine/base1 (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...oliage/nofoliagevine/base2 (Chris DeChamplain's conflicted copy 2015-02-13).png b/...oliage/nofoliagevine/base2 (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...orest/foliage/apple/crown2 (Chris DeChamplain's conflicted copy 2015-02-13).png b/...orest/foliage/apple/crown2 (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...orest/foliage/peach/crown1 (Chris DeChamplain's conflicted copy 2015-02-13).png b/...orest/foliage/peach/crown1 (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...orest/foliage/peach/crown2 (Chris DeChamplain's conflicted copy 2015-02-13).png b/...orest/foliage/peach/crown2 (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...orest/stem/applewood/base2 (Chris DeChamplain's conflicted copy 2015-02-13).png b/...orest/stem/applewood/base2 (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...orest/stem/pearwood/crown2 (Chris DeChamplain's conflicted copy 2015-02-13).png b/...orest/stem/pearwood/crown2 (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...liage/nyanifoliage/branch1 (Chris DeChamplain's conflicted copy 2015-02-13).png b/...liage/nyanifoliage/branch1 (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...tem/solaristem/saplingicon (Chris DeChamplain's conflicted copy 2015-02-13).png b/...tem/solaristem/saplingicon (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...ns/clustergoo2/clustergoo2 (Chris DeChamplain's conflicted copy 2015-02-13).png b/...ns/clustergoo2/clustergoo2 (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...ns/ffslimeblob/ffslimeblob (Chris DeChamplain's conflicted copy 2015-02-13).png b/...ns/ffslimeblob/ffslimeblob (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...ns/goocluster2/goocluster2 (Chris DeChamplain's conflicted copy 2015-02-13).png b/...ns/goocluster2/goocluster2 (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...ns/vashtagun/vashtagunshot (Chris DeChamplain's conflicted copy 2015-02-13).png b/...ns/vashtagun/vashtagunshot (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/...ather/lavaburst/lavabubble (Chris DeChamplain's conflicted copy 2015-02-13).png b/...ather/lavaburst/lavabubble (Chris DeChamplain's conflicted copy 2015-02-13).png
diff --git a/quests/biochemlab/1_biochemlab.questtemplate b/quests/biochemlab/1_biochemlab.questtemplate
@@ -1,6 +1,6 @@
   {
   "id" : "1_biochemlab.gearup",
-  "prerequisites" : [ "8_tobiochem.gearup", "6_cinnabar.gearup", "7_blisterextract.gearup" ],
+  "prerequisites" : [ "8_tobiochem.gearup", "6_cinnabar.gearup", "5_protocitebar.gearup" ],
   "title" : "^#1693d5;The Biochem Lab",
   "text" : "Before you can really get started on science you are going to need a lot of resources. For that, you need a ^orange;Bio-Chem Lab^white;. It lets you make the chemicals and formulas you'll need. Build one now.",
   "completionText" : "This lab can create amazing chemical products. You're going to love it. If you don't blow yourself up, anyhow.",

diff --git a/quests/xenolab/4_toxingene.questtemplate b/quests/xenolab/4_toxingene.questtemplate
@@ -4,7 +4,7 @@
   "text" : "Statement. Now you need to create a ^orange;toxin gene^white;. Caution. Use protective gear.",
   "completionText" : "Enthusiastic. Great.",
   "conditions" : [ 
-    { "kind" : "gather", "item" : [ "toxingene", 1], "consume" : false }
+    { "kind" : "gather", "item" : [ "toxicgene", 1], "consume" : false }
   ],
   "moneyRange" : [0,0],
   "rewards" : [],

diff --git a/recipes/armor/armor_blisterhelm2.recipe b/recipes/armor/armor_blisterhelm2.recipe
diff --git a/recipes/armor/armor_fieldsciencechest.recipe b/recipes/armor/armor_fieldsciencechest.recipe
@@ -0,0 +1,12 @@
+{
+  "input" : [
+    { "item" : "mutaviskthread", "count" : 12 },
+    { "item" : "vialproto", "count" : 4 },
+    { "item" : "ff_plastic", "count" : 12 }
+  ],
+  "output" : {
+    "item" : "fieldscientistchest",
+    "count" : 1
+  },
+  "groups" : [ "prototyper", "armors", "all" ]
+}
diff --git a/recipes/armor/armor_fieldsciencehelm.recipe b/recipes/armor/armor_fieldsciencehelm.recipe
@@ -0,0 +1,13 @@
+{
+  "input" : [
+    { "item" : "circuitboard", "count" : 1 },
+    { "item" : "glassmaterial", "count" : 1 },
+    { "item" : "ff_silicon", "count" : 4 },
+    { "item" : "steelbar", "count" : 4 }
+  ],
+  "output" : {
+    "item" : "fieldscientisthead",
+    "count" : 1
+  },
+  "groups" : [ "prototyper", "armors", "all" ]
+}
diff --git a/recipes/armor/armor_fieldsciencelegs.recipe b/recipes/armor/armor_fieldsciencelegs.recipe
@@ -0,0 +1,12 @@
+{
+  "input" : [
+    { "item" : "mutaviskthread", "count" : 12 },
+    { "item" : "alienjuice", "count" : 8 },
+    { "item" : "ff_plastic", "count" : 8 }
+  ],
+  "output" : {
+    "item" : "fieldscientistlegs",
+    "count" : 1
+  },
+  "groups" : [ "prototyper", "armors", "all" ]
+}
diff --git a/recipes/armor/armor_goggles1.recipe b/recipes/armor/armor_goggles1.recipe
@@ -2,7 +2,7 @@
   "input" : [
     { "item" : "copperbar", "count" : 1 },
     { "item" : "glassmaterial", "count" : 1 },
-    { "item" : "steelbar", "count" : 1 }
+    { "item" : "ff_plastic", "count" : 1 }
   ],
   "output" : {
     "item" : "goggles1",

diff --git a/recipes/armor/armor_goggles2.recipe b/recipes/armor/armor_goggles2.recipe
@@ -0,0 +1,12 @@
+{
+  "input" : [
+    { "item" : "ironbar", "count" : 1 },
+    { "item" : "glassmaterial", "count" : 1 },
+    { "item" : "ff_plastic", "count" : 1 }
+  ],
+  "output" : {
+    "item" : "goggles2",
+    "count" : 1
+  },
+  "groups" : [ "prototyper", "armors", "all" ]
+}
diff --git a/recipes/armor/armor_scoutchest.recipe b/recipes/armor/armor_scoutchest.recipe
@@ -1,9 +1,9 @@
 {
   "input" : [
-    { "item" : "ff_penumbraplating", "count" : 4 },
-    { "item" : "vialproto", "count" : 12 },
-    { "item" : "steelbar", "count" : 25 },
-    { "item" : "biochip", "count" : 15 }
+    { "item" : "ff_protoplating", "count" : 8 },
+    { "item" : "vialproto", "count" : 4 },
+    { "item" : "titaniumbar", "count" : 8 },
+    { "item" : "moonstoneore", "count" : 6 }
   ],
   "output" : {
     "item" : "ff_scoutchest",

diff --git a/recipes/armor/armor_scoutchest_melee.recipe b/recipes/armor/armor_scoutchest_melee.recipe
@@ -1,9 +1,9 @@
 {
   "input" : [
-    { "item" : "ff_plastic", "count" : 6 },
-    { "item" : "vialproto", "count" : 10 },
-    { "item" : "steelbar", "count" : 25 },
-    { "item" : "biochip", "count" : 15 }
+    { "item" : "ff_protoplating", "count" : 8 },
+    { "item" : "vialproto", "count" : 4 },
+    { "item" : "titaniumbar", "count" : 8 },
+    { "item" : "prisiliteore", "count" : 6 }
   ],
   "output" : {
     "item" : "ff_scoutchest_melee",

diff --git a/recipes/armor/armor_scouthelm.recipe b/recipes/armor/armor_scouthelm.recipe
@@ -1,9 +1,9 @@
 {
   "input" : [
-    { "item" : "ff_penumbraplating", "count" : 2 },
-    { "item" : "vialproto", "count" : 4 },
-    { "item" : "steelbar", "count" : 10 },
-    { "item" : "biochip", "count" : 15 }
+    { "item" : "ff_protoplating", "count" : 5 },
+    { "item" : "vialproto", "count" : 2 },
+    { "item" : "titaniumbar", "count" : 5 },
+    { "item" : "moonstoneore", "count" : 3 }
   ],
   "output" : {
     "item" : "ff_scouthelm",

diff --git a/recipes/armor/armor_scouthelm_melee.recipe b/recipes/armor/armor_scouthelm_melee.recipe
@@ -1,9 +1,9 @@
 {
   "input" : [
-    { "item" : "ff_plastic", "count" : 4 },
-    { "item" : "vialproto", "count" : 6 },
-    { "item" : "steelbar", "count" : 8 },
-    { "item" : "biochip", "count" : 15 }
+    { "item" : "ff_protoplating", "count" : 5 },
+    { "item" : "vialproto", "count" : 2 },
+    { "item" : "titaniumbar", "count" : 5 },
+    { "item" : "prisiliteore", "count" : 3 }
   ],
   "output" : {
     "item" : "ff_scouthelm_melee",

diff --git a/recipes/armor/armor_scoutlegs.recipe b/recipes/armor/armor_scoutlegs.recipe
@@ -1,9 +1,9 @@
 {
   "input" : [
-    { "item" : "ff_penumbraplating", "count" : 4 },
-    { "item" : "vialproto", "count" : 8 },
-    { "item" : "steelbar", "count" : 15 },
-    { "item" : "biochip", "count" : 15 }
+    { "item" : "ff_protoplating", "count" : 6 },
+    { "item" : "vialproto", "count" : 2 },
+    { "item" : "titaniumbar", "count" : 6 },
+    { "item" : "moonstoneore", "count" : 4 }
   ],
   "output" : {
     "item" : "ff_scoutpants",

diff --git a/recipes/armor/armor_scoutlegs_melee.recipe b/recipes/armor/armor_scoutlegs_melee.recipe
@@ -1,9 +1,9 @@
 {
   "input" : [
-    { "item" : "ff_plastic", "count" : 6 },
-    { "item" : "vialproto", "count" : 8 },
-    { "item" : "steelbar", "count" : 17 },
-    { "item" : "biochip", "count" : 15 }
+    { "item" : "ff_protoplating", "count" : 6 },
+    { "item" : "vialproto", "count" : 2 },
+    { "item" : "titaniumbar", "count" : 6 },
+    { "item" : "prisiliteore", "count" : 4 }
   ],
   "output" : {
     "item" : "ff_scoutpants_melee",

diff --git a/recipes/ff_stations/designlab/wretchelseed.recipe b/recipes/ff_stations/designlab/wretchelseed.recipe
@@ -2,7 +2,8 @@
   "input" : [
     { "item" : "aliencompound", "count" : 12 },
     { "item" : "cellhardening2", "count" : 1 }, 
-    { "item" : "organicsynthesis", "count" : 1 }
+    { "item" : "organicsynthesis", "count" : 1 },
+    { "item" : "voidgene", "count" : 2 }
   ],
   "output" : {
     "item" : "wretchelseed",

diff --git a/recipes/ff_stations/prototyper/hydrotube.recipe b/recipes/ff_stations/prototyper/hydrotube.recipe
@@ -0,0 +1,11 @@
+{
+  "input" : [
+    { "item" : "dirtmaterial", "count" : 1 },
+    { "item" : "ff_plastic", "count" : 2 }
+  ],
+  "output" : {
+    "item" : "hydrotubematerial",
+    "count" : 1
+  },
+  "groups" : [ "prototyper", "materials", "all" ]
+}
diff --git a/recipes/ff_stations/xenostation/ff_gene_voidgene.recipe b/recipes/ff_stations/xenostation/ff_gene_voidgene.recipe
@@ -0,0 +1,14 @@
+{
+  "input" : [
+    { "item" : "cellresistance1", "count" : 1 },
+    { "item" : "densiniumore", "count" : 8 },
+    { "item" : "aquatichomeostasis", "count" : 2 },
+    { "item" : "aggressiongene", "count" : 1 },
+    { "item" : "alienjuice", "count" : 2 }
+  ],
+  "output" : {
+    "item" : "voidgene",
+    "count" : 1
+  },
+  "groups" : [ "xenostation", "objects", "all", "crafting" ]
+}
diff --git a/recipes/weapons/weapon_densiniumrifle.recipe b/recipes/weapons/weapon_densiniumrifle.recipe
@@ -0,0 +1,16 @@
+{
+  "input" : [
+    { "item" : "densiniumbar", "count" : 11 },
+    { "item" : "ff_diamondplating", "count" : 2 },
+    { "item" : "ff_silicon", "count" : 6 },
+    { "item" : "ff_focusingarray", "count" : 2 }, 
+    { "item" : "gunhousing", "count" : 2 },
+    { "item" : "prisilitestar", "count" : 2 },
+    { "item" : "triggerassembly", "count" : 1 }
+  ],
+  "output" : {
+    "item" : "densiniumrifle",
+    "count" : 1
+  },
+  "groups" : [ "prototyper", "armors", "all" ]
+}
diff --git a/recipes/weapons/weapon_eldercarbine.recipe b/recipes/weapons/weapon_eldercarbine.recipe
@@ -7,7 +7,7 @@
     { "item" : "gunhousing", "count" : 2 },
     { "item" : "triggerassembly", "count" : 1 },
     { "item" : "prisilitestar", "count" : 2 },
-    { "item" : "focusingarray", "count" : 2 }
+    { "item" : "f_focusingarray", "count" : 2 }
   ],
   "output" : {
     "item" : "eldercarbine",

diff --git a/...s/bloodstone/ff_bloodstone (Chris DeChamplain's conflicted copy 2015-02-13).png b/...s/bloodstone/ff_bloodstone (Chris DeChamplain's conflicted copy 2015-02-13).png