diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 4852d99acb..ca1fd7f9bb 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -59,7 +59,8 @@ new /datum/data/mining_equipment("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000), new /datum/data/mining_equipment("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000), new /datum/data/mining_equipment("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000), - new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000) + new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000), + new /datum/data/mining_equipment("Premium Accelerator", /obj/item/gun/energy/kinetic_accelerator/premiumka, 8000) ) /datum/data/mining_equipment diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 10ce341fec..ad2949892e 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -22,9 +22,44 @@ var/max_mod_capacity = 100 var/list/modkits = list() - + var/recharge_timerid +/obj/item/gun/energy/kinetic_accelerator/premiumka + name = "premium accelerator" + desc = "A premium kinetic accelerator fitted with an extended barrel and increased pressure tank." + icon_state = "premiumgun" + item_state = "premiumgun" + lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi' + ammo_type = list(/obj/item/ammo_casing/energy/kinetic/premium) + +/obj/item/gun/energy/kinetic_accelerator/premiumka/dropped() + . = ..() + if(!QDELING(src) && !holds_charge) + // Put it on a delay because moving item from slot to hand + // calls dropped(). + addtimer(CALLBACK(src, .proc/empty_if_not_held), 1.60) + +/obj/item/ammo_casing/energy/kinetic/premium + projectile_type = /obj/item/projectile/kinetic/premium + +/obj/item/projectile/kinetic/premium + name = "kinetic force" + icon_state = null + damage = 50 + damage_type = BRUTE + flag = "bomb" + range = 5 + log_override = TRUE + +/obj/item/gun/energy/kinetic_accelerator/premiumka/update_icon() + ..() + if(!can_shoot()) + add_overlay("[icon_state]_empty") + else + cut_overlays() + /obj/item/gun/energy/kinetic_accelerator/examine(mob/user) ..() if(max_mod_capacity) diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi index 5198f3bda9..dae3861233 100644 Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi index afbd091d13..f3d5c42570 100644 Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi index d8092a6095..e3ec4171ad 100644 Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