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 @@ -76,8 +76,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
15 changes: 7 additions & 8 deletions code/modules/cargo/packs/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
name = "Stechkin Pistol Crate"
desc = "Contains a concealable stechkin pistol, produced by Scarborough Arms and chambered in 10mm."
cost = 1000
contains = list(/obj/item/gun/ballistic/automatic/pistol,
/obj/item/gun/ballistic/automatic/pistol)
contains = list(/obj/item/gun/ballistic/automatic/pistol)

/datum/supply_pack/gun/candors
name = "Candor Pistol Crate"
Expand Down Expand Up @@ -119,32 +118,32 @@

/datum/supply_pack/gun/hellfire_shotgun
name = "Hellfire Shotgun Crate"
desc = "For when you need to deal with 7 hooligans. Contains a pump shotgun, 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 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 rifle 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/illestren
name = "Illestren Rifle Crate"
desc = "Contains a expertly made bolt action rifle intended for hunting wildlife. Chambered in 8x50mmR rounds."
desc = "Contains an 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"
Expand All @@ -165,7 +164,7 @@

/datum/supply_pack/gun/cobra20
name = "Cobra-20 SMG Crate"
desc = "Contains a .45 submachine gun, manufactured by Scarborough 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"
Expand Down
Loading