Skip to content

Commit

Permalink
Fixes some cargo gun descriptions and lowers 38 ammo price. (#2777)
Browse files Browse the repository at this point in the history
<!-- 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

As the name says.

## Why It's Good For The Game

38 Special is supposed to be the cheapest ammo, doing the same damage as
9mm rounds and has guns either with low ammo capacity, or that need to
be pumped after every shot. Also i fucked some things up in my last PR.
sorry. sorry. im so stupid. dont hit me with the tail.

## Changelog

:cl:
balance: .38 ammo boxes are cheaper.
spellcheck: Fixed some cargo gun descriptions.
fix: Fixed an issue regarding multiple stechkin pistols in a singular
cargo pack.
: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. -->

---------

Signed-off-by: Martinpachu <[email protected]>
Co-authored-by: Mark Suckerberg <[email protected]>
Co-authored-by: Theos <[email protected]>
  • Loading branch information
3 people authored May 20, 2024
1 parent de068bd commit b898359
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
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

0 comments on commit b898359

Please sign in to comment.