oh god here we go

code/game/objects/items/devices/flashlight.dm

@@ -75,7 +75,7 @@
 				var/obj/item/organ/internal/eyes/eyes = H.get_int_organ(/obj/item/organ/internal/eyes)
 				if(M.stat == DEAD || !eyes || M.disabilities & BLIND)	//mob is dead or fully blind
 					to_chat(user, "<span class='notice'>[M]'s pupils are unresponsive to the light!</span>")
-				else if((XRAY in M.mutations) || (eyes.colourblind_darkview && eyes.colourblind_darkview == eyes.get_dark_view())) //The mob's either got the X-RAY vision or has a tapetum lucidum (extreme nightvision, i.e. Vulp/Tajara with COLOURBLIND & their monkey forms).
+				else if((XRAY in M.mutations) || eyes.get_dark_view() >= 8) //The mob's either got the X-RAY vision or has a tapetum lucidum (extreme nightvision, i.e. Vulp/Tajara with COLOURBLIND & their monkey forms).
 					to_chat(user, "<span class='notice'>[M]'s pupils glow eerily!</span>")
 				else //they're okay!
 					if(M.flash_eyes(visual = 1))

code/modules/surgery/organs/organ_internal.dm

@@ -297,7 +297,6 @@
 	var/eye_colour = "#000000"
 	var/list/colourmatrix = null
 	var/list/colourblind_matrix = MATRIX_GREYSCALE //Special colourblindness parameters. By default, it's black-and-white.
-	var/colourblind_darkview = null
 	var/dependent_disabilities = null //Gets set by eye-dependent disabilities such as colourblindness so the eyes can transfer the disability during transplantation.
 	var/dark_view = 2 //Default dark_view for Humans.
 	var/weld_proof = null //If set, the eyes will not take damage during welding. eg. IPC optical sensors do not take damage when they weld things while all other eyes will.
@@ -312,9 +311,6 @@
 		return colourmatrix
 
 /obj/item/organ/internal/eyes/proc/get_dark_view() //Returns dark_view (if the eyes are organic) for see_invisible handling in species.dm to be autoprocessed by life().
-	if(!robotic && colourblind_darkview && owner.disabilities & COLOURBLIND) //Returns special darkview value if colourblind and it exists, otherwise reuse current.
-		return colourblind_darkview
-	else
 		return dark_view
 
 /obj/item/organ/internal/eyes/insert(mob/living/carbon/human/M, special = 0)

code/modules/surgery/organs/subtypes/grey.dm

@@ -17,5 +17,5 @@
 
 /obj/item/organ/internal/eyes/grey
 	name = "grey eyeballs"
-	dark_view = 5
+	dark_view = 3
 	species = "Grey"

code/modules/surgery/organs/subtypes/tajaran.dm

@@ -2,12 +2,16 @@
 	alcohol_intensity = 1.4
 	species = "Tajaran"
 
-/obj/item/organ/internal/eyes/tajaran /*Most Tajara see in full colour as a result of genetic augmentation, although it cost them their darksight (darksight = 2)
-										unless they choose otherwise by selecting the colourblind disability in character creation (darksight = 8 but colourblind).*/
+/obj/item/organ/internal/eyes/tajaran
 	name = "tajaran eyeballs"
 	species = "Tajaran"
+	dark_view = 8
+
+/obj/item/organ/internal/eyes/tajaran/cblind //Most Tajara see in full colour as a result of genetic augmentation.
+	name = "unmodified tajaran eyeballs"
+	species = "Tajaran"
 	colourblind_matrix = MATRIX_TAJ_CBLIND //The colour matrix and darksight parameters that the mob will recieve when they get the disability.
-	colourblind_darkview = 8
+	dark_view = 8
 
 /obj/item/organ/internal/eyes/tajaran/farwa //Being the lesser form of Tajara, Farwas have an utterly incurable version of their colourblindness.
 	name = "farwa eyeballs"

code/modules/surgery/organs/subtypes/unathi.dm

@@ -4,5 +4,5 @@
 
 /obj/item/organ/internal/eyes/unathi
 	name = "unathi eyeballs"
-	dark_view = 3
+	dark_view = 5
 	species = "Unathi"

code/modules/surgery/organs/subtypes/vulpkanin.dm

@@ -2,12 +2,17 @@
 	alcohol_intensity = 1.4
 	species = "Vulpkanin"
 
-/obj/item/organ/internal/eyes/vulpkanin /*Most Vulpkanin see in full colour as a result of genetic augmentation, although it cost them their darksight (darksight = 2)
-										  unless they choose otherwise by selecting the colourblind disability in character creation (darksight = 8 but colourblind).*/
+
+/obj/item/organ/internal/eyes/vulpkanin
 	name = "vulpkanin eyeballs"
 	species = "Vulpkanin"
+	dark_view = 8
+
+/obj/item/organ/internal/eyes/vulpkanin/cblind //Most Vulpkanin see in full colour as a result of genetic augmentation.
+	name = "unmodified vulpkanin eyeballs"
+	species = "Vulpkanin"
 	colourblind_matrix = MATRIX_VULP_CBLIND //The colour matrix and darksight parameters that the mob will recieve when they get the disability.
-	colourblind_darkview = 8
+	dark_view = 8
 
 /obj/item/organ/internal/eyes/vulpkanin/wolpin //Being the lesser form of Vulpkanin, Wolpins have an utterly incurable version of their colourblindness.
 	name = "wolpin eyeballs"