Merge branch 'dev' into ofChemistryAndStuff

Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm

code/modules/research/rdconsole.dm

@@ -30,6 +30,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 /obj/machinery/computer/rdconsole
 	name = "R&D control console"
 	icon_state = "rdcomp"
+	light_color = "#a97faa"
 	circuit = /obj/item/weapon/circuitboard/rdconsole
 	var/datum/research/files							//Stores all the collected research data.
 	var/obj/item/weapon/disk/tech_disk/t_disk = null	//Stores the technology disk.
@@ -66,8 +67,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 	if (copytext(ID, 1, 2) == "$")
 		return_name = copytext(ID, 2)
 		switch(return_name)
-			if("metal")
-				return_name = "Metal"
+			if(DEFAULT_WALL_MATERIAL)
+				return_name = "Steel"
 			if("glass")
 				return_name = "Glass"
 			if("gold")
@@ -262,7 +263,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 							if(linked_destroy.loaded_item.reliability < 100 && linked_destroy.loaded_item.crit_fail)
 								files.UpdateDesign(linked_destroy.loaded_item.type)
 							if(linked_lathe && linked_destroy.loaded_item.matter) //Also sends salvaged materials to a linked protolathe, if any.
-								linked_lathe.m_amount += min((linked_lathe.max_material_storage - linked_lathe.TotalMaterials()), (linked_destroy.loaded_item.matter["metal"]*linked_destroy.decon_mod))
+								linked_lathe.m_amount += min((linked_lathe.max_material_storage - linked_lathe.TotalMaterials()), (linked_destroy.loaded_item.matter[DEFAULT_WALL_MATERIAL]*linked_destroy.decon_mod))
 								linked_lathe.g_amount += min((linked_lathe.max_material_storage - linked_lathe.TotalMaterials()), (linked_destroy.loaded_item.matter["glass"]*linked_destroy.decon_mod))
 							linked_destroy.loaded_item = null
 						for(var/obj/I in linked_destroy.contents)
@@ -438,27 +439,24 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 	else if(href_list["lathe_ejectsheet"] && linked_lathe) //Causes the protolathe to eject a sheet of material
 		var/desired_num_sheets = text2num(href_list["amount"])
 		var/res_amount, type
-		switch(href_list["lathe_ejectsheet"])
-			if("metal")
-				type = /obj/item/stack/sheet/metal
+		var/material/M = name_to_material[href_list["lathe_ejectsheet"]]
+		if(istype(M))
+			type = M.stack_type
+
+		switch(name_to_material[href_list["lathe_ejectsheet"]])
+			if(DEFAULT_WALL_MATERIAL)
 				res_amount = "m_amount"
 			if("glass")
-				type = /obj/item/stack/sheet/glass
 				res_amount = "g_amount"
 			if("gold")
-				type = /obj/item/stack/sheet/mineral/gold
 				res_amount = "gold_amount"
 			if("silver")
-				type = /obj/item/stack/sheet/mineral/silver
 				res_amount = "silver_amount"
 			if("phoron")
-				type = /obj/item/stack/sheet/mineral/phoron
 				res_amount = "phoron_amount"
 			if("uranium")
-				type = /obj/item/stack/sheet/mineral/uranium
 				res_amount = "uranium_amount"
 			if("diamond")
-				type = /obj/item/stack/sheet/mineral/diamond
 				res_amount = "diamond_amount"
 
 		if(ispath(type) && hasvar(linked_lathe, res_amount))
@@ -817,11 +815,11 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			dat += "<A href='?src=\ref[src];menu=3.1'>Protolathe Menu</A><HR>"
 			dat += "Material Storage<BR><HR>"
 			dat += "<UL>"
-			for(var/M in list("metal", "glass", "gold", "silver", "phoron", "uranium", "diamond"))
+			for(var/M in list(DEFAULT_WALL_MATERIAL, "glass", "gold", "silver", "phoron", "uranium", "diamond"))
 				var/amount
 				var/sheetsize = 2000
 				switch(M)
-					if("metal")
+					if(DEFAULT_WALL_MATERIAL)
 						amount = linked_lathe.m_amount
 						sheetsize = 3750
 					if("glass")

code/modules/research/research.dm

@@ -269,7 +269,7 @@ datum/tech/robotics
 	icon_state = "datadisk2"
 	item_state = "card-id"
 	w_class = 2.0
-	matter = list("metal" = 30, "glass" = 10)
+	matter = list(DEFAULT_WALL_MATERIAL = 30, "glass" = 10)
 	var/datum/tech/stored
 
 /obj/item/weapon/disk/tech_disk/New()
@@ -283,7 +283,7 @@ datum/tech/robotics
 	icon_state = "datadisk2"
 	item_state = "card-id"
 	w_class = 2.0
-	matter = list("metal" = 30,"glass" = 10)
+	matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10)
 	var/datum/design/blueprint
 
 /obj/item/weapon/disk/design_disk/New()

code/modules/research/server.dm

@@ -196,6 +196,7 @@
 /obj/machinery/computer/rdservercontrol
 	name = "R&D Server Controller"
 	icon_state = "rdcomp"
+	light_color = "#a97faa"
 	circuit = /obj/item/weapon/circuitboard/rdservercontrol
 	var/screen = 0
 	var/obj/machinery/r_n_d/server/temp_server
@@ -355,4 +356,4 @@
 	name = "Core R&D Server"
 	id_with_upload_string = "1"
 	id_with_download_string = "1"
