diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 10e51a0d913..a3984de77d4 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -39,11 +39,7 @@ new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/weapon/pickaxe/diamond, 2000), new /datum/data/mining_equipment("Super Resonator", /obj/item/weapon/resonator/upgraded, 2500), new /datum/data/mining_equipment("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 200), - new /datum/data/mining_equipment("KA Brown Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/brown, 250), - new /datum/data/mining_equipment("KA Yellow Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/yellow, 250), - new /datum/data/mining_equipment("KA Orange Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/orange, 250), - new /datum/data/mining_equipment("KA Green Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/green, 250), - new /datum/data/mining_equipment("KA Purple Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/purple, 250), + new /datum/data/mining_equipment("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 300), new /datum/data/mining_equipment("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 400), new /datum/data/mining_equipment("KA Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 500), new /datum/data/mining_equipment("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000), diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 53027608459..a992f1f8495 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -219,6 +219,12 @@ ..() user << "Occupies [cost]% of mod capacity." +/obj/item/borg/upgrade/modkit/attackby(obj/item/A, mob/user) + if(istype(A, /obj/item/weapon/gun/energy/kinetic_accelerator)) + install(A) + else + ..() + /obj/item/borg/upgrade/modkit/action(mob/living/silicon/robot/R) if(..()) return @@ -373,46 +379,15 @@ desc = "Causes kinetic accelerator bolts to have a white tracer trail and explosion." cost = 4 denied_type = /obj/item/borg/upgrade/modkit/tracer + var/bolt_color = "#FFFFFF" /obj/item/borg/upgrade/modkit/tracer/modify_projectile(obj/item/projectile/kinetic/K) K.icon_state = "ka_tracer" + K.color = bolt_color -/obj/item/borg/upgrade/modkit/tracer/brown - name = "brown tracer bolts" - desc = "Causes kinetic accelerator bolts to have a brown tracer trail and explosion." +/obj/item/borg/upgrade/modkit/tracer/adjustable + name = "adjustable tracer bolts" + desc = "Causes kinetic accelerator bolts to have a adjustably-colored tracer trail and explosion. Use in-hand to change color." -/obj/item/borg/upgrade/modkit/tracer/brown/modify_projectile(obj/item/projectile/kinetic/K) - K.color = "#C08F45" - ..() - -/obj/item/borg/upgrade/modkit/tracer/yellow - name = "yellow tracer bolts" - desc = "Causes kinetic accelerator bolts to have a yellow tracer trail and explosion." - -/obj/item/borg/upgrade/modkit/tracer/yellow/modify_projectile(obj/item/projectile/kinetic/K) - K.color = "#FFFF99" - ..() - -/obj/item/borg/upgrade/modkit/tracer/orange - name = "orange tracer bolts" - desc = "Causes kinetic accelerator bolts to have an orange tracer trail and explosion." - -/obj/item/borg/upgrade/modkit/tracer/orange/modify_projectile(obj/item/projectile/kinetic/K) - K.color = "#FF9933" - ..() - -/obj/item/borg/upgrade/modkit/tracer/green - name = "green tracer bolts" - desc = "Causes kinetic accelerator bolts to have a green tracer trail and explosion." - -/obj/item/borg/upgrade/modkit/tracer/green/modify_projectile(obj/item/projectile/kinetic/K) - K.color = "#515B41" - ..() - -/obj/item/borg/upgrade/modkit/tracer/purple - name = "purple tracer bolts" - desc = "Causes kinetic accelerator bolts to have a purple tracer trail and explosion." - -/obj/item/borg/upgrade/modkit/tracer/purple/modify_projectile(obj/item/projectile/kinetic/K) - K.color = "#8456A4" - ..() +/obj/item/borg/upgrade/modkit/tracer/adjustable/attack_self(mob/user) + bolt_color = input(user,"Choose Color") as color