diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm index 2f0f80447e0..e006cd84151 100644 --- a/code/modules/projectiles/ammunition/energy.dm +++ b/code/modules/projectiles/ammunition/energy.dm @@ -69,14 +69,14 @@ /obj/item/ammo_casing/energy/immolator/strong projectile_type = /obj/item/projectile/beam/immolator/strong - e_cost = 650 + e_cost = 125 select_name = "precise" /obj/item/ammo_casing/energy/immolator/scatter projectile_type = /obj/item/projectile/beam/immolator/weak - e_cost = 650 + e_cost = 125 pellets = 8 - variance = 20 + variance = 25 select_name = "scatter" /obj/item/ammo_casing/energy/electrode diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 7e25d8d270d..04120976a5d 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -128,10 +128,10 @@ /obj/item/gun/energy/immolator/multi name = "multi lens immolator cannon" desc = "A large laser cannon, similar to the Immolator Laser, with togglable firemodes. It is frequently used by military-like forces through Nanotrasen." + icon_state = "multilensimmolator" ammo_type = list(/obj/item/ammo_casing/energy/immolator/strong, /obj/item/ammo_casing/energy/immolator/scatter) origin_tech = "combat=5;magnets=5;powerstorage=4" shaded_charge = TRUE - cell_type = /obj/item/stock_parts/cell/upgraded/plus ////////Laser Tag//////////////////// diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 1edcc6f20da..3cd4e888b1f 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -122,10 +122,12 @@ /obj/item/projectile/beam/immolator/strong name = "heavy immolation beam" damage = 45 + icon_state = "heavylaser" /obj/item/projectile/beam/immolator/weak name = "light immolation beam" damage = 8 + icon_state = "scatterlaser" /obj/item/projectile/beam/immolator/on_hit(var/atom/target, var/blocked = 0) . = ..() diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi index 03b8eba0f8c..be873f7a5b3 100644 Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