Removes mining tech

code/modules/cargo/bounties/progression.dm

@@ -13,17 +13,17 @@
 /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"
 
 /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"
+	return "[reward] Credits and clearance to order high quality mining gear"

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,

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/aoe/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)
 

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),

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."
@@ -72,66 +52,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 +60,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
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO