diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index 7d5a22a2e2f..98e47b44a95 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -465,8 +465,8 @@ muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL -/obj/item/ammo_casing/laser - desc = "An experimental laser casing." +/obj/item/ammo_casing/caseless/laser + desc = "An experimental laser casing, designed to vaporize when fired." caliber = "laser" projectile_type = /obj/item/projectile/beam/laser muzzle_flash_effect = /obj/effect/temp_visual/target_angled/muzzle_flash/energy diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 67e307d12ed..ade6328746f 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -495,10 +495,10 @@ ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot /obj/item/ammo_box/magazine/laser - name = "encased laser projector magazine" - desc = "Fits experimental laser ammo casings." + name = "laser carbine projector magazine" + desc = "Fits experimental laser ammo casings. Compatible with laser rifles and carbines." icon_state = "laser" - ammo_type = /obj/item/ammo_casing/laser + ammo_type = /obj/item/ammo_casing/caseless/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 b144897574f..bd2165d1ba3 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -319,3 +319,22 @@ /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]" : ""]" + +/obj/item/gun/projectile/automatic/laserrifle + name = "security laser rifle" + desc = "A bulky, single barreled rifle that uses disposable laser cartridges rather than an internal power cell. Utilized by Nanotrasen's private security force." + icon_state = "laserrifle" + item_state = "lasercarbine" + w_class = WEIGHT_CLASS_BULKY + origin_tech = "combat=3;materials=2" + mag_type = /obj/item/ammo_box/magazine/laser + fire_sound = 'sound/weapons/gunshots/gunshot_lascarbine.ogg' + magin_sound = 'sound/weapons/gun_interactions/batrifle_magin.ogg' + magout_sound = 'sound/weapons/gun_interactions/batrifle_magout.ogg' + can_suppress = FALSE + burst_size = 1 + actions_types = list() + +/obj/item/gun/projectile/automatic/laserrifle/update_icon_state() + icon_state = "laserrifle[magazine ? "-[CEILING(get_ammo(0)/5, 1)*5]" : ""]" + item_state = "lasercarbine[magazine ? "-[CEILING(get_ammo(0)/5, 1)*5]" : ""]" diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 7e3b39ddaed..191fed974ce 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -178,6 +178,16 @@ materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_URANIUM = 2000) build_path = /obj/item/ammo_box/magazine/wt550m9/wttx +/datum/design/mag_laser + name = "Laser Rifle Projector Magazine" + desc = "A 20 round encased projector magazine for the IK Laser Rifle series" + id = "mag_laser" + build_type = PROTOLATHE + req_tech = list("combat" = 4, "powerstorage" = 4) + materials = list(MAT_METAL = 4000, MAT_PLASMA = 600) + build_path = /obj/item/ammo_box/magazine/laser + category = list("Weapons") + /datum/design/stunrevolver name = "Arc Revolver Parts Kit" desc = "A high-tech revolver that fires internal, reusable shock cartridges in a revolving cylinder. The cartridges can be recharged using conventional rechargers. These shots charge whatever they hit, causing arcs of electricity to form between them." diff --git a/code/modules/supply/supply_packs/pack_security.dm b/code/modules/supply/supply_packs/pack_security.dm index 51ff1adcd80..3250ecffb2e 100644 --- a/code/modules/supply/supply_packs/pack_security.dm +++ b/code/modules/supply/supply_packs/pack_security.dm @@ -255,6 +255,23 @@ cost = 500 containername = "auto rifle ammo crate" +/datum/supply_packs/security/armory/laserrifle + name = "IK-30 Security Laser Rifle Crate" + contains = list(/obj/item/gun/projectile/automatic/laserrifle, + /obj/item/gun/projectile/automatic/laserrifle) + cost = 500 + containertype = /obj/structure/closet/crate/secure/plasma + containername = "laser rifle crate" + +/datum/supply_packs/security/armory/laserammo + name = "IK-30 Security Laser Rifle Ammo Crate" + contains = list(/obj/item/ammo_box/magazine/laser, + /obj/item/ammo_box/magazine/laser, + /obj/item/ammo_box/magazine/laser, + /obj/item/ammo_box/magazine/laser) + cost = 300 + containername = "laser rifle ammo crate" + /////// Implants & etc /datum/supply_packs/security/armory/mindshield diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 84c794d591e..c928d212f2e 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 20cfc157100..d96c29d84d0 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