Merge pull request #4909 from Miauw62/ninjacangosuckadick

Fixes voice changers.

code/modules/clothing/masks/gasmask.dm

@@ -195,6 +195,11 @@
 	var/voice = "Unknown"
 	var/vchange = 0//This didn't do anything before. It now checks if the mask has special functions/N
 	origin_tech = "syndicate=4"
+	action_button_name = "Toggle mask"
+
+/obj/item/clothing/mask/gas/voice/attack_self(mob/user)
+	vchange = !vchange
+	user << "<span class='notice'>The voice changer is now [vchange ? "on" : "off"]!</span>"
 
 /obj/item/clothing/mask/gas/voice/space_ninja
 	name = "ninja mask"

code/modules/mob/living/carbon/human/say.dm

@@ -47,10 +47,14 @@
 	return message
 
 /mob/living/carbon/human/GetVoice()
-	if(istype(src.wear_mask, /obj/item/clothing/mask/gas/voice))
-		var/obj/item/clothing/mask/gas/voice/V = src.wear_mask
-		if(V.vchange)
-			return V.voice
+	if(istype(wear_mask, /obj/item/clothing/mask/gas/voice))
+		var/obj/item/clothing/mask/gas/voice/V = wear_mask
+		if(V.vchange && wear_id)
+			var/obj/item/weapon/card/id/idcard = wear_id.GetID()
+			if(istype(idcard))
+				return idcard.registered_name
+			else
+				return real_name
 		else
 			return real_name
 	if(mind && mind.changeling && mind.changeling.mimicing)