Armory Expansion - Ammunition Arsenal

modular_darkpack/modules/retail/code/stores/black_market.dm

@@ -29,9 +29,23 @@
 		new /datum/data/vending_product("Compact Medical Kit", /obj/item/storage/medkit/tactical_lite, 1125),
 		new /datum/data/vending_product("Coroner's Surgical Kit", /obj/item/storage/medkit/coroner, 750),
 // CRIMSON EDIT ADD END - Medkit to Pharmacy
-		new /datum/data/vending_product("silver 9mm ammo", /obj/item/ammo_box/darkpack/c9mm/silver, 5000),
-		new /datum/data/vending_product("silver .45 ACP ammo", /obj/item/ammo_box/darkpack/c45acp/silver, 6000),
-		new /datum/data/vending_product("silver .44 ammo", /obj/item/ammo_box/darkpack/c44/silver, 7000),
-		new /datum/data/vending_product("silver 5.56 ammo", /obj/item/ammo_box/darkpack/c556/silver, 8000),
-		new /datum/data/vending_product("incendiary 5.56 ammo", /obj/item/ammo_box/darkpack/c556/incendiary, 9000)
+		new /datum/data/vending_product("silver 9mm ammo", /obj/item/ammo_box/darkpack/c9mm/silver, 2000), // Crimson Grid Edit - Was 5000
+		new /datum/data/vending_product("silver .45 ACP ammo", /obj/item/ammo_box/darkpack/c45acp/silver, 2500), // Crimson Grid Edit - Was 6000
+		new /datum/data/vending_product("silver .44 ammo", /obj/item/ammo_box/darkpack/c44/silver, 3000), // Crimson Grid Edit - Was 7000
+		new /datum/data/vending_product("silver 5.56 ammo", /obj/item/ammo_box/darkpack/c556/silver, 3000), // Crimson Grid Edit - Was 8000
+		new /datum/data/vending_product("incendiary 5.56 ammo", /obj/item/ammo_box/darkpack/c556/incendiary, 3000), // Crimson Grid Edit - Was 9000
+// CRIMSON EDIT START - Armory Ammunition Additions - Eventually wanna lock these behind high streetwise skill, can lower prices then
+		new /datum/data/vending_product(".45 Wiley Pete ammo", /obj/item/ammo_box/darkpack/c45acp/wp, 3000),
+		new /datum/data/vending_product(".44 Wiley Pete ammo", /obj/item/ammo_box/darkpack/c44/wp, 3000),
+		new /datum/data/vending_product(".50 AE Wiley Pete ammo", /obj/item/ammo_box/darkpack/c50ae/wp, 4000),
+		new /datum/data/vending_product(".50 AE HE ammo", /obj/item/ammo_box/darkpack/c50ae/he, 5000),
+		new /datum/data/vending_product("5.45 incendiary ammo", /obj/item/ammo_box/darkpack/c545/incendiary, 3500),
+		new /datum/data/vending_product(".50 BMG DU ammo", /obj/item/ammo_box/darkpack/c50/du, 6500),
+		new /datum/data/vending_product(".50 BMG API ammo", /obj/item/ammo_box/darkpack/c50/api, 6500),
+		new /datum/data/vending_product(".50 BMG raufoss ammo", /obj/item/ammo_box/darkpack/c50/rauf, 7500),
+		new /datum/data/vending_product("12g HE slugs", /obj/item/ammo_box/darkpack/c12g/he, 7000),
+		new /datum/data/vending_product("12g silver buckshot", /obj/item/ammo_box/darkpack/c12g/buck/silver, 4000),
+		new /datum/data/vending_product("12g flechette shells", /obj/item/ammo_box/darkpack/c12g/buck/flech, 2000),
+		new /datum/data/vending_product("silver crossbow bolts", /obj/item/ammo_box/darkpack/arrows/silver, 2500),
+// CRIMSON EDIT END - Armory Ammunition Addtions
 	)

modular_darkpack/modules/retail/code/stores/camping_store.dm

@@ -23,6 +23,10 @@
 		new /datum/data/vending_product("hunting rifle", /obj/item/gun/ballistic/automatic/darkpack/huntrifle),
 		new /datum/data/vending_product("7.52x51 ammo", /obj/item/ammo_box/darkpack/c762x51mm, 1000), // Crimson Grid Replacement - Was 5.56 Ammo Box
 		new /datum/data/vending_product("military parka", /obj/item/clothing/suit/vampire/coat/milparka,	90),
