From 6e153f36f15625e8919af26948e9259c539defaf Mon Sep 17 00:00:00 2001
From: sayterdarkwynd <sayterdarkwynd@gmail.com>
Date: Thu, 3 Jan 2019 10:05:16 -0500
Subject: [PATCH] added Upgrade Table

---
 .../fu_upgradetable/fu_upgradetable.frames      |  16 ++++++++++++++++
 .../fu_upgradetable.object}                     |   8 ++++----
 .../fu_upgradetable/fu_upgradetable.png         | Bin 0 -> 720 bytes
 .../fu_upgradetablefullbright.frames            |  16 ++++++++++++++++
 .../fu_upgradetablefullbright.png               | Bin 0 -> 688 bytes
 .../fu_upgradetable/fu_upgradetableicon.png     | Bin 0 -> 171 bytes
 .../crafting/matterassembler/prototyper.object  |   6 +++---
 .../crafting_stations/fu_upgradetable.recipe    |  15 +++++++++++++++
 8 files changed, 54 insertions(+), 7 deletions(-)
 create mode 100644 objects/crafting/fu_upgradetable/fu_upgradetable.frames
 rename objects/crafting/{fu_racialiser/fu_racialiser2.object => fu_upgradetable/fu_upgradetable.object} (69%)
 create mode 100644 objects/crafting/fu_upgradetable/fu_upgradetable.png
 create mode 100644 objects/crafting/fu_upgradetable/fu_upgradetablefullbright.frames
 create mode 100644 objects/crafting/fu_upgradetable/fu_upgradetablefullbright.png
 create mode 100644 objects/crafting/fu_upgradetable/fu_upgradetableicon.png
 create mode 100644 recipes/prototyper/labs/crafting_stations/fu_upgradetable.recipe

