diff --git a/code/__DEFINES/research/techweb_nodes.dm b/code/__DEFINES/research/techweb_nodes.dm index 6199918bc01..3c730e02169 100644 --- a/code/__DEFINES/research/techweb_nodes.dm +++ b/code/__DEFINES/research/techweb_nodes.dm @@ -97,7 +97,6 @@ #define TECHWEB_NODE_PASSIVE_IMPLANTS "passive_implants" #define TECHWEB_NODE_PLASMA_CONTROL "plasma_control" #define TECHWEB_NODE_PLASMA_MINING "plasma_mining" -#define TECHWEB_NODE_PLUMBING "plumbing" #define TECHWEB_NODE_POSITRONIC_SPHERE "positronic_sphere" #define TECHWEB_NODE_PROGRAMMED_ROBOT "programmed_robot" #define TECHWEB_NODE_PROGRAMMED_SERVER "programmed_server" diff --git a/code/modules/research/techweb/nodes/medbay_nodes.dm b/code/modules/research/techweb/nodes/medbay_nodes.dm index 7d6db08f584..f5b122ccd28 100644 --- a/code/modules/research/techweb/nodes/medbay_nodes.dm +++ b/code/modules/research/techweb/nodes/medbay_nodes.dm @@ -28,6 +28,7 @@ "syringe", "dropper", "pillbottle", + "xlarge_beaker", ) experiments_to_unlock = list( /datum/experiment/autopsy/human, @@ -43,7 +44,6 @@ description = "Synthesizing complex chemicals from electricity and thin air... Don't ask how..." prereq_ids = list(TECHWEB_NODE_MEDBAY_EQUIP) design_ids = list( - "xlarge_beaker", "med_spray_bottle", "medigel", "medipen_refiller", @@ -53,29 +53,19 @@ "portable_chem_mixer", "chem_heater", "w-recycler", - ) - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS) - -/datum/techweb_node/plumbing - id = TECHWEB_NODE_PLUMBING - display_name = "Plumbing" - description = "Essential infrastructure for building chemical factories. To scale up the production of happy pills to an industrial level." - prereq_ids = list(TECHWEB_NODE_CHEM_SYNTHESIS) - design_ids = list( + "meta_beaker", "plumbing_rcd", "plumbing_rcd_service", "plunger", "fluid_ducts", - "meta_beaker", - "piercesyringe", ) - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS) + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS) /datum/techweb_node/medbay_equip_adv id = TECHWEB_NODE_MEDBAY_EQUIP_ADV display_name = "Advanced Medbay Equipment" description = "State-of-the-art medical gear for keeping the crew in one piece — mostly." - prereq_ids = list(TECHWEB_NODE_PLUMBING) + prereq_ids = list(TECHWEB_NODE_CHEM_SYNTHESIS) design_ids = list( "smoke_machine", "chem_mass_spec", @@ -85,6 +75,7 @@ "defibrillator_compact", "defibmount", "medicalbed_emergency", + "piercesyringe", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS) required_experiments = list(/datum/experiment/scanning/reagent/haloperidol)