diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 87486f3be77..d16612b2ab7 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/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 diff --git a/code/modules/projectiles/guns/energy/blaster.dm b/code/modules/projectiles/guns/energy/blaster.dm index abd6f43d830..a57a0f54029 100644 --- a/code/modules/projectiles/guns/energy/blaster.dm +++ b/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 diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index f67040c63e8..710ef929503 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/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 diff --git a/code/modules/projectiles/guns/energy/rifle.dm b/code/modules/projectiles/guns/energy/rifle.dm index 50bd41e226b..d6aef7f7958 100644 --- a/code/modules/projectiles/guns/energy/rifle.dm +++ b/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) diff --git a/code/modules/projectiles/guns/projectile/rifle.dm b/code/modules/projectiles/guns/projectile/rifle.dm index 5713bec0fcc..220a4ba1086 100644 --- a/code/modules/projectiles/guns/projectile/rifle.dm +++ b/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 diff --git a/html/changelogs/alberyk-riflesprite.yml b/html/changelogs/alberyk-riflesprite.yml new file mode 100644 index 00000000000..e601f3e5ba0 --- /dev/null +++ b/html/changelogs/alberyk-riflesprite.yml @@ -0,0 +1,6 @@ +author: Alberyk, Kyres1 + +delete-after: True + +changes: + - imageadd: "Added wielded laser rifle sprites." diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 2ac90924fcf..75f5708a073 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/belt_mirror.dmi b/icons/mob/belt_mirror.dmi index b37fe1891bb..72fa1a712f8 100644 Binary files a/icons/mob/belt_mirror.dmi and b/icons/mob/belt_mirror.dmi differ diff --git a/icons/mob/items/lefthand_guns.dmi b/icons/mob/items/lefthand_guns.dmi index 49a1468b055..8cb76e637c9 100644 Binary files a/icons/mob/items/lefthand_guns.dmi and b/icons/mob/items/lefthand_guns.dmi differ diff --git a/icons/mob/items/righthand_guns.dmi b/icons/mob/items/righthand_guns.dmi index 95ba22f7ae3..938b7f73a45 100644 Binary files a/icons/mob/items/righthand_guns.dmi and b/icons/mob/items/righthand_guns.dmi differ diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index 62d80487405..6fe127a13ba 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi index 82ea98856ea..a82bb9857ce 100644 Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ diff --git a/icons/obj/vaurca_items.dmi b/icons/obj/vaurca_items.dmi index ec6640e3b66..d23b3074b6d 100644 Binary files a/icons/obj/vaurca_items.dmi and b/icons/obj/vaurca_items.dmi differ