Merge branch 'master' into upstream-merge-26386

code/modules/research/designs/smelting_designs.dm

@@ -0,0 +1,18 @@
+///////SMELTABLE ALLOYS///////
+
+/datum/design/plasteel_alloy
+	name = "Plasma + Iron alloy"
+	id = "plasteel"
+	build_type = SMELTER
+	materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT / 2, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT / 2)
+	build_path = /obj/item/stack/sheet/plasteel
+	category = list("initial","Alloys")
+
+
+/datum/design/plastitanium_alloy
+	name = "Plasma + Titanium alloy"
+	id = "plastitanium"
+	build_type = SMELTER
+	materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT / 2, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT / 2)
+	build_path = /obj/item/stack/sheet/mineral/plastitanium
+	category = list("initial","Alloys")

code/modules/research/rdconsole.dm

@@ -1068,7 +1068,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 /obj/machinery/computer/rdconsole/robotics/Initialize()
 	. = ..()
 	if(circuit)
-		circuit.name = "RD Console - Robotics (Computer Board)"
+		circuit.name = "R&D Console - Robotics (Computer Board)"
 		circuit.build_path = /obj/machinery/computer/rdconsole/robotics
 
 /obj/machinery/computer/rdconsole/core

code/modules/research/research.dm

@@ -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					  **

code/modules/research/xenobiology/xenobiology.dm

@@ -20,7 +20,7 @@
 		if(Uses >= 5)
 			to_chat(user, "<span class='warning'>You cannot enhance this extract further!</span>")
 			return ..()
-		user <<"<span class='notice'>You apply the enhancer to the slime extract. It may now be reused one more time.</span>"
+		to_chat(user, "<span class='notice'>You apply the enhancer to the slime extract. It may now be reused one more time.</span>")
 		Uses++
 		qdel(O)
 	..()
@@ -146,8 +146,8 @@
 
 	M.docile = 1
 	M.nutrition = 700
-	M <<"<span class='warning'>You absorb the potion and feel your intense desire to feed melt away.</span>"
-	user <<"<span class='notice'>You feed the slime the potion, removing its hunger and calming it.</span>"
+	to_chat(M, "<span class='warning'>You absorb the potion and feel your intense desire to feed melt away.</span>")
+	to_chat(user, "<span class='notice'>You feed the slime the potion, removing its hunger and calming it.</span>")
 	var/newname = copytext(sanitize(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text),1,MAX_NAME_LEN)
 
 	if (!newname)
@@ -261,10 +261,10 @@
 		to_chat(user, "<span class='warning'>The slime is dead!</span>")
 		return ..()
 	if(M.cores >= 5)
-		user <<"<span class='warning'>The slime already has the maximum amount of extract!</span>"
+		to_chat(user, "<span class='warning'>The slime already has the maximum amount of extract!</span>")
 		return ..()
 
-	user <<"<span class='notice'>You feed the slime the steroid. It will now produce one more extract.</span>"
+	to_chat(user, "<span class='notice'>You feed the slime the steroid. It will now produce one more extract.</span>")
 	M.cores++
 	qdel(src)
 
@@ -288,10 +288,10 @@
 		to_chat(user, "<span class='warning'>The slime is dead!</span>")
 		return ..()
 	if(M.mutation_chance == 0)
-		user <<"<span class='warning'>The slime already has no chance of mutating!</span>"
+		to_chat(user, "<span class='warning'>The slime already has no chance of mutating!</span>")
 		return ..()
 
-	user <<"<span class='notice'>You feed the slime the stabilizer. It is now less likely to mutate.</span>"
+	to_chat(user, "<span class='notice'>You feed the slime the stabilizer. It is now less likely to mutate.</span>")
 	M.mutation_chance = Clamp(M.mutation_chance-15,0,100)
 	qdel(src)
 
@@ -312,10 +312,10 @@
 		to_chat(user, "<span class='warning'>This slime has already consumed a mutator, any more would be far too unstable!</span>")
 		return ..()
 	if(M.mutation_chance == 100)
-		user <<"<span class='warning'>The slime is already guaranteed to mutate!</span>"
+		to_chat(user, "<span class='warning'>The slime is already guaranteed to mutate!</span>")
 		return ..()
 
-	user <<"<span class='notice'>You feed the slime the mutator. It is now more likely to mutate.</span>"
+	to_chat(user, "<span class='notice'>You feed the slime the mutator. It is now more likely to mutate.</span>")
 	M.mutation_chance = Clamp(M.mutation_chance+12,0,100)
 	M.mutator_used = TRUE
 	qdel(src)
@@ -348,7 +348,7 @@
 				return ..()
 			R.vehicle_move_delay = 0
 
-	user <<"<span class='notice'>You slather the red gunk over the [C], making it faster.</span>"
+	to_chat(user, "<span class='notice'>You slather the red gunk over the [C], making it faster.</span>")
 	C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
 	C.add_atom_colour("#FF0000", FIXED_COLOUR_PRIORITY)
 	qdel(src)
@@ -373,7 +373,7 @@
 	if(C.max_heat_protection_temperature == FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT)
 		to_chat(user, "<span class='warning'>The [C] is already fireproof!</span>")
 		return ..()
-	user <<"<span class='notice'>You slather the blue gunk over the [C], fireproofing it.</span>"
+	to_chat(user, "<span class='notice'>You slather the blue gunk over the [C], fireproofing it.</span>")
 	C.name = "fireproofed [C.name]"
 	C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
 	C.add_atom_colour("#000080", FIXED_COLOUR_PRIORITY)