Gun update 2018 version (#4397)

-laser should now produce light
-added a wielded sprite for the lmg
-added a new lwap in hand sprite

code/game/objects/effects/projectile/projectile_impact.dm

@@ -5,48 +5,62 @@
 /obj/effect/projectile/impact/laser
 	name = "laser impact"
 	icon_state = "impact_laser"
+	light_color = LIGHT_COLOR_RED
 
 /obj/effect/projectile/impact/laser/blue
 	name = "laser impact"
 	icon_state = "impact_blue"
+	light_color = LIGHT_COLOR_BLUE
 
 /obj/effect/projectile/impact/disabler
 	name = "disabler impact"
 	icon_state = "impact_omni"
+	light_color = LIGHT_COLOR_CYAN
 
 /obj/effect/projectile/impact/xray
 	name = "xray impact"
 	icon_state = "impact_xray"
+	light_color = LIGHT_COLOR_GREEN
 
 /obj/effect/projectile/impact/pulse
 	name = "pulse impact"
 	icon_state = "impact_u_laser"
+	light_color = LIGHT_COLOR_BLUE
 
 /obj/effect/projectile/impact/plasma_cutter
 	name = "plasma impact"
 	icon_state = "impact_plasmacutter"
+	light_color = LIGHT_COLOR_CYAN
 
 /obj/effect/projectile/impact/stun
 	name = "stun impact"
 	icon_state = "impact_stun"
+	light_color = LIGHT_COLOR_YELLOW
 
 /obj/effect/projectile/impact/heavy_laser
 	name = "heavy laser impact"
 	icon_state = "impact_beam_heavy"
+	light_power = 3
+	light_color = LIGHT_COLOR_RED
 
 /obj/effect/projectile/impact/cult
 	name = "arcane blast"
 	icon_state = "impact_cult"
+	light_color = LIGHT_COLOR_VIOLET
 
 /obj/effect/projectile/impact/cult/heavy
 	icon_state = "impact_hcult"
+	light_power = 3
 
 /obj/effect/projectile/impact/solar
 	name = "solar eruption"
 	icon_state = "impact_solar"
+	light_color = LIGHT_COLOR_FIRE
 
 /obj/effect/projectile/impact/eyelaser
 	icon_state = "impact_eye"
+	light_color = LIGHT_COLOR_RED
 
 /obj/effect/projectile/impact/emitter
 	icon_state = "impact_emitter"
+	light_color = LIGHT_COLOR_GREEN

code/game/objects/effects/projectile/projectile_muzzle.dm

@@ -4,43 +4,57 @@
 
 /obj/effect/projectile/muzzle/laser
 	icon_state = "muzzle_laser"
+	light_color = LIGHT_COLOR_RED
 
 /obj/effect/projectile/muzzle/laser/blue
 	icon_state = "muzzle_laser_blue"
+	light_color = LIGHT_COLOR_BLUE
 
 /obj/effect/projectile/muzzle/disabler
 	icon_state = "muzzle_omni"
+	light_color = LIGHT_COLOR_CYAN
 
 /obj/effect/projectile/muzzle/xray
 	icon_state = "muzzle_xray"
+	light_color = LIGHT_COLOR_GREEN
 
 /obj/effect/projectile/muzzle/pulse
 	icon_state = "muzzle_u_laser"
+	light_color = LIGHT_COLOR_BLUE
 
 /obj/effect/projectile/muzzle/plasma_cutter
 	icon_state = "muzzle_plasmacutter"
+	light_color = LIGHT_COLOR_CYAN
 
 /obj/effect/projectile/muzzle/stun
 	icon_state = "muzzle_stun"
+	light_color = LIGHT_COLOR_YELLOW
 
 /obj/effect/projectile/muzzle/heavy_laser
 	icon_state = "muzzle_beam_heavy"
+	light_power = 3
+	light_color = LIGHT_COLOR_RED
 
 /obj/effect/projectile/muzzle/cult
 	name = "arcane flash"
 	icon_state = "muzzle_cult"
+	light_color = LIGHT_COLOR_VIOLET
 
 /obj/effect/projectile/muzzle/cult/heavy
 	icon_state = "muzzle_hcult"
+	light_power = 3
 
 /obj/effect/projectile/muzzle/solar
 	icon_state = "muzzle_solar"
+	light_color = LIGHT_COLOR_FIRE
 
 /obj/effect/projectile/muzzle/eyelaser
 	icon_state = "muzzle_eye"
+	light_color = LIGHT_COLOR_RED
 
 /obj/effect/projectile/muzzle/emitter
 	icon_state = "muzzle_emitter"
+	light_color = LIGHT_COLOR_GREEN
 
 /obj/effect/projectile/muzzle/bullet
 	icon_state = "muzzle_bullet"

code/game/objects/effects/projectile/projectile_tracer.dm

@@ -17,6 +17,7 @@
 /obj/effect/projectile/tracer/laser
 	name = "laser"
 	icon_state = "beam"
+	light_color = LIGHT_COLOR_RED
 
 /obj/effect/projectile/tracer/laser/blue
 	icon_state = "beam_blue"
@@ -24,41 +25,53 @@
 /obj/effect/projectile/tracer/disabler
 	name = "disabler"
 	icon_state = "beam_omni"
+	light_color = LIGHT_COLOR_CYAN
 
 /obj/effect/projectile/tracer/xray
 	name = "xray laser"
 	icon_state = "xray"
+	light_color = LIGHT_COLOR_GREEN
 
 /obj/effect/projectile/tracer/pulse
 	name = "pulse laser"
 	icon_state = "u_laser"
+	light_color = LIGHT_COLOR_BLUE
 
 /obj/effect/projectile/tracer/plasma_cutter
 	name = "plasma blast"
 	icon_state = "plasmacutter"
+	light_color = LIGHT_COLOR_CYAN
 
 /obj/effect/projectile/tracer/stun
 	name = "stun beam"
 	icon_state = "stun"
+	light_color = LIGHT_COLOR_YELLOW
 
 /obj/effect/projectile/tracer/heavy_laser
 	name = "heavy laser"
 	icon_state = "beam_heavy"
-
-/obj/effect/projectile/tracer/cult/heavy
-	name = "heavy arcane beam"
-	icon_state = "hcult"
+	light_power = 3
+	light_color = LIGHT_COLOR_RED
 
 /obj/effect/projectile/tracer/cult
 	name = "arcane beam"
 	icon_state = "cult"
+	light_color = LIGHT_COLOR_VIOLET
+
+/obj/effect/projectile/tracer/cult/heavy
+	name = "heavy arcane beam"
+	icon_state = "hcult"
+	light_power = 3
 
 /obj/effect/projectile/tracer/solar
 	name = "solar energy"
 	icon_state = "solar"
+	light_color = LIGHT_COLOR_FIRE
 
 /obj/effect/projectile/tracer/eyelaser
 	icon_state = "eye"
+	light_color = LIGHT_COLOR_RED
 
 /obj/effect/projectile/tracer/emitter
 	icon_state = "emitter"
+	light_color = LIGHT_COLOR_GREEN

code/modules/projectiles/guns/energy/laser.dm

@@ -101,7 +101,7 @@ obj/item/weapon/gun/energy/retro
 	name = "marksman energy rifle"
 	desc = "The HI L.W.A.P. is an older design of Hephaestus Industries. A designated marksman rifle capable of shooting powerful ionized beams, this is a weapon to kill from a distance."
 	icon_state = "sniper"
-	item_state = "sniper"
+	item_state = "psniper"
 	fire_sound = 'sound/weapons/marauder.ogg'
 	origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 5, TECH_POWER = 4)
 	projectile_type = /obj/item/projectile/beam/sniper

code/modules/projectiles/guns/projectile/automatic.dm

@@ -273,6 +273,10 @@
 
 /obj/item/weapon/gun/projectile/automatic/rifle/l6_saw/update_icon()
 	icon_state = "l6[cover_open ? "open" : "closed"][ammo_magazine ? round(ammo_magazine.stored_ammo.len, 25) : "-empty"]"
+	if(wielded)
+		item_state = "l6closedmag-wielded"
+	else
+		item_state = initial(item_state)
 
 /obj/item/weapon/gun/projectile/automatic/rifle/l6_saw/load_ammo(var/obj/item/A, mob/user)
 	if(!cover_open)