diff --git a/aurorastation.dme b/aurorastation.dme
index cb5dbb5c2ce..9db2e20f0aa 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -1373,13 +1373,13 @@
 #include "code\modules\background\origins\_origins.dm"
 #include "code\modules\background\origins\origins\diona\biesel.dm"
 #include "code\modules\background\origins\origins\diona\coalition.dm"
-#include "code\modules\background\origins\origins\diona\narrows.dm"
 #include "code\modules\background\origins\origins\diona\deep_space.dm"
 #include "code\modules\background\origins\origins\diona\dominia.dm"
 #include "code\modules\background\origins\origins\diona\eridani.dm"
 #include "code\modules\background\origins\origins\diona\eum.dm"
 #include "code\modules\background\origins\origins\diona\jargon.dm"
 #include "code\modules\background\origins\origins\diona\moghes.dm"
+#include "code\modules\background\origins\origins\diona\narrows.dm"
 #include "code\modules\background\origins\origins\diona\sol.dm"
 #include "code\modules\background\origins\origins\diona\xrim.dm"
 #include "code\modules\background\origins\origins\human\biesel.dm"
diff --git a/code/modules/organs/internal/species/tajara.dm b/code/modules/organs/internal/species/tajara.dm
index 9982411a44a..4bc945a181f 100644
--- a/code/modules/organs/internal/species/tajara.dm
+++ b/code/modules/organs/internal/species/tajara.dm
@@ -7,8 +7,9 @@
 	relative_size = 8
 	var/night_vision = FALSE
 	var/datum/client_color/vision_color = /datum/client_color/monochrome
-	var/datum/client_color/vision_mechanical_color
+	var/datum/client_color/vision_mechanical_color = /datum/client_color/monochrome
 	var/eye_emote = "'s eyes dilate!"
+	var/allowed_model = PROSTHETIC_TESLA //what robotic model allows this eyes to use the night vision
 
 /obj/item/organ/internal/eyes/night/Destroy()
 	disable_night_vision()
@@ -33,8 +34,9 @@
 	if(is_broken())
 		return
 
-	if(!vision_mechanical_color && (status & ORGAN_ROBOT))
-		return
+	if(status & ORGAN_ROBOT)
+		if(!robotic_check())
+			return
 
 	if(!night_vision)
 		enable_night_vision()
@@ -43,6 +45,12 @@
 
 	owner.last_special = world.time + 20
 
+/obj/item/organ/internal/eyes/night/proc/robotic_check(var/mob/user)
+	if(robotize_type == allowed_model)
+		return TRUE
+	else
+		return FALSE
+
 /obj/item/organ/internal/eyes/night/take_damage(var/amount, var/silent = 0)
 	. = ..()
 	disable_night_vision()
diff --git a/code/modules/organs/internal/species/vaurca.dm b/code/modules/organs/internal/species/vaurca.dm
index b4f03b13c88..b964a1de456 100644
--- a/code/modules/organs/internal/species/vaurca.dm
+++ b/code/modules/organs/internal/species/vaurca.dm
@@ -30,4 +30,7 @@
 		owner.eye_blind = 5
 		owner.eye_blurry = 5
 		owner.disabilities |= NEARSIGHTED
-		addtimer(CALLBACK(owner, /mob/.proc/reset_nearsighted), 100)
\ No newline at end of file
+		addtimer(CALLBACK(owner, /mob/.proc/reset_nearsighted), 100)
+
+/obj/item/organ/internal/eyes/night/vaurca/robotic_check()
+	return TRUE
\ No newline at end of file
diff --git a/html/changelogs/alberyk-tesla_eyes.yml b/html/changelogs/alberyk-tesla_eyes.yml
new file mode 100644
index 00000000000..1a1b7abe913
--- /dev/null
+++ b/html/changelogs/alberyk-tesla_eyes.yml
@@ -0,0 +1,6 @@
+author: Alberyk
+
+delete-after: True
+
+changes:
+  - tweak: "Tesla prosthetics eyes can now use night vision."