From 1b83269c4a02dbfc55f8ce2807699c9b40cf0a60 Mon Sep 17 00:00:00 2001 From: Theos Date: Tue, 6 Jul 2021 19:05:50 -0400 Subject: [PATCH 1/9] gone reduced to atoms --- .../research/designs/mining_designs.dm | 62 +------------------ 1 file changed, 1 insertion(+), 61 deletions(-) diff --git a/code/modules/research/designs/mining_designs.dm b/code/modules/research/designs/mining_designs.dm index 4caac4df4808..11e74ab34706 100644 --- a/code/modules/research/designs/mining_designs.dm +++ b/code/modules/research/designs/mining_designs.dm @@ -72,66 +72,6 @@ category = list("Mining Designs") departmental_flags = DEPARTMENTAL_FLAG_CARGO -/datum/design/superresonator - name = "Upgraded Resonator" - desc = "An upgraded version of the resonator that allows more fields to be active at once." - id = "superresonator" - build_type = PROTOLATHE - materials = list(/datum/material/iron = 4000, /datum/material/glass = 1500, /datum/material/silver = 1000, /datum/material/uranium = 1000) - build_path = /obj/item/resonator/upgraded - category = list("Mining Designs") - departmental_flags = DEPARTMENTAL_FLAG_CARGO - -/datum/design/trigger_guard_mod - name = "Kinetic Accelerator Trigger Guard Mod" - desc = "A device which allows kinetic accelerators to be wielded by any organism." - id = "triggermod" - build_type = PROTOLATHE - materials = list(/datum/material/iron = 2000, /datum/material/glass = 1500, /datum/material/gold = 1500, /datum/material/uranium = 1000) - build_path = /obj/item/borg/upgrade/modkit/trigger_guard - category = list("Mining Designs") - departmental_flags = DEPARTMENTAL_FLAG_CARGO - -/datum/design/damage_mod - name = "Kinetic Accelerator Damage Mod" - desc = "A device which allows kinetic accelerators to deal more damage." - id = "damagemod" - build_type = PROTOLATHE | MECHFAB - materials = list(/datum/material/iron = 2000, /datum/material/glass = 1500, /datum/material/gold = 1500, /datum/material/uranium = 1000) - build_path = /obj/item/borg/upgrade/modkit/damage - category = list("Mining Designs", "Cyborg Upgrade Modules") - departmental_flags = DEPARTMENTAL_FLAG_CARGO - -/datum/design/cooldown_mod - name = "Kinetic Accelerator Cooldown Mod" - desc = "A device which decreases the cooldown of a Kinetic Accelerator." - id = "cooldownmod" - build_type = PROTOLATHE | MECHFAB - materials = list(/datum/material/iron = 2000, /datum/material/glass = 1500, /datum/material/gold = 1500, /datum/material/uranium = 1000) - build_path = /obj/item/borg/upgrade/modkit/cooldown - category = list("Mining Designs", "Cyborg Upgrade Modules") - departmental_flags = DEPARTMENTAL_FLAG_CARGO - -/datum/design/range_mod - name = "Kinetic Accelerator Range Mod" - desc = "A device which allows kinetic accelerators to fire at a further range." - id = "rangemod" - build_type = PROTOLATHE | MECHFAB - materials = list(/datum/material/iron = 2000, /datum/material/glass = 1500, /datum/material/gold = 1500, /datum/material/uranium = 1000) - build_path = /obj/item/borg/upgrade/modkit/range - category = list("Mining Designs", "Cyborg Upgrade Modules") - departmental_flags = DEPARTMENTAL_FLAG_CARGO - -/datum/design/hyperaccelerator - name = "Kinetic Accelerator Mining AoE Mod" - desc = "A modification kit for Kinetic Accelerators which causes it to fire AoE blasts that destroy rock." - id = "hypermod" - build_type = PROTOLATHE | MECHFAB - materials = list(/datum/material/iron = 8000, /datum/material/glass = 1500, /datum/material/silver = 2000, /datum/material/gold = 2000, /datum/material/diamond = 2000) - build_path = /obj/item/borg/upgrade/modkit/aoe/turfs - category = list("Mining Designs", "Cyborg Upgrade Modules") - departmental_flags = DEPARTMENTAL_FLAG_CARGO - /datum/design/miner_body_camera name = "Miner Bodycamera" desc = "A camera worn around the neck, that can be viewed from a miner camera console." @@ -140,4 +80,4 @@ materials = list(/datum/material/iron = 1000, /datum/material/glass = 1000, /datum/material/gold = 500) build_path = /obj/item/clothing/neck/bodycam/miner category = list("Mining Designs","Equipment") - departmental_flags = DEPARTMENTAL_FLAG_CARGO \ No newline at end of file + departmental_flags = DEPARTMENTAL_FLAG_CARGO From 2c6bbbd3a0fbab2c68ef2f24f1d07b60a8fc1f2b Mon Sep 17 00:00:00 2001 From: Theos Date: Tue, 6 Jul 2021 19:09:17 -0400 Subject: [PATCH 2/9] no more mining tech --- code/modules/research/techweb/all_nodes.dm | 26 ++++------------------ 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 49d2bc8866fd..a3b2dc374cdd 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -148,7 +148,7 @@ design_ids = list("solarcontrol", "recharger", "powermonitor", "rped", "pacman", "adv_capacitor", "adv_scanning", "emitter", "high_cell", "adv_matter_bin", "scanner_gate", "atmosalerts", "atmos_control", "recycler", "autolathe", "high_micro_laser", "nano_mani", "mesons", "thermomachine", "rad_collector", "tesla_coil", "grounding_rod", "apc_control", "cell_charger", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "stack_console", "stack_machine", - "oxygen_tank", "plasma_tank", "emergency_oxygen", "emergency_oxygen_engi", "plasmaman_tank_belt", "electrolyzer", "floorigniter", "crystallizer") + "oxygen_tank", "plasma_tank", "emergency_oxygen", "emergency_oxygen_engi", "plasmaman_tank_belt", "electrolyzer", "floorigniter", "crystallizer", "ore_redemption", "mining_equipment_vendor", "cargoexpress") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500) export_price = 5000 @@ -157,7 +157,7 @@ display_name = "Advanced Engineering" description = "Pushing the boundaries of physics, one chainsaw-fist at a time." prereq_ids = list("engineering", "emp_basic") - design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask") + design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask","drill", "drill_diamond") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -313,7 +313,7 @@ display_name = "Cyborg Upgrades: Utility" description = "Utility upgrades for cyborgs." prereq_ids = list("engineering") - design_ids = list("borg_upgrade_holding", "borg_upgrade_lavaproof", "borg_upgrade_thrusters", "borg_upgrade_selfrepair", "borg_upgrade_expand", "borg_upgrade_rped") + design_ids = list("borg_upgrade_holding", "borg_upgrade_lavaproof", "borg_upgrade_thrusters", "borg_upgrade_selfrepair", "borg_upgrade_expand", "borg_upgrade_rped","borg_upgrade_plasmacutter") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000) export_price = 5000 @@ -526,24 +526,6 @@ ////////////////////////Tools//////////////////////// -/datum/techweb_node/basic_mining - id = "basic_mining" - display_name = "Mining Technology" - description = "Better than Efficiency V." - prereq_ids = list("engineering", "basic_plasma") - design_ids = list("drill", "superresonator", "triggermod", "damagemod", "cooldownmod", "rangemod", "ore_redemption", "mining_equipment_vendor", "cargoexpress", "plasmacutter")//e a r l y g a m e) - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) - export_price = 5000 - -/datum/techweb_node/adv_mining - id = "adv_mining" - display_name = "Advanced Mining Technology" - description = "Efficiency Level 127" //dumb mc references - prereq_ids = list("basic_mining", "adv_engi", "adv_power", "adv_plasma") - design_ids = list("drill_diamond", "jackhammer", "hypermod", "plasmacutter_adv", "borg_upgrade_plasmacutter") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) - export_price = 5000 - /datum/techweb_node/camera_theory id = "cam_theory" display_name = "Camera Theory" @@ -575,7 +557,7 @@ id = "exp_tools" display_name = "Experimental Tools" description = "Highly advanced tools." - design_ids = list("exwelder", "jawsoflife", "handdrill", "laserscalpel", "mechanicalpinches", "searingtool", "tool_switcher", "tricorder") + design_ids = list("exwelder", "jawsoflife", "handdrill", "laserscalpel", "mechanicalpinches", "searingtool", "tool_switcher", "tricorder", "jackhammer") prereq_ids = list("adv_engi") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 From 01dad8fa0a118e2f50573d124ffe4f758ca26aa7 Mon Sep 17 00:00:00 2001 From: Theos Date: Tue, 6 Jul 2021 21:34:14 -0400 Subject: [PATCH 3/9] think that's everything --- code/modules/mining/machine_vending.dm | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 26fc60df2680..ce4cd1707dea 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -20,8 +20,8 @@ var/list/prize_list = list( //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces. new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 750, VENDING_WEAPON), new /datum/data/mining_equipment("Kinetic Crusher", /obj/item/twohanded/required/kinetic_crusher, 750, VENDING_WEAPON), - new /datum/data/mining_equipment("Resonator", /obj/item/resonator, 800, VENDING_WEAPON), - new /datum/data/mining_equipment("Super Resonator", /obj/item/resonator/upgraded, 2500, VENDING_WEAPON), + new /datum/data/mining_equipment("Resonator", /obj/item/resonator, 500, VENDING_WEAPON), + new /datum/data/mining_equipment("Super Resonator", /obj/item/resonator/upgraded, 750, VENDING_WEAPON), new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 1000, VENDING_WEAPON), new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/pickaxe/diamond, 2000, VENDING_WEAPON), new /datum/data/mining_equipment("Plasma Cutter Shotgun", /obj/item/gun/energy/plasmacutter/scatter, 6000, VENDING_WEAPON), @@ -250,9 +250,19 @@ /obj/machinery/mineral/equipment_vendor/golem/Initialize() desc += "\nIt seems a few selections have been added." prize_list += list( - new /datum/data/mining_equipment("Brute Pill Bottle", /obj/item/storage/pill_bottle/libi, 600, VENDING_MEDS), - new /datum/data/mining_equipment("Burn Pill Bottle", /obj/item/storage/pill_bottle/aiur, 600, VENDING_MEDS), - new /datum/data/mining_equipment("Toxin Pill Bottle", /obj/item/storage/pill_bottle/charcoal, 600, VENDING_MEDS), + new /datum/data/mining_equipment("Brute Pill Bottle", /obj/item/storage/pill_bottle/libi, 600, VENDING_MEDS), + new /datum/data/mining_equipment("Burn Pill Bottle", /obj/item/storage/pill_bottle/aiur, 600, VENDING_MEDS), + new /datum/data/mining_equipment("Toxin Pill Bottle", /obj/item/storage/pill_bottle/charcoal, 600, VENDING_MEDS), + new /datum/data/mining_equipment("KA Minebot Passthrough", /obj/item/borg/upgrade/modkit/minebot_passthrough, 100, VENDING_UPGRADE), + new /datum/data/mining_equipment("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 100, VENDING_UPGRADE), + new /datum/data/mining_equipment("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 150, VENDING_UPGRADE), + new /datum/data/mining_equipment("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 250, VENDING_UPGRADE), + new /datum/data/mining_equipment("KA Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 300, VENDING_UPGRADE), + new /datum/data/mining_equipment("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000, VENDING_UPGRADE), + new /datum/data/mining_equipment("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000, VENDING_UPGRADE), + new /datum/data/mining_equipment("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000, VENDING_UPGRADE), + new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000, VENDING_UPGRADE), + new /datum/data/mining_equipment("KA AoE Mining", /obj/item/borg/upgrade/modkit/aoe/turfs, 2000, VENDING_UPGRADE), new /datum/data/mining_equipment("KA Trigger Guard Kit", /obj/item/borg/upgrade/modkit/trigger_guard, 1700, VENDING_UPGRADE), new /datum/data/mining_equipment("Extra ID", /obj/item/card/id/mining, 250, VENDING_MISC), new /datum/data/mining_equipment("Monkey Cube", /obj/item/reagent_containers/food/snacks/monkeycube, 300, VENDING_MISC), @@ -276,7 +286,8 @@ new /datum/data/mining_equipment("Super Resonator", /obj/item/resonator/upgraded, 2000, VENDING_WEAPON), new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 750, VENDING_WEAPON), new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/pickaxe/diamond, 1500, VENDING_WEAPON), - new /datum/data/mining_equipment("Plasma Cutter" , /obj/item/gun/energy/plasmacutter, 2500, VENDING_WEAPON), + new /datum/data/mining_equipment("Plasmacutter", /obj/item/gun/energy/plasmacutter, 1000, VENDING_EQUIPMENT), + new /datum/data/mining_equipment("Plasmacutter", /obj/item/gun/energy/plasmacutter/adv, 5000, VENDING_EQUIPMENT), new /datum/data/mining_equipment("Plasma Cutter Shotgun", /obj/item/gun/energy/plasmacutter/scatter, 6000, VENDING_WEAPON), new /datum/data/mining_equipment("Plasma Shotgun Upgrade", /obj/item/upgrade/plasmacutter/defuser, 1000, VENDING_WEAPON), new /datum/data/mining_equipment("KA Minebot Passthrough", /obj/item/borg/upgrade/modkit/minebot_passthrough, 100, VENDING_UPGRADE), @@ -288,6 +299,7 @@ new /datum/data/mining_equipment("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000, VENDING_UPGRADE), new /datum/data/mining_equipment("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000, VENDING_UPGRADE), new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000, VENDING_UPGRADE), + new /datum/data/mining_equipment("KA AoE Mining", /obj/item/borg/upgrade/modkit/aoe/turfs, 2000, VENDING_UPGRADE), new /datum/data/mining_equipment("Shelter Capsule", /obj/item/survivalcapsule, 400, VENDING_TOOL), new /datum/data/mining_equipment("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 800, VENDING_TOOL), new /datum/data/mining_equipment("Hivelord Stabilizer", /obj/item/hivelordstabilizer, 400, VENDING_TOOL), From 2346d87ff794d6878191de30fcd9fe4f042a3a0b Mon Sep 17 00:00:00 2001 From: Theos Date: Tue, 6 Jul 2021 21:34:27 -0400 Subject: [PATCH 4/9] add missing supply packs --- code/modules/cargo/packs.dm | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 92be1d5dde32..05f5aa916b35 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1663,28 +1663,41 @@ group = "Unlocked Clearance" special = TRUE small_item = TRUE + crate_type = /obj/structure/closet/crate/secure/cheap //:^ /datum/supply_pack/clearance/ka_damage - name = "KA Damage Mods" - desc = "Modifiers for a kinetic accelerator that increase the force of its projectiles." + name = "Kinetic Accelerator Damage Mods" + desc = "Modification kits for a kinetic accelerator that increase the force of its projectiles." cost = 350 contains = list(/obj/item/borg/upgrade/modkit/damage,/obj/item/borg/upgrade/modkit/damage,/obj/item/borg/upgrade/modkit/damage) /datum/supply_pack/clearance/ka_cooldown - name = "KA Cooldown Mods" - desc = "Modifiers for a kinetic accelerator that decrease the time needed for the accelerator to cool between shots." + name = "Kinetic Accelerator Cooldown Mods" + desc = "Modification kits for a kinetic accelerator that decrease the time needed for the accelerator to cool between shots." cost = 350 contains = list(/obj/item/borg/upgrade/modkit/cooldown,/obj/item/borg/upgrade/modkit/cooldown,/obj/item/borg/upgrade/modkit/cooldown) /datum/supply_pack/clearance/ka_range - name = "KA Range Mods" - desc = "Modifiers for a kinetic accelerator that increase the range of its projectiles." + name = "Kinetic Accelerator Range Mods" + desc = "Modification kits for a kinetic accelerator that increase the range of its projectiles." cost = 350 contains = list(/obj/item/borg/upgrade/modkit/range,/obj/item/borg/upgrade/modkit/range,/obj/item/borg/upgrade/modkit/range) +/datum/supply_pack/clearance/ka_aoe + name = "Kinetic Accelerator Mining AoE Mod" + desc = "A modification kit for a kinetic accelerator that maximizes the area mined by each projectile." + cost = 200 + contains = list(/obj/item/borg/upgrade/modkit/turfs) + +/datum/supply_pack/clearance/ka_triggermod + name = "Kinetic Accelerator Species Equality Trigger Guard Mod" + desc = "A modification kit for a kinetic acclerator that makes the trigger guard friendly for species incapable of using it otherwise." + cost = 200 + contains = list(/obj/item/borg/upgrade/modkit/trigger_guard) + /datum/supply_pack/clearance/plasmacutter name = "Plasmacutter Crate" - desc = "Two plasmacutters, experimental mining equipment that uses heated plasma as fuel." + desc = "Two plasmacutters, experimental mining equipment that use heated plasma as fuel." cost = 900 contains = list(/obj/item/gun/energy/plasmacutter,/obj/item/gun/energy/plasmacutter) From a67ae702d9efb98f25131fd2724e94010ac92139 Mon Sep 17 00:00:00 2001 From: Theos Date: Tue, 6 Jul 2021 21:34:56 -0400 Subject: [PATCH 5/9] add stuff to mining progression bounties --- code/modules/cargo/bounties/progression.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/cargo/bounties/progression.dm b/code/modules/cargo/bounties/progression.dm index d85c6c9f6396..51033c872f8b 100644 --- a/code/modules/cargo/bounties/progression.dm +++ b/code/modules/cargo/bounties/progression.dm @@ -13,9 +13,9 @@ /datum/bounty/item/progression/mining_basic name = "Common Mineral Prospecting" description = "Basic materials are worth pocket change, but are integral for station longevity. Ship us a sheet of gold, uranium, or silver to certify your mining program as \"functional\"" - reward = 1000 + reward = 2000 wanted_types = list(/obj/item/stack/sheet/mineral/silver,/obj/item/stack/sheet/mineral/gold,/obj/item/stack/sheet/mineral/uranium) - unlocked_crates = list(/datum/supply_pack/clearance/ka_damage,/datum/supply_pack/clearance/ka_cooldown,/datum/supply_pack/clearance/ka_range) + unlocked_crates = list(/datum/supply_pack/clearance/ka_damage,/datum/supply_pack/clearance/ka_cooldown,/datum/supply_pack/clearance/ka_range, /datum/supply_pack/clearance/ka_aoe, /datum/supply_pack/clearance/ka_triggermod) /datum/bounty/item/progression/mining_basic/reward_string() return "[reward] Credits and clearance to order basic kinetic accelerator modification crates" @@ -23,7 +23,7 @@ /datum/bounty/item/progression/mining_plasma name = "Plasma Extraction" description = "The reason you're here: plasma. Ship us a stack of it and we can certify your mining program as \"profitable\", allowing access to plasma-based mining equipment." - reward = 9000 //1000 less than a normal ship of plasma as a fee + reward = 1000 wanted_types = list(/obj/item/stack/sheet/mineral/plasma) required_count = 50 unlocked_crates = list(/datum/supply_pack/clearance/plasmacutter) @@ -34,9 +34,9 @@ /datum/bounty/item/progression/mining_advanced name = "Strange Material Prospecting" description = "Initial scanning of your mining locale showed anomalous readings in line with that of bluespace crystals. ship us one to confirm their presence and we'll allow you to order a special treat." - reward = 1000 + reward = 2000 wanted_types = list(/obj/item/stack/sheet/bluespace_crystal, /obj/item/stack/ore/bluespace_crystal) //we'll let them send artficial crystals since those would require department cooperation or shooting swarmers unlocked_crates = list(/datum/supply_pack/clearance/plasmacutter_advanced) /datum/bounty/item/progression/mining_advanced/reward_string() - return "[reward] Credits and clearance to order high quality mining gear" \ No newline at end of file + return "[reward] Credits and clearance to order high quality mining gear" From 9b6094578c166992d6c441c3b75648f16b6f31f0 Mon Sep 17 00:00:00 2001 From: Theos Date: Tue, 6 Jul 2021 21:35:29 -0400 Subject: [PATCH 6/9] also unused --- .../research/designs/mining_designs.dm | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/code/modules/research/designs/mining_designs.dm b/code/modules/research/designs/mining_designs.dm index 11e74ab34706..c6e69ae2c006 100644 --- a/code/modules/research/designs/mining_designs.dm +++ b/code/modules/research/designs/mining_designs.dm @@ -42,26 +42,6 @@ category = list("Mining Designs") departmental_flags = DEPARTMENTAL_FLAG_CARGO -/datum/design/plasmacutter - name = "Plasma Cutter" - desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff." - id = "plasmacutter" - build_type = PROTOLATHE - materials = list(/datum/material/iron = 1500, /datum/material/glass = 500, /datum/material/plasma = 1000, /datum/material/silver = 1000, /datum/material/uranium = 800) - build_path = /obj/item/gun/energy/plasmacutter - category = list("Mining Designs") - departmental_flags = DEPARTMENTAL_FLAG_CARGO - -/datum/design/plasmacutter_adv - name = "Advanced Plasma Cutter" - desc = "It's an advanced plasma cutter, oh my god." - id = "plasmacutter_adv" - build_type = PROTOLATHE - materials = list(/datum/material/iron = 3000, /datum/material/glass = 1000, /datum/material/plasma = 2000, /datum/material/gold = 2000, /datum/material/uranium = 3000, /datum/material/diamond = 2000) - build_path = /obj/item/gun/energy/plasmacutter/adv - category = list("Mining Designs") - departmental_flags = DEPARTMENTAL_FLAG_CARGO - /datum/design/jackhammer name = "Sonic Jackhammer" desc = "Essentially a handheld planet-cracker. Can drill through walls with ease as well." From 114efe3d57b7d7561a3ef30a96316a5af4a01373 Mon Sep 17 00:00:00 2001 From: Theos Date: Tue, 6 Jul 2021 21:37:45 -0400 Subject: [PATCH 7/9] Update all_nodes.dm --- yogstation/code/modules/research/techweb/all_nodes.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yogstation/code/modules/research/techweb/all_nodes.dm b/yogstation/code/modules/research/techweb/all_nodes.dm index d5229ff2ff74..734b5213aa7a 100644 --- a/yogstation/code/modules/research/techweb/all_nodes.dm +++ b/yogstation/code/modules/research/techweb/all_nodes.dm @@ -55,7 +55,7 @@ description = "Cutting up asteroids using your spacepods" research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3500) export_price = 500 - prereq_ids = list("basic_mining", "spacepod_disabler") + prereq_ids = list("spacepod_disabler") design_ids = list("pod_ka_basic") /datum/techweb_node/spacepod_advmining @@ -64,7 +64,7 @@ description = "Cutting up asteroids using your spacepods.... faster!" research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3500) export_price = 3500 - prereq_ids = list("spacepod_ka", "adv_mining") + prereq_ids = list("spacepod_ka") design_ids = list("pod_ka", "pod_plasma_cutter") /datum/techweb_node/spacepod_advplasmacutter From d519b008c3797ef2d2fc5ec77f80606d724887d6 Mon Sep 17 00:00:00 2001 From: Theos Date: Tue, 6 Jul 2021 21:57:07 -0400 Subject: [PATCH 8/9] Update packs.dm --- code/modules/cargo/packs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 05f5aa916b35..2abba0112f0b 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1687,7 +1687,7 @@ name = "Kinetic Accelerator Mining AoE Mod" desc = "A modification kit for a kinetic accelerator that maximizes the area mined by each projectile." cost = 200 - contains = list(/obj/item/borg/upgrade/modkit/turfs) + contains = list(/obj/item/borg/upgrade/modkit/aoe/turfs) /datum/supply_pack/clearance/ka_triggermod name = "Kinetic Accelerator Species Equality Trigger Guard Mod" From 1c79b5c3c3e9f1cba53d3dbe0b8e4b4fb0620337 Mon Sep 17 00:00:00 2001 From: Theos Date: Thu, 22 Jul 2021 14:20:15 -0400 Subject: [PATCH 9/9] moves progression bounties to the top of the bounty list for easier visibility this has the side effect of letting them be marked high priority but I don't really care --- code/modules/cargo/bounty.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/cargo/bounty.dm b/code/modules/cargo/bounty.dm index 9dd343f5eb3e..4a642f4e27ce 100644 --- a/code/modules/cargo/bounty.dm +++ b/code/modules/cargo/bounty.dm @@ -132,6 +132,12 @@ GLOBAL_LIST_EMPTY(bounties_list) var/pick // instead of creating it a bunch let's go ahead and toss it here, we know we're going to use it for dynamics and subtypes! + /********************************Progression Gens********************************/ + var/list/progression_type_list = typesof(/datum/bounty/item/progression) + + for(var/progression_bounty in progression_type_list) + try_add_bounty(new progression_bounty) + /********************************Subtype Gens********************************/ var/list/easy_add_list_subtypes = list(/datum/bounty/item/assistant = 3, /datum/bounty/item/mech = 1, @@ -172,12 +178,6 @@ GLOBAL_LIST_EMPTY(bounties_list) var/datum/bounty/B = pick(GLOB.bounties_list) B.mark_high_priority() - /********************************Progression Gens********************************/ - var/list/progression_type_list = typesof(/datum/bounty/item/progression) - - for(var/progression_bounty in progression_type_list) - try_add_bounty(new progression_bounty) - /********************************Low Priority Gens********************************/ var/list/low_priority_strict_type_list = list( /datum/bounty/item/alien_organs, /datum/bounty/item/syndicate_documents,