diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 6e1da239701..5d9df318468 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -230,6 +230,9 @@ var/obj/effect/temp_visual/kinetic_blast/K = new /obj/effect/temp_visual/kinetic_blast(target_turf) K.color = color +//mecha_kineticgun version of the projectile +/obj/projectile/kinetic/mech + range = 5 //Modkits /obj/item/borg/upgrade/modkit diff --git a/code/modules/research/designs/mecha_designs.dm b/code/modules/research/designs/mecha_designs.dm index bb7e24562ad..6191fe480cc 100644 --- a/code/modules/research/designs/mecha_designs.dm +++ b/code/modules/research/designs/mecha_designs.dm @@ -452,6 +452,16 @@ construction_time = 100 category = list("Exosuit Equipment") +/datum/design/mecha_kineticgun + name = "Exosuit Mining (Proto-kinetic Accelerator)" + desc = "An exosuit-mounted mining tool that does increased damage in low pressure. Drawing from an onboard power source allows it to project further than the handheld version." + id = "mecha_kineticgun" + build_type = MECHFAB + build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/mecha_kineticgun + materials = list(/datum/material/iron = 8000, /datum/material/glass = 1000) + construction_time = 100 + category = list("Exosuit Equipment") + /datum/design/mech_lmg name = "Exosuit Weapon (\"Ultra AC 2\" LMG)" desc = "A weapon for combat exosuits. Shoots a rapid, three shot burst." diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index f25712a0b6b..e98b34ec94c 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1211,6 +1211,7 @@ "rangemod", "superresonator", "triggermod", + "mecha_kineticgun", )//e a r l y g a m e) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) diff --git a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm index 989292401ee..6aa3baee6bf 100644 --- a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm +++ b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm @@ -134,6 +134,25 @@ return TRUE return FALSE +//Exosuit-mounted kinetic accelerator +/obj/item/mecha_parts/mecha_equipment/weapon/energy/mecha_kineticgun + equip_cooldown = 10 + name = "Exosuit Proto-kinetic Accelerator" + desc = "An exosuit-mounted mining tool that does increased damage in low pressure. Drawing from an onboard power source allows it to project further than the handheld version." + icon_state = "mecha_kineticgun" + energy_drain = 30 + projectile = /obj/projectile/kinetic/mech + fire_sound = 'sound/weapons/kenetic_accel.ogg' + harmful = TRUE + +//attachable to all mechas, like the plasma cutter +/obj/item/mecha_parts/mecha_equipment/weapon/energy/mecha_kineticgun/can_attach(obj/vehicle/sealed/mecha/M) + . = ..() + if(.) //combat mech + return + if(LAZYLEN(M.equipment) < M.max_equip) + return TRUE + /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser name = "\improper PBT \"Pacifier\" mounted taser" desc = "A weapon for combat exosuits. Shoots non-lethal stunning electrodes." diff --git a/icons/mecha/mecha_equipment.dmi b/icons/mecha/mecha_equipment.dmi index 999da98f812..ad53c49a5b2 100644 Binary files a/icons/mecha/mecha_equipment.dmi and b/icons/mecha/mecha_equipment.dmi differ