-	server_id = 1
+	server_id = 1

code/modules/research/xenoarchaeology/finds/finds.dm

@@ -101,7 +101,7 @@
 	var/apply_prefix = 1
 	if(prob(40))
 		material_descriptor = pick("rusted ","dusty ","archaic ","fragile ")
-	source_material = pick("cordite","quadrinium","steel","titanium","aluminium","ferritic-alloy","plasteel","duranium")
+	source_material = pick("cordite","quadrinium",DEFAULT_WALL_MATERIAL,"titanium","aluminium","ferritic-alloy","plasteel","duranium")
 
 	var/talkative = 0
 	if(prob(5))
@@ -490,7 +490,7 @@
 				new_item = new /obj/item/clothing/mask/gas(src.loc)
 	var/decorations = ""
 	if(apply_material_decorations)
-		source_material = pick("cordite","quadrinium","steel","titanium","aluminium","ferritic-alloy","plasteel","duranium")
+		source_material = pick("cordite","quadrinium",DEFAULT_WALL_MATERIAL,"titanium","aluminium","ferritic-alloy","plasteel","duranium")
 		desc = "A [material_descriptor ? "[material_descriptor] " : ""][item_type] made of [source_material], all craftsmanship is of [pick("the lowest","low","average","high","the highest")] quality."
 
 		var/list/descriptors = list()

code/modules/research/xenoarchaeology/genetics/reconstitutor.dm

@@ -302,7 +302,6 @@ datum/genesequence
 	name = "Circuit board (Flora Reconstitution Console)"
 	build_path = "/obj/machinery/computer/reconstitutor"
 	origin_tech = "programming=2;biotech=4;materials=6"
-	frame_desc = "Requires 2 Advanced Scanning Module, 1 Nano Manipulator, 1 Matter Bin and 1 Advanced Capacitor."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/scanning_module/adv" = 2,
 							"/obj/item/weapon/stock_parts/manipulator/nano" = 1,
@@ -313,7 +312,6 @@ datum/genesequence
 	name = "Circuit board (Fauna Reconstitution Console)"
 	build_path = "/obj/machinery/computer/reconstitutor/animal"
 	origin_tech = "programming=2;biotech=4;materials=6"
-	frame_desc = "Requires 2 Advanced Scanning Module, 1 Nano Manipulator, 1 Matter Bin and 1 Advanced Capacitor."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/scanning_module/adv" = 2,
 							"/obj/item/weapon/stock_parts/manipulator/nano" = 1,

code/modules/research/xenoarchaeology/geosample.dm

@@ -61,44 +61,19 @@
 	age = rand(1,999)
 
 	if(container.mineral)
-		switch(container.mineral.name)
-			if("Uranium")
-				age_million = rand(1, 704)
-				age_thousand = rand(1,999)
-				find_presence["potassium"] = rand(1,1000) / 100
-				source_mineral = "potassium"
-			if("Iron")
-				age_thousand = rand(1, 999)
-				age_million = rand(1, 999)
-				find_presence["iron"] = rand(1,1000) / 100
-				source_mineral = "iron"
-			if("Diamond")
-				age_thousand = rand(1,999)
-				age_million = rand(1,999)
-				find_presence["nitrogen"] = rand(1,1000) / 100
-				source_mineral = "nitrogen"
-			if("Gold")
-				age_thousand = rand(1,999)
-				age_million = rand(1,999)
-				age_billion = rand(3,4)
-				find_presence["iron"] = rand(1,1000) / 100
-				source_mineral = "iron"
-			if("Silver")
-				age_thousand = rand(1,999)
-				age_million = rand(1,999)
-				find_presence["iron"] = rand(1,1000) / 100
-				source_mineral = "iron"
-			if("Phoron")
-				age_thousand = rand(1,999)
-				age_million = rand(1,999)
-				age_billion = rand(10, 13)
-				find_presence["phoron"] = rand(1,1000) / 100
-				source_mineral = "phoron"
-			if("Clown")
-				age = rand(-1,-999)				//thats the joke
-				age_thousand = rand(-1,-999)
-				find_presence["phoron"] = rand(1,1000) / 100
-				source_mineral = "phoron"
+		if(islist(container.mineral.xarch_ages))
+			var/list/ages = container.mineral.xarch_ages
+			if(ages["thousand"])
+				age_thousand = rand(1,ages["thousand"])
+			if(ages["million"])
+				age_million = rand(1,ages["million"])
+			if(ages["billion"])
+				if(ages["billion_lower"])
+					age_billion = rand(ages["billion_lower"],ages["billion"])
+				else
+					age_billion = rand(1,ages["billion"])
+		if(container.mineral.xarch_source_mineral)
+			source_mineral = container.mineral.xarch_source_mineral
 
 	if(prob(75))
 		find_presence["phosphorus"] = rand(1,500) / 100

code/modules/research/xenoarchaeology/misc.dm

@@ -73,7 +73,7 @@
 		..()
 		sleep(2)
 		new /obj/item/clothing/under/rank/scientist(src)
-		new /obj/item/clothing/suit/storage/labcoat(src)
+		new /obj/item/clothing/suit/storage/toggle/labcoat(src)
 		new /obj/item/clothing/shoes/white(src)
 		new /obj/item/clothing/glasses/science(src)
 		new /obj/item/device/radio/headset/headset_sci(src)