Chameleon overhaul

code/modules/ninja/suit/mask.dm

@@ -6,7 +6,7 @@ Contents:
 
 */
 
-/obj/item/clothing/mask/gas/voice/space_ninja
+/obj/item/clothing/mask/gas/space_ninja
 	name = "ninja mask"
 	desc = "A close-fitting mask that acts both as an air filter and a post-modern fashion statement."
 	icon_state = "s-ninja(norm)"
@@ -19,3 +19,13 @@ Contents:
 		"Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
 		"Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi'
 		)
+
+	var/obj/item/voice_changer/voice_changer
+
+/obj/item/clothing/mask/gas/space_ninja/Initialize(mapload)
+	. = ..()
+	voice_changer = new(src)
+
+/obj/item/clothing/mask/gas/space_ninja/Destroy()
+	QDEL_NULL(voice_changer)
+	return ..()

code/modules/ninja/suit/suit.dm

@@ -24,7 +24,7 @@ Contents:
 	var/obj/item/clothing/head/helmet/space/space_ninja/suitHood
 	var/obj/item/clothing/gloves/space_ninja/suitGloves
 	var/obj/item/clothing/shoes/space_ninja/suitShoes
-	var/obj/item/clothing/mask/gas/voice/space_ninja/suitMask
+	var/obj/item/clothing/mask/gas/space_ninja/suitMask
 	var/mob/living/carbon/human/suitOccupant
 
 /obj/item/clothing/suit/space/space_ninja/proc/toggle_suit_lock(mob/living/carbon/human/user)
@@ -41,7 +41,7 @@ Contents:
 		if(!istype(user.shoes, /obj/item/clothing/shoes/space_ninja))
 			to_chat(user, "<span style='color: #ff0000;'><b>ERROR:</b> Unable to locate foot gear.\nABORTING...</span>")
 			return 0
-		if(!istype(user.wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja))
+		if(!istype(user.wear_mask, /obj/item/clothing/mask/gas/space_ninja))
 			to_chat(user, "<span style='color: #ff0000;'><b>ERROR:</b> Unable to locate mask.\nABORTING...</span>")
 			return 0