Merge pull request #8424 from phil235/SiliconWeldProtFix

Fixes silicons being flashed when welding.

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

@@ -81,9 +81,9 @@
 
 	else if(issilicon(M))
 		add_logs(user, M, "flashed", object="[src.name]")
-		if(M.flash_eyes())
-			M.Weaken(rand(5,10))
-			user.visible_message("<span class='disarm'>[user] overloads [M]'s sensors with the flash!</span>")
+		flick("e_flash", M.flash)
+		M.Weaken(rand(5,10))
+		user.visible_message("<span class='disarm'>[user] overloads [M]'s sensors with the flash!</span>")
 		return 1
 
 	user.visible_message("<span class='notice'>[user] fails to blind [M] with the flash!</span>")

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

@@ -117,7 +117,7 @@
 		var/mob/living/silicon/S = target
 		//20% chance to actually hit the sensors
 		if(prob(effectchance * diode.rating))
-			S.flash_eyes()
+			flick("e_flash", S.flash)
 			S.Weaken(rand(5,10))
 			S << "<span class='warning'>Your sensors were overloaded by a laser!</span>"
 			outmsg = "<span class='notice'>You overload [S] by shining [src] at their sensors.</span>"

code/modules/mob/living/silicon/silicon.dm

@@ -416,6 +416,9 @@
 /mob/living/silicon/setEarDamage()
 	return
 
+/mob/living/silicon/check_eye_prot()
+	return 2
+
 /mob/living/silicon/proc/GetPhoto()
 	if (aicamera)
 		return aicamera.selectpicture(aicamera)

code/modules/mob/living/simple_animal/friendly/drone/_drone.dm

@@ -171,4 +171,7 @@
 					cleared = 1
 					L -= I
 		if(cleared)
-			src << "--- [class] alarm in [A.name] has been cleared."
+			src << "--- [class] alarm in [A.name] has been cleared."
+
+/mob/living/simple_animal/drone/check_eye_prot()
+	return 2