+		// CRIMSON GRID ADDITION BEGIN - Armory Ammunition Additions
+		new /datum/data/vending_product("Bodkin bolts", /obj/item/ammo_box/darkpack/arrows/bodkin, 800),
+		new /datum/data/vending_product("Broadhead bolts", /obj/item/ammo_box/darkpack/arrows/broadhead, 800),
+		// CRIMSON GRID ADDITION END - Armory Ammunition Additions
 	)
 	product_types = list(
 		/obj/item/fishing_rod,

modular_darkpack/modules/retail/code/stores/gun_store.dm

@@ -27,4 +27,22 @@
 		new /datum/data/vending_product("taser", /obj/item/melee/baton/security/handtaser, 250),
 		new /datum/data/vending_product("pepperspray", /obj/item/reagent_containers/spray/pepper, 200),
 		new /datum/data/vending_product("holster", /obj/item/storage/belt/holster/detective/darkpack, 100), // CRIMSON EDIT ADD - Shop Inventories Additions
+		// CRIMSON GRID ADDITION BEGIN - Armory Ammunition Additions
+		new /datum/data/vending_product("9mm +P ammo", /obj/item/ammo_box/darkpack/c9mm/plus, 800),
+		new /datum/data/vending_product("9mm AP ammo", /obj/item/ammo_box/darkpack/c9mm/ap, 1000),
+		new /datum/data/vending_product("9mm HP ammo", /obj/item/ammo_box/darkpack/c9mm/hp, 800),
+		new /datum/data/vending_product(".45 ACP +P ammo", /obj/item/ammo_box/darkpack/c45acp/plus, 900),
+		new /datum/data/vending_product(".45 ACP AP ammo", /obj/item/ammo_box/darkpack/c45acp/ap, 1000),
+		new /datum/data/vending_product(".45 ACP HP ammo", /obj/item/ammo_box/darkpack/c45acp/hp, 900),
+		new /datum/data/vending_product("5.56mm HP ammo", /obj/item/ammo_box/darkpack/c556/hp, 2000),
+		new /datum/data/vending_product("5.56mm AP ammo", /obj/item/ammo_box/darkpack/c556/ap, 2500),
+		new /datum/data/vending_product("5.45mm HP ammo", /obj/item/ammo_box/darkpack/c545/hp, 2000),
+		new /datum/data/vending_product("5.45mm AP ammo", /obj/item/ammo_box/darkpack/c545/ap, 2500),
+		new /datum/data/vending_product(".44 Magnum HP ammo", /obj/item/ammo_box/darkpack/c44/hp, 1000),
+		new /datum/data/vending_product("7.62x51mm HP ammo", /obj/item/ammo_box/darkpack/c762x51mm/hp, 2000),
+		new /datum/data/vending_product("7.62x51mm AP ammo", /obj/item/ammo_box/darkpack/c762x51mm/ap, 2500),
+		new /datum/data/vending_product("12 gauge RIP slugs", /obj/item/ammo_box/darkpack/c12g/rip, 800),
+		new /datum/data/vending_product("12 gauge AP slugs", /obj/item/ammo_box/darkpack/c12g/ap, 800),
+		new /datum/data/vending_product("12 gauge slugs", /obj/item/ammo_box/darkpack/c12g, 400)
+		// CRIMSON GRID ADDITION END - Armory Ammunition Additions
 	)

modular_darkpack/modules/retail/code/stores/police_store.dm

@@ -58,6 +58,15 @@
 		new /datum/data/vending_product("9mm ammo box", /obj/item/ammo_box/darkpack/c9mm, 80),
 		new /datum/data/vending_product("5.56 ammo box", /obj/item/ammo_box/darkpack/c556, 80),
 		new /datum/data/vending_product("PDW ammo box", /obj/item/ammo_box/darkpack/c46pdw, 80),
