Makes more exosuit equipment available through cargo (#3060)

## About The Pull Request Adds a bunch of equipment, tools, and weapons to the outpost catalogue and a few to the black market. Namely, a diamond drill, nuclear generator, tesla relay, extinguisher, cable layer, mounted sleeper, medical beam gun, melee armor booster, ranged armor booster, ion cannon, scattershot gun, burst gun, missile rack, and corresponding ammo for the previous guns. (Also adds the mounted syringe gun, incendiary carbine and corresponding ammo to the black market) Also changes the mounted PKA price from 1500 to 750. A low damage short range weapon that drains cell charge shouldn't be more expensive than a superior exosuit laser. ## Why It's Good For The Game Allows players more freedom and ability to use exosuits, incentivizing their usage (especially after their recent resprite)! Makes more R&D junk available through other methods. ## Changelog :cl: add: Added a diamond drill, nuclear generator, tesla relay, extinguisher, cable layer, mounted sleeper, medical beam gun, armor boosters, ion cannon, scattershot gun, burst gun, missile rack, and corresponding ammo to the outpost catalogue! add: Added a mounted syringe gun, incendiary carbine, and corresponding ammo to the blackmarket catalogue. balance: lowered the price of the mounted PKA in the outpost catalogue to 750. /:cl:
shiptest-ss13 · Jun 12, 2024 · 3365e60 · 3365e60
1 parent 1a29868
commit 3365e60
Show file tree

Hide file tree

Showing 2 changed files with 177 additions and 4 deletions.
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -209,6 +209,38 @@
 	stock_max = 3
 	availability_prob = 30
 
+/datum/blackmarket_item/weapon/mecha_syringe_gun
+	name = "Mounted Syringe Gun"
+	desc = "We ripped this off an old Nanotrasen exosuit. It's a real advanced piece of equipment. Exosuit not included."
+	item = /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun
+
+	price_min = 5000
+	price_max = 7000
+	stock = 1
+	availability_prob = 15
+
+/datum/blackmarket_item/weapon/mecha_hades
+	name = "Mounted FNX-99 Carbine"
+	desc = "This so called \"Hades\" carbine is sure to burn brightly above the competition! Not to be confused with the \"Hades\" energy rifle. Exosuit not included."
+	item = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine
+	pair_item = /datum/blackmarket_item/weapon/mecha_hades_ammo
+
+	price_min = 2000
+	price_max = 3000
+	stock_max = 2
+	availability_prob = 25
+
+/datum/blackmarket_item/weapon/mecha_hades_ammo
+	name = "FNX-99 Incediary Ammo"
+	desc = "A box of 24 incendiary shells for the FNX-99 mounted carbine."
+	item = /obj/item/mecha_ammo/incendiary
+
+	price_min = 250
+	price_max = 350
+	stock_min = 3
+	stock_max = 5
+	availability_prob = 0
+
 /datum/blackmarket_item/weapon/model_h
 	name = "Model H"
 	desc = "A Model H slug pistol. The H stands for Hurt. Chambered in ferromagnetic slugs."

diff --git a/code/modules/cargo/packs/mechs.dm b/code/modules/cargo/packs/mechs.dm
@@ -109,6 +109,14 @@ Mech Equipment
 		/obj/item/mecha_parts/mecha_equipment/drill
 	)
 
+/datum/supply_pack/mech/equipment/diamond_drill
+	name = "Mech diamond drill kit"
+	desc = "Contains mechanized diamond drill, for the enterprising prospector!"
+	cost = 750
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill
+	)
+
 /datum/supply_pack/mech/equipment/scanner
 	name = "Mech scanner kit"
 	desc = "An electronic mining scanner, graded to interface with a mech."
@@ -125,6 +133,22 @@ Mech Equipment
 		/obj/item/mecha_parts/mecha_equipment/generator
 	)
 
+/datum/supply_pack/mech/equipment/nuclear_gen
+	name = "Mech nuclear generator kit"
+	desc = "Contains a uranium-fueled generator for a mech, ideal for polluting the environment."
+	cost = 1250
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/generator/nuclear
+	)
+
+/datum/supply_pack/mech/equipment/tesla_energy_relay
+	name = "Mech tesla relay kit"
+	desc = "Contains an advanced exosuit module which draws power from nearby APCs."
+	cost = 1750
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay
+	)
+
 /datum/supply_pack/mech/equipment/clamp
 	name = "Mech clamp kit"
 	desc = "Contains a clamp designed for mechanized freight hauling."
@@ -133,6 +157,37 @@ Mech Equipment
 		/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp
 	)
 
