diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index eb4e42ff821..4904085d638 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -375,3 +375,9 @@ desc = "A cap for children toys." caliber = "caps" projectile_type = /obj/item/projectile/bullet/cap + +/obj/item/ammo_casing/laser + desc = "An experimental laser casing." + caliber = "laser" + projectile_type = /obj/item/projectile/beam/laser + icon_state = "lasercasing" diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index aecd66b1ea5..5487f8d5bc9 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -437,3 +437,12 @@ /obj/item/ammo_box/magazine/toy/m762/update_icon() ..() icon_state = "a762-[round(ammo_count(),10)]" + +/obj/item/ammo_box/magazine/laser + name = "encased laser projector magazine" + desc = "Fits experimental laser ammo casings." + icon_state = "laser" + ammo_type = /obj/item/ammo_casing/laser + origin_tech = "combat=3" + caliber = "laser" + max_ammo = 20 diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index d0e7efcd26b..e8ff8969fdf 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -249,3 +249,15 @@ /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag) ..() empty_alarm() + +/obj/item/weapon/gun/projectile/automatic/lasercarbine + name = "\improper IK-60 Laser Carbine" + desc = "An experimental carbine. Uses encased laser projectors as ammunition."//we need to uncouple the toroidal resistance dejammers + icon_state = "lasercarbine" + item_state = "laser" + w_class = 3 + origin_tech = "combat=5;materials=5" + mag_type = /obj/item/ammo_box/magazine/laser + fire_sound = 'sound/weapons/emitter2.ogg' + can_suppress = 0 + burst_size = 2 diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 10f3c91437e..5971737ea39 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 d410ca031c0..92ea788d5de 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