Merge remote-tracking branch 'upstream/master' into arconomy

This commit is contained in:
ArcaneMusic
2020-02-20 02:51:18 -05:00
913 changed files with 14323 additions and 28732 deletions
+25 -1
View File
@@ -65,7 +65,7 @@
display_name = "Biological Technology"
description = "What makes us tick." //the MC, silly!
prereq_ids = list("base")
design_ids = list("chem_heater", "chem_master", "chem_dispenser", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "medigel","genescanner", "med_spray_bottle", "chem_pack", "blood_pack", "medical_kiosk", "crewpinpointerprox")
design_ids = list("chem_heater", "chem_master", "chem_dispenser", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "medigel","genescanner", "med_spray_bottle", "chem_pack", "blood_pack", "medical_kiosk", "crewpinpointerprox", "medipen_refiller")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -1087,6 +1087,17 @@
hidden = TRUE
experimental = TRUE
/datum/techweb_node/rolling_table
id = "rolling_table"
display_name = "Advanced Wheel Applications"
description = "Adding wheels to things can lead to extremely beneficial outcomes."
prereq_ids = list("base")
design_ids = list("rolling_table")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 2500
hidden = TRUE
experimental = TRUE
/datum/techweb_node/Mauna_Mug
id = "mauna_mug"
display_name = "Mauna Mug"
@@ -1121,6 +1132,19 @@
hidden = TRUE
experimental = TRUE
/datum/techweb_node/interrogation
id = "interrogation"
display_name = "Enhanced Interrogation Technology"
description = "By cross-referencing several declassified documents from past dictatorial regimes, we were able to develop an incredibly effective interrogation device. \
Ethical concerns about loss of free will do not apply to criminals, according to galactic law."
prereq_ids = list("base")
design_ids = list("hypnochair")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3500)
export_price = 3500
hidden = TRUE
experimental = TRUE
//Helpers for debugging/balancing the techweb in its entirety!
/proc/total_techweb_exports()
var/list/datum/techweb_node/processing = list()