Merge branch 'master' into upstream-merge-26386

2017-05-01 15:27:25 -05:00
parent 161891e51b 1842665af6
commit b57a4aa6b4
267 changed files with 15247 additions and 8768 deletions
@@ -175,6 +175,21 @@ research holder datum.
 		return
 	..()

+//Smelter files
+/datum/research/smelter/New()
+	for(var/T in (subtypesof(/datum/tech)))
+		possible_tech += new T(src)
+	for(var/path in subtypesof(/datum/design))
+		var/datum/design/D = new path(src)
+		possible_designs += D
+		if((D.build_type & SMELTER) && ("initial" in D.category))
+			AddDesign2Known(D)
+
+/datum/research/biogenerator/AddDesign2Known(datum/design/D)
+	if(!(D.build_type & SMELTER))
+		return
+	..()
+

 /***************************************************************
 **						Technology Datums					  **