Fixes conflicts and commits

code/game/gamemodes/changeling/powers/augmented_eyesight.dm

@@ -4,7 +4,7 @@
 /obj/effect/proc_holder/changeling/augmented_eyesight
 	name = "Augmented Eyesight"
 	desc = "Creates heat receptors in our eyes and dramatically increases light sensing ability."
-	helptext = "Grants us night vision and thermal vision. It may be toggled on or off."
+	helptext = "Grants us night vision and thermal vision. It may be toggled on or off. We will become more vulnerable to flash-based devices while active."
 	chemical_cost = 0
 	dna_cost = 2 //Would be 1 without thermal vision
 	var/active = 0 //Whether or not vision is enhanced
@@ -13,9 +13,11 @@
 	active = !active
 	if(active)
 		user << "<span class='notice'>We feel a minute twitch in our eyes, and darkness creeps away.</span>"
+		user.weakeyes = 1
 	else
 		user << "<span class='notice'>Our vision dulls. Shadows gather.</span>"
 		user.sight -= SEE_MOBS
+		user.weakeyes = 0
 	while(active)
 		user.see_in_dark = 8
 		user.see_invisible = 2

code/game/machinery/flasher.dm

@@ -84,6 +84,9 @@
 
 		if(L.flash_eyes())
 			L.Weaken(strength)
+			if(L.weakeyes)
+				L.Weaken(strength * 1.5)
+				L.visible_message("<span class='disarm'><b>[L]</b> gasps and shields their eyes!</span>")
 
 	return 1
 

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

@@ -60,11 +60,16 @@
 /obj/item/device/flash/proc/flash_carbon(var/mob/living/carbon/M, var/mob/user = null, var/power = 5, targeted = 1)
 	add_logs(user, M, "flashed", object="[src.name]")
 	if(user && targeted)
+		if(M.weakeyes)
+			M.Weaken(3) //quick weaken bypasses eye protection but has no eye flash
 		if(M.flash_eyes(1, 1))
 			M.confused += power
 			terrible_conversion_proc(M, user)
 			M.Stun(1)
 			user.visible_message("<span class='disarm'>[user] blinds [M] with the flash!</span>")
+			if(M.weakeyes)
+				M.Stun(2)
+				M.visible_message("<span class='disarm'><b>[M]</b> gasps and shields their eyes!</span>")
 		else
 			user.visible_message("<span class='disarm'>[user] fails to blind [M] with the flash!</span>")
 	else

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

@@ -109,6 +109,8 @@
 			//20% chance to actually hit the eyes
 			if(prob(effectchance * diode.rating) && C.flash_eyes(severity))
 				outmsg = "<span class='notice'>You blind [C] by shining [src] in their eyes.</span>"
+				if(C.weakeyes)
+					C.Stun(1)
 			else
 				outmsg = "<span class='notice'>You fail to blind [C] by shining [src] at their eyes.</span>"
 

code/game/objects/items/weapons/grenades/flashbang.dm

@@ -27,11 +27,19 @@
 	var/distance = max(1,get_dist(src,T))
 
 //Flash
+	if(M.weakeyes)
+		M.visible_message("<span class='disarm'><b>[M]</b> screams and collapses!</span>")
+		M << "<span class='userdanger'><font size=3>AAAAGH!</font></span>"
+		M.Weaken(15) //hella stunned
+		M.Stun(15)
+		M.eye_stat += 8
+
 	if(M.flash_eyes())
 		M.eye_stat += rand(1, 3)
 		M.Stun(max(10/distance, 3))
 		M.Weaken(max(10/distance, 3))
 
+
 //Bang
 	if((loc == M) || loc == M.loc)//Holding on person or being exactly where lies is significantly more dangerous and voids protection
 		M.Stun(10)

code/modules/mob/living/carbon/carbon.dm

@@ -155,6 +155,8 @@
 /mob/living/carbon/flash_eyes(intensity = 1, override_blindness_check = 0)
 	var/damage = intensity - check_eye_prot()
 	if(..()) // we've been flashed
+		if(weakeyes)
+			Stun(2)
 		switch(damage)
 			if(1)
 				src << "<span class='warning'>Your eyes sting a little.</span>"

code/modules/mob/mob_defines.dm

@@ -141,6 +141,7 @@
 	var/area/lastarea = null
 
 	var/digitalcamo = 0 // Can they be tracked by the AI?
+	var/weakeyes = 0 //Are they vulnerable to flashes?
 
 	var/has_unlimited_silicon_privilege = 0 // Can they interact with station electronics