Merge branch 'master' into master

code/modules/research/designs/medical_designs.dm

@@ -172,6 +172,16 @@
 	category = list("Medical Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
 
+/datum/design/organbox
+	name = "Empty Organ Box"
+	desc = "A large cool box that can hold large amouts of medical tools or organs."
+	id = "organbox"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 3000, MAT_GLASS = 1000, MAT_SILVER= 3500, MAT_GOLD = 3500, MAT_PLASTIC = 5000)
+	build_path = /obj/item/storage/belt/organbox
+	category = list("Medical Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
+
 ////////////////////////////////////////
 //////////Defibrillator Tech////////////
 ////////////////////////////////////////

code/modules/research/research_disk.dm

@@ -20,3 +20,12 @@
 /obj/item/disk/tech_disk/debug/Initialize()
 	. = ..()
 	stored_research = new /datum/techweb/admin
+
+/obj/item/disk/tech_disk/illegal
+	name = "Illegal technology disk"
+	desc = "A technology disk containing schematics for syndicate inspired equipment."
+	materials = list()
+
+/obj/item/disk/tech_disk/illegal/Initialize()
+	. = ..()
+	stored_research = new /datum/techweb/syndicate

code/modules/research/techweb/_techweb.dm

@@ -41,6 +41,14 @@
 		research_points[i] = INFINITY
 	hidden_nodes = list()
 
+/datum/techweb/syndicate
+	id = "SYNDICATE"
+	organization = "Syndicate"
+
+/datum/techweb/syndicate/New()
+	var/datum/techweb_node/syndicate_basic/Node = new()
+	research_node(Node, TRUE)
+
 /datum/techweb/science	//Global science techweb for RND consoles.
 	id = "SCIENCE"
 	organization = "Nanotrasen"

code/modules/research/techweb/all_nodes.dm

@@ -115,7 +115,7 @@
 	display_name = "Advanced Surgery"
 	description = "When simple medicine doesn't cut it."
 	prereq_ids = list("adv_biotech")
-	design_ids = list("surgery_lobotomy", "surgery_reconstruction")
+	design_ids = list("surgery_lobotomy", "surgery_reconstruction", "organbox")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
 	export_price = 5000
 
@@ -203,6 +203,24 @@
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3000)
 	export_price = 5000
 
+/datum/techweb_node/basic_meteor_defense
+	id = "basic_meteor_defense"
+	display_name = "Meteor Defense Research"
+	description = "Unlock the potential of the mysterious of why CC decided to not build these around the station themselves."
+	prereq_ids = list("adv_engi", "high_efficiency")
+	design_ids = list("meteor_defence", "meteor_console")
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
+	export_price = 5000
+
+//datum/techweb_node/adv_meteor_defense
+	//id = "adv_meteor_defense"
+	//display_name = "Meteor Defense Research"
+	//description = "New and improved coding and lock on tech for meteor defence!"
+	//prereq_ids = list("basic_meteor_defense", "adv_datatheory", "emp_adv")
+	//design_ids = list("meteor_disk")
+	//research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
+	//export_price = 5000
+
 /////////////////////////Bluespace tech/////////////////////////
 /datum/techweb_node/bluespace_basic //Bluespace-memery
 	id = "bluespace_basic"