Factional Cargo: Magazines, I Love War Edition (#3989)

## About The Pull Request Adds the Firestorm Pan Magazine (apogee request), Bulldog Drum Magazine (12 rounds over 8), Boomslang 10rnd Magazine and SKM Extended Magazine (effectively two magazines in one) to factional cargo. ## Why It's Good For The Game Adds another way to upgrade without totally breaking the balance, as most of these are only small increases in ammo or the equivalent of two magazines in one, and have been priced appropriately. This also accounts for the cost it would take to refill these magazines, which effectively doubles the cost in some cases. Most of these being as expensive as they are should also make sure they're thought about before purchasing. ## Changelog :cl: add: SKM Extended Magazine, Bulldog Drum Magazine, Boomslang 10rnd Magazine and Firestorm Pan Magazine to factional cargo. /:cl:
shiptest-ss13 · Jan 18, 2025 · cfa5b14 · cfa5b14
1 parent 0d0998c
commit cfa5b14
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 3 deletions.
diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm
@@ -657,7 +657,7 @@
 	faction = /datum/faction/syndicate/scarborough_arms
 
 /datum/supply_pack/gun/boomslang10
-	name = "Boomslang-10 Sniper Rifle Crate"
+	name = "MSR-90 'Boomslang' Sniper Rifle Crate"
 	desc = "Contains a military variant of the Boomslang Sniper rifle equipped with an 8x sniper scope, for licenesed buyers only. Chambered in the powerful 6.5x57mm CLIP."
 	cost = 4500
 	contains = list(/obj/item/storage/guncase/boomslangmilitary)

diff --git a/code/modules/cargo/packs/magazines.dm b/code/modules/cargo/packs/magazines.dm
@@ -49,12 +49,19 @@
 	faction = /datum/faction/srm
 
 /datum/supply_pack/magazine/firestorm_mag
-	name = "Firestorm Magazine Crate"
+	name = "Firestorm Stick Magazine Crate"
 	desc = "Contains a 28-round magazine for the Hunter's Pride Firestorm SMG."
 	contains = list(/obj/item/ammo_box/magazine/c45_firestorm_mag/empty)
 	cost = 300
 	faction = /datum/faction/srm
 
+/datum/supply_pack/magazine/firestorm_mag
+	name = "Firestorm Pan Magazine Crate"
+	desc = "Contains a 50-round pan magazine for the Hunter's Pride Firestorm SMG."
+	contains = list(/obj/item/ammo_box/magazine/c45_firestorm_mag/pan/empty)
+	cost = 1000
+	faction = /datum/faction/srm
+
 
 /* Serene Sporting */
 
@@ -158,6 +165,14 @@
 	cost = 750
 	faction = /datum/faction/syndicate/scarborough_arms
 
+/datum/supply_pack/magazine/boomslang_mag_extended
+	name = "MSR-90 'Boomslang' Magazine Crate"
+	desc = "Contains a 6.5 CLIP magazine for the Boomslang rifle platform, with a capacity of ten rounds."
+	contains = list(/obj/item/ammo_box/magazine/boomslang/empty)
+	cost = 1500
+	faction = /datum/faction/syndicate/scarborough_arms
+
+
 /* CM Lancaster */
 
 /datum/supply_pack/magazine/cm23_mag
@@ -203,6 +218,15 @@
 	contains = list(/obj/item/ammo_box/magazine/skm_762_40/empty)
 	cost = 500
 
+/datum/supply_pack/magazine/skm_ammo_extended
+	name = "SKM Extended Magazine Crate"
+	desc = "Contains a 7.62x40mm magazine for the SKM rifles, with a capacity of fourty rounds."
+	contains = list(/obj/item/ammo_box/magazine/skm_762_40/extended/empty)
+	cost = 1250
+	faction = /datum/faction/inteq
+	faction_discount = 0
+	faction_locked = TRUE
+
 /datum/supply_pack/magazine/f4_mag
 	name = "F4 Magazine Crate"
 	desc = "Contains a .308 magazine for SsG-04 and CM-F4 platform rifles, with a capacity of ten rounds."
@@ -282,12 +306,18 @@
 /* Shotguns */
 
 /datum/supply_pack/magazine/bulldog
-	name = "Bulldog Magazine Crate"
+	name = "Bulldog Box Magazine Crate"
 	desc = "Contains an 8-round 12ga box magazine for the Bulldog weapons platform."
 	contains = list(/obj/item/ammo_box/magazine/m12g_bulldog/empty)
 	cost = 750
 	faction = /datum/faction/syndicate/scarborough_arms
 
+/datum/supply_pack/magazine/bulldog_12
+	name = "Bulldog Drum Magazine Crate"
+	desc = "Contains a 12-round 12ga drum magazine for the Bulldog weapons platform."
+	contains = list(/obj/item/ammo_box/magazine/m12g_bulldog/drum/empty)
+	cost = 1500
+	faction = /datum/faction/syndicate/scarborough_arms
 
 /* energy weapons */
 

diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm
@@ -45,6 +45,9 @@
 	icon_state = "skm_extended_mag-1"
 	max_ammo = 40
 
+/obj/item/ammo_box/magazine/skm_762_40/extended/empty
+	start_empty = TRUE
+
 /obj/item/ammo_box/magazine/skm_762_40/drum
 	name = "assault rifle drum (7.62x40mm CLIP)"
 	desc = "A 75-round drum for the 7.62x40mm CLIP variants of the SKM assault rifle family. These rounds do good damage with good armor penetration."

diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm
@@ -111,3 +111,6 @@
 /obj/item/ammo_box/magazine/c45_firestorm_mag/pan/update_icon_state() //Causes the mag to NOT inherit the parent's update_icon oooh the misery
 	. = ..()
 	icon_state = "firestorm_pan"
+
+/obj/item/ammo_box/magazine/c45_firestorm_mag/pan/empty
+	start_empty = TRUE
diff --git a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
@@ -594,6 +594,9 @@ NO_MAG_GUN_HELPER(automatic/marksman/boomslang/indie)
 	max_ammo = 10
 	multiple_sprites = AMMO_BOX_PER_BULLET
 
+/obj/item/ammo_box/magazine/boomslang/empty
+	start_empty = TRUE
+
 /obj/item/ammo_box/magazine/boomslang/short
 	name = "\improper Boomslang Magazine (6.5x57mm CLIP)"
 	desc = "A 5-round box magazine for Boomslang sniper rifles. These rounds deal amazing damage and can pierce protective equipment, excluding armored vehicles."