diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index 94569f769ef..39fb1b8f2de 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -327,6 +327,16 @@
 	category = CAT_MISC
 
 
+/datum/crafting_recipe/flashlight_eyes
+	name = "Flashlight Eyes"
+	result = /obj/item/organ/cyberimp/eyes/flashlight
+	time = 10
+	reqs = list(
+		/obj/item/device/flashlight = 2,
+		/obj/item/weapon/restraints/handcuffs/cable = 1
+	)
+	category = CAT_MISC
+
 /datum/crafting_recipe/chemical_payload
 	name = "Chemical Payload (C4)"
 	result = /obj/item/weapon/bombcore/chemical
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 772b8bc54d7..644bb450cbe 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -568,6 +568,8 @@
 		. += HT.tint
 	if(wear_mask)
 		. += wear_mask.tint
+	for(var/obj/item/organ/cyberimp/eyes/E in internal_organs)
+		. += E.tint
 
 //this handles hud updates
 /mob/living/carbon/update_damage_hud()
diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm
index f5bf53e30ce..666eeac27a1 100644
--- a/code/modules/surgery/organs/augments_eyes.dm
+++ b/code/modules/surgery/organs/augments_eyes.dm
@@ -9,6 +9,7 @@
 
 	var/sight_flags = 0
 	var/dark_view = 0
+	var/tint = 0
 	var/eye_color = "fff"
 	var/old_eye_color = "fff"
 	var/flash_protect = 0
@@ -25,7 +26,7 @@
 		HMN.regenerate_icons()
 	if(aug_message && !special)
 		owner << "<span class='notice'>[aug_message]</span>"
-
+	M.update_tint()
 	owner.update_sight()
 
 /obj/item/organ/cyberimp/eyes/Remove(var/mob/living/carbon/M, var/special = 0)
@@ -34,6 +35,7 @@
 		var/mob/living/carbon/human/HMN = owner
 		HMN.eye_color = old_eye_color
 		HMN.regenerate_icons()
+	M.update_tint()
 	..()
 
 /obj/item/organ/cyberimp/eyes/emp_act(severity)
@@ -66,6 +68,25 @@
 	dark_view = 8
 	aug_message = "You see prey everywhere you look..."
 
+/obj/item/organ/cyberimp/eyes/flashlight
+	name = "flashlight eyes"
+	desc = "It's two flashlights rigged together with some wire. Why would you put these in someones head?"
+	eye_color ="fee5a3"
+	icon = 'icons/obj/lighting.dmi'
+	icon_state = "flashlight_eyes"
+	flash_protect = 2
+	tint = INFINITY
+	implant_color = "#FFFF00"
+	aug_message = "You've become a beacon of light, but ironically can see nothing at all."
+
+/obj/item/organ/cyberimp/eyes/flashlight/Insert(var/mob/living/carbon/M, var/special = 0)
+	..()
+	M.AddLuminosity(15)
+
+
+/obj/item/organ/cyberimp/eyes/flashlight/Remove(var/mob/living/carbon/M, var/special = 0)
+	M.AddLuminosity(-15)
+	..()
 
 // HUD implants
 /obj/item/organ/cyberimp/eyes/hud
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index 986b35dac1f..3f473e684f6 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