+
+// Crimson Grid Additions - Armory Ammunition Additions
+		new /datum/data/vending_product("5.56 AP ammo", /obj/item/ammo_box/darkpack/c556/ap, 80),
+		new /datum/data/vending_product("PDW AP ammo box", /obj/item/ammo_box/darkpack/c46pdw/ap, 80),
+		new /datum/data/vending_product("7.62x51mm AP ammo", /obj/item/ammo_box/darkpack/c762x51mm/ap, 80),
+		new /datum/data/vending_product("7.62x51mm HP ammo", /obj/item/ammo_box/darkpack/c762x51mm/hp, 80),
+		new /datum/data/vending_product("12 gauge flechette ammo box", /obj/item/ammo_box/darkpack/c12g/buck/flech, 80),
+		new /datum/data/vending_product(".50 BMG DU ammo", /obj/item/ammo_box/darkpack/c50/du, 200),
+// Crimson Grid Additions End - Armory Ammunition Additions
 	)
 
 /obj/structure/retail/police_equipment/can_shop(mob/user)

modular_darkpack/modules/weapons/code/guns.dm

@@ -663,7 +663,7 @@
 	//zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you.
 	//zoom_out_amt = 5
 	slot_flags = ITEM_SLOT_BACK
-	projectile_damage_multiplier = 2 //140 damage. Nice.
+	// projectile_damage_multiplier = 2 //140 damage. Nice. // Crimson Grid Edit - Retuned damage, forgot this existed. Oops.
 	actions_types = list()
 	masquerade_violating = TRUE
 	serial_type = "RB"

modular_darkpack/modules/weapons/code/projectiles.dm

@@ -176,7 +176,7 @@
 	armour_penetration = 0
 	exposed_wound_bonus = 0
 	wound_bonus = 0
-	var/fire_stacks = 1 // 1 stack per pellet but we have 9 pellets so it adds up
+	var/fire_stacks = 2 // 1 stack per pellet but we have 9 pellets so it adds up // Crimson Grid Edit - Was 1
 
 /obj/projectile/bullet/darkpack/dragonsbreath/on_hit(atom/target, blocked = 0, pierce_hit)
 	. = ..()

modular_vcg/modules/cargo/code/supply_packs/weapons.dm

