Adds wielded laser rifle sprites, improves freezeray and tcfl guns (#6133)

code/modules/projectiles/ammunition/bullets.dm

@@ -265,7 +265,7 @@
 /obj/item/ammo_casing/gauss
 	name = "tungsten slug"
 	desc = "A heavy tungsten gauss slug."
-	caliber = "gaus"
+	caliber = "gauss"
 	icon_state = "tungstenslug"
 	projectile_type = /obj/item/projectile/bullet/gauss
 

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

@@ -1,6 +1,6 @@
 /obj/item/weapon/gun/energy/blaster
 	name = "blaster pistol"
-	desc = "A tiny energy pistol converted to fire off energy bolts rather than lasers beams. It's covered in the colors of the Tau Ceti Foreign Legion."
+	desc = "A tiny energy pistol converted to fire off energy bolts rather than lasers beams."
 	icon_state = "blaster_pistol"
 	item_state = "blaster_pistol"
 	fire_sound = 'sound/weapons/Laser.ogg'
@@ -22,7 +22,7 @@
 
 /obj/item/weapon/gun/energy/blaster/carbine
 	name = "blaster carbine"
-	desc = "A short-barreled blaster carbine meant for easy handling and comfort when in combat. It's covered in the colors of the Tau Ceti Foreign Legion."
+	desc = "A short-barreled blaster carbine meant for easy handling and comfort when in combat."
 	icon_state = "blaster_carbine"
 	item_state = "blaster_carbine"
 	max_shots = 12
@@ -32,7 +32,7 @@
 
 /obj/item/weapon/gun/energy/blaster/rifle
 	name = "bolt slinger"
-	desc = "A blaster rifle which seems to work by accelerating particles and flinging them out in destructive bolts. It's covered in the colors of the Tau Ceti Foreign Legion."
+	desc = "A blaster rifle which seems to work by accelerating particles and flinging them out in destructive bolts."
 	icon_state = "blaster_rifle"
 	item_state = "blaster_rifle"
 	max_shots = 20

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

@@ -1,8 +1,8 @@
 /obj/item/weapon/gun/energy/laser
 	name = "laser carbine"
 	desc = "An Hephaestus Industries G40E carbine, designed to kill with concentrated energy blasts."
-	icon_state = "laser"
-	item_state = "laser"
+	icon_state = "laserrifle"
+	item_state = "laserrifle"
 	fire_sound = 'sound/weapons/Laser.ogg'
 	slot_flags = SLOT_BELT|SLOT_BACK
 	accuracy = 1

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

@@ -51,8 +51,8 @@
 /obj/item/weapon/gun/energy/rifle/laser
 	name = "laser rifle"
 	desc = "A common laser weapon, designed to kill with concentrated energy blasts."
-	icon_state = "laser"
-	item_state = "laser"
+	icon_state = "laserrifle"
+	item_state = "laserrifle"
 	fire_sound = 'sound/weapons/Laser.ogg'
 	max_shots = 15
 	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
@@ -66,6 +66,14 @@
 	firemodes = list()
 	modifystate = null
 
+/obj/item/weapon/gun/energy/rifle/laser/update_icon()
+	..()
+	if(wielded)
+		item_state = "[initial(icon_state)]-wielded"
+	else
+		item_state = initial(item_state)
+	update_held_icon()
+
 /obj/item/weapon/gun/energy/rifle/laser/heavy
 	name = "laser cannon"
 	desc = "With the laser cannon, the lasing medium is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core. This incredible technology may help YOU achieve high excitation rates with small laser volumes!"
@@ -92,7 +100,7 @@
 	name = "xray laser rifle"
 	desc = "A high-power laser rifle capable of expelling concentrated xray blasts."
 	icon_state = "xrifle"
-	item_state = "xray"
+	item_state = "xrifle"
 	fire_sound = 'sound/weapons/laser3.ogg'
 	projectile_type = /obj/item/projectile/beam/xray
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 3, TECH_MAGNET = 2, TECH_ILLEGAL = 2)

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

@@ -210,7 +210,7 @@
 
 /obj/item/weapon/gun/projectile/gauss
 	name = "gauss thumper"
-	desc = "An outdated gauss weapon which sees sparing use in modern times. It's covered in the colors of the Tau Ceti Foreign Legion."
+	desc = "An outdated gauss weapon which sees sparing use in modern times."
 	w_class = 3
 	slot_flags = 0
 	magazine_type = /obj/item/ammo_magazine/gauss

html/changelogs/alberyk-riflesprite.yml

@@ -0,0 +1,6 @@
+author: Alberyk, Kyres1
+
+delete-after: True
+
+changes: 
+  - imageadd: "Added wielded laser rifle sprites."