Merge pull request #3767 from Tastyfish/silence

Tranquillité, Prospérité & Mimeré

code/modules/mining/coins.dm

@@ -64,6 +64,12 @@
 	materials = list(MAT_BANANIUM = 400)
 	credits = 600 //makes the clown cri
 
+/obj/item/weapon/coin/mime
+	cmineral = "tranquillite"
+	icon_state = "coin_tranquillite_heads"
+	materials = list(MAT_TRANQUILLITE = 400)
+	credits = 600 //makes the mime cri
+
 /obj/item/weapon/coin/adamantine
 	cmineral = "adamantine"
 	icon_state = "coin_adamantine_heads"

code/modules/mining/equipment_locker.dm

@@ -19,7 +19,7 @@
 	var/ore_pickup_rate = 15
 	var/sheet_per_ore = 1
 	var/point_upgrade = 1
-	var/list/ore_values = list(("sand" = 1), ("iron" = 1), ("plasma" = 15), ("silver" = 16), ("gold" = 18), ("uranium" = 30), ("diamond" = 50), ("bananium" = 60))
+	var/list/ore_values = list(("sand" = 1), ("iron" = 1), ("plasma" = 15), ("silver" = 16), ("gold" = 18), ("uranium" = 30), ("diamond" = 50), ("bananium" = 60), ("tranquillite" = 60))
 	var/list/supply_consoles = list("Science", "Robotics", "Research Director's Desk", "Mechanic", "Engineering" = list("metal", "glass", "plasma"), "Chief Engineer's Desk" = list("metal", "glass", "plasma"), "Atmospherics" = list("metal", "glass", "plasma"), "Bar" = list("uranium", "plasma"))
 
 /obj/machinery/mineral/ore_redemption/New()
@@ -721,7 +721,7 @@
 	speak_emote = list("states")
 	wanted_objects = list(/obj/item/weapon/ore/diamond, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/silver,
 						  /obj/item/weapon/ore/plasma,  /obj/item/weapon/ore/uranium,    /obj/item/weapon/ore/iron,
-						  /obj/item/weapon/ore/bananium, /obj/item/weapon/ore/glass)
+						  /obj/item/weapon/ore/bananium, /obj/item/weapon/ore/tranquillite, /obj/item/weapon/ore/glass)
 
 /mob/living/simple_animal/hostile/mining_drone/attackby(obj/item/I as obj, mob/user as mob, params)
 	if(istype(I, /obj/item/weapon/weldingtool))

code/modules/mining/laborcamp/laborstacker.dm

@@ -133,7 +133,7 @@
 
 /obj/machinery/mineral/stacking_machine/laborstacker
 	var/points = 0 //The unclaimed value of ore stacked.  Value for each ore loosely relative to its rarity.
-	var/list/ore_values = list(("glass" = 1), ("metal" = 2), ("solid plasma" = 20), ("plasteel" = 23), ("reinforced glass" = 4), ("gold" = 20), ("silver" = 20), ("uranium" = 20), ("diamond" = 25), ("bananium" = 50))
+	var/list/ore_values = list(("glass" = 1), ("metal" = 2), ("solid plasma" = 20), ("plasteel" = 23), ("reinforced glass" = 4), ("gold" = 20), ("silver" = 20), ("uranium" = 20), ("diamond" = 25), ("bananium" = 50), ("tranquillite" = 50))
 
 /obj/machinery/mineral/stacking_machine/laborstacker/proc/get_ore_values()
 	var/dat = "<table border='0' width='200'>"

code/modules/mining/machine_processing.dm

@@ -22,7 +22,7 @@
 
 	var/dat = "<b>Smelter control console</b><br><br>"
 	//iron
-	if(machine.ore_iron || machine.ore_glass || machine.ore_plasma || machine.ore_uranium || machine.ore_gold || machine.ore_silver || machine.ore_diamond || machine.ore_clown || machine.ore_adamantine)
+	if(machine.ore_iron || machine.ore_glass || machine.ore_plasma || machine.ore_uranium || machine.ore_gold || machine.ore_silver || machine.ore_diamond || machine.ore_clown || machine.ore_mime || machine.ore_adamantine)
 		if(machine.ore_iron)
 			if (machine.selected_iron==1)
 				dat += text("<A href='?src=\ref[src];sel_iron=no'><font color='green'>Smelting</font></A> ")
