From bcd456eea1c39bf22d0990141430d5833b28ca4b Mon Sep 17 00:00:00 2001 From: bgobandit Date: Mon, 23 Nov 2015 18:44:54 -0500 Subject: [PATCH] Added new PKA, R&D designs, tweaked numbers, honked the honk up the honk --- code/modules/mining/equipment_locker.dm | 9 +++-- code/modules/mining/ores_coins.dm | 6 +-- code/modules/projectiles/ammunition/energy.dm | 7 +++- .../projectiles/guns/energy/special.dm | 22 ++++++++-- .../modules/projectiles/projectile/special.dm | 18 +++++++-- code/modules/research/designs.dm | 40 +++++++++++++++++++ 6 files changed, 86 insertions(+), 16 deletions(-) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 8fe2818a82f..bb65d712de5 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -19,7 +19,7 @@ var/ore_pickup_rate = 15 var/sheet_per_ore = 1 var/point_upgrade = 1 - var/list/ore_values = list(("sand" = 1), ("iron" = 1), ("plasma" = 12), ("gold" = 16), ("silver" = 16), ("uranium" = 30), ("diamond" = 50), ("bananium" = 60)) + var/list/ore_values = list(("sand" = 1), ("iron" = 1), ("plasma" = 15), ("silver" = 16), ("gold" = 18), ("uranium" = 30), ("diamond" = 50), ("bananium" = 60)) /obj/machinery/mineral/ore_redemption/New() ..() @@ -292,9 +292,9 @@ new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/weapon/pickaxe/silver, 1200), new /datum/data/mining_equipment("Jetpack", /obj/item/weapon/tank/jetpack/carbondioxide/mining, 2000), new /datum/data/mining_equipment("Space Cash", /obj/item/stack/spacecash/c1000, 2000), - new /datum/data/mining_equipment("Resonator v2", /obj/item/weapon/resonator/upgraded, 2500), - new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/weapon/pickaxe/diamond, 3500), - new /datum/data/mining_equipment("Accelerator v2", /obj/item/weapon/gun/energy/kinetic_accelerator/upgraded, 4000), + new /datum/data/mining_equipment("Super Resonator", /obj/item/weapon/resonator/upgraded, 2400), + new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/weapon/pickaxe/diamond, 3000), + new /datum/data/mining_equipment("Super Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator/super, 3500), new /datum/data/mining_equipment("Point Transfer Card", /obj/item/weapon/card/mining_point_card, 500), ) @@ -538,6 +538,7 @@ desc = "An upgraded version of the resonator that can produce more fields at once." icon_state = "resonator_u" item_state = "resonator_u" + origin_tech = "magnets=3;combat=3" fieldlimit = 5 /obj/item/weapon/resonator/proc/CreateResonance(target, creator) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 520804fe893..d7302441fad 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -64,7 +64,7 @@ name = "plasma ore" icon_state = "Plasma ore" origin_tech = "plasmatech=2;materials=2" - points = 10 + points = 15 materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/plasma @@ -81,7 +81,7 @@ name = "silver ore" icon_state = "Silver ore" origin_tech = "materials=3" - points = 15 + points = 16 materials = list(MAT_SILVER=MINERAL_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/silver @@ -89,7 +89,7 @@ name = "gold ore" icon_state = "Gold ore" origin_tech = "materials=4" - points = 15 + points = 18 materials = list(MAT_GOLD=MINERAL_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/gold diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm index 4b56bc61a0f..bc8bdb6f428 100644 --- a/code/modules/projectiles/ammunition/energy.dm +++ b/code/modules/projectiles/ammunition/energy.dm @@ -112,8 +112,11 @@ e_cost = 500 fire_sound = 'sound/weapons/Kenetic_accel.ogg' // fine spelling there chap -/obj/item/ammo_casing/energy/kinetic/upgraded - projectile_type = /obj/item/projectile/kinetic/upgraded +/obj/item/ammo_casing/energy/kinetic/super + projectile_type = /obj/item/projectile/kinetic/super + +/obj/item/ammo_casing/energy/kinetic/hyper + projectile_type = /obj/item/projectile/kinetic/hyper /obj/item/ammo_casing/energy/disabler projectile_type = /obj/item/projectile/beam/disabler diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index d7b50a28c14..a88d5122e01 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -142,12 +142,21 @@ unique_rename = 1 origin_tech = "combat=2;powerstorage=1" -/obj/item/weapon/gun/energy/kinetic_accelerator/upgraded - name = "upgraded proto-kinetic accelerator" +/obj/item/weapon/gun/energy/kinetic_accelerator/super + name = "super-kinetic accelerator" desc = "An upgraded, superior version of the proto-kinetic accelerator." icon_state = "kineticgun_u" item_state = "kineticgun_u" - ammo_type = list(/obj/item/ammo_casing/energy/kinetic/upgraded) + ammo_type = list(/obj/item/ammo_casing/energy/kinetic/super) + overheat_time = 12 + origin_tech = "combat=3;powerstorage=2" + +/obj/item/weapon/gun/energy/kinetic_accelerator/hyper + name = "hyper-kinetic accelerator" + desc = "An upgraded, even more superior version of the proto-kinetic accelerator." + icon_state = "kineticgun_h" + item_state = "kineticgun_h" + ammo_type = list(/obj/item/ammo_casing/energy/kinetic/hyper) overheat_time = 12 origin_tech = "combat=3;powerstorage=2" @@ -204,6 +213,13 @@ ammo_type = list(/obj/item/ammo_casing/energy/bolt/large) pin = null +/obj/item/weapon/gun/energy/kinetic_accelerator/suicide_act(mob/user) + if(!suppressed) + playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) + user.visible_message("[user] cocks the [src.name] and pretends to blow \his brains out! It looks like \he's trying to commit suicide!") + shoot_live_shot() + return (OXYLOSS) + /obj/item/weapon/gun/energy/plasmacutter name = "plasma cutter" desc = "A mining tool capable of expelling concentrated plasma bursts. You could use it to cut limbs off of xenos! Or, you know, mine stuff." diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index fb48228024c..5c4f1bd046d 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -118,12 +118,18 @@ damage_type = BRUTE flag = "bomb" range = 3 + var/splash = 0 -/obj/item/projectile/kinetic/upgraded - damage = 12 +/obj/item/projectile/kinetic/super + damage = 11 range = 4 -obj/item/projectile/kinetic/New() +/obj/item/projectile/kinetic/hyper + damage = 12 + range = 5 + splash = 1 + +/obj/item/projectile/kinetic/New() var/turf/proj_turf = get_turf(src) if(!istype(proj_turf, /turf)) return @@ -145,7 +151,11 @@ obj/item/projectile/kinetic/New() var/turf/simulated/mineral/M = target_turf M.gets_drilled(firer) new /obj/item/effect/kinetic_blast(target_turf) - + if(src.splash >= 1) + for(var/turf/T in range(splash, target_turf)) + if(istype(T, /turf/simulated/mineral)) + var/turf/simulated/mineral/M = T + M.gets_drilled(firer) /obj/item/effect/kinetic_blast diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 815c269b5e1..c752cf2a1e0 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -169,6 +169,46 @@ other types of metals and chemistry for reagents). build_path = /obj/item/weapon/gun/energy/plasmacutter/adv category = list("Mining Designs") +/datum/design/jackhammer + name = "Sonic Jackhammer" + desc = "Essentially a handheld planet-cracker. Can drill through walls with ease as well." + id = "jackhammer" + req_tech = list("materials" = 6, "powerstorage" = 6, "engineering" = 5, "magnets" = 6) + build_type = PROTOLATHE + materials = list(MAT_METAL = 6000, MAT_GLASS = 2000, MAT_SILVER = 2000, MAT_DIAMOND = 6000) + build_path = /obj/item/weapon/pickaxe/drill/jackhammer + category = list("Mining Designs") + +/datum/design/superaccelerator + name = "Super-Kinetic Accelerator" + desc = "An upgraded version of the proto-kinetic accelerator, with superior damage, speed and range." + id = "superaccelerator" + req_tech = list("materials" = 5, "powerstorage" = 4, "engineering" = 4, "magnets" = 4, "combat" = 3) + build_type = PROTOLATHE + materials = list(MAT_METAL = 8000, MAT_GLASS = 1500, MAT_SILVER = 2000, MAT_URANIUM = 2000) + build_path = /obj/item/weapon/gun/energy/kinetic_accelerator/super + category = list("Mining Designs") + +/datum/design/hyperaccelerator + name = "Hyper-Kinetic Accelerator" + desc = "An upgraded version of the proto-kinetic accelerator, with eve more superior damage, speed and range." + id = "hyperaccelerator" + req_tech = list("materials" = 6, "powerstorage" = 6, "engineering" = 5, "magnets" = 6, "combat" = 4) + build_type = PROTOLATHE + materials = list(MAT_METAL = 8000, MAT_GLASS = 1500, MAT_SILVER = 2000, MAT_GOLD = 2000, MAT_DIAMOND = 2000) + build_path = /obj/item/weapon/gun/energy/kinetic_accelerator/hyper + category = list("Mining Designs") + +/datum/design/superresonator + name = "Upgraded Resonator" + desc = "An upgraded version of the resonator that allows more fields to be active at once." + id = "superresonator" + req_tech = list("materials" = 4, "powerstorage" = 3, "engineering" = 3, "magnets" = 3) + build_type = PROTOLATHE + materials = list(MAT_METAL = 4000, MAT_GLASS = 1500, MAT_SILVER = 2000, MAT_URANIUM = 2000) + build_path = /obj/item/weapon/resonator/upgraded + category = list("Mining Designs") + /datum/design/jackhammer name = "Sonic Jackhammer" desc = "Essentially a handheld planet-cracker. Can drill through walls with ease as well."