diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 65be2736355..045e8f0c12d 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -170,6 +170,12 @@ ABSTRACT_TYPE(/obj/item/clothing/mask/smokable)
 	var/burn_rate = 0
 	/// Spam limiter for audio/message when taking a drag of cigarette.
 	var/last_drag = 0
+	/// Used when setting light; change on child obj def for any weird smokables.
+	var/lit_light_radius = 1
+	/// Used when setting light; change on child obj def for any weird smokables.
+	var/lit_light_power = 0.1
+	/// Used when setting light; change on child obj def for any weird smokables.
+	var/lit_light_color = "#ffa251"
 	drop_sound = 'sound/items/drop/food.ogg'
 	pickup_sound = 'sound/items/pickup/food.ogg'
 
@@ -229,7 +235,7 @@ ABSTRACT_TYPE(/obj/item/clothing/mask/smokable)
 			M.update_inv_r_hand(1)
 		var/turf/T = get_turf(src)
 		T.visible_message(flavor_text)
-		set_light_range_power_color(2, 0.25, "#E38F46")
+		set_light_range_power_color(lit_light_radius, lit_light_power, lit_light_color)
 		set_light_on(TRUE)
 		START_PROCESSING(SSprocessing, src)
 
diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index 83fdf599aaf..6ff33b518ae 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -43,7 +43,7 @@
 
 	var/mutable_appearance/screen_overlay = mutable_appearance(icon, "atm-active", plane = ABOVE_LIGHTING_PLANE)
 	AddOverlays(screen_overlay)
-	set_light(1.4, 1, COLOR_CYAN)
+	set_light(1.4, 0.75, COLOR_CYAN)
 
 	if(held_card)
 		var/mutable_appearance/card_overlay = mutable_appearance(icon, "atm-cardin", plane = ABOVE_LIGHTING_PLANE)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 74f56973390..c95127feae8 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1287,7 +1287,7 @@
 		if(HAS_TRAIT(src, TRAIT_ORIGIN_LIGHT_SENSITIVE))
 			T = loc
 			// From testing, this generally leaves several minutes between each message.
-			if(prob(1) && T.get_lumcount() > 0.8)
+			if(prob(0.5) && T.get_lumcount() > 0.95)
 				var/mob/living/carbon/human/self = src
 
 				// If you have this trait, your default flash protection is -1; check for ANY protection.
@@ -1308,6 +1308,15 @@
 							"The bright light leaves your vision strained."
 						)
 						to_chat(src, SPAN_WARNING(pick(eye_sensitivity_messages)))
+						if(prob(20))
+							// If your eyes are covered, people can see you squinting.
+							var/list/protection = list(self.head, self.glasses, self.wear_mask)
+							var/eyes_covered = FALSE
+							for(var/obj/item/I in protection)
+								if(I?.body_parts_covered & EYES)
+									eyes_covered = TRUE
+							if(!eyes_covered)
+								self.visible_message("[self] squints in discomfort.")
 
 /mob/living/carbon/human/proc/handle_changeling()
 	if(mind)
diff --git a/html/changelogs/Bat-LightSensitivityNerf.yml b/html/changelogs/Bat-LightSensitivityNerf.yml
new file mode 100644
index 00000000000..e5276b3b2b3
--- /dev/null
+++ b/html/changelogs/Bat-LightSensitivityNerf.yml
@@ -0,0 +1,6 @@
+author: Batrachophrenoboocosmomachia
+delete-after: True
+changes:
+  - rscadd: "Adds minor visual tell to light sensitivity."
+  - balance: "Reduces probability of light sensitivity effects firing, increases minimum threshold."
+  - balance: "Slightly reduces the brightness of cigarettes and ATMs (turf corner light calculations resulted in outsized returns)."