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

Gun-shy #76536

Merged
merged 14 commits into from
Sep 21, 2024
Merged

Gun-shy #76536

merged 14 commits into from
Sep 21, 2024
+32 −1

Commits on Sep 18, 2024

  1. Update mutations.json to add gunshy trait

    @Consoleable
    Consoleable committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    01706a3 View commit details
    Browse the repository at this point in the history

  2. Update turret.cpp for gunshy

    @Consoleable
    Consoleable committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    808dd2f View commit details
    Browse the repository at this point in the history

  3. Update ranged.cpp for gunshy

    @Consoleable
    Consoleable committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    41cece7 View commit details
    Browse the repository at this point in the history

  4. Update handle_action.cpp for gunshy

    @Consoleable
    Consoleable committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    ab5fded View commit details
    Browse the repository at this point in the history

  5. Update mutations.json adding gunshy

    @Consoleable
    Consoleable committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    a78d53d View commit details
    Browse the repository at this point in the history

  6. Update turret.cpp astyle fix

    @Consoleable
    Consoleable committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    7b72a91 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Update data/json/mutations/mutations.json 

    Co-authored-by: TheShadowFerret <[email protected]>
    @Consoleable @TheShadowFerret
    Consoleable and TheShadowFerret committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    594d705 View commit details
    Browse the repository at this point in the history

  2. Update mutations.json for description and mutual exclusivity

    @Consoleable
    Consoleable committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    d565753 View commit details
    Browse the repository at this point in the history

  3. Update data/json/mutations/mutations.json 

    Co-authored-by: Uwuewsky <[email protected]>
    @Consoleable @Uwuewsky
    Consoleable and Uwuewsky committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    328a430 View commit details
    Browse the repository at this point in the history

  4. Update mutations.json fixes style

    @Consoleable
    Consoleable committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    97bcab9 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'CleverRaven:master' into gunshy

    @Consoleable
    Consoleable committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    a687aa3 View commit details
    Browse the repository at this point in the history

  6. Update turret.cpp 

    checks if any turrets are firearms
    @Consoleable
    Consoleable committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    eada139 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'CleverRaven:master' into gunshy

    @Consoleable
    Consoleable committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    151f048 View commit details
    Browse the repository at this point in the history

  8. Update turret.cpp rollback turret checks

    @Consoleable
    Consoleable committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    ef449cb View commit details
    Browse the repository at this point in the history