From a4e998854dda9a6ae4d41c5ab7d28422baf44652 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Thu, 18 Nov 2021 16:34:03 -0600 Subject: [PATCH] =?UTF-8?q?repaths=20i=20forgor=20=F0=9F=92=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mining/ore_redemption_machine/equipment_vendor.dm | 3 ++- .../projectiles/guns/energy/kinetic_accelerator_vr.dm | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm index 3e53242a77c..b67b203b413 100644 --- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm @@ -123,12 +123,13 @@ EQUIPMENT("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1200), EQUIPMENT("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000), EQUIPMENT("KA Temperature Modulator", /obj/item/borg/upgrade/modkit/heater, 1000), - EQUIPMENT("KA Off-Station Modulator", /obj/item/borg/upgrade/modkit/indoors/offsite, 1500), + EQUIPMENT("KA Off-Station Modulator", /obj/item/borg/upgrade/modkit/offsite, 1750), EQUIPMENT("KA Holster", /obj/item/clothing/accessory/holster/waist/kinetic_accelerator, 350), EQUIPMENT("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 250), EQUIPMENT("KA Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 300), EQUIPMENT("KA Adjustable Tracer Rounds",/obj/item/borg/upgrade/modkit/tracer/adjustable, 175), EQUIPMENT("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 125), + EQUIPMENT("Premium Kinetic Accelerator",/obj/item/weapon/gun/energy/kinetic_accelerator/premium, 12000), ) prize_list["Digging Tools"] = list( // EQUIPMENT("Diamond Pickaxe", /obj/item/weapon/pickaxe/diamond, 2000), diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm index 59e006124bb..4a1955d7a73 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm @@ -273,6 +273,7 @@ else if(environment == KA_ENVIRO_TYPE_OFFSITE) if(!offsite_environment_check(get_turf(src))) name = "nullified [name]" + nodamage = TRUE damage = 0 pressure_decrease_active = TRUE return ..() @@ -292,6 +293,7 @@ else if(environment == KA_ENVIRO_TYPE_OFFSITE) if(!offsite_environment_check(get_turf(src))) name = "nullified [name]" + nodamage = TRUE damage = 0 pressure_decrease_active = TRUE return ..() @@ -323,6 +325,7 @@ else if(environment == KA_ENVIRO_TYPE_OFFSITE) if(!offsite_environment_check(get_turf(src))) name = "nullified [name]" + nodamage = TRUE damage = 0 pressure_decrease_active = TRUE var/turf/target_turf = get_turf(target) @@ -546,7 +549,7 @@ //Tendril-unique modules /obj/item/borg/upgrade/modkit/cooldown/repeater name = "rapid repeater" - desc = "Quarters the kinetic accelerator's cooldown on striking a living target, but greatly increases the base cooldown." + desc = "Quarters the kinetic accelerator's cooldown on striking a living or mineral target, but greatly increases the base cooldown." denied_type = /obj/item/borg/upgrade/modkit/cooldown/repeater modifier = -14 //Makes the cooldown 3 seconds(with no cooldown mods) if you miss. Don't miss. cost = 50 @@ -654,6 +657,8 @@ name = "offsite pressure modulator" desc = "A non-standard modification kit that increases the damage a kinetic accelerator does in pressurized environments, \ in exchange for nullifying any projected forces while on or in an associated facility." + denied_type = /obj/item/borg/upgrade/modkit/heater + maximum_of_type = 1 cost = 35 /obj/item/borg/upgrade/modkit/indoors/offsite/modify_projectile(obj/item/projectile/kinetic/K) @@ -664,7 +669,7 @@ name = "temperature modulator" desc = "A remarkably unusual modification kit that makes kinetic accelerators more usable in hot, overpressurized environments, \ in exchange for making them weak elsewhere, like the cold or in space." - denied_type = /obj/item/borg/upgrade/modkit/indoors + denied_type = /obj/item/borg/upgrade/modkit/offsite maximum_of_type = 1 cost = 10