From 01af00225b4c48ce4835c3e73557f0bd2e285e95 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Sat, 17 Sep 2016 00:25:35 -0400 Subject: [PATCH] Miners can buy KA AoE damage mods from the vendor for a premium (#20430) * Miners can buy AoE damage mods from the vendor for a premium * message adjustment; if you don't have ENOUGH who cares if you COULD * adjusta --- .../mining/lavaland/necropolis_chests.dm | 2 +- code/modules/mining/machine_vending.dm | 9 +++--- .../guns/energy/kinetic_accelerator.dm | 28 ++++++++++++------- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index c17e682949e..02e71c0f08f 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -48,7 +48,7 @@ if(16) new /obj/item/weapon/guardiancreator(src) if(17) - new /obj/item/borg/upgrade/modkit/aoe/mobs(src) + new /obj/item/borg/upgrade/modkit/aoe/turfs/andmobs(src) if(18) new /obj/item/device/warp_cube/red(src) if(19) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index fdb907cac4b..6c9143d943e 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -38,13 +38,14 @@ new /datum/data/mining_equipment("Mining Hardsuit", /obj/item/clothing/suit/space/hardsuit/mining, 2000), 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 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 White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 100), + new /datum/data/mining_equipment("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 150), + new /datum/data/mining_equipment("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 250), + new /datum/data/mining_equipment("KA Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 300), 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("Point Transfer Card", /obj/item/weapon/card/mining_point_card, 500), new /datum/data/mining_equipment("Mining Drone", /mob/living/simple_animal/hostile/mining_drone, 800), new /datum/data/mining_equipment("Drone Melee Upgrade", /obj/item/device/mine_bot_ugprade, 400), diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 34ac3eb6407..bb586419f9b 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -243,18 +243,19 @@ if(number_of_denied >= maximum_of_type) . = FALSE break - if(.) - if(KA.get_remaining_mod_capacity() >= cost) + if(KA.get_remaining_mod_capacity() >= cost) + if(.) user << "You install the modkit." playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1) user.unEquip(src) forceMove(KA) KA.modkits += src else - user << "You don't have room([KA.get_remaining_mod_capacity()]% remaining, [cost]% needed) to install this modkit. Use a crowbar to remove existing modkits." - . = FALSE + user << "The modkit you're trying to install would conflict with an already installed modkit. Use a crowbar to remove existing modkits." else - user << "The modkit you're trying to install would conflict with an already installed modkit. Use a crowbar to remove existing modkits." + user << "You don't have room([KA.get_remaining_mod_capacity()]% remaining, [cost]% needed) to install this modkit. Use a crowbar to remove existing modkits." + . = FALSE + /obj/item/borg/upgrade/modkit/proc/uninstall(obj/item/weapon/gun/energy/kinetic_accelerator/KA) @@ -301,27 +302,34 @@ //AoE blasts +/obj/item/borg/upgrade/modkit/aoe + modifier = 0 + /obj/item/borg/upgrade/modkit/aoe/modify_projectile(obj/item/projectile/kinetic/K) K.name = "kinetic explosion" if(!K.turf_aoe && !K.mob_aoe) K.hit_overlays += /obj/effect/overlay/temp/explosion/fast + K.mob_aoe += modifier /obj/item/borg/upgrade/modkit/aoe/turfs name = "mining explosion" desc = "Causes the kinetic accelerator to destroy rock in an AoE." + denied_type = /obj/item/borg/upgrade/modkit/aoe/turfs /obj/item/borg/upgrade/modkit/aoe/turfs/modify_projectile(obj/item/projectile/kinetic/K) ..() K.turf_aoe = TRUE +/obj/item/borg/upgrade/modkit/aoe/turfs/andmobs + name = "offensive mining explosion" + desc = "Causes the kinetic accelerator to destroy rock and damage mobs in an AoE." + maximum_of_type = 3 + modifier = 0.25 + /obj/item/borg/upgrade/modkit/aoe/mobs name = "offensive explosion" desc = "Causes the kinetic accelerator to damage mobs in an AoE." - modifier = 0.25 - -/obj/item/borg/upgrade/modkit/aoe/mobs/modify_projectile(obj/item/projectile/kinetic/K) - ..() - K.mob_aoe += modifier + modifier = 0.2 //Indoors