From a3f97c5a383bed4b8f1b605a8ba7492f5ae347fa Mon Sep 17 00:00:00 2001 From: Denton Date: Sun, 22 Jul 2018 23:05:22 +0200 Subject: [PATCH] Moves auto unlocked exofab nodes to techweb nodes --- code/modules/research/techweb/_techweb.dm | 1 - code/modules/research/techweb/all_nodes.dm | 115 ++++++++++----------- 2 files changed, 53 insertions(+), 63 deletions(-) diff --git a/code/modules/research/techweb/_techweb.dm b/code/modules/research/techweb/_techweb.dm index 7c23609c215..f11b0ad7097 100644 --- a/code/modules/research/techweb/_techweb.dm +++ b/code/modules/research/techweb/_techweb.dm @@ -355,5 +355,4 @@ allowed_buildtypes = SMELTER /datum/techweb/specialized/autounlocking/exofab - node_autounlock_ids = list("robotics", "mmi", "cyborg", "mecha_odysseus", "mech_gygax", "mech_durand", "mecha_phazon", "mecha", "mech_tools", "clown") allowed_buildtypes = MECHFAB diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 3a9c6d70212..2f3405256a1 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1,7 +1,7 @@ //Current rate: 132500 research points in 90 minutes -//Base Node +//Base Nodes /datum/techweb_node/base id = "base" starting_node = TRUE @@ -11,6 +11,35 @@ "destructive_analyzer", "circuit_imprinter", "experimentor", "rdconsole", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab", "space_heater", "xlarge_beaker", "sec_rshot", "sec_bshot", "sec_slug", "sec_Islug", "sec_dart", "sec_38") //Default research tech, prevents bricking +/datum/techweb_node/mmi + id = "mmi" + starting_node = TRUE + display_name = "Man Machine Interface" + description = "A slightly Frankensteinian device that allows human brains to interface natively with software APIs." + design_ids = list("mmi") + +/datum/techweb_node/cyborg + id = "cyborg" + starting_node = TRUE + display_name = "Cyborg Construction" + description = "Sapient robots with preloaded tool modules and programmable laws." + design_ids = list("robocontrol", "sflash", "borg_suit", "borg_head", "borg_chest", "borg_r_arm", "borg_l_arm", "borg_r_leg", "borg_l_leg", "borgupload", + "cyborgrecharger", "borg_upgrade_restart", "borg_upgrade_rename") + +/datum/techweb_node/mech + id = "mecha" + starting_node = TRUE + display_name = "Mechanical Exosuits" + description = "Mechanized exosuits that are several magnitudes stronger and more powerful than the average human." + design_ids = list("mecha_tracking", "mechacontrol", "mechapower", "mech_recharger", "ripley_chassis", "firefighter_chassis", "ripley_torso", "ripley_left_arm", "ripley_right_arm", "ripley_left_leg", "ripley_right_leg", + "ripley_main", "ripley_peri", "mech_hydraulic_clamp") + +/datum/techweb_node/mech_tools + id = "mech_tools" + starting_node = TRUE + display_name = "Basic Exosuit Equipment" + description = "Various tools fit for basic mech units" + design_ids = list("mech_drill", "mech_mscanner", "mech_extinguisher", "mech_cable_layer") /////////////////////////Biotech///////////////////////// /datum/techweb_node/biotech @@ -219,39 +248,20 @@ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 -/datum/techweb_node/mmi - id = "mmi" - display_name = "Man Machine Interface" - description = "A slightly Frankensteinian device that allows human brains to interface natively with software APIs." - prereq_ids = list("neural_programming") - design_ids = list("mmi") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) - export_price = 5000 - /datum/techweb_node/posibrain id = "posibrain" display_name = "Positronic Brain" description = "Applied usage of neural technology allowing for autonomous AI units based on special metallic cubes with conductive and processing circuits." - prereq_ids = list("neural_programming", "mmi") + prereq_ids = list("neural_programming") design_ids = list("mmi_posi") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 -/datum/techweb_node/cyborg - id = "cyborg" - display_name = "Cyborg Construction" - description = "Sapient robots with preloaded tool modules and programmable laws." - prereq_ids = list("mmi", "robotics") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000) - export_price = 5000 - design_ids = list("robocontrol", "sflash", "borg_suit", "borg_head", "borg_chest", "borg_r_arm", "borg_l_arm", "borg_r_leg", "borg_l_leg", "borgupload", - "cyborgrecharger", "borg_upgrade_restart", "borg_upgrade_rename") - /datum/techweb_node/cyborg_upg_util id = "cyborg_upg_util" display_name = "Cyborg Upgrades: Utility" description = "Utility upgrades for cyborgs." - prereq_ids = list("engineering", "cyborg") + prereq_ids = list("engineering") design_ids = list("borg_upgrade_holding", "borg_upgrade_lavaproof", "borg_upgrade_thrusters", "borg_upgrade_selfrepair", "borg_upgrade_expand", "borg_upgrade_rped") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000) export_price = 5000 @@ -260,7 +270,7 @@ id = "cyborg_upg_med" display_name = "Cyborg Upgrades: Medical" description = "Medical upgrades for cyborgs." - prereq_ids = list("adv_biotech", "cyborg") + prereq_ids = list("adv_biotech") design_ids = list("borg_upgrade_defibrillator", "borg_upgrade_piercinghypospray", "borg_upgrade_highstrengthsynthesiser", "borg_upgrade_expandedsynthesiser", "borg_upgrade_pinpointer") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000) export_price = 5000 @@ -423,7 +433,7 @@ id = "cyber_organs" display_name = "Cybernetic Organs" description = "We have the technology to rebuild him." - prereq_ids = list("adv_biotech", "cyborg") + prereq_ids = list("adv_biotech") design_ids = list("cybernetic_heart", "cybernetic_liver", "cybernetic_liver_u", "cybernetic_lungs") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -432,7 +442,7 @@ id = "cyber_implants" display_name = "Cybernetic Implants" description = "Electronic implants that improve humans." - prereq_ids = list("adv_biotech", "cyborg", "adv_datatheory") + prereq_ids = list("adv_biotech", "adv_datatheory") design_ids = list("ci-nutriment", "ci-breather", "ci-gloweyes", "ci-welding", "ci-medhud", "ci-sechud") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -602,21 +612,11 @@ export_price = 5000 ////////////////////////mech technology//////////////////////// -/datum/techweb_node/mech - id = "mecha" - display_name = "Mechanical Exosuits" - description = "Mechanized exosuits that are several magnitudes stronger and more powerful than the average human." - prereq_ids = list("robotics", "adv_engi") - design_ids = list("mecha_tracking", "mechacontrol", "mechapower", "mech_recharger", "ripley_chassis", "firefighter_chassis", "ripley_torso", "ripley_left_arm", "ripley_right_arm", "ripley_left_leg", "ripley_right_leg", - "ripley_main", "ripley_peri", "mech_hydraulic_clamp") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) - export_price = 5000 - /datum/techweb_node/adv_mecha id = "adv_mecha" display_name = "Advanced Exosuits" description = "For when you just aren't Gundam enough." - prereq_ids = list("adv_robotics", "mecha") + prereq_ids = list("adv_robotics") design_ids = list("mech_repair_droid") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -625,7 +625,7 @@ id = "mecha_odysseus" display_name = "EXOSUIT: Odysseus" description = "Odysseus exosuit designs" - prereq_ids = list("mecha") + prereq_ids = list("base") design_ids = list("odysseus_chassis", "odysseus_torso", "odysseus_head", "odysseus_left_arm", "odysseus_right_arm" ,"odysseus_left_leg", "odysseus_right_leg", "odysseus_main", "odysseus_peri") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) @@ -661,20 +661,11 @@ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 -/datum/techweb_node/mech_tools - id = "mech_tools" - display_name = "Basic Exosuit Equipment" - description = "Various tools fit for basic mech units" - prereq_ids = list("mecha") - design_ids = list("mech_drill", "mech_mscanner", "mech_extinguisher", "mech_cable_layer") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) - export_price = 5000 - /datum/techweb_node/adv_mecha_tools id = "adv_mecha_tools" display_name = "Advanced Exosuit Equipment" description = "Tools for high level mech suits" - prereq_ids = list("adv_mecha", "mech_tools") + prereq_ids = list("adv_mecha") design_ids = list("mech_rcd") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -683,7 +674,7 @@ id = "med_mech_tools" display_name = "Medical Exosuit Equipment" description = "Tools for high level mech suits" - prereq_ids = list("mecha", "adv_biotech", "mech_tools") + prereq_ids = list("adv_biotech") design_ids = list("mech_sleeper", "mech_syringe_gun", "mech_medi_beam") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -701,7 +692,7 @@ id = "mecha_tools" display_name = "Exosuit Weapon (LBX AC 10 \"Scattershot\")" description = "An advanced piece of mech weaponry" - prereq_ids = list("mecha", "ballistic_weapons") + prereq_ids = list("ballistic_weapons") design_ids = list("mech_scattershot") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -710,7 +701,7 @@ id = "mech_carbine" display_name = "Exosuit Weapon (FNX-99 \"Hades\" Carbine)" description = "An advanced piece of mech weaponry" - prereq_ids = list("mecha", "ballistic_weapons") + prereq_ids = list("ballistic_weapons") design_ids = list("mech_carbine") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -719,7 +710,7 @@ id = "mmech_ion" display_name = "Exosuit Weapon (MKIV Ion Heavy Cannon)" description = "An advanced piece of mech weaponry" - prereq_ids = list("mecha", "electronic_weapons", "emp_adv") + prereq_ids = list("electronic_weapons", "emp_adv") design_ids = list("mech_ion") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -728,7 +719,7 @@ id = "mech_tesla" display_name = "Exosuit Weapon (MKI Tesla Cannon)" description = "An advanced piece of mech weaponry" - prereq_ids = list("mecha", "electronic_weapons", "adv_power") + prereq_ids = list("electronic_weapons", "adv_power") design_ids = list("mech_tesla") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -737,7 +728,7 @@ id = "mech_laser" display_name = "Exosuit Weapon (CH-PS \"Immolator\" Laser)" description = "A basic piece of mech weaponry" - prereq_ids = list("mecha", "beam_weapons") + prereq_ids = list("beam_weapons") design_ids = list("mech_laser") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -746,7 +737,7 @@ id = "mech_laser_heavy" display_name = "Exosuit Weapon (CH-LC \"Solaris\" Laser Cannon)" description = "An advanced piece of mech weaponry" - prereq_ids = list("mecha", "adv_beam_weapons") + prereq_ids = list("adv_beam_weapons") design_ids = list("mech_laser_heavy") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -755,7 +746,7 @@ id = "mech_grenade_launcher" display_name = "Exosuit Weapon (SGL-6 Grenade Launcher)" description = "An advanced piece of mech weaponry" - prereq_ids = list("mecha", "explosive_weapons") + prereq_ids = list("explosive_weapons") design_ids = list("mech_grenade_launcher") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -764,7 +755,7 @@ id = "mech_missile_rack" display_name = "Exosuit Weapon (SRM-8 Missile Rack)" description = "An advanced piece of mech weaponry" - prereq_ids = list("mecha", "explosive_weapons") + prereq_ids = list("explosive_weapons") design_ids = list("mech_missile_rack") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -773,7 +764,7 @@ id = "clusterbang_launcher" display_name = "Exosuit Module (SOB-3 Clusterbang Launcher)" description = "An advanced piece of mech weaponry" - prereq_ids = list("mecha", "explosive_weapons") + prereq_ids = list("explosive_weapons") design_ids = list("clusterbang_launcher") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -782,7 +773,7 @@ id = "mech_teleporter" display_name = "Exosuit Module (Teleporter Module)" description = "An advanced piece of mech Equipment" - prereq_ids = list("mech_tools", "adv_bluespace") + prereq_ids = list("adv_bluespace") design_ids = list("mech_teleporter") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -791,7 +782,7 @@ id = "mech_wormhole_gen" display_name = "Exosuit Module (Localized Wormhole Generator)" description = "An advanced piece of mech weaponry" - prereq_ids = list("mecha", "mech_tools", "adv_bluespace") + prereq_ids = list("adv_bluespace") design_ids = list("mech_wormhole_gen") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -800,7 +791,7 @@ id = "mech_taser" display_name = "Exosuit Weapon (PBT \"Pacifier\" Mounted Taser)" description = "A basic piece of mech weaponry" - prereq_ids = list("mecha", "electronic_weapons") + prereq_ids = list("electronic_weapons") design_ids = list("mech_taser") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -809,7 +800,7 @@ id = "mech_lmg" display_name = "Exosuit Weapon (\"Ultra AC 2\" LMG)" description = "An advanced piece of mech weaponry" - prereq_ids = list("mecha", "ballistic_weapons") + prereq_ids = list("ballistic_weapons") design_ids = list("mech_lmg") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -818,7 +809,7 @@ id = "mech_diamond_drill" display_name = "Exosuit Diamond Drill" description = "A diamond drill fit for a large exosuit" - prereq_ids = list("mecha", "adv_mining") + prereq_ids = list("adv_mining") design_ids = list("mech_diamond_drill") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000