Adds wielded sprites for some guns (#3032)

Adds wielded sprites for the assault rifle, bullup carbine and the AM rifle. Empty sprites for some pistols and also fixes the decloner dealing no damage at all.

code/modules/projectiles/gun.dm

@@ -466,6 +466,9 @@
 	if(accuracy_wielded)
 		accuracy = initial(accuracy)
 
+	update_icon()
+	update_held_icon()
+
 /obj/item/weapon/gun/proc/wield()
 	wielded = 1
 	if(fire_delay_wielded)
@@ -475,6 +478,9 @@
 	if(accuracy_wielded)
 		accuracy = accuracy_wielded
 
+	update_icon()
+	update_held_icon()
+
 /obj/item/weapon/gun/mob_can_equip(M as mob, slot)
 	//Cannot equip wielded items.
 	if(can_wield())
@@ -528,7 +534,7 @@
 				user << "<span class='notice'>You are no-longer stabilizing the [name] with both hands.</span>"
 				O.unwield()
 				unwield()
-				
+
 		if (!QDELETED(src))
 			qdel(src)
 

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

@@ -129,6 +129,7 @@
 	set src in usr
 
 	toggle_wield(usr)
+	usr.update_icon()
 
 /obj/item/weapon/gun/projectile/automatic/rifle/sts35
 	name = "assault rifle"
@@ -137,6 +138,10 @@
 /obj/item/weapon/gun/projectile/automatic/rifle/sts35/update_icon()
 	..()
 	icon_state = (ammo_magazine)? "arifle" : "arifle-empty"
+	if(wielded)
+		item_state = (ammo_magazine)? "arifle-wielded" : "arifle-wielded-empty"
+	else
+		item_state = (ammo_magazine)? "arifle" : "arifle-empty"
 	update_held_icon()
 
 /datum/firemode/z8
@@ -200,6 +205,11 @@
 		icon_state = "carbine-[round(ammo_magazine.stored_ammo.len,2)]"
 	else
 		icon_state = "carbine"
+	if(wielded)
+		item_state = "z8carbine-wielded"
+	else
+		item_state = "z8carbine"
+	update_held_icon()
 	return
 
 /obj/item/weapon/gun/projectile/automatic/rifle/z8/examine(mob/user)

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

@@ -9,6 +9,13 @@
 	fire_sound = 'sound/weapons/Gunshot_light.ogg'
 	load_method = MAGAZINE
 
+/obj/item/weapon/gun/projectile/colt/update_icon()
+	..()
+	if(ammo_magazine && ammo_magazine.stored_ammo.len)
+		icon_state = "colt"
+	else
+		icon_state = "colt-e"
+
 /obj/item/weapon/gun/projectile/colt/detective
 	magazine_type = /obj/item/ammo_magazine/c45m/rubber
 
@@ -41,6 +48,13 @@
 	fire_sound = 'sound/weapons/Gunshot_light.ogg'
 	load_method = MAGAZINE
 
+/obj/item/weapon/gun/projectile/sec/update_icon()
+	..()
+	if(ammo_magazine && ammo_magazine.stored_ammo.len)
+		icon_state = "secguncomp"
+	else
+		icon_state = "secguncomp-e"
+
 /obj/item/weapon/gun/projectile/sec/lethal
 	magazine_type = /obj/item/ammo_magazine/c45m
 
@@ -53,6 +67,13 @@
 	name = "custom .45 Pistol"
 	icon_state = "secgundark"
 
+/obj/item/weapon/gun/projectile/sec/wood/update_icon()
+	..()
+	if(ammo_magazine && ammo_magazine.stored_ammo.len)
+		icon_state = "secgundark"
+	else
+		icon_state = "secgundark-e"
+
 /obj/item/weapon/gun/projectile/automatic/x9
 	name = "automatic .45 pistol"
 	desc = "The x9 tactical pistol is a lightweight fast firing handgun. Uses .45 rounds."
@@ -205,9 +226,18 @@
 	else
 		icon_state = "pistol"
 
+/obj/item/weapon/gun/projectile/pistol/update_icon()
+	..()
+	if(silenced)
+		icon_state = "pistol-silencer"
+	else
+		icon_state = "pistol"
+	if(!(ammo_magazine && ammo_magazine.stored_ammo.len))
+		icon_state = "[icon_state]-e"
+
 /obj/item/weapon/silencer
 	name = "silencer"
-	desc = "a silencer"
+	desc = "A silencer"
 	icon = 'icons/obj/gun.dmi'
 	icon_state = "silencer"
 	w_class = 2

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

@@ -39,12 +39,18 @@
 	set src in usr
 
 	toggle_wield(usr)
+	usr.update_icon()
 
 /obj/item/weapon/gun/projectile/heavysniper/update_icon()
 	if(bolt_open)
 		icon_state = "heavysniper-open"
 	else
 		icon_state = "heavysniper"
+	if(wielded)
+		item_state = "heavysniper-wielded"
+	else
+		item_state = "heavysniper"
+	update_held_icon()
 
 /obj/item/weapon/gun/projectile/heavysniper/attack_self(mob/user as mob)
 	playsound(src.loc, 'sound/weapons/flipblade.ogg', 50, 1)
@@ -124,3 +130,8 @@
 		icon_state = "tranqsniper-open"
 	else
 		icon_state = "tranqsniper"
+	if(wielded)
+		item_state = "heavysniper-wielded"
+	else
+		item_state = "heavysniper"
+	update_held_icon()

code/modules/projectiles/projectile/energy.dm

@@ -5,7 +5,6 @@
 	damage_type = BURN
 	check_armour = "energy"
 
-
 //releases a burst of light on impact or after travelling a distance
 /obj/item/projectile/energy/flash
 	name = "chemical shell"
@@ -57,13 +56,12 @@
 	agony = 80
 
 /obj/item/projectile/energy/declone
-	name = "declone"
+	name = "decloner beam"
 	icon_state = "declone"
-	nodamage = 1
+	damage = 20
 	damage_type = CLONE
 	irradiate = 40
 
-
 /obj/item/projectile/energy/dart
 	name = "dart"
 	icon_state = "toxin"
@@ -71,7 +69,6 @@
 	damage_type = TOX
 	weaken = 5
 
-
 /obj/item/projectile/energy/bolt
 	name = "bolt"
 	icon_state = "cbbolt"