diff --git a/code/modules/events/ninja.dm b/code/modules/events/ninja.dm
index 6e25cb211f5..746d1010d0f 100644
--- a/code/modules/events/ninja.dm
+++ b/code/modules/events/ninja.dm
@@ -374,6 +374,7 @@ ________________________________________________________________________________
 	equip_to_slot_or_del(new /obj/item/clothing/gloves/space_ninja(src), slot_gloves)
 	equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/space_ninja(src), slot_head)
 	equip_to_slot_or_del(new /obj/item/clothing/mask/gas/voice/space_ninja(src), slot_wear_mask)
+	equip_to_slot_or_del(new /obj/item/clothing/glasses/night(src), slot_glasses)
 	equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_belt)
 	equip_to_slot_or_del(new /obj/item/weapon/plastique(src), slot_r_store)
 	equip_to_slot_or_del(new /obj/item/weapon/plastique(src), slot_l_store)
@@ -2521,7 +2522,6 @@ ________________________________________________________________________________
 
 /obj/item/clothing/mask/gas/voice/space_ninja/New()
 	verbs += /obj/item/clothing/mask/gas/voice/space_ninja/proc/togglev
-	verbs += /obj/item/clothing/mask/gas/voice/space_ninja/proc/switchm
 
 //This proc is linked to human life.dm. It determines what hud icons to display based on mind special role for most mobs.
 /obj/item/clothing/mask/gas/voice/space_ninja/proc/assess_targets(list/target_list, mob/living/carbon/U)
@@ -2586,46 +2586,8 @@ ________________________________________________________________________________
 		voice = "Unknown"
 	return
 
-/obj/item/clothing/mask/gas/voice/space_ninja/proc/switchm()
-	set name = "Switch Mode"
-	set desc = "Switches between Night Vision, Meson, or Thermal vision modes."
-	set category = "Ninja Equip"
-	//Have to reset these manually since life.dm is retarded like that. Go figure.
-	//This will only work for humans because only they have the appropriate code for the mask.
-	var/mob/U = loc
-	switch(mode)
-		if(0)
-			mode=1
-			U << "Switching mode to <B>Night Vision</B>."
-		if(1)
-			mode=2
-			U.see_in_dark = 2
-			U << "Switching mode to <B>Thermal Scanner</B>."
-		if(2)
-			mode=3
-			U.see_invisible = SEE_INVISIBLE_LIVING
-			U.sight &= ~SEE_MOBS
-			U << "Switching mode to <B>Meson Scanner</B>."
-		if(3)
-			mode=0
-			U.sight &= ~SEE_TURFS
-			U << "Switching mode to <B>Scouter</B>."
-
 /obj/item/clothing/mask/gas/voice/space_ninja/examine()
-	set src in view()
 	..()
-
-	var/mode
-	switch(mode)
-		if(0)
-			mode = "Scouter"
-		if(1)
-			mode = "Night Vision"
-		if(2)
-			mode = "Thermal Scanner"
-		if(3)
-			mode = "Meson Scanner"
-	usr << "<B>[mode]</B> is active."//Leaving usr here since it may be on the floor or on a person.
 	usr << "Voice mimicking algorithm is set <B>[!vchange?"inactive":"active"]</B>."
 
 /*
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index de73e267986..b6ace019c5c 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -443,27 +443,6 @@
 		else
 			H.hud_used.lingchemdisplay.invisibility = 101
 
-		if(istype(H.wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja))
-			var/obj/item/clothing/mask/gas/voice/space_ninja/O = H.wear_mask
-			switch(O.mode)
-				if(0)
-					var/target_list[] = list()
-					for(var/mob/living/target in oview(H))
-						if( target.mind&&(target.mind.special_role||issilicon(target)) )//They need to have a mind.
-							target_list += target
-					if(target_list.len)//Everything else is handled by the ninja mask proc.
-						O.assess_targets(target_list, H)
-					H.see_invisible = SEE_INVISIBLE_LIVING
-				if(1)
-					H.see_in_dark = 5
-					H.see_invisible = SEE_INVISIBLE_LIVING
-				if(2)
-					H.sight |= SEE_MOBS
-					H.see_invisible = SEE_INVISIBLE_LEVEL_TWO
-				if(3)
-					H.sight |= SEE_TURFS
-					H.see_invisible = SEE_INVISIBLE_LIVING
-
 		if(H.glasses)
 			if(istype(H.glasses, /obj/item/clothing/glasses))
 				var/obj/item/clothing/glasses/G = H.glasses