Skip to content

Commit

Permalink
Finishes The Ballistic Rework (#2176)
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
Finishes #1493 
From the previous PR:
HOW CARTRIDGES ARE BALANCED:

Lower-velocity cartridges like pistol and shotgun rounds now have a
default penalty to AP power. As velocity increases, AP increases
substantially and damage increases slightly. Hollowpoint and AP round
variants modify that base AP further, with AP handgun bullets having
lower AP than AP rifle bullets.

    Shotgun & Handgun: -20 AP
    PDW: 0 AP
    Assault Rifle, LMG: 20 AP
    Rifle: 40 AP
    Shotgun: -35 AP pellets, -10 AP slugs

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Also from the previous PR:
Ballistic cartridges should be distinguished by traits other than just
raw damage. By using AP to distinguish ballistic weapon classes, they
now have more distinct use cases. Additionally, low-AP weapons like
handguns and shotguns remain useful against simple mobs but drop off
significantly in effectiveness against well-armored players, meaning
there's more reason to seek out specialized ammo types or higher-caliber
weapons than just damage output. The lower raw damage of rifle-caliber
weapons also means they are a much more viable choice for roundstart
placement in ships, leading to more loadout diversity.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl: Apogee, Erika, Imaginos
add: transferring bullets from magazine to magazine now has a do_after
and loops.
add: Ammo magazines are now purchasable at the outpost
add: P16s, SVG-whatevers, Bolt-Action Rifles, and .357 revolvers are now
available for purchase at the outpost
del: Removed paywall and clown firing pins from purchase.
balance: AP Values have been tweaked across the board (On guns at
least), smaller cartridges tend to penetrate less, while larger ones
penetrate more.
imageadd: New bullet sprites (I believe they're apogee's), and new ammo
box sprites by Imaginos
/: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: Apogee <[email protected]>
Co-authored-by: Imaginos16 <[email protected]>
  • Loading branch information
3 people authored Aug 18, 2023
1 parent 9cbfd04 commit 6d8a070
Show file tree
Hide file tree
Showing 54 changed files with 3,997 additions and 3,768 deletions.
2,690 changes: 1,345 additions & 1,345 deletions _maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm

Large diffs are not rendered by default.

2,904 changes: 1,466 additions & 1,438 deletions _maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions _maps/shuttles/shiptest/independent_dwayne.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1654,10 +1654,9 @@
/obj/item/kinetic_crusher,
/obj/effect/turf_decal/box,
/obj/item/vending_refill/mining_equipment,
/obj/item/ammo_box/c38_box/hunting,
/obj/item/ammo_box/c38_box/hunting,
/obj/item/ammo_box/c38_box,
/obj/item/disk/design_disk/ammo_38_hunting,
/obj/item/ammo_box/c38_box,
/obj/item/ammo_box/c38_box,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
Expand Down
Loading

0 comments on commit 6d8a070

Please sign in to comment.