merge conflict and job/dept discounts support.

code/modules/research/techweb/_techweb.dm

@@ -352,6 +352,7 @@
 
 /datum/techweb/specialized/autounlocking
 	var/design_autounlock_buildtypes = NONE
+	var/design_autounlock_skip_types = NONE
 	var/design_autounlock_categories = list("initial")		//if a design has a buildtype that matches the abovea and either has a category in this or this is null, unlock it.
 	var/node_autounlock_ids = list()				//autounlock nodes of this type.
 
@@ -364,7 +365,7 @@
 		research_node_id(id, TRUE, FALSE)
 	for(var/id in SSresearch.techweb_designs)
 		var/datum/design/D = SSresearch.techweb_design_by_id(id)
-		if(D.build_type & design_autounlock_buildtypes)
+		if(D.build_type & (design_autounlock_buildtypes & allowed_buildtypes) && !(D.build_type & design_autounlock_skip_types))
 			for(var/i in D.category)
 				if(i in design_autounlock_categories)
 					add_design_by_id(D.id)
@@ -372,7 +373,16 @@
 
 /datum/techweb/specialized/autounlocking/autolathe
 	design_autounlock_buildtypes = AUTOLATHE
-	allowed_buildtypes = AUTOLATHE
+	allowed_buildtypes = AUTOLATHE|TOYLATHE
+
+/datum/techweb/specialized/autounlocking/autolathe/public
+	design_autounlock_skip_types = NO_PUBLIC_LATHE
+
+/datum/techweb/specialized/autounlocking/autolathe/toy
+	design_autounlock_buildtypes = TOYLATHE
+
+/datum/techweb/specialized/autounlocking/autolathe/toy/public
+	design_autounlock_skip_types = NO_PUBLIC_LATHE
 
 /datum/techweb/specialized/autounlocking/limbgrower
 	design_autounlock_buildtypes = LIMBGROWER
@@ -389,10 +399,6 @@
 /datum/techweb/specialized/autounlocking/exofab
 	allowed_buildtypes = MECHFAB
 
-/datum/techweb/specialized/autounlocking/autoylathe
-	design_autounlock_buildtypes = AUTOYLATHE
-	allowed_buildtypes = AUTOYLATHE
-
 /datum/techweb/specialized/autounlocking/autobottler
 	design_autounlock_buildtypes = AUTOBOTTLER
 	allowed_buildtypes = AUTOBOTTLER

code/modules/research/techweb/all_nodes.dm

@@ -957,6 +957,14 @@
 	design_ids = list("spreading_nanites","mindcontrol_nanites","mitosis_nanites")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000)
 
+/datum/techweb_node/nanite_replication_protocols
+	id = "nanite_replication_protocols"
+	display_name = "Nanite Replication Protocols"
+	description = "Advanced behaviours that allow nanites to exploit certain circumstances to replicate faster."
+	prereq_ids = list("nanite_smart")
+	design_ids = list("kickstart_nanites","factory_nanites","tinker_nanites","offline_nanites","synergy_nanites")
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
+
 ////////////////////////Alien technology////////////////////////
 /datum/techweb_node/alientech //AYYYYYYYYLMAOO tech
 	id = "alientech"