Add noise sensor and add muzzles to protolathe

code/modules/assembly/voice.dm

@@ -10,46 +10,67 @@
 
 	bomb_name = "voice-activated bomb"
 
-	describe()
-		if(recorded || listening)
-			return "A meter on [src] flickers with every nearby sound."
-		else
-			return "[src] is deactivated."
+/obj/item/assembly/voice/describe()
+	if(recorded || listening)
+		return "A meter on [src] flickers with every nearby sound."
+	else
+		return "[src] is deactivated."
 
-	hear_talk(mob/living/M as mob, msg)
-		hear_input(M, msg, 0)
+/obj/item/assembly/voice/hear_talk(mob/living/M as mob, msg)
+	hear_input(M, msg, 0)
 
-	hear_message(mob/living/M as mob, msg)
+/obj/item/assembly/voice/hear_message(mob/living/M as mob, msg)
 		hear_input(M, msg, 1)
 
-	proc/hear_input(mob/living/M as mob, msg, type)
-		if(!istype(M,/mob/living))
-			return
-		if(listening)
-			recorded = msg
-			recorded_type = type
-			listening = 0
-			var/turf/T = get_turf(src)	//otherwise it won't work in hand
-			T.visible_message("[bicon(src)] beeps, \"Activation message is [type ? "the sound when one [recorded]" : "'[recorded]'."]\"")
-		else
-			if(findtext(msg, recorded) && type == recorded_type)
-				pulse(0)
-				var/turf/T = get_turf(src)  //otherwise it won't work in hand
-				T.visible_message("<span class='warning'>[bicon(src)] beeps!</span>")
+/obj/item/assembly/voice/proc/hear_input(mob/living/M as mob, msg, type)
+	if(!istype(M,/mob/living))
+		return
+	if(listening)
+		recorded = msg
+		recorded_type = type
+		listening = 0
+		var/turf/T = get_turf(src)	//otherwise it won't work in hand
+		T.visible_message("[bicon(src)] beeps, \"Activation message is [type ? "the sound when one [recorded]" : "'[recorded]'."]\"")
+	else if(findtext(msg, recorded) && type == recorded_type)
+		pulse(0)
+		var/turf/T = get_turf(src)  //otherwise it won't work in hand
+		T.visible_message("<span class='warning'>[bicon(src)] beeps!</span>")
 
-	activate()
-		return // previously this toggled listning when not in a holder, that's a little silly.  It was only called in attack_self that way.
+/obj/item/assembly/voice/activate()
+	return // previously this toggled listning when not in a holder, that's a little silly.  It was only called in attack_self that way.
 
 
-	attack_self(mob/user)
-		if(!user || !secured)	return 0
+/obj/item/assembly/voice/attack_self(mob/user)
+	if(!user || !secured)	return 0
 
-		listening = !listening
-		var/turf/T = get_turf(src)
-		T.visible_message("[bicon(src)] beeps, \"[listening ? "Now" : "No longer"] recording input.\"")
-		return 1
+	listening = !listening
+	var/turf/T = get_turf(src)
+	T.visible_message("[bicon(src)] beeps, \"[listening ? "Now" : "No longer"] recording input.\"")
+	return 1
 
 
-	toggle_secure()
-		. = ..()
-		listening = 0
+/obj/item/assembly/voice/toggle_secure()
+	. = ..()
+	listening = 0
+
+/obj/item/assembly/voice/noise
+	name = "noise sensor"
+	desc = "A simple noise sensor that triggers on vocalizations other then speech."
+	icon_state = "voice"
+	materials = list(MAT_METAL=100, MAT_GLASS=10)
+	origin_tech = "magnets=1;engineering=1"
+	bomb_name = "noise-activated bomb"
+
+/obj/item/assembly/voice/noise/attack_self(mob/user)
+	return
+
+/obj/item/assembly/voice/noise/describe()
+	return "[src] does not appear to have any controls."
+
+/obj/item/assembly/voice/noise/hear_talk(mob/living/M as mob, msg)
+	return
+
+/obj/item/assembly/voice/hear_message(mob/living/M as mob, msg)
+	pulse(0)
+	var/turf/T = get_turf(src)  //otherwise it won't work in hand
+	T.visible_message("<span class='warning'>[bicon(src)] beeps!</span>")

code/modules/clothing/masks/miscellaneous.dm

@@ -120,12 +120,14 @@
 	mute = MUZZLE_MUTE_NONE
 	security_lock = TRUE
 	locked = FALSE
+	materials = list(MAT_METAL=500, MAT_GLASS=50)
 
 /obj/item/clothing/mask/muzzle/safety/shock
 	name = "shock muzzle"
 	desc = "A muzzle designed to prevent biting.  This one is fitted with a behavior correction system."
 	var/obj/item/assembly/trigger = null
 	origin_tech = "materials=1;engineering=1"
+	materials = list(MAT_METAL=500, MAT_GLASS=50)
 
 /obj/item/clothing/mask/muzzle/safety/shock/attackby(obj/item/W, mob/user, params)
 	if(isscrewdriver(W))

code/modules/research/designs/autolathe_designs.dm

@@ -551,6 +551,14 @@
 	build_path = /obj/item/assembly/voice
 	category = list("initial", "Miscellaneous")
 
+/datum/design/noise_analyser
+	name = "Noise Analyser"
+	id = "Noise_analyser"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 100, MAT_GLASS = 10)
+	build_path = /obj/item/assembly/voice/noise
+	category = list("initial", "Miscellaneous")
+
 /datum/design/light_tube
 	name = "Light Tube"
 	id = "light_tube"

code/modules/research/designs/misc_designs.dm

@@ -60,3 +60,23 @@
 	materials = list(MAT_METAL = 500, MAT_GLASS = 300)
 	build_path = /obj/item/camera/digital
 	category = list("Miscellaneous")
+
+/datum/design/safety_muzzle
+	name = "Safety Muzzle"
+	desc = "Produce a lockable muzzle keyed to security ID cards"
+	id = "safetymuzzle"
+	req_tech = list("materials" = 1)
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL=500, MAT_GLASS=50)
+	build_path = /obj/item/clothing/mask/muzzle/safety
+	category = list("Miscellaneous")
+
+/datum/design/shock_muzzle
+	name = "Shock Muzzle"
+	desc = "Produce a modified saftey muzzle that includes an electric shock pack and a slot for a trigger assembly."
+	id = "shockmuzzle"
+	req_tech = list("materials" = 1, "engineering" = 1)
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL=500, MAT_GLASS=50)
+	build_path = /obj/item/clothing/mask/muzzle/safety/shock
+	category = list("Miscellaneous")