Skip to content

Commit

Permalink
Makes the Cobra not just a better Mongrel (and fixes a typo) (shiptes…
Browse files Browse the repository at this point in the history
…t-ss13#3437)

<!-- 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
Reduces the size of the C-20r and Cobra-20's magazines to 24 rounds,
identical to the Mongrel. This also means you get two clean reloads out
of a box of .45 ammunition instead of having one mag and _almost_ a
second mag. Also, fixed the "civillian" typo in the cargo listings for
scarborough guns.

## Why It's Good For The Game

not getting two reloads out of a box is just plain irritating and also
the cobra shouldn't just be a mongrel but better

## Changelog

:cl:
balance: Reduced Cobra-20 magazine size to 24 rounds
fix: removed a typo from Scarborough cargo catalog entries
/: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. -->

---------

Co-authored-by: FalloutFalcon <[email protected]>
  • Loading branch information
2 people authored and zimon9 committed Oct 29, 2024
1 parent 8841c25 commit c9107f7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions code/modules/cargo/packs/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

/datum/supply_pack/gun/ringneck
name = "Ringneck Pistol Crate"
desc = "Contains a civillian variant of the Ringneck pistol, produced by Scarborough Arms and chambered in 10mm."
desc = "Contains a civilian variant of the Ringneck pistol, produced by Scarborough Arms and chambered in 10mm."
cost = 1000
contains = list(/obj/item/storage/pistolcase/ringneck)
faction = FACTION_SYNDICATE
Expand Down Expand Up @@ -66,7 +66,7 @@

/datum/supply_pack/gun/viperrevolver
name = "Viper-23 Revolver Crate"
desc = "Contains a a civillian variant of the Viper revolver, chambered in .357 magnum."
desc = "Contains a a civilian variant of the Viper revolver, chambered in .357 magnum."
cost = 2500
contains = list(/obj/item/storage/pistolcase/viper)

Expand Down Expand Up @@ -198,14 +198,14 @@

/datum/supply_pack/gun/boomslang90
name = "Boomslang-90 Rifle Crate"
desc = "Contains a civillian variant of the Boomslang Sniper rifle- modified with a 2x scope, rather than a sniper scope. Chambered in the powerful 6.5x57mm CLIP."
desc = "Contains a civilian variant of the Boomslang Sniper rifle- modified with a 2x scope, rather than a sniper scope. Chambered in the powerful 6.5x57mm CLIP."
cost = 5000
contains = list(/obj/item/storage/guncase/boomslang)
crate_name = "rifle crate"

/datum/supply_pack/gun/cobra20
name = "Cobra-20 SMG Crate"
desc = "Contains a civillian variant of the Cobra SMG, manufactured by Scaraborough Arms and chambered in .45"
desc = "Contains a civilian variant of the Cobra SMG, manufactured by Scaraborough Arms and chambered in .45"
cost = 3000
contains = list(/obj/item/storage/guncase/cobra)
crate_name = "SMG crate"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -421,12 +421,12 @@ EMPTY_GUN_HELPER(automatic/smg/cobra/indie)

/obj/item/ammo_box/magazine/m45_cobra
name = "Cobra magazine (.45)"
desc = "A 28-round magazine for the Cobra submachine gun. These rounds do moderate damage, but struggle against armor."
icon_state = "cobra_mag-28"
desc = "A 24-round magazine for the Cobra submachine gun. These rounds do moderate damage, but struggle against armor."
icon_state = "cobra_mag-24"
base_icon_state = "cobra_mag"
ammo_type = /obj/item/ammo_casing/c45
caliber = ".45"
max_ammo = 28
max_ammo = 24

/obj/item/ammo_box/magazine/m45_cobra/update_icon_state()
. = ..()
Expand Down
Binary file modified icons/obj/ammo.dmi
Binary file not shown.

0 comments on commit c9107f7

Please sign in to comment.