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.

Sign up for GitHub

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

Jump to bottom

Adds post-apoc prices to all melee weapons (part 4 of reworking all prices) #39336

Merged
merged 5 commits into from
Apr 8, 2020
Merged

Adds post-apoc prices to all melee weapons (part 4 of reworking all prices) #39336

merged 5 commits into from
Apr 8, 2020

Commits on Apr 7, 2020

  1. Melee weapon prices

    @Brian-Otten
    Brian-Otten committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    df3bb77 View commit details
    Browse the repository at this point in the history

  2. Remove duplicate prices

    @Brian-Otten
    Brian-Otten committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    781bb68 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2020

  1. Update data/json/items/melee/swords_and_blades.json

    @kevingranade
    kevingranade authored Apr 8, 2020
    Configuration menu
    Copy the full SHA
    48ae93f View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review

    @kevingranade
    kevingranade authored Apr 8, 2020
    Configuration menu
    Copy the full SHA
    06c689c View commit details
    Browse the repository at this point in the history

  3. Merge conflicts

    @Brian-Otten
    Brian-Otten committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    2359b11 View commit details
    Browse the repository at this point in the history