diff --git a/objects/crafting/fu_upgradetable/fu_upgradetable.frames b/objects/crafting/fu_upgradetable/fu_upgradetable.frames
new file mode 100644
index 0000000000..3fb7eafe2d
--- /dev/null
+++ b/objects/crafting/fu_upgradetable/fu_upgradetable.frames
@@ -0,0 +1,16 @@
+{
+
+  "frameGrid" : {
+    "size" : [32, 24],
+    "dimensions" : [1, 1],
+    "names" : [
+      [ "default" ]
+    ],
+    
+    "aliases" : {
+    "default.default" : "default",
+    "default.default.default" : "default"
+    }
+
+  }
+}
diff --git a/objects/crafting/fu_racialiser/fu_racialiser2.object b/objects/crafting/fu_upgradetable/fu_upgradetable.object
similarity index 69%
rename from objects/crafting/fu_racialiser/fu_racialiser2.object
rename to objects/crafting/fu_upgradetable/fu_upgradetable.object
index 28c2e8dbd1..e1fe07a5fc 100644
--- a/objects/crafting/fu_racialiser/fu_racialiser2.object
+++ b/objects/crafting/fu_upgradetable/fu_upgradetable.object
@@ -1,6 +1,6 @@
 {
-  "objectName" : "fu_racialiser2",
-  "colonyTags" : ["crafting"],
+  "objectName" : "fu_upgradetable",
+  "colonyTags" : ["crafting","science"],
   "rarity" : "Rare",
   "printable" : false,
   "description" : "Can be used to upgrade weapons and armors.",
@@ -8,10 +8,10 @@
   "race" : "generic",
   "category" : "crafting",
 
-  "inventoryIcon" : "fu_racialisericon.png",
+  "inventoryIcon" : "fu_upgradetableicon.png",
   "orientations" : [
     {
-      "dualImage" : "fu_racialiser.png:<color>",
+      "imageLayers" : [ { "image" : "fu_upgradetable.png:<color>", "fullbright" : true }, { "image" : "fu_upgradetablefullbright.png:<color>" } ],
 
       "imagePosition" : [-16, 0],
       "frames" : 1,
diff --git a/objects/crafting/fu_upgradetable/fu_upgradetable.png b/objects/crafting/fu_upgradetable/fu_upgradetable.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ad981b2e73d9cacc156c0091b8e4735b77920c2
GIT binary patch
literal 720
zcmV;>0x$iEP)<h;3K|Lk000e1NJLTq001BW000;W1^@s6n^XTZ0007)Nkl<ZNQu3c
zKWGzC9LGP`rqa>HAQ%gxaVbK`;^`2mT6*YWkyk{-<uF59#PKExUCbmM8i&$Ak>cP{
z94h7Ds?`jVL1;T<F+w3&D7ZM53Z6rHFZVB(YfJsY<KFwd-~0VO`TgD<Q2@&2vZJah
zNu_C;($7Z-;iS`P0IJn$Pydt<!f_Y1S}hTPWm!%fgb>0pO;heqPft6&AQT~lGdem7
zfU2r!*C+Y{h~gBwu7@h|^5L-a;O>6x*{e_Rok@8YjYb0tIuILylVjkV1?4@M3-6#f
z<*S67d}VDI<LN$Jc^nDw{mruDh459tm8`@@Co#|k8bjLMN^CCO$NS4AL=UxgyOmG?
zc?X0L(kTelOU-7J{NQQ`z+Jm@uMN5YDQ{w3*Apf6N>x=hmsUge?1k=pWo_7JYwdRT
ze0Lz}TM$%!u=ieED<IH<pu8<PE%{my)NxvJEP(uAxQ74}L*}Ui#J1pnXy6b+wm}FX
z=jC!4%d$c(T7Gs$4uDrf-Qm@Z%PBd$^2Aj9J27&T0Te_5fVx=+V8?;E+c$as@oVVZ
zqg$7F`)Q|V+<~M3pT8VX5CsaN!0gOA7Z27W{k#<f__g;l(tc!s#ci0K=_GwIe<!s6
zquz)-ckX;9Hf~~oAVg5}fBwq3X?EV8On#F3?;M%@<jDczK1zF&f_on<uDxC$olZ;N
z@$qqVU6;=&CBB5N7PkReg#&4Cx7#7#k&zMF?Y4ZL2%yz!k;~-(_y$xe6%4~5m+S25
zx{hHO0Bmh-0ibD`FGf@q69be=B{{ck+h?<Fn_8_#sZ_$YZL-;H(y++^ip8RD?OwEg
zwj%??1nK)vI3Nc)Wj~A=`Po;z&H;Or?Z^QAV*UfcTJui}BWzRv0000<MNUMnLSTXd
CW>HxH

literal 0
HcmV?d00001

diff --git a/objects/crafting/fu_upgradetable/fu_upgradetablefullbright.frames b/objects/crafting/fu_upgradetable/fu_upgradetablefullbright.frames
new file mode 100644
index 0000000000..3fb7eafe2d
--- /dev/null
+++ b/objects/crafting/fu_upgradetable/fu_upgradetablefullbright.frames
@@ -0,0 +1,16 @@
+{
+
+  "frameGrid" : {
+    "size" : [32, 24],
+    "dimensions" : [1, 1],
+    "names" : [
+      [ "default" ]
+    ],
+    
+    "aliases" : {
+    "default.default" : "default",
+    "default.default.default" : "default"
+    }
+
+  }
+}
diff --git a/objects/crafting/fu_upgradetable/fu_upgradetablefullbright.png b/objects/crafting/fu_upgradetable/fu_upgradetablefullbright.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb3a0f45a3a09b1d77467a0760c5ef02499266dd
GIT binary patch
literal 688
zcmV;h0#E&kP)<h;3K|Lk000e1NJLTq001BW000;W1^@s6n^XTZ0007aNkl<ZNQu3c
zziSg=7{@<pQ^`MI5Ud5!xD?^YbUNIi27@jJc|k;64m+ep9B-1)#Z2PRIFts86qln@
zr5s!p%^(?swnG;q6oQ3<i(`r4Ii&aIy&t(;TIv^G?s=b|-}iamJ1zrItJOSR*GY?V
zxttm0BZTns`8)uPMq{XdRtVwwn`X0_ih$!dUJ?l*glF5fw9n7ad&5X%gb?2B>?{Df
zuBSeoX_^t=SC4Yu!+S@GvDcmwh{>v(cDp_DbO6Vv^Hg8I`1)oJ>)8=peG(h{{oR_U
zk_dFb$GDx?UVVUia!FzcItPPJWB_>wgb>mxOllbR_Vy@FZbS(9dtX*{Fd&ds3!A2y
zs;CNG*V$g(i0BI!2lD!6E}-ii3~YfrkoGMIqc}O-mNW_ojUWtlBxi-d2*NnYNKQnc
zI2oNGz}+eP%n2lp;D2D^n1mdI5JJkeS`Ei>A|qOReoiic*HeR~;>MM%Tq=~DnV=;B
zelY+;7yz{F76AJmyt#do7azYy;vV0+%==IKL-S6gCGh!64?`Fj!eDV>i%Y$&SU<Ic
z0KX1@#_Go=u(At_3;m)mm+nODKU(eBxbqjL6Z57f5GE1E(x1Olw(b7gGhM9E`mHft
ztel=e(nsmABDnv-;riQU^7*{<EtN``rYWCsNPP)?tn31^3q7gtcDoVZnVA{7-L8C|
zia@8+LDMt<z5(@m9m}%Nw7$(WO)Sd-U}t9sfO5GU$Pw4Y)C8*4s+3*V4d`6grP*v!
ztyXbemqMYCHf?$Wb8~Zny?@b0>Bc6IkYwZ^QV1UO+kTug_OqW+okRLK-Pi<1<@^Wn
W_3~(1YiTh60000<MNUMnLSTa9%|k!{

literal 0
HcmV?d00001

diff --git a/objects/crafting/fu_upgradetable/fu_upgradetableicon.png b/objects/crafting/fu_upgradetable/fu_upgradetableicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1af8a8c7e13d14a7450a8fa51f30e57f59764530
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa3-AeX{r~?zkjZ3x-oU`Xs_buK
zV&c4c^KNo7{dKqc`@qj`r;a92nz1CvFPOpM*^M+H$J*1yF@$4ga>4<A7FN~<mBkAd
zxUhF9=H%qW<#C7<h_Em!IG1V(_^_;Q=`b)@*4Ea>nULNvh2z0yeg?)f+_L%?>Or<M
Nc)I$ztaD0e0stNtGWq}j

literal 0
HcmV?d00001

diff --git a/objects/crafting/matterassembler/prototyper.object b/objects/crafting/matterassembler/prototyper.object
index 49ec99bb25..9d84e72332 100644
--- a/objects/crafting/matterassembler/prototyper.object
+++ b/objects/crafting/matterassembler/prototyper.object
@@ -57,7 +57,7 @@
         },
 
         "filter" : [ "prototyper1" ],
-        "initialRecipeUnlocks" : [ "fu_byoscaptainschair", "fu_byosfuelhatch", "fu_byosshipdoor", "fu_byosshiphatch", "fu_byosshiplocker", "fu_byostechstationdeco", "fu_byosteleporterdeco", "powerstation", "petpicrepair", "servitorloader", "bothealingstation", "genecabinet", "genestorage", "polymer", "laserdiode", "wiretoolfu", "fu_alternatorgenerator", "fu_woodensifter", "siliconboard","electromagnet", "wire", "microscope", "handmill", "nanofabricator", "armory", "designlab", "sproutingtable", "fu_growingtray", "farmwell", "eggincubator", "heavypipe", "fulabpipe", "labtechpanel", "fu_autobeamer3bugs", "portablelight", "crewcontract_science", "fm_musicplayer", "fu_byospethouse", "fu_racialiser", "fu_shipcraftingtable", "fu_ftldrivedeco", "fu_byoscaptainschairdeco" ],
+        "initialRecipeUnlocks" : [ "fu_upgradetable", "fu_byoscaptainschair", "fu_byosfuelhatch", "fu_byosshipdoor", "fu_byosshiphatch", "fu_byosshiplocker", "fu_byostechstationdeco", "fu_byosteleporterdeco", "powerstation", "petpicrepair", "servitorloader", "bothealingstation", "genecabinet", "genestorage", "polymer", "laserdiode", "wiretoolfu", "fu_alternatorgenerator", "fu_woodensifter", "siliconboard","electromagnet", "wire", "microscope", "handmill", "nanofabricator", "armory", "designlab", "sproutingtable", "fu_growingtray", "farmwell", "eggincubator", "heavypipe", "fulabpipe", "labtechpanel", "fu_autobeamer3bugs", "portablelight", "crewcontract_science", "fm_musicplayer", "fu_byospethouse", "fu_racialiser", "fu_shipcraftingtable", "fu_ftldrivedeco", "fu_byoscaptainschairdeco" ],
         "upgradeMaterials" : [
           { "item" : "tungstenbar", "count" : 10 },
           { "item" : "siliconboard", "count" : 2 },
@@ -94,7 +94,7 @@
           }
         },
         "filter" : [ "prototyper1", "prototyper2" ],
-        "initialRecipeUnlocks" : [ "labcomputer2", "labcomputer3","fu_autobeamer3farmbeasts","mechassemblystation", "fusubcontroller", "fu_byoscaptainschair", "fu_byosfuelhatch", "fu_byosshipdoor", "fu_byosshiphatch", "fu_byosshiplocker", "fu_byostechstationdeco", "fu_byosteleporterdeco", "powerstation", "mechcraftingtable", "mechrepairpod", "miningbench", "checkpoint", "petpicrepair", "servitorloader", "bothealingstation", "genecabinet", "genestorage", "polymer", "laserdiode", "wiretoolfu", "fu_alternatorgenerator", "fu_woodensifter", "siliconboard", "electromagnet", "wire", "microscope", "handmill", "nanofabricator", "armory", "designlab", "sproutingtable", "fu_growingtray", "farmwell", "eggincubator", "heavypipe", "fulabpipe", "labtechpanel", "fu_autobeamer3bugs", "portablelight", "fulabhoverplatform", "fulabhoverpanel", "labvendingmachine", "techconsole", "xenostation", "apexcoolshelf2",  "apexpod2", "electronmicroscope", "titaniumwallblockmaterial", "speedblockmaterial", "jumpblockmaterial", "extractionlab", "manipulatormodule", "upgrademodule", "techcard", "crewcontract_gas", "crewcontract_sciencedrug", "crewcontract_scuba", "fm_musicplayer", "fu_byospethouse", "fu_racialiser", "fu_shipcraftingtable", "fu_ftldrivedeco", "fu_byoscaptainschairdeco" ],
+        "initialRecipeUnlocks" : [ "fu_upgradetable", "labcomputer2", "labcomputer3","fu_autobeamer3farmbeasts","mechassemblystation", "fusubcontroller", "fu_byoscaptainschair", "fu_byosfuelhatch", "fu_byosshipdoor", "fu_byosshiphatch", "fu_byosshiplocker", "fu_byostechstationdeco", "fu_byosteleporterdeco", "powerstation", "mechcraftingtable", "mechrepairpod", "miningbench", "checkpoint", "petpicrepair", "servitorloader", "bothealingstation", "genecabinet", "genestorage", "polymer", "laserdiode", "wiretoolfu", "fu_alternatorgenerator", "fu_woodensifter", "siliconboard", "electromagnet", "wire", "microscope", "handmill", "nanofabricator", "armory", "designlab", "sproutingtable", "fu_growingtray", "farmwell", "eggincubator", "heavypipe", "fulabpipe", "labtechpanel", "fu_autobeamer3bugs", "portablelight", "fulabhoverplatform", "fulabhoverpanel", "labvendingmachine", "techconsole", "xenostation", "apexcoolshelf2",  "apexpod2", "electronmicroscope", "titaniumwallblockmaterial", "speedblockmaterial", "jumpblockmaterial", "extractionlab", "manipulatormodule", "upgrademodule", "techcard", "crewcontract_gas", "crewcontract_sciencedrug", "crewcontract_scuba", "fm_musicplayer", "fu_byospethouse", "fu_racialiser", "fu_shipcraftingtable", "fu_ftldrivedeco", "fu_byoscaptainschairdeco" ],
         "upgradeMaterials" : [
           { "item" : "titaniumbar", "count" : 6 },
           { "item" : "cpu", "count" : 2 },
@@ -136,7 +136,7 @@
         "filter" : [ "prototyper1", "prototyper2", "prototyper3" ],
         "craftingSound" : "/sfx/interface/crafting_furnacetech.ogg",
         "initialRecipeUnlocks" : [
-        "mechassemblystation", "fusubcontroller", "fu_autobeamer3farmbeasts",
+        "fu_upgradetable", "mechassemblystation", "fusubcontroller", "fu_autobeamer3farmbeasts",
         "fu_byoscaptainschair", "fu_byosfuelhatch", "fu_byosshipdoor", "fu_byosshiphatch", "fu_byosshiplocker", "fu_byostechstationdeco", "fu_byosteleporterdeco",
         "mechcraftingtable",
         "mechrepairpod",
diff --git a/recipes/prototyper/labs/crafting_stations/fu_upgradetable.recipe b/recipes/prototyper/labs/crafting_stations/fu_upgradetable.recipe
new file mode 100644
index 0000000000..8ab74d2d41
--- /dev/null
+++ b/recipes/prototyper/labs/crafting_stations/fu_upgradetable.recipe
@@ -0,0 +1,15 @@
+{
+  "input" : [
+	{ "item" : "tungstenbar", "count" : 5 },
+	{ "item" : "glass", "count" : 1 },
+	{ "item" : "electromagnet", "count" : 1 },
+	{ "item" : "siliconboard", "count" : 2 },
+	{ "item" : "goldbar", "count" : 2 }
+  ],
+  "output" : {
+    "item" : "fu_upgradetable",
+    "count" : 1
+  },
+  "groups" : [ "prototyper1", "genetics", "all" ],
+  "duration" : 5
+}