Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2

# Conflicts:
#	code/defines/procs/announce.dm
#	code/modules/events/mass_hallucination.dm

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

@@ -55,7 +55,7 @@
 	interact(user)
 
 /obj/item/device/camera_bug/check_eye(var/mob/user as mob)
-	if(user.stat || loc != user || !user.canmove || user.eye_blind || !current)
+	if(user.stat || loc != user || !user.canmove || !user.can_see() || !current)
 		user.reset_view(null)
 		user.unset_machine()
 		return null

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

@@ -81,7 +81,7 @@
 		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
+			M.AdjustConfused(power)
 			terrible_conversion_proc(M, user)
 			M.Stun(1)
 			visible_message("<span class='disarm'>[user] blinds [M] with the flash!</span>")
@@ -96,7 +96,7 @@
 			to_chat(M, "<span class='danger'>[user] fails to blind you with the flash!</span>")
 	else
 		if(M.flash_eyes())
-			M.confused += power
+			M.AdjustConfused(power)
 
 /obj/item/device/flash/attack(mob/living/M, mob/user)
 	if(!try_use_flash(user))