From 175bc573fef7906b0b70e7833ac92d0d7234b05e Mon Sep 17 00:00:00 2001 From: Casey Date: Thu, 11 Nov 2021 06:00:43 -0500 Subject: [PATCH] A Miner Update [forgot to test a thing] --- code/defines/obj/weapon.dm | 2 +- code/modules/mining/drilling/drill.dm | 16 ++++++++++++---- .../ore_redemption_machine/equipment_vendor.dm | 5 +++++ .../guns/energy/kinetic_accelerator_vr.dm | 15 +++++++++++++++ 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 70bb41717d..21f8c0fbfe 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -377,7 +377,7 @@ icon_state = unique_reskin[pick] item_state = unique_reskin[pick] reskin_ran = TRUE - to_chat(M, "[src] is now '[pick].'") + to_chat(M, "[src] is now '[pick]'.") /obj/item/weapon/storage/part_replacer/drop_contents() // hacky-feeling tier-based drop system hide_from(usr) diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index e1874f1a93..92d616bd1c 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -11,6 +11,7 @@ icon_state = "mining_drill" circuit = /obj/item/weapon/circuitboard/miningdrill var/braces_needed = 2 + var/total_brace_tier = 0 var/list/obj/machinery/mining/brace/supports = list() var/supported = 0 var/active = 0 @@ -176,6 +177,9 @@ if(newtag) name = "[initial(name)] #[newtag]" to_chat(user, "You changed the drill ID to: [newtag]") + else + name = "[initial(name)]" + to_chat(user, SPAN_NOTICE("You removed the drill's ID and any extraneous labels.")) return if(default_deconstruction_screwdriver(user, O)) return @@ -199,6 +203,7 @@ /obj/machinery/mining/drill/attack_hand(mob/user as mob) check_supports() + RefreshParts() if (panel_open && cell && user.Adjacent(src)) to_chat(user, "You take out \the [cell].") @@ -219,6 +224,8 @@ if(active) visible_message("\The [src] lurches downwards, grinding noisily.") need_update_field = 1 + harvest_speed *= total_brace_tier + charge_use *= total_brace_tier else visible_message("\The [src] shudders to a grinding halt.") else @@ -249,9 +256,7 @@ for(var/obj/item/weapon/stock_parts/P in component_parts) if(istype(P, /obj/item/weapon/stock_parts/micro_laser)) - harvest_speed = P.rating - if(P.rating >= 5) - harvest_speed *= 2 + harvest_speed = P.rating ** 2 // 1, 4, 9, 16, 25 exotic_drilling = P.rating - 1 if(exotic_drilling >= 1) ore_types |= ore_types_uncommon @@ -277,6 +282,7 @@ /obj/machinery/mining/drill/proc/check_supports() supported = 0 + total_brace_tier = 0 if((!supports || !supports.len) && initial(anchored) == 0) icon_state = "mining_drill" @@ -291,6 +297,8 @@ else for(var/obj/machinery/mining/brace/check in supports) if(check.brace_tier > 3) supported = 1 + for(var/obj/machinery/mining/brace/check in supports) + total_brace_tier += check.brace_tier update_icon() @@ -357,7 +365,7 @@ /obj/machinery/mining/brace/examine(mob/user) . = ..() - if(brace_tier > 3) + if(brace_tier > 2) . += SPAN_NOTICE("The internals of the brace look resilient enough to support a drill by itself.") /obj/machinery/mining/brace/Initialize() diff --git a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm index e1f33581e1..795f54339d 100644 --- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm @@ -78,7 +78,12 @@ EQUIPMENT("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000), EQUIPMENT("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1200), EQUIPMENT("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000), +<<<<<<< HEAD EQUIPMENT("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 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), +>>>>>>> 39c4edb9cb... Merge pull request #11808 from Hatterhat/a-miner-upgrade 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), diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm index 3b95676eee..813b96329f 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm @@ -273,7 +273,10 @@ else if(environment == KA_ENVIRO_TYPE_OFFSITE) if(!offsite_environment_check(get_turf(src))) name = "nullified [name]" +<<<<<<< HEAD nodamage = TRUE +======= +>>>>>>> 39c4edb9cb... Merge pull request #11808 from Hatterhat/a-miner-upgrade damage = 0 pressure_decrease_active = TRUE return ..() @@ -293,7 +296,10 @@ else if(environment == KA_ENVIRO_TYPE_OFFSITE) if(!offsite_environment_check(get_turf(src))) name = "nullified [name]" +<<<<<<< HEAD nodamage = TRUE +======= +>>>>>>> 39c4edb9cb... Merge pull request #11808 from Hatterhat/a-miner-upgrade damage = 0 pressure_decrease_active = TRUE return ..() @@ -325,7 +331,10 @@ else if(environment == KA_ENVIRO_TYPE_OFFSITE) if(!offsite_environment_check(get_turf(src))) name = "nullified [name]" +<<<<<<< HEAD nodamage = TRUE +======= +>>>>>>> 39c4edb9cb... Merge pull request #11808 from Hatterhat/a-miner-upgrade damage = 0 pressure_decrease_active = TRUE var/turf/target_turf = get_turf(target) @@ -653,11 +662,17 @@ 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." +<<<<<<< HEAD denied_type = /obj/item/borg/upgrade/modkit/heater maximum_of_type = 1 cost = 35 /obj/item/borg/upgrade/modkit/offsite/modify_projectile(obj/item/projectile/kinetic/K) +======= + cost = 35 + +/obj/item/borg/upgrade/modkit/indoors/offsite/modify_projectile(obj/item/projectile/kinetic/K) +>>>>>>> 39c4edb9cb... Merge pull request #11808 from Hatterhat/a-miner-upgrade K.environment = KA_ENVIRO_TYPE_OFFSITE // Atmospheric