From 4172c8e13c8dcce598e8ff7ea9bd19dd80b3e9a7 Mon Sep 17 00:00:00 2001
From: Martinpachu <86135885+Martinpachu@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:38:29 -0300
Subject: [PATCH] Fixes cargo descriptions and granularizes 357 speedloaders.
 (#2809)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Fixes my mistakes.

## Why It's Good For The Game

I'm so fucking stupid!! why do you keep letting me make prs!!! you
should kill me now

## Changelog

:cl:

spellcheck: Fixes some cargo descriptions.
Fix: Properly granularizes 357 speedloaders.

/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
---
 code/modules/cargo/packs/ammo.dm |  9 ++++-----
 code/modules/cargo/packs/gun.dm  | 16 ++++++++--------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm
index ffd662a0425e4..28d5ad1ec248a 100644
--- a/code/modules/cargo/packs/ammo.dm
+++ b/code/modules/cargo/packs/ammo.dm
@@ -39,9 +39,8 @@
 /datum/supply_pack/ammo/a357_mag
 	name = ".357 Speedloader Crate"
 	desc = "Contains a .357 speedloader for revolvers,  containing seven rounds."
-	contains = list(/obj/item/ammo_box/a357,
-					/obj/item/ammo_box/a357)
-	cost = 1500
+	contains = list(/obj/item/ammo_box/a357)
+	cost = 750
 
 /datum/supply_pack/ammo/mag_556mm
 	name = "5.56 Pistole C Magazine Crate"
@@ -164,7 +163,7 @@
 
 /datum/supply_pack/ammo/a850r_ammo
 	name = "8x50mmR En Bloc Clip Crate"
-	desc = "Contains a 8x50mmR en bloc clips for rifles like the illestren rifle, containing five rounds."
+	desc = "Contains a 8x50mmR en bloc clip for rifles like the illestren rifle, containing five rounds."
 	contains = list(/obj/item/ammo_box/magazine/illestren_a850r)
 	cost = 250
 
@@ -182,7 +181,7 @@
 
 /datum/supply_pack/ammo/c45_ammo_box
 	name = ".45 Ammo Box Crate"
-	desc = "Contains a fifty-round .45 box for pistols and SMGs like the M1911 or the C-20r."
+	desc = "Contains a fifty-round .45 box for pistols and SMGs like the Candor or the C-20r."
 	contains = list(/obj/item/ammo_box/c45)
 	cost = 250
 
diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm
index 05fb2308702b4..8ed63f7cfb47f 100644
--- a/code/modules/cargo/packs/gun.dm
+++ b/code/modules/cargo/packs/gun.dm
@@ -62,7 +62,7 @@
 
 /datum/supply_pack/gun/laser
 	name = "Mini Energy Gun Crate"
-	desc = "Contains a small, versatile energy guns, capable of firing both nonlethal and lethal blasts, but with a limited power cell."
+	desc = "Contains a small, versatile energy gun, capable of firing both nonlethal and lethal blasts, but with a limited power cell."
 	cost = 500
 	contains = list(/obj/item/gun/energy/e_gun/mini)
 	crate_name = "laser crate"
@@ -89,14 +89,14 @@
 
 /datum/supply_pack/gun/hellfire_shotgun
 	name = "Hellfire Shotgun Crate"
-	desc = "For when you need to deal with 7 hooligans. Contains a pump shotguns, with a 8-round capacity."
+	desc = "For when you need to deal with 7 hooligans. Contains a pump shotgun, with a 8-round capacity."
 	cost = 2000
 	contains = list(/obj/item/gun/ballistic/shotgun/hellfire)
 	crate_name = "shotguns crate"
 
 /datum/supply_pack/gun/brimstone_shotgun
 	name = "Brimstone Shotgun Crate"
-	desc = "For when you need to deal with 5 hooligans, and QUICKLY. Contains a slamfire shotguns, with a 5-round capacity. Warranty voided if sawed off."
+	desc = "For when you need to deal with 5 hooligans, and QUICKLY. Contains a slamfire shotgun, with a 5-round capacity. Warranty voided if sawed off."
 	cost = 2000
 	contains = list(/obj/item/gun/ballistic/shotgun/brimstone)
 	crate_name = "shotguns crate"
@@ -107,21 +107,21 @@
 
 /datum/supply_pack/gun/winchester
 	name = "Flaming Arrow Lever Action Rifle Crate"
-	desc = "Contains a antiquated lever action rifles intended for hunting wildlife. Chambered in .38 rounds."
+	desc = "Contains a antiquated lever action rifle intended for hunting wildlife. Chambered in .38 rounds."
 	cost = 750
 	contains = list(/obj/item/gun/ballistic/shotgun/flamingarrow)
 	crate_name = "rifle crate"
 
 /datum/supply_pack/gun/cobra20
 	name = "Cobra-20 SMG Crate"
-	desc = "Contains a .45 submachine guns, manufactured by Scaraborough Arms and chambered in .45"
+	desc = "Contains a .45 submachine gun, manufactured by Scaraborough Arms and chambered in .45"
 	cost = 3000
 	contains = list(/obj/item/gun/ballistic/automatic/smg/c20r/cobra)
 	crate_name = "SMG crate"
 
 /datum/supply_pack/gun/illestren
 	name = "Illestren Rifle Crate"
-	desc = "Contains a expertly made bolt action rifles intended for hunting wildlife. Chambered in 8x50mmR rounds."
+	desc = "Contains a expertly made bolt action rifle intended for hunting wildlife. Chambered in 8x50mmR rounds."
 	cost = 1250
 	contains = list(/obj/item/gun/ballistic/rifle/illestren)
 	crate_name = "rifle crate"
@@ -135,14 +135,14 @@
 
 /datum/supply_pack/gun/p16
 	name = "P16 Assault Rifle Crate"
-	desc = "Contains a high-powered, automatic rifles chambered in 5.56mm."
+	desc = "Contains a high-powered, automatic rifle chambered in 5.56mm."
 	cost = 5000
 	contains = list(/obj/item/gun/ballistic/automatic/assault/p16)
 	crate_name = "auto rifle crate"
 
 /datum/supply_pack/gun/skm
 	name = "SKM-24 Rifle Crate"
-	desc = "Contains a high-powered, automatic rifles chambered in 7.62x40mm CLIP."
+	desc = "Contains a high-powered, automatic rifle chambered in 7.62x40mm CLIP."
 	cost = 5000
 	contains = list(/obj/item/gun/ballistic/automatic/assault/skm)
 	crate_name = "auto rifle crate"