diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 68712be10f0..bc840d3778e 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -502,7 +502,7 @@ origin_tech = "combat=3" caliber = "laser" max_ammo = 20 - multi_sprite_step = AMMO_MULTI_SPRITE_STEP_ON_OFF + multi_sprite_step = 5 /obj/item/ammo_box/magazine/toy/smgm45 name = "donksoft SMG magazine" diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index c132f503136..2e47ab0c484 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -302,10 +302,10 @@ //Laser carbine// /obj/item/gun/projectile/automatic/lasercarbine - name = "\improper IK-60 Laser Carbine" - desc = "A short, compact carbine like rifle, relying more on battery cartridges rather than a built in power cell. Utilized by the Nanotrasen Navy for combat operations." + name = "\improper IK-60 laser carbine" + desc = "A compact, twin barrelled carbine that uses disposable laser cartridges rather than an internal power cell. Utilized by the Nanotrasen Navy for combat operations." icon_state = "lasercarbine" - item_state = "laser" + item_state = "lasercarbine" w_class = WEIGHT_CLASS_NORMAL origin_tech = "combat=4;materials=2" mag_type = /obj/item/ammo_box/magazine/laser @@ -317,3 +317,4 @@ /obj/item/gun/projectile/automatic/lasercarbine/update_icon_state() icon_state = "lasercarbine[magazine ? "-[CEILING(get_ammo(0)/5, 1)*5]" : ""]" + item_state = "lasercarbine[magazine ? "-[CEILING(get_ammo(0)/5, 1)*5]" : ""]" diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi index 8d5c0d29403..8f346ca3068 100644 Binary files a/icons/mob/inhands/guns_lefthand.dmi and b/icons/mob/inhands/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi index 94915d2d408..d3812fbab86 100644 Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 0df87542e6d..d378e6c3c42 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 0e86a0f6309..7ee06f44470 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