Skip to content

Commit

Permalink
added Upgrade Table
Browse files Browse the repository at this point in the history
  • Loading branch information
sayterdarkwynd committed Jan 3, 2019
1 parent f5c1e5f commit 6e153f3
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 7 deletions.
16 changes: 16 additions & 0 deletions objects/crafting/fu_upgradetable/fu_upgradetable.frames
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{

"frameGrid" : {
"size" : [32, 24],
"dimensions" : [1, 1],
"names" : [
[ "default" ]
],

"aliases" : {
"default.default" : "default",
"default.default.default" : "default"
}

}
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"objectName" : "fu_racialiser2",
"colonyTags" : ["crafting"],
"objectName" : "fu_upgradetable",
"colonyTags" : ["crafting","science"],
"rarity" : "Rare",
"printable" : false,
"description" : "Can be used to upgrade weapons and armors.",
"shortdescription" : "^cyan;Upgrade Table^white;",
"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,
Expand Down
Binary file added objects/crafting/fu_upgradetable/fu_upgradetable.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions objects/crafting/fu_upgradetable/fu_upgradetablefullbright.frames
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{

"frameGrid" : {
"size" : [32, 24],
"dimensions" : [1, 1],
"names" : [
[ "default" ]
],

"aliases" : {
"default.default" : "default",
"default.default.default" : "default"
}

}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions objects/crafting/matterassembler/prototyper.object
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down Expand Up @@ -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 },
Expand Down Expand Up @@ -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",
Expand Down
15 changes: 15 additions & 0 deletions recipes/prototyper/labs/crafting_stations/fu_upgradetable.recipe
Original file line number Diff line number Diff line change
@@ -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
}

0 comments on commit 6e153f3

Please sign in to comment.