@@ -102,6 +102,16 @@
 		else
 			machine.selected_clown = 0
 
+		//tranquillite
+		if(machine.ore_mime)
+			if (machine.selected_mime==1)
+				dat += text("<A href='?src=\ref[src];sel_mime=no'><font color='green'>Smelting</font></A> ")
+			else
+				dat += text("<A href='?src=\ref[src];sel_mime=yes'><font color='red'>Not smelting</font></A> ")
+			dat += text("Tranquillite: [machine.ore_mime]<br>")
+		else
+			machine.selected_mime = 0
+
 
 		//On or off
 		dat += text("Machine is currently ")
@@ -160,6 +170,11 @@
 			machine.selected_clown = 1
 		else
 			machine.selected_clown = 0
+	if(href_list["sel_mime"])
+		if (href_list["sel_mime"] == "yes")
+			machine.selected_mime = 1
+		else
+			machine.selected_mime = 0
 	if(href_list["set_on"])
 		if (href_list["set_on"] == "on")
 			machine.on = 1
@@ -178,15 +193,16 @@
 	density = 1
 	anchored = 1
 	var/obj/machinery/mineral/CONSOLE = null
-	var/ore_gold = 0;
-	var/ore_silver = 0;
-	var/ore_diamond = 0;
-	var/ore_glass = 0;
-	var/ore_plasma = 0;
-	var/ore_uranium = 0;
-	var/ore_iron = 0;
-	var/ore_clown = 0;
-	var/ore_adamantine = 0;
+	var/ore_gold = 0
+	var/ore_silver = 0
+	var/ore_diamond = 0
+	var/ore_glass = 0
+	var/ore_plasma = 0
+	var/ore_uranium = 0
+	var/ore_iron = 0
+	var/ore_clown = 0
+	var/ore_mime = 0
+	var/ore_adamantine = 0
 	var/selected_gold = 0
 	var/selected_silver = 0
 	var/selected_diamond = 0
@@ -195,20 +211,21 @@
 	var/selected_uranium = 0
 	var/selected_iron = 0
 	var/selected_clown = 0
+	var/selected_mime = 0
 	var/on = 0 //0 = off, 1 =... oh you know!
 
 /obj/machinery/mineral/processing_unit/process()
 	var/i
 	for (i = 0; i < 10; i++)
 		if (on)
-			if (selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0)
+			if (selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
 				if (ore_glass > 0)
 					ore_glass--;
 					generate_mineral(/obj/item/stack/sheet/glass)
 				else
 					on = 0
 				continue
-			if (selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0)
+			if (selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_mime == 0)
 				if (ore_glass > 0 && ore_iron > 0)
 					ore_glass--;
 					ore_iron--;
@@ -216,49 +233,49 @@
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 1 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0)
+			if (selected_glass == 0 && selected_gold == 1 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
 				if (ore_gold > 0)
 					ore_gold--;
 					generate_mineral(/obj/item/stack/sheet/mineral/gold)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 1 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0)
+			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 1 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
 				if (ore_silver > 0)
 					ore_silver--;
 					generate_mineral(/obj/item/stack/sheet/mineral/silver)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0)
+			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
 				if (ore_diamond > 0)
 					ore_diamond--;
 					generate_mineral(/obj/item/stack/sheet/mineral/diamond)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0)
+			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
 				if (ore_plasma > 0)
 					ore_plasma--;
 					generate_mineral(/obj/item/stack/sheet/mineral/plasma)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0)
+			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
 				if (ore_uranium > 0)
 					ore_uranium--;
 					generate_mineral(/obj/item/stack/sheet/mineral/uranium)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0)
+			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_mime == 0)
 				if (ore_iron > 0)
 					ore_iron--;
 					generate_mineral(/obj/item/stack/sheet/metal)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0)
+			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_mime == 0)
 				if (ore_iron > 0 && ore_plasma > 0)
 					ore_iron--;
 					ore_plasma--;
@@ -266,16 +283,23 @@
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 1)
+			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 1 && selected_mime == 0)
 				if (ore_clown > 0)
 					ore_clown--;
 					generate_mineral(/obj/item/stack/sheet/mineral/bananium)
 				else
 					on = 0
 				continue
