Factional Cargo Pt. 2: The Left Behind Items (shiptest-ss13#3857)

## About The Pull Request

Turns out, a few things were left behind during the development of the
factional cargo. This adds a couple guns to various markets such as the
E-TAR, the CM-24 Battle Rifle and missing magazines.

## Why It's Good For The Game

Finishes an unfinished PR, and adds missing items so some purchased
items can actually be used.

## Changelog

:cl:
add: Additional cargo magazine and gun orders that were missing from the
previous factional cargo PR.
/:cl:

---------

Signed-off-by: firebudgy <[email protected]>

code/game/objects/items/storage/filled_guncases.dm

@@ -216,6 +216,12 @@
 /obj/item/storage/guncase/energy/egun
 	gun_type = /obj/item/gun/energy/e_gun
 
+/obj/item/storage/guncase/energy/ultima
+	gun_type = /obj/item/gun/energy/e_gun/iot
+
+/obj/item/storage/guncase/energy/etar
+	gun_type = /obj/item/gun/energy/e_gun/smg
+
 /obj/item/storage/guncase/energy/iongun
 	gun_type = /obj/item/gun/energy/ionrifle
 
@@ -267,6 +273,10 @@
 	gun_type = /obj/item/gun/ballistic/shotgun/cm15
 	mag_type = /obj/item/ammo_box/magazine/cm15_12g
 
+/obj/item/storage/guncase/cm24
+	gun_type = /obj/item/gun/ballistic/automatic/assault/skm/cm24
+	mag_type = /obj/item/ammo_box/magazine/skm_762_40
+
 /obj/item/storage/guncase/cmf90
 	gun_type = /obj/item/gun/ballistic/automatic/marksman/f90
 	mag_type = /obj/item/ammo_box/magazine/f90

code/modules/cargo/packs/gun.dm

@@ -142,6 +142,15 @@
 	faction_discount = 0
 	faction_locked = TRUE
 
+/datum/supply_pack/gun/cm357
+	name = "CM-357 Automag Pistol Crate"
+	desc = "Contains a magazine-fed .357 handgun, produced for the CMM-BARD division and available for requisition in small numbers to the Minutemen."
+	cost = 3000
+	contains = list(/obj/item/storage/guncase/pistol/cm357)
+	faction = /datum/faction/clip
+	faction_discount = 0
+	faction_locked = TRUE
+
 /*
 		Energy
 */
@@ -200,7 +209,7 @@
 /datum/supply_pack/gun/laser/bg16
 	name = "Etherbor BG-16 Beam Rifle Crate"
 	desc = "Contains a single BG-16 Beam Rifle, a military-grade automatic developed in the PGF and manufactured by Etherbor Industries for use within the Marine Corps."
-	cost = 3000
+	cost = 3500
 	contains = list(/obj/item/storage/guncase/energy/bg16)
 	crate_name = "beam rifle crate"
 	faction = /datum/faction/pgf
@@ -298,6 +307,16 @@
 	faction_discount = 0
 	faction_locked = TRUE
 
+/datum/supply_pack/gun/ultima
+	name = "E-SG 500 Energy Shotgun Crate"
+	desc = "Contains an energy-based shotgun equipped with dual kill/disable modes, ideal for short range. The on-board computer is notoriously unreliable. For NT employee use only."
+	cost = 3000
+	contains = list(/obj/item/storage/guncase/energy/ultima)
+	crate_name = "shotgun crate"
+	faction = /datum/faction/nt
+	faction_discount = 0
+	faction_locked = TRUE
+
 /*
 		SMGs
 */
@@ -350,6 +369,16 @@
 	faction_discount = 0
 	faction_locked = TRUE
 
+/datum/supply_pack/gun/etar
+	name = "E-TAR Dual-Mode Energy SMG Crate"
+	desc = "Contains a compact energy-based PDW platform, ideal for suppressing threats at mid-range. For NT employee use only."
+	cost = 2000
+	contains = list(/obj/item/storage/guncase/energy/etar)
+	crate_name = "SMG crate"
+	faction = /datum/faction/nt
+	faction_discount = 0
+	faction_locked = TRUE
+
 /datum/supply_pack/gun/firestorm
 	name = "Firestorm SMG Crate"
 	desc = "Contains a Hunter's Pride SMG, intended for internal use by hunters and chambered in .45"
@@ -497,6 +526,17 @@
 	faction_discount = 0
 	faction_locked = TRUE
 
+/datum/supply_pack/gun/cm24
+	name = "CM-24 Surplus Stockpile Rifle"
+	desc = "Contains a higher-powered rifle chambered in 7.62x40 CLIP based on the SKM-24 platform, formerly the main service rifle of the CMM. This one has been pulled from reservist stockpiles."
+	cost = 5000
+	contains = list(/obj/item/storage/guncase/cm82)
+	crate_name = "rifle crate"
+	faction = /datum/faction/clip
+	faction_discount = 0
+	faction_locked = TRUE
+
+
 /* Marksman Rifles */
 
 /datum/supply_pack/gun/cmf4

code/modules/cargo/packs/magazines.dm

@@ -162,6 +162,34 @@
 
 /* CM Lancaster */
 
+/datum/supply_pack/magazine/cm23_mag
+	name = "CM-23 Magazine Crate"
+	desc = "Contains a 10mm magazine for the CM-23 handgun."
+	contains = list(/obj/item/ammo_box/magazine/cm23)
+	cost = 500
+	faction = /datum/faction/clip
+
+/datum/supply_pack/magazine/cm70_mag
+	name = "CM-70 Magazine Crate"
+	desc = "Contains a 9mm magazine for the CM-70 machinepistol."
+	contains = list(/obj/item/ammo_box/magazine/m9mm_cm70)
+	cost = 750
+	faction = /datum/faction/clip
+
+/datum/supply_pack/magazine/cm357_mag
+	name = "CM-357 Magazine Crate"
+	desc = "Contains a .357 magazine for the CM-357 automag pistol."
+	contains = list(/obj/item/ammo_box/magazine/cm357)
+	cost = 1000
+	faction = /datum/faction/clip
+
+/datum/supply_pack/magazine/cm5_mag
+	name = "CM-5 Magazine Crate"
+	desc = "Contains a 9mm magazine for the CM-5 SMG."
+	contains = list(/obj/item/ammo_box/magazine/cm5_9mm)
+	cost = 750
+	faction = /datum/faction/clip
+
 /datum/supply_pack/magazine/cm82_mag
 	name = "CM-82 Magazine Crate"
 	desc = "Contains a 5.56mm magazine for the CM-82 rifle, containing thirty rounds. Notably, these are also compatable with the P-16 rifle."
@@ -189,6 +217,13 @@
 	cost = 1000
 	faction = /datum/faction/clip
 
+/datum/supply_pack/magazine/cm15
+	name = "CM-15 Magazine Crate"
+	desc = "Contains an 8-round 12ga magazine for the CM-15 Automatic Shotgun."
+	contains = list(/obj/item/ammo_box/magazine/cm15_12g)
+	cost = 1500
+	faction = /datum/faction/clip
+
 /* NT */
 
 /datum/supply_pack/magazine/wt550_mag
@@ -247,18 +282,11 @@
 
 /* Shotguns */
 
-/datum/supply_pack/magazine/cm15
-	name = "CM-15 Magazine Crate"
-	desc = "Contains an 8-round 12ga magazine for the CM-15 Automatic Shotgun."
-	contains = list(/obj/item/ammo_box/magazine/cm15_12g)
-	cost = 1500
-	faction = /datum/faction/clip
-
 /datum/supply_pack/magazine/bulldog
 	name = "Bulldog Magazine Crate"
 	desc = "Contains an 8-round 12ga box magazine for the Bulldog weapons platform."
 	contains = list(/obj/item/ammo_box/magazine/m12g_bulldog)
-	cost = 1500
+	cost = 1000
 	faction = /datum/faction/syndicate/scarborough_arms