shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update all_nodes.dm

Browse Source
This commit is contained in:
LetterJay
2018-05-20 00:44:33 -05:00
committed by GitHub
parent d54667c81b
commit 742e6a076a
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/techweb/all_nodes.dm
-15
View File
@@ -18,13 +18,8 @@
display_name = "Biological Technology"
description = "What makes us tick." //the MC, silly!
prereq_ids = list("base")
<<<<<<< HEAD
design_ids = list("chem_heater", "chem_master", "chem_dispenser", "sleeper", "pandemic", "defibmount", "operating", "soda_dispenser", "beer_dispenser")
research_cost = 2500
=======
design_ids = list("chem_heater", "chem_master", "chem_dispenser", "sleeper", "vr_sleeper", "pandemic", "defibmount", "operating", "soda_dispenser", "beer_dispenser")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
>>>>>>> 7e6f361... Refactors techwebs to have different types of points (#37448)
export_price = 5000
/datum/techweb_node/adv_biotech
@@ -145,13 +140,8 @@
display_name = "Basic Bluespace Theory"
description = "Basic studies into the mysterious alternate dimension known as bluespace."
prereq_ids = list("base")
<<<<<<< HEAD
design_ids = list("beacon","telesci_gps") //CIT CHANGE removed xenobioconsole from here.
research_cost = 2500
=======
design_ids = list("beacon", "xenobioconsole", "telesci_gps")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
>>>>>>> 7e6f361... Refactors techwebs to have different types of points (#37448)
export_price = 5000
/datum/techweb_node/adv_bluespace
@@ -169,13 +159,8 @@
display_name = "Applied Bluespace Research"
description = "Using bluespace to make things faster and better."
prereq_ids = list("bluespace_basic", "engineering")
<<<<<<< HEAD
design_ids = list("bs_rped","minerbag_holding", "telesci_gps", "bluespacebeaker", "bluespacesyringe", "bluespacebodybag", "phasic_scanning", "roastingstick", "xenobioconsole") //CIT CHANGE added xenobioconsole here
research_cost = 5000
=======
design_ids = list("bs_rped","minerbag_holding", "bluespacebeaker", "bluespacesyringe", "bluespacebodybag", "phasic_scanning", "roastingstick")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
>>>>>>> 7e6f361... Refactors techwebs to have different types of points (#37448)
export_price = 5000
/datum/techweb_node/bluespace_power