Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev

code/modules/research/designs.dm

@@ -16,7 +16,6 @@ The currently supporting non-reagent materials:
 - $gold (/obj/item/stack/gold). One sheet = 3750 units.
 - $uranium (/obj/item/stack/uranium). One sheet = 3750 units.
 - $diamond (/obj/item/stack/diamond). One sheet = 3750 units.
-- $clown (/obj/item/stack/clown). One sheet = 3750 units. ("Bananium")
 (Insert new ones here)
 
 Don't add new keyword/IDs if they are made from an existing one (such as rods which are made from metal). Only add raw materials.

code/modules/research/protolathe.dm

@@ -20,9 +20,6 @@ Note: Must be placed west/left of and R&D console to function.
 	var/phoron_amount = 0.0
 	var/uranium_amount = 0.0
 	var/diamond_amount = 0.0
-	var/clown_amount = 0.0
-	var/adamantine_amount = 0.0
-
 
 /obj/machinery/r_n_d/protolathe/New()
 	..()
@@ -37,7 +34,7 @@ Note: Must be placed west/left of and R&D console to function.
 	RefreshParts()
 
 /obj/machinery/r_n_d/protolathe/proc/TotalMaterials() //returns the total of all the stored materials. Makes code neater.
-	return m_amount + g_amount + gold_amount + silver_amount + phoron_amount + uranium_amount + diamond_amount + clown_amount
+	return m_amount + g_amount + gold_amount + silver_amount + phoron_amount + uranium_amount + diamond_amount
 
 /obj/machinery/r_n_d/protolathe/RefreshParts()
 	var/T = 0
@@ -102,12 +99,6 @@ Note: Must be placed west/left of and R&D console to function.
 			if(diamond_amount >= 2000)
 				var/obj/item/stack/sheet/mineral/diamond/G = new /obj/item/stack/sheet/mineral/diamond(src.loc)
 				G.amount = round(diamond_amount / G.perunit)
-			if(clown_amount >= 2000)
-				var/obj/item/stack/sheet/mineral/clown/G = new /obj/item/stack/sheet/mineral/clown(src.loc)
-				G.amount = round(clown_amount / G.perunit)
-			if(adamantine_amount >= 2000)
-				var/obj/item/stack/sheet/mineral/adamantine/G = new /obj/item/stack/sheet/mineral/adamantine(src.loc)
-				G.amount = round(adamantine_amount / G.perunit)
 			del(src)
 			return 1
 		else
@@ -172,10 +163,6 @@ Note: Must be placed west/left of and R&D console to function.
 				uranium_amount += amount * 2000
 			if(/obj/item/stack/sheet/mineral/diamond)
 				diamond_amount += amount * 2000
-			if(/obj/item/stack/sheet/mineral/clown)
-				clown_amount += amount * 2000
-			if(/obj/item/stack/sheet/mineral/adamantine)
-				adamantine_amount += amount * 2000
 	else
 		new stacktype(src.loc, amount)
 	busy = 0

code/modules/research/rdconsole.dm

@@ -84,8 +84,6 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 				return_name = "Uranium"
 			if("diamond")
 				return_name = "Diamond"
-			if("clown")
-				return_name = "Bananium"
 	else
 		for(var/R in typesof(/datum/reagent) - /datum/reagent)
 			temp_reagent = null
@@ -163,7 +161,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 	else
 		//The construction/deconstruction of the console code.
 		..()
-	
+
 	src.updateUsrDialog()
 	return
 
@@ -361,8 +359,6 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 									linked_lathe.uranium_amount = max(0, (linked_lathe.uranium_amount-being_built.materials[M]))
 								if("$diamond")
 									linked_lathe.diamond_amount = max(0, (linked_lathe.diamond_amount-being_built.materials[M]))
-								if("$clown")
-									linked_lathe.clown_amount = max(0, (linked_lathe.clown_amount-being_built.materials[M]))
 								else
 									linked_lathe.reagents.remove_reagent(M, being_built.materials[M])
 
@@ -456,9 +452,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			if("diamond")
 				type = /obj/item/stack/sheet/mineral/diamond
 				res_amount = "diamond_amount"
-			if("clown")
-				type = /obj/item/stack/sheet/mineral/clown
-				res_amount = "clown_amount"
+
 		if(ispath(type) && hasvar(linked_lathe, res_amount))
 			var/obj/item/stack/sheet/sheet = new type(linked_lathe.loc)
 			var/available_num_sheets = round(linked_lathe.vars[res_amount]/sheet.perunit)
@@ -723,8 +717,6 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 								if(D.materials[M] > linked_lathe.uranium_amount) check_materials = 0
 							if("$diamond")
 								if(D.materials[M] > linked_lathe.diamond_amount) check_materials = 0
-							if("$clown")
-								if(D.materials[M] > linked_lathe.clown_amount) check_materials = 0
 					else if (!linked_lathe.reagents.has_reagent(M, D.materials[M]))
 						check_materials = 0
 				if (check_materials)
@@ -785,12 +777,6 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			if(linked_lathe.diamond_amount >= 10000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=diamond;lathe_ejectsheet_amt=5'>(5 Sheets)</A> "
 			if(linked_lathe.diamond_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=diamond;lathe_ejectsheet_amt=50'>(Max Sheets)</A>"
 			dat += "<BR>"
-			//Bananium
-			dat += "* [linked_lathe.clown_amount] cm<sup>3</sup> of Bananium || "
-			dat += "Eject: "
-			if(linked_lathe.clown_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=clown;lathe_ejectsheet_amt=1'>(1 Sheet)</A> "
-			if(linked_lathe.clown_amount >= 10000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=clown;lathe_ejectsheet_amt=5'>(5 Sheets)</A> "
-			if(linked_lathe.clown_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=clown;lathe_ejectsheet_amt=50'>(Max Sheets)</A>"
 
 		if(3.3) //Protolathe Chemical Storage Submenu
 			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A> || "

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

@@ -225,7 +225,6 @@
 			possible_spawns += /obj/item/stack/sheet/glass
 			possible_spawns += /obj/item/stack/sheet/rglass
 			possible_spawns += /obj/item/stack/sheet/mineral/phoron
-			possible_spawns += /obj/item/stack/sheet/mineral/mythril
 			possible_spawns += /obj/item/stack/sheet/mineral/gold
 			possible_spawns += /obj/item/stack/sheet/mineral/silver
 			possible_spawns += /obj/item/stack/sheet/mineral/enruranium