Merge pull request #3767 from Tastyfish/silence

Tranquillité, Prospérité & Mimeré

code/modules/clothing/clothing.dm

@@ -351,6 +351,8 @@ BLIND     // can't see anything
 	slot_flags = SLOT_FEET
 
 	var/silence_steps = 0
+	var/shoe_sound_footstep = 1
+	var/shoe_sound = null
 
 	permeability_coefficient = 0.50
 	slowdown = SHOES_SLOWDOWN
@@ -396,6 +398,25 @@ BLIND     // can't see anything
 	else
 		..()
 
+/obj/item/clothing/shoes/proc/step_action(var/mob/living/carbon/human/H) //squeek squeek
+	if(shoe_sound)
+		var/turf/T = get_turf(H)
+
+		if(!istype(H) || !istype(T))
+			return 0
+
+		if(H.m_intent == "run")
+			if(shoe_sound_footstep >= 2)
+				if(T.shoe_running_volume)
+					playsound(src, shoe_sound, T.shoe_running_volume, 1)
+				shoe_sound_footstep = 0
+			else
+				shoe_sound_footstep++
+		else if(T.shoe_walking_volume)
+			playsound(src, shoe_sound, T.shoe_walking_volume, 1)
+
+	return 1
+
 /obj/item/proc/negates_gravity()
 	return 0
 

code/modules/clothing/shoes/miscellaneous.dm

@@ -1,5 +1,3 @@
-/obj/item/clothing/shoes/proc/step_action(var/mob/living/carbon/human/H) //squeek squeek
-
 /obj/item/clothing/shoes/syndigaloshes
 	desc = "A pair of brown shoes. They seem to have extra grip."
 	name = "brown shoes"
@@ -77,18 +75,7 @@
 	var/footstep = 1	//used for squeeks whilst walking
 	species_restricted = null
 	silence_steps = 1
-
-/obj/item/clothing/shoes/clown_shoes/step_action(var/mob/living/carbon/human/H)
-	if(!istype(H))	return 0
-
-	if(H.m_intent == "run")
-		if(footstep >= 2)
-			playsound(src, "clownstep", 50, 1)
-			footstep = 0
-		else
-			footstep++
-	else
-		playsound(src, "clownstep", 20, 1)
+	shoe_sound = "clownstep"
 
 /obj/item/clothing/shoes/jackboots
 	name = "jackboots"
@@ -101,18 +88,7 @@
 	put_on_delay = 50
 	var/footstep = 1
 	silence_steps = 1
-
-/obj/item/clothing/shoes/jackboots/step_action(var/mob/living/carbon/human/H)
-	if(!istype(H))	return 0
-
-	if(H.m_intent == "run")
-		if(footstep >= 2)
-			playsound(src, "jackboot", 50, 1)
-			footstep = 0
-		else
-			footstep++
-	else
-		playsound(src, "jackboot", 20, 1)
+	shoe_sound = "jackboot"
 
 /obj/item/clothing/shoes/jackboots/jacksandals
 	name = "jacksandals"
@@ -190,6 +166,7 @@
 /obj/item/clothing/shoes/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/shoe_silencer))
 		silence_steps = 1
+		shoe_sound = null
 		user.unEquip(I)
 		qdel(I)
 	else . = ..()

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>")
 

code/modules/projectiles/projectile/bullets.dm

@@ -160,15 +160,23 @@
 
 
 /obj/item/projectile/bullet/mime
-	damage = 20
+	damage = 0
+	stun = 5
+	weaken = 5
+	slur = 20
+	stutter = 20
 
 /obj/item/projectile/bullet/mime/on_hit(var/atom/target, var/blocked = 0)
-		if(istype(target, /mob/living/carbon))
-				var/mob/living/carbon/M = target
-				M.silent = max(M.silent, 10)
-
-
-
+	..(target, blocked)
+	if(istype(target, /mob/living/carbon))
+		var/mob/living/carbon/M = target
+		M.silent = max(M.silent, 10)
+	else if(istype(target, /obj/mecha/combat/honker))
+		var/obj/mecha/chassis = target
+		chassis.occupant_message("A mimetech anti-honk bullet has hit \the [chassis]!")
+		chassis.use_power(chassis.get_charge() / 2)
+		for(var/obj/item/mecha_parts/mecha_equipment/weapon/honker in chassis.equipment)
+			honker.set_ready_state(0)
 
 /obj/item/projectile/bullet/dart
 	name = "dart"

