Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix

Conflicts:
	code/game/atoms.dm
	code/game/atoms_movable.dm

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

@@ -243,7 +243,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 /obj/item/device/pda/proc/can_use(mob/user)
 	if(user && ismob(user))
-		if(user.stat || user.restrained() || user.paralysis || user.stunned || user.weakened)
+		if(user.incapacitated())
 			return 0
 		if(loc == user)
 			return 1

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

@@ -34,8 +34,7 @@
 		M.Stun(15)
 		M.eye_stat += 8
 
-	if(M.flash_eyes())
-		M.eye_stat += rand(1, 3)
+	if(M.flash_eyes(affect_silicon = 1))
 		M.Stun(max(10/distance, 3))
 		M.Weaken(max(10/distance, 3))
 

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

@@ -14,8 +14,8 @@
 		// Make a quick flash
 		var/turf/T = get_turf(src)
 		playsound(T, 'sound/effects/phasein.ogg', 100, 1)
-		for(var/mob/living/carbon/human/M in viewers(T, null))
-			M.flash_eyes()
+		for(var/mob/living/carbon/C in viewers(T, null))
+			C.flash_eyes()
 
 		for(var/i=1, i<=deliveryamt, i++)
 			var/atom/movable/x = new spawner_type

code/game/objects/items/weapons/tools.dm

@@ -162,6 +162,7 @@
 	var/max_fuel = 20 	//The max amount of fuel the welder can hold
 	var/change_icons = 1
 	var/can_off_process = 0
+	var/light_intensity = 2 //how powerful the emitted light is when used.
 
 /obj/item/weapon/weldingtool/New()
 	..()
@@ -289,7 +290,7 @@
 		reagents.remove_reagent("welding_fuel", amount)
 		check_fuel()
 		if(M)
-			M.flash_eyes(2)
+			M.flash_eyes(light_intensity)
 		return 1
 	else
 		if(M)
@@ -409,7 +410,7 @@
 
 /obj/item/weapon/weldingtool/experimental
 	name = "experimental welding tool"
-	desc = "An experimental welder capable of self-fuel generation."
+	desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes."
 	icon_state = "exwelder"
 	item_state = "exwelder"
 	max_fuel = 40
@@ -418,6 +419,7 @@
 	var/last_gen = 0
 	change_icons = 0
 	can_off_process = 1
+	light_intensity = 1
 
 
 //Proc to make the experimental welder generate fuel, optimized as fuck -Sieve