Merge pull request #1510 from Holdelta/MiningAdditions

Mining additions

code/game/objects/items/weapons/storage/bags.dm

@@ -186,6 +186,23 @@
 		else
 			stored_ore[O.name] = 1
 
+//CHOMPstation edit START
+/obj/item/weapon/storage/bag/ore/large
+	name = "large mining satchel"
+	desc = "This little bugger can be used to store and transport ores.  Appears to have upgraded storage space, up to three times your normal satchel!"
+	icon = 'icons/obj/mining_ch.dmi'
+	icon_state = "satchel_large"
+	max_storage_space = ITEMSIZE_COST_NORMAL * 75 // triple storage size of original
+
+/obj/item/weapon/storage/bag/ore/holding
+	name = "satchel of holding"
+	desc = "An ore satchel that opens into a localized pocket of bluespace."
+	icon = 'icons/obj/mining_ch.dmi'
+	icon_state = "satchel_bspace"
+	max_storage_space = ITEMSIZE_COST_NORMAL * 250 // ten times storage size of original
+
+//CHOMPstation edit END
+
 // -----------------------------
 //          Plant bag
 // -----------------------------

code/modules/mining/ore_redemption_machine/equipment_vendor.dm

@@ -51,7 +51,7 @@
 		EQUIPMENT("Jump Boots",									/obj/item/clothing/shoes/bhop,										2500),
 		EQUIPMENT("Mini-Translocator",							/obj/item/device/perfect_tele/one_beacon,							1200),
 		EQUIPMENT("Survival Equipment - Insulated Poncho",		/obj/random/thermalponcho,											750),
-
+		EQUIPMENT("Large Mining Satchel",						/obj/item/weapon/storage/bag/ore/large,								1000), //CHOMPstation addition
 	)
 	prize_list["Consumables"] = list(
 		EQUIPMENT("1 Marker Beacon",		/obj/item/stack/marker_beacon,													1),
@@ -75,6 +75,7 @@
 		EQUIPMENT("KA Damage Increase",			/obj/item/borg/upgrade/modkit/damage,							1000),
 		EQUIPMENT("KA Efficiency Increase",		/obj/item/borg/upgrade/modkit/efficiency,						1200),
 		EQUIPMENT("KA Range Increase",			/obj/item/borg/upgrade/modkit/range,							1000),
+		EQUIPMENT("KA Cooldown Decrease",		/obj/item/borg/upgrade/modkit/cooldown,							1000),
 		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),
@@ -82,7 +83,7 @@
 		EQUIPMENT("KA White Tracer Rounds",		/obj/item/borg/upgrade/modkit/tracer,							125),
 	)
 	prize_list["Digging Tools"] = list(
-		// EQUIPMENT("Diamond Pickaxe",	/obj/item/weapon/pickaxe/diamond,				2000),
+		EQUIPMENT("Diamond Pickaxe",	/obj/item/weapon/pickaxe/diamond,				2000), //CHOMPstation re-addition
 		// EQUIPMENT("Kinetic Crusher",	/obj/item/twohanded/required/kinetic_crusher,	750),
 		EQUIPMENT("Resonator",			/obj/item/resonator,							900),
 		EQUIPMENT("Silver Pickaxe",		/obj/item/weapon/pickaxe/silver,				1200),

code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm

@@ -233,22 +233,22 @@
 	K.damage += modifier
 
 
-// //Cooldown
+ //Cooldown - CHOMPstation re-addition start
-// /obj/item/borg/upgrade/modkit/cooldown
+/obj/item/borg/upgrade/modkit/cooldown
-// 	name = "cooldown decrease"
+	name = "cooldown decrease"
-// 	desc = "Decreases the cooldown of a kinetic accelerator."
+	desc = "Decreases the cooldown of a kinetic accelerator."
-// 	modifier = 2.5
+	modifier = 2.5
 
-// /obj/item/borg/upgrade/modkit/cooldown/install(obj/item/weapon/gun/energy/kinetic_accelerator/KA, mob/user)
+/obj/item/borg/upgrade/modkit/cooldown/install(obj/item/weapon/gun/energy/kinetic_accelerator/KA, mob/user)
-// 	. = ..()
+	. = ..()
-// 	if(.)
+	if(.)
-// 		KA.overheat_time -= modifier
+		KA.fire_delay -= modifier
 
-// /obj/item/borg/upgrade/modkit/cooldown/uninstall(obj/item/weapon/gun/energy/kinetic_accelerator/KA)
+/obj/item/borg/upgrade/modkit/cooldown/uninstall(obj/item/weapon/gun/energy/kinetic_accelerator/KA)
-// 	KA.overheat_time += modifier
+	KA.fire_delay += modifier
-// 	..()
+	..()
 
-//Cooldown
+//Cooldown - CHOMPstation re-addition end
 /obj/item/borg/upgrade/modkit/efficiency
 	name = "energy efficiency"
 	desc = "Decreases the energy use of a kinetic accelerator."

code/modules/research/designs/mining_toys.dm

@@ -48,3 +48,13 @@
 	materials = list(DEFAULT_WALL_MATERIAL = 1000,"glass" = 1000)
 	build_path = /obj/item/device/depth_scanner
 	sort_string = "FBAAA"
+// CHOMPstation addition
+/datum/design/item/weapon/mining/satchel_holding
+	name = "Satchel of Holding"
+	desc = "An ore satchel that opens into a localized pocket of bluespace."
+	id = "satchel_bspace"
+	req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6)
+	materials = list("gold" = 2500, "diamond" = 1000, "uranium" = 250)
+	build_path = /obj/item/weapon/storage/bag/ore/holding
+	sort_string = "FBAAB"
+// CHOMPstation addition end