code/modules/reagents/Chemistry-Machinery.dm

@@ -819,6 +819,7 @@
 		/obj/item/stack/sheet/mineral/plasma = list("plasma" = 20),
 		/obj/item/stack/sheet/mineral/uranium = list("uranium" = 20),
 		/obj/item/stack/sheet/mineral/bananium = list("banana" = 20),
+		/obj/item/stack/sheet/mineral/tranquillite = list("nothing" = 20),
 		/obj/item/stack/sheet/mineral/silver = list("silver" = 20),
 		/obj/item/stack/sheet/mineral/gold = list("gold" = 20),
 		/obj/item/weapon/grown/novaflower = list("capsaicin" = 0),

code/modules/research/designs.dm

@@ -17,6 +17,7 @@ The currently supporting non-reagent materials:
 - MAT_URANIUM (/obj/item/stack/uranium).
 - MAT_DIAMOND (/obj/item/stack/diamond).
 - MAT_BANANIUM (/obj/item/stack/bananium).
+- MAT_TRANQUILLITE (/obj/item/stack/tranquillite).
 (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/designs/mecha_designs.dm

@@ -166,3 +166,33 @@
 	materials = list(MAT_GLASS = 1000, "sacid" = 20)
 	build_path = /obj/item/weapon/circuitboard/mecha/honker/targeting
 	category = list("Exosuit Modules")
+
+/datum/design/recitence_main
+	name = "Exosuit Module (\"Recitence\" Central Control module)"
+	desc = "Allows for the construction of a \"Recitence\" Central Control module."
+	id = "recitence_main"
+	req_tech = list("programming" = 3)
+	build_type = IMPRINTER
+	materials = list(MAT_GLASS = 1000, "sacid" = 20)
+	build_path = /obj/item/weapon/circuitboard/mecha/recitence/main
+	category = list("Exosuit Modules")
+
+/datum/design/recitence_peri
+	name = "Exosuit Module (\"Recitence\" Peripherals Control module)"
+	desc = "Allows for the construction of a \"Recitence\" Peripheral Control module."
+	id = "recitence_peri"
+	req_tech = list("programming" = 3)
+	build_type = IMPRINTER
+	materials = list(MAT_GLASS = 1000, "sacid" = 20)
+	build_path = /obj/item/weapon/circuitboard/mecha/recitence/peripherals
+	category = list("Exosuit Modules")
+
+/datum/design/recitence_targ
+	name = "Exosuit Module (\"Recitence\" Weapons & Targeting Control module)"
+	desc = "Allows for the construction of a \"Recitence\" Weapons & Targeting Control module."
+	id = "recitence_targ"
+	req_tech = list("programming" = 3)
+	build_type = IMPRINTER
+	materials = list(MAT_GLASS = 1000, "sacid" = 20)
+	build_path = /obj/item/weapon/circuitboard/mecha/recitence/targeting
+	category = list("Exosuit Modules")

code/modules/research/designs/mechfabricator_designs.dm

@@ -459,6 +459,70 @@
 	construction_time = 200
 	category = list("H.O.N.K")
 
+//Recitence
+/datum/design/recitence_chassis
+	name = "Exosuit Chassis (\"Recitence\")"
+	id = "recitence_chassis"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/chassis/recitence
+	materials = list(MAT_METAL=20000)
+	construction_time = 100
+	category = list("Recitence")
+
+/datum/design/recitence_torso
+	name = "Exosuit Torso (\"Recitence\")"
+	id = "recitence_torso"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/recitence_torso
+	materials = list(MAT_METAL=20000,MAT_GLASS=10000,MAT_TRANQUILLITE=10000)
+	construction_time = 300
+	category = list("Recitence")
+
+/datum/design/recitence_head
+	name = "Exosuit Head (\"Recitence\")"
+	id = "recitence_head"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/recitence_head
+	materials = list(MAT_METAL=10000,MAT_GLASS=5000,MAT_TRANQUILLITE=5000)
+	construction_time = 200
+	category = list("Recitence")
+
+/datum/design/recitence_left_arm
+	name = "Exosuit Left Arm (\"Recitence\")"
+	id = "recitence_left_arm"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/recitence_left_arm
+	materials = list(MAT_METAL=15000,MAT_TRANQUILLITE=5000)
+	construction_time = 200
+	category = list("Recitence")
+
+/datum/design/recitence_right_arm
+	name = "Exosuit Right Arm (\"Recitence\")"
+	id = "recitence_right_arm"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/recitence_right_arm
+	materials = list(MAT_METAL=15000,MAT_TRANQUILLITE=5000)
+	construction_time = 200
+	category = list("Recitence")
+
+/datum/design/recitence_left_leg
+	name = "Exosuit Left Leg (\"Recitence\")"
+	id = "recitence_left_leg"
+	build_type = MECHFAB
+	build_path =/obj/item/mecha_parts/part/recitence_left_leg
+	materials = list(MAT_METAL=20000,MAT_TRANQUILLITE=5000)
+	construction_time = 200
+	category = list("Recitence")
+
+/datum/design/recitence_right_leg
+	name = "Exosuit Right Leg (\"Recitence\")"
+	id = "recitence_right_leg"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/recitence_right_leg
+	materials = list(MAT_METAL=20000,MAT_TRANQUILLITE=5000)
+	construction_time = 200
+	category = list("Recitence")
+
 //Phazon
 /datum/design/phazon_chassis
 	name = "Exosuit Chassis (\"Phazon\")"
@@ -641,6 +705,25 @@
 	construction_time = 300
 	category = list("Exosuit Equipment")
 
+/datum/design/mech_silentgun
+	name = "S.H.H. \"Quietus\" Carbine"
+	id = "mech_silentgun"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine/silenced
+	materials = list(MAT_METAL=20000,MAT_TRANQUILLITE=10000)
+	construction_time = 500
+	category = list("Exosuit Equipment")
+
+/datum/design/mech_mimercd
+	name = "Exosuit Module (Mime RCD Module)"
+	desc = "An exosuit-mounted Mime Rapid Construction Device."
+	id = "mech_mrcd"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/mecha_equipment/tool/mimercd
+	materials = list(MAT_METAL=30000,MAT_TRANQUILLITE=10000)
+	construction_time = 700
+	category = list("Exosuit Equipment")
+
 // Exosuit Modules
 /datum/design/mech_diamond_drill
 	name = "Exosuit Module (Diamond Mining Drill)"

code/modules/research/rdconsole.dm

@@ -90,6 +90,8 @@ proc/CallMaterialName(ID)
 				return_name = "Diamond"
 			if("clown")
 				return_name = "Bananium"
+			if("mime")
+				return_name = "Tranquillite"
 	else
 		for(var/R in subtypesof(/datum/reagent))
 			temp_reagent = null
@@ -535,6 +537,8 @@ proc/CallMaterialName(ID)
 				MAT = MAT_DIAMOND
 			if("clown")
 				MAT = MAT_BANANIUM
+			if("mime")
+				MAT = "Tranquillite"
 		linked_lathe.materials.retrieve_sheets(desired_num_sheets, MAT)
 
 	else if(href_list["imprinter_ejectsheet"] && linked_imprinter) //Causes the protolathe to eject a sheet of material
@@ -1011,6 +1015,15 @@ proc/CallMaterialName(ID)
 			if(bananium_amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "<A href='?src=\ref[src];lathe_ejectsheet=clown;lathe_ejectsheet_amt=5'>5x</A> "
 			if(bananium_amount >= MINERAL_MATERIAL_AMOUNT) dat += "<A href='?src=\ref[src];lathe_ejectsheet=clown;lathe_ejectsheet_amt=50'>All</A>"
 			dat += "</div>"
+			//Tranquillite
+			var/tranquillite_amount = linked_lathe.materials.amount(MAT_TRANQUILLITE)
+			dat += "* [tranquillite_amount] of Tranquillite, [round(tranquillite_amount / MINERAL_MATERIAL_AMOUNT,0.1)] sheets: "
+			if(tranquillite_amount >= MINERAL_MATERIAL_AMOUNT)
+				dat += "<A href='?src=\ref[src];lathe_ejectsheet=mime;lathe_ejectsheet_amt=1'>Eject</A> "
+				dat += "<A href='?src=\ref[src];lathe_ejectsheet=mime;lathe_ejectsheet_amt=custom'>C</A> "
+			if(tranquillite_amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "<A href='?src=\ref[src];lathe_ejectsheet=mime;lathe_ejectsheet_amt=5'>5x</A> "
+			if(tranquillite_amount >= MINERAL_MATERIAL_AMOUNT) dat += "<A href='?src=\ref[src];lathe_ejectsheet=mime;lathe_ejectsheet_amt=50'>All</A>"
+			dat += "</div>"
 
 		if(3.3)
 			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A>"