Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state

Conflicts:
	code/modules/clothing/head/jobs.dm
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/items.dmi

code/modules/projectiles/ammunition/boxes.dm

@@ -238,7 +238,7 @@
 
 /obj/item/ammo_magazine/a10mm
 	name = "magazine (10mm)"
-	icon_state = "12mm"
+	icon_state = "10mm"
 	origin_tech = list(TECH_COMBAT = 2)
 	mag_type = MAGAZINE
 	caliber = "10mm"

code/modules/projectiles/effects.dm

@@ -124,3 +124,15 @@
 //----------------------------
 /obj/effect/projectile/bullet/muzzle
 	icon_state = "muzzle_bullet"
+
+//----------------------------
+// Lightning beam
+//----------------------------
+/obj/effect/projectile/lightning/tracer
+	icon_state = "lightning"
+
+/obj/effect/projectile/lightning/muzzle
+	icon_state = "muzzle_lightning"
+
+/obj/effect/projectile/lightning/impact
+	icon_state = "impact_lightning"

code/modules/projectiles/projectile.dm

@@ -54,6 +54,7 @@
 	var/drowsy = 0
 	var/agony = 0
 	var/embed = 0 // whether or not the projectile can embed itself in the mob
+	var/reflected = 0 // This should be set to 1 if reflected by any means, to prevent infinite reflections.
 
 	var/hitscan = 0		// whether the projectile should be hitscan
 	var/step_delay = 1	// the delay between iterations if not a hitscan projectile
@@ -169,7 +170,7 @@
 		return
 
 	//roll to-hit
-	miss_modifier = max(15*(distance-2) - round(15*accuracy) + miss_modifier, 0)
+	miss_modifier = max(15*(distance-2) - round(15*accuracy) + miss_modifier + round(15*target_mob.evasion), 0)
 	var/hit_zone = get_zone_with_miss_chance(def_zone, target_mob, miss_modifier, ranged_attack=(distance > 1 || original != target_mob)) //if the projectile hits a target we weren't originally aiming at then retain the chance to miss
 
 	var/result = PROJECTILE_FORCE_MISS