+/datum/supply_pack/mech/equipment/extinguisher
+	name = "Mech extinguisher kit"
+	desc = "Contains a heavy duty fire extinguisher, for heavy duty firefighting."
+	cost = 250
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/extinguisher
+	)
+
+/datum/supply_pack/mech/equipment/cable_layer
+	name = "Mech RCL Kit"
+	desc = "Contains a \"rapid cable layer\" for laying down long lengths of wire."
+	cost = 250
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/cable_layer
+	)
+
+/datum/supply_pack/mech/equipment/mech_sleeper
+	name = "Mech Mounted Sleeper Kit"
+	desc = "Contains a mounted sleeper device, used for retrieving and stabilizing patients."
+	cost = 1000
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/medical/sleeper
+	)
+
+/datum/supply_pack/mech/equipment/beam_gun
+	name = "Mech Beam Gun Kit"
+	desc = "Contains an advanced mounted medical beamgun, capable of alleviating wounds to targets."
+	cost = 7000
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam
+	)
 /datum/supply_pack/mech/equipment/rcs
 	name = "Mech RCS kit"
 	desc = "A gas fueled RCS pack, ideal for mechanized space operation."
@@ -149,30 +204,116 @@ Mech Equipment
 		/obj/item/mecha_parts/mecha_equipment/conversion_kit/ripley
 	)
 
+/datum/supply_pack/mech/equipment/melee_armor_booster
+	name = "Mech CCW armor kit"
+	desc = "A \"close combat weaponry\" module designed to deflect melee attacks."
+	cost = 750
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster
+	)
+
+/datum/supply_pack/mech/equipment/projectile_armor_booster
+	name = "Mech projectile armor kit"
+	desc = "A protective exosuit module designed to deflect ranged attacks."
+	cost = 1000
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster
+	)
+
 /*
 weapons
 */
 
-/datum/supply_pack/mech/equipment/pka
+/datum/supply_pack/mech/weapon
+	name = "Mech weapons crate"
+	crate_type = /obj/structure/closet/crate/secure/weapon
+	crate_name = "mech weapon crate"
+
+/datum/supply_pack/mech/weapon/pka
 	name = "Mech Mounted Proto-Kinetic Accelerator kit"
 	desc = "A ranged mining attachment for any mech."
-	cost = 1500
+	cost = 750
 	contains = list(
 		/obj/item/mecha_parts/mecha_equipment/weapon/energy/mecha_kineticgun
 	)
 
-/datum/supply_pack/mech/equipment/laser
+/datum/supply_pack/mech/weapon/laser
 	name = "Immolator kit"
 	desc = "A light laser cannon designed for combat usage."
 	cost = 1000
 	contains = list(
 		/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
 	)
 
-/datum/supply_pack/mech/equipment/biglaser
+/datum/supply_pack/mech/weapon/biglaser
 	name = "Solaris kit"
 	desc = "A heavy laser cannon designed for combat usage."
 	cost = 2000
 	contains = list(
 		/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
 	)
+
+/datum/supply_pack/mech/weapon/ion_cannon
+	name = "MK4 ion cannon kit"
+	desc = "Contains a heavy ion cannon for disabling technology in large blasts."
+	cost = 3000
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/weapon/energy/ion
+	)
+
+/datum/supply_pack/mech/weapon/scattershot
+	name = "LBX AC 10 kit"
+	desc = "Contains a \"Scattershot\" gun to mount on combat exosuits."
+	cost = 1750
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
+	)
+
+/datum/supply_pack/mech/weapon/lmg
+	name = "Ultra AC 2 kit"
+	desc = "Contains a mounted gun which fires in three round bursts."
+	cost = 2250
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
+	)
+
+/datum/supply_pack/mech/weapon/missile_rack
+	name = "BRM-6 kit"
+	desc = "Contains a low-explosive missile launcher, excellent for breaching through obstacles."
+	cost = 3000
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/breaching
+	)
+
+/*
+ammo
+*/
+
+/datum/supply_pack/mech/ammo
+	name = "Mech ammo crate"
+	crate_type = /obj/structure/closet/crate/secure/gear
+	crate_name = "mech ammo crate"
+
+/datum/supply_pack/mech/ammo/scattershot_ammo
+	name = "LBX AC 10 ammo box"
+	desc = "Contains a fourty-round box of upscaled buckshot, to be loaded directly in a mounted LBX AC 10."
+	cost = 500
+	contains = list(
+		/obj/item/mecha_ammo/scattershot
+	)
+
+/datum/supply_pack/mech/ammo/lmg_ammo
+	name = "Ultra AC 2 ammo box"
+	desc = "Contains a three hundred-round box of heavy ammunition for the Ultra AC 2."
+	cost = 750
+	contains = list(
+		/obj/item/mecha_ammo/lmg
+	)
+
+/datum/supply_pack/mech/ammo/missile_rack_ammo
+	name = "BRM-6 missile box"
+	desc = "Contains a box of six breaching missiles designed to explode upon striking hard surfaces."
+	cost = 1000
+	contains = list(
+		/obj/item/mecha_ammo/missiles_br
+	)