@@ -0,0 +1,246 @@
+/datum/supply_pack/weapons/ammo9mm/hollowpoint
+	name = "Ammo (9mm Hollowpoints)"
+	desc = "Contains 3 boxes of hollowpoint 9mm ammunition."
+	cost = 300
+	contains = list(/obj/item/ammo_box/darkpack/c9mm/hp, /obj/item/ammo_box/darkpack/c9mm/hp, /obj/item/ammo_box/darkpack/c9mm/hp)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo9mm/ap
+	name = "Ammo (9mm AP)"
+	desc = "Contains 3 boxes of armor-piercing 9mm ammunition."
+	cost = 500
+	contains = list(/obj/item/ammo_box/darkpack/c9mm/ap, /obj/item/ammo_box/darkpack/c9mm/ap, /obj/item/ammo_box/darkpack/c9mm/ap)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo45acp/plus
+	name = "Ammo (.45 ACP +P)"
+	desc = "Contains 3 boxes of +P .45 ACP ammunition."
+	cost = 800
+	contains = list(/obj/item/ammo_box/darkpack/c45acp/plus, /obj/item/ammo_box/darkpack/c45acp/plus, /obj/item/ammo_box/darkpack/c45acp/plus)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo45acp/ap
+	name = "Ammo (.45 ACP AP)"
+	desc = "Contains 3 boxes of armor-piercing .45 ACP ammunition."
+	cost = 900
+	contains = list(/obj/item/ammo_box/darkpack/c45acp/ap, /obj/item/ammo_box/darkpack/c45acp/ap, /obj/item/ammo_box/darkpack/c45acp/ap)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo45acp/wp
+	name = "Ammo (.45 ACP WP)"
+	desc = "Contains 1 box of white-phosphorus .45 ACP ammunition."
+	cost = 1200
+	contains = list(/obj/item/ammo_box/darkpack/c45acp/wp)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo44/ep
+	name = "Ammo (.44 Mag EP)"
+	desc = "Contains 1 box of .44 Magnum extreme penetrator ammunition."
+	cost = 900
+	contains = list(/obj/item/ammo_box/darkpack/c44/ep)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo44/hp
+	name = "Ammo (.44 Mag HP)"
+	desc = "Contains 3 boxes of hollowpoint .44 Magnum ammunition."
+	cost = 750
+	contains = list(/obj/item/ammo_box/darkpack/c44/hp, /obj/item/ammo_box/darkpack/c44/hp, /obj/item/ammo_box/darkpack/c44/hp)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo44/wp
+	name = "Ammo (.44 Mag Wiley Pete)"
+	desc = "Contains 1 box of white-phosphorus .44 Magnum ammunition."
+	cost = 2500
+	contains = list(/obj/item/ammo_box/darkpack/c44/wp)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo46pdw/ap
+	name = "Ammo (4.6mm AP)"
+	desc = "Contains 3 boxes of armor-piercing 4.6mm ammunition."
+	cost = 1200
+	contains = list(/obj/item/ammo_box/darkpack/c46pdw/ap, /obj/item/ammo_box/darkpack/c46pdw/ap, /obj/item/ammo_box/darkpack/c46pdw/ap)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo50ae/ap
+	name = "Ammo (.50 AE AP)"
+	desc = "Contains 1 box of armor-piercing .50 AE ammunition."
+	cost = 2000
+	contains = list(/obj/item/ammo_box/darkpack/c50ae/ap)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo50ae/hp
+	name = "Ammo (.50 AE HP)"
+	desc = "Contains 1 box of hollowpoint .50 AE ammunition."
+	cost = 2500
+	contains = list(/obj/item/ammo_box/darkpack/c50ae/hp)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo50ae/wp
+	name = "Ammo (.50 AE Wiley Pete)"
+	desc = "Contains 1 box of white-phosphorus .50 AE ammunition."
+	cost = 3000
+	contains = list(/obj/item/ammo_box/darkpack/c50ae/wp)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo50ae/he
+	name = "Ammo (.50 AE HE)"
+	desc = "Contains 1 box of high-explosive .50 AE ammunition."
+	cost = 5000
+	contains = list(/obj/item/ammo_box/darkpack/c50ae/he)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo545/ap
+	name = "Ammo (5.45mm AP)"
+	desc = "Contains 3 boxes of armor-piercing 5.45mm ammunition."
+	cost = 1200
+	contains = list(/obj/item/ammo_box/darkpack/c545/ap, /obj/item/ammo_box/darkpack/c545/ap, /obj/item/ammo_box/darkpack/c545/ap)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo545/hp
+	name = "Ammo (5.45mm HP)"
+	desc = "Contains 3 boxes of hollowpoint 5.45mm ammunition."
+	cost = 1100
+	contains = list(/obj/item/ammo_box/darkpack/c545/hp, /obj/item/ammo_box/darkpack/c545/hp, /obj/item/ammo_box/darkpack/c545/hp)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo545/incendiary
+	name = "Ammo (5.45mm Incendiary)"
+	desc = "Contains 1 box of incendiary 5.45mm ammunition."
+	cost = 3000
+	contains = list(/obj/item/ammo_box/darkpack/c545/incendiary)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo556/ap
+	name = "Ammo (5.56mm AP)"
+	desc = "Contains 3 boxes of armor-piercing 5.56mm ammunition."
+	cost = 1250
+	contains = list(/obj/item/ammo_box/darkpack/c556/ap, /obj/item/ammo_box/darkpack/c556/ap, /obj/item/ammo_box/darkpack/c556/ap)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo556/hp
+	name = "Ammo (5.56mm HP)"
+	desc = "Contains 3 boxes of hollowpoint 5.56mm ammunition."
+	cost = 1250
+	contains = list(/obj/item/ammo_box/darkpack/c556/hp, /obj/item/ammo_box/darkpack/c556/hp, /obj/item/ammo_box/darkpack/c556/hp)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo762x51/ap
+	name = "Ammo (7.62x51mm AP)"
+	desc = "Contains 3 boxes of armor-piercing 7.62x51mm ammunition."
+	cost = 1250
+	contains = list(/obj/item/ammo_box/darkpack/c762x51mm/ap, /obj/item/ammo_box/darkpack/c762x51mm/ap, /obj/item/ammo_box/darkpack/c762x51mm/ap)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo762x51/hp
+	name = "Ammo (7.62x51mm HP)"
+	desc = "Contains 3 boxes of hollowpoint 7.62x51mm ammunition."
+	cost = 1300
+	contains = list(/obj/item/ammo_box/darkpack/c762x51mm/hp, /obj/item/ammo_box/darkpack/c762x51mm/hp, /obj/item/ammo_box/darkpack/c762x51mm/hp)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo50bmg/du
+	name = "Ammo (.50 BMG DU)"
+	desc = "Contains 1 box of depleted uranium .50 BMG ammunition."
+	cost = 5000
+	contains = list(/obj/item/ammo_box/darkpack/c50/du)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo50bmg/rauf
+	name = "Ammo (.50 BMG raufoss)"
+	desc = "Contains 1 boxes of raufoss .50 BMG ammunition."
+	cost = 6000
+	contains = list(/obj/item/ammo_box/darkpack/c50/rauf)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo50bmg/ratshot
+	name = "Ammo (.50 BMG Ratshot)"
+	desc = "Contains 1 box of ratshot .50 BMG ammunition."
+	cost = 2500
+	contains = list(/obj/item/ammo_box/darkpack/c50/ratshot)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo50bmg/api
+	name = "Ammo (.50 BMG API)"
+	desc = "Contains 1 boxes of armor-piercing incendiary .50 BMG ammunition."
+	cost = 5000
+	contains = list(/obj/item/ammo_box/darkpack/c50/api)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo12g/rip
+	name = "Ammo (12g RIP slugs)"
+	desc = "Contains 3 boxes of RIP slug 12 gauge ammunition."
+	cost = 1000
+	contains = list(/obj/item/ammo_box/darkpack/c12g/rip, /obj/item/ammo_box/darkpack/c12g/rip, /obj/item/ammo_box/darkpack/c12g/rip)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo12g/apslug
+	name = "Ammo (12g AP slugs)"
+	desc = "Contains 3 boxes of AP slug 12 gauge ammunition."
+	cost = 1000
+	contains = list(/obj/item/ammo_box/darkpack/c12g/ap, /obj/item/ammo_box/darkpack/c12g/ap, /obj/item/ammo_box/darkpack/c12g/ap)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo12g/he
+	name = "Ammo (12g HE slugs)"
+	desc = "Contains 1 box of high-explosive 12 gauge ammunition."
+	cost = 6000
+	contains = list(/obj/item/ammo_box/darkpack/c12g/he)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo12g/flech
+	name = "Ammo (12g Flechette shells)"
+	desc = "Contains 3 boxes of flechette 12 gauge ammunition."
+	cost = 1000
+	contains = list(/obj/item/ammo_box/darkpack/c12g/buck/flech, /obj/item/ammo_box/darkpack/c12g/buck/flech, /obj/item/ammo_box/darkpack/c12g/buck/flech)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammo12g/silver
+	name = "Ammo (12g Silver buckshot)"
+	desc = "Contains 1 box of silver buckshot 12 gauge ammunition."
+	cost = 3000
+	contains = list(/obj/item/ammo_box/darkpack/c12g/buck/silver)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammoarrows/bodkin
+	name = "Ammo (Bodkin bolts)"
+	desc = "Contains 1 boxes of bodkin crossbow bolts."
+	cost = 500
+	contains = list(/obj/item/ammo_box/darkpack/arrows/bodkin)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammoarrows/broadhead
+	name = "Ammo (Broadhead bolts)"
+	desc = "Contains 1 box of broadhead crossbow bolts."
+	cost = 600
+	contains = list(/obj/item/ammo_box/darkpack/arrows/broadhead)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/weapons/ammoarrows/silver
+	name = "Ammo (Silver bolts)"
+	desc = "Contains 1 box of silver crossbow bolts."
+	cost = 1500
+	contains = list(/obj/item/ammo_box/darkpack/arrows/silver, /obj/item/ammo_box/darkpack/arrows/silver, /obj/item/ammo_box/darkpack/arrows/silver)
+	crate_name = "ammo crate"
+
+// Redefined prices for Darkpack cargo items
+
+/datum/supply_pack/weapons/ammo12gsilver
+	cost = 3000
+
+/datum/supply_pack/weapons/ammo12g/incendiary
+	cost = 3500
+
+/datum/supply_pack/weapons/ammo9/silver
+	cost = 2000
+
+/datum/supply_pack/weapons/ammo44/silver
+	cost = 2500
+
+/datum/supply_pack/weapons/ammo45/silver
+	cost = 2000
+
+/datum/supply_pack/weapons/ammo556/silver
+	cost = 2500
+
+/datum/supply_pack/weapons/ammo556/incendiart
+	cost = 3000