+			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 1)
+				if (ore_mime > 0)
+					ore_mime--;
+					generate_mineral(/obj/item/stack/sheet/mineral/tranquillite)
+				else
+					on = 0
+				continue
 			//THESE TWO ARE CODED FOR URIST TO USE WHEN HE GETS AROUND TO IT.
 			//They were coded on 18 Feb 2012. If you're reading this in 2015, then firstly congratulations on the world not ending on 21 Dec 2012 and secondly, Urist is apparently VERY lazy. ~Errorage
-			/*if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0)
+			/*if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
 				if (ore_uranium >= 2 && ore_diamond >= 1)
 					ore_uranium -= 2
 					ore_diamond -= 1
@@ -283,7 +307,7 @@
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 1 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0)
+			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 1 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0)
 				if (ore_silver >= 1 && ore_plasma >= 3)
 					ore_silver -= 1
 					ore_plasma -= 3
@@ -324,6 +348,9 @@
 			if (selected_clown == 1)
 				if (ore_clown <= 0)
 					b = 0
+			if (selected_mime == 1)
+				if (ore_mime <= 0)
+					b = 0
 
 			if (b) //if they are, deduct one from each, produce slag and shut the machine off
 				if (selected_gold == 1)
@@ -340,6 +367,8 @@
 					ore_iron--
 				if (selected_clown == 1)
 					ore_clown--
+				if (selected_mime == 1)
+					ore_mime--
 				generate_mineral(/obj/item/weapon/ore/slag)
 				on = 0
 			else
@@ -387,6 +416,10 @@
 				ore_clown++
 				O.loc = null
 				continue
+			if (istype(O,/obj/item/weapon/ore/tranquillite))
+				ore_mime++
+				O.loc = null
+				continue
 			unload_mineral(O)
 
 /obj/machinery/mineral/processing_unit/proc/generate_mineral(var/P)

code/modules/mining/mine_turfs.dm

@@ -133,6 +133,8 @@ var/global/list/rockTurfEdgeCache
 					M = new/turf/simulated/mineral/gibtonite(src)
 				if("Bananium")
 					M = new/turf/simulated/mineral/clown(src)
+				if("Tranquillite")
+					M = new/turf/simulated/mineral/mime(src)
 				if("BScrystal")
 					M = new/turf/simulated/mineral/bscrystal(src)
 			if(M)
@@ -156,7 +158,7 @@ var/global/list/rockTurfEdgeCache
 	mineralSpawnChanceList = list(
 		"Uranium" = 35, "Diamond" = 2,
 		"Gold" = 5, "Silver" = 5, "Plasma" = 25,
-		"Iron" = 30, "Clown" = 15, "BScrystal" = 10)
+		"Iron" = 30, "Bananium" = 15, "Tranquillite" = 15, "BScrystal" = 10)
 
 /turf/simulated/mineral/random/high_chance/New()
 	icon_state = "rock"
@@ -239,6 +241,15 @@ var/global/list/rockTurfEdgeCache
 	spread = 0
 	hidden = 0
 
+/turf/simulated/mineral/mime
+	name = "tranquillite deposit"
+	icon_state = "rock_Mime"
+	mineralType = /obj/item/weapon/ore/tranquillite
+	mineralAmt = 3
+	spreadChance = 0
+	spread = 0
+	hidden = 0
+
 /turf/simulated/mineral/bscrystal
 	name = "bluespace crystal deposit"
 	icon_state = "rock_BScrystal"

code/modules/mining/mint.dm

@@ -14,6 +14,7 @@
 	var/amt_plasma = 0
 	var/amt_uranium = 0
 	var/amt_clown = 0
+	var/amt_mime = 0
 	var/amt_adamantine = 0
 	var/amt_mythril = 0
 	var/newCoins = 0   //how many coins the machine made in it's last load
@@ -46,6 +47,9 @@
 			if (istype(O, /obj/item/stack/sheet/mineral/bananium))
 				amt_clown += 100 * O.amount
 				O.loc = null
+			if (istype(O, /obj/item/stack/sheet/mineral/tranquillite))
+				amt_mime += 100 * O.amount
+				O.loc = null
 			return
 
 
@@ -78,7 +82,7 @@
 		dat += text("chosen")
 	else
 		dat += text("<A href='?src=\ref[src];choose=plasma'>Choose</A>")
-	dat += text("<br><font color='#008800'><b>uranium inserted: </b>[amt_uranium]</font> ")
+	dat += text("<br><font color='#008800'><b>Uranium inserted: </b>[amt_uranium]</font> ")
 	if (chosen == "uranium")
 		dat += text("chosen")
 	else
@@ -89,6 +93,12 @@
 			dat += text("chosen")
 		else
 			dat += text("<A href='?src=\ref[src];choose=clown'>Choose</A>")
+	if(amt_mime > 0)
+		dat += text("<br><font color='#666666'><b>Tranquillite inserted: </b>[amt_mime]</font> ")
+		if (chosen == "mime")
+			dat += text("chosen")
+		else
+			dat += text("<A href='?src=\ref[src];choose=mime'>Choose</A>")
 	dat += text("<br><font color='#888888'><b>Adamantine inserted: </b>[amt_adamantine]</font> ")//I don't even know these color codes, so fuck it.
 	if (chosen == "adamantine")
 		dat += text("chosen")
@@ -132,7 +142,7 @@
 					coinsToProduce--
 					newCoins++
 					src.updateUsrDialog()
-					sleep(5);
+					sleep(5)
 			if("gold")
 				while(amt_gold > 0 && coinsToProduce > 0)
 					create_coins(/obj/item/weapon/coin/gold)
@@ -140,7 +150,7 @@
 					coinsToProduce--
 					newCoins++
 					src.updateUsrDialog()
-					sleep(5);
+					sleep(5)
 			if("silver")
 				while(amt_silver > 0 && coinsToProduce > 0)
 					create_coins(/obj/item/weapon/coin/silver)
@@ -148,7 +158,7 @@
 					coinsToProduce--
 					newCoins++
 					src.updateUsrDialog()
-					sleep(5);
+					sleep(5)
 			if("diamond")
 				while(amt_diamond > 0 && coinsToProduce > 0)
 					create_coins(/obj/item/weapon/coin/diamond)
@@ -156,7 +166,7 @@
 					coinsToProduce--
 					newCoins++
 					src.updateUsrDialog()
-					sleep(5);
+					sleep(5)
 			if("plasma")
 				while(amt_plasma > 0 && coinsToProduce > 0)
 					create_coins(/obj/item/weapon/coin/plasma)
@@ -164,7 +174,7 @@
 					coinsToProduce--
 					newCoins++
 					src.updateUsrDialog()
-					sleep(5);
+					sleep(5)
 			if("uranium")
 				while(amt_uranium > 0 && coinsToProduce > 0)
 					create_coins(/obj/item/weapon/coin/uranium)
@@ -180,7 +190,15 @@
 					coinsToProduce--
 					newCoins++
 					src.updateUsrDialog()
-					sleep(5);
+					sleep(5)
+			if("mime")
+				while(amt_mime > 0 && coinsToProduce > 0)
+					create_coins(/obj/item/weapon/coin/mime)
+					amt_mime -= 20
+					coinsToProduce--
+					newCoins++
+					src.updateUsrDialog()
+					sleep(5)
 			if("adamantine")
 				while(amt_adamantine > 0 && coinsToProduce > 0)
 					create_coins(/obj/item/weapon/coin/adamantine)
@@ -188,7 +206,7 @@
 					coinsToProduce--
 					newCoins++
 					src.updateUsrDialog()
-					sleep(5);
+					sleep(5)
 			if("mythril")
 				while(amt_adamantine > 0 && coinsToProduce > 0)
 					create_coins(/obj/item/weapon/coin/mythril)
@@ -196,9 +214,9 @@
 					coinsToProduce--
 					newCoins++
 					src.updateUsrDialog()
-					sleep(5);
+					sleep(5)
 		icon_state = "coinpress0"
-		processing = 0;
+		processing = 0
 		coinsToProduce = temp_coins
 	src.updateUsrDialog()
 	return

code/modules/mining/money_bag.dm

@@ -17,25 +17,28 @@
 	var/amt_plasma = 0
 	var/amt_uranium = 0
 	var/amt_clown = 0
+	var/amt_mime = 0
 	var/amt_adamantine = 0
 
 	for (var/obj/item/weapon/coin/C in contents)
 		if (istype(C,/obj/item/weapon/coin/diamond))
-			amt_diamond++;
+			amt_diamond++
 		if (istype(C,/obj/item/weapon/coin/plasma))
-			amt_plasma++;
+			amt_plasma++
 		if (istype(C,/obj/item/weapon/coin/iron))
-			amt_iron++;
+			amt_iron++
 		if (istype(C,/obj/item/weapon/coin/silver))
-			amt_silver++;
+			amt_silver++
 		if (istype(C,/obj/item/weapon/coin/gold))
-			amt_gold++;
+			amt_gold++
 		if (istype(C,/obj/item/weapon/coin/uranium))
-			amt_uranium++;
+			amt_uranium++
 		if (istype(C,/obj/item/weapon/coin/clown))
-			amt_clown++;
+			amt_clown++
+		if (istype(C,/obj/item/weapon/coin/mime))
+			amt_mime++
 		if (istype(C,/obj/item/weapon/coin/adamantine))
-			amt_adamantine++;
+			amt_adamantine++
 
 	var/dat = text("<b>The contents of the moneybag reveal...</b><br>")
 	if (amt_gold)
@@ -52,6 +55,8 @@
 		dat += text("Uranium coins: [amt_uranium] <A href='?src=\ref[src];remove=uranium'>Remove one</A><br>")
 	if (amt_clown)
 		dat += text("Bananium coins: [amt_clown] <A href='?src=\ref[src];remove=clown'>Remove one</A><br>")
+	if (amt_mime)
+		dat += text("Tranquillite coins: [amt_mime] <A href='?src=\ref[src];remove=mime'>Remove one</A><br>")
 	if (amt_adamantine)
 		dat += text("Adamantine coins: [amt_adamantine] <A href='?src=\ref[src];remove=adamantine'>Remove one</A><br>")
 	user << browse("[dat]", "window=moneybag")
@@ -93,6 +98,8 @@
 				COIN = locate(/obj/item/weapon/coin/uranium,src.contents)
 			if("clown")
 				COIN = locate(/obj/item/weapon/coin/clown,src.contents)
+			if("mime")
+				COIN = locate(/obj/item/weapon/coin/mime,src.contents)
 			if("adamantine")
 				COIN = locate(/obj/item/weapon/coin/adamantine,src.contents)
 		if(!COIN)

code/modules/mining/ore.dm

@@ -130,6 +130,14 @@
 	refined_type = /obj/item/stack/sheet/mineral/bananium
 	materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
 
+/obj/item/weapon/ore/tranquillite
+	name = "tranquillite ore"
+	icon_state = "Mime ore"
+	origin_tech = "materials=4"
+	points = 60
+	refined_type = /obj/item/stack/sheet/mineral/tranquillite
+	materials = list(MAT_TRANQUILLITE=MINERAL_MATERIAL_AMOUNT)
+
 /obj/item/weapon/ore/slag
 	name = "slag"
 	desc = "Completely useless"

code/modules/mining/satchel_ore_boxdm.dm

@@ -31,25 +31,28 @@
 	var/amt_plasma = 0
 	var/amt_uranium = 0
 	var/amt_clown = 0
+	var/amt_mime = 0
 	var/amt_bluespace = 0
 
 	for (var/obj/item/weapon/ore/C in contents)
 		if (istype(C,/obj/item/weapon/ore/diamond))
-			amt_diamond++;
+			amt_diamond++
 		if (istype(C,/obj/item/weapon/ore/glass))
-			amt_glass++;
+			amt_glass++
 		if (istype(C,/obj/item/weapon/ore/plasma))
-			amt_plasma++;
+			amt_plasma++
 		if (istype(C,/obj/item/weapon/ore/iron))
-			amt_iron++;
+			amt_iron++
 		if (istype(C,/obj/item/weapon/ore/silver))
-			amt_silver++;
+			amt_silver++
 		if (istype(C,/obj/item/weapon/ore/gold))
-			amt_gold++;
+			amt_gold++
 		if (istype(C,/obj/item/weapon/ore/uranium))
-			amt_uranium++;
+			amt_uranium++
 		if (istype(C,/obj/item/weapon/ore/bananium))
-			amt_clown++;
+			amt_clown++
+		if (istype(C,/obj/item/weapon/ore/tranquillite))
+			amt_mime++
 		if (istype(C,/obj/item/weapon/ore/bluespace_crystal))
 			amt_bluespace++
 
@@ -70,6 +73,8 @@
 		dat += text("Uranium ore: [amt_uranium]<br>")
 	if (amt_clown)
 		dat += text("Bananium ore: [amt_clown]<br>")
+	if (amt_mime)
+		dat += text("Tranquillite ore: [amt_mime]<br>")
 	if (amt_bluespace)
 		dat += text("Bluespace crystals: [amt_bluespace]<br>")