Merge pull request #10993 from Zuhayr/species

Human subspecies.

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

@@ -64,30 +64,18 @@
 	var/flashfail = 0
 
 	if(iscarbon(M))
-		var/safety = M:eyecheck()
-		if(safety <= 0)
-			M.Weaken(10)
-			flick("e_flash", M.flash)
-
-			if(ishuman(M) && ishuman(user) && M.stat!=DEAD)
-				if(user.mind && user.mind in revs.current_antagonists)
-					var/revsafe = 0
-					for(var/obj/item/weapon/implant/loyalty/L in M)
-						if(L && L.implanted)
-							revsafe = 1
-							break
-					M.mind_initialize()		//give them a mind datum if they don't have one.
-					if(M.mind.has_been_rev)
-						revsafe = 2
-					if(!revsafe)
-						M.mind.has_been_rev = 1
-						revs.add_antagonist(M.mind)
-					else if(revsafe == 1)
-						user << "<span class='warning'>Something seems to be blocking the flash!</span>"
-					else
-						user << "<span class='warning'>This mind seems resistant to the flash!</span>"
-		else
-			flashfail = 1
+		if(M.stat!=DEAD)
+			var/safety = M:eyecheck()
+			if(safety <= 0)
+				var/flash_strength = 10
+				if(ishuman(M))
+					var/mob/living/carbon/human/H = M
+					flash_strength *= H.species.flash_mod
+				if(flash_strength > 0)
+					M.Weaken(flash_strength)
+					flick("e_flash", M.flash)
+			else
+				flashfail = 1
 
 	else if(issilicon(M))
 		M.Weaken(rand(5,10))