Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes some cargo gun descriptions and lowers 38 ammo price. #2777

Merged
merged 13 commits into from
May 20, 2024
4 changes: 2 additions & 2 deletions code/modules/cargo/packs/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@

/datum/supply_pack/ammo/winchester_ammo
name = "Flaming Arrow and Detective Special .38 Ammo Boxes"
desc = "Contains a 30 round ammo boxes for refilling .38 weapons."
cost = 500
desc = "Contains two 50 round ammo boxes for refilling .38 weapons."
cost = 250
contains = list(/obj/item/ammo_box/c38_box,
/obj/item/ammo_box/c38_box)
crate_name = "ammo crate"
Expand Down
24 changes: 12 additions & 12 deletions code/modules/cargo/packs/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

/datum/supply_pack/gun/detrevolver
name = "Hunter's Pride Detective Revolver crate"
desc = "Contains a concealable Solarian revolver, chambered in .38."
desc = "Contains a concealable revolver, originally commissioned by Nanotrasen and produced by Hunter's Pride, chambered in .38."
cost = 1000
contains = list(/obj/item/gun/ballistic/revolver/detective)

Expand All @@ -60,9 +60,9 @@
contains = list(/obj/item/gun/energy/laser)
crate_name = "laser crate"

/datum/supply_pack/gun/laser
/datum/supply_pack/gun/miniegun
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"
Expand All @@ -89,39 +89,39 @@

/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 8 hooligans. Contains a pump shotgun, with a 8-round capacity."
cost = 2000
contains = list(/obj/item/gun/ballistic/shotgun/hellfire)
crate_name = "shotguns crate"
crate_name = "shotgun 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"
crate_name = "shotgun crate"

/*
Rifles
*/

/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 an 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."
Martinpachu marked this conversation as resolved.
Show resolved Hide resolved
cost = 1250
contains = list(/obj/item/gun/ballistic/rifle/illestren)
crate_name = "rifle crate"
Expand All @@ -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"
Expand Down
Loading