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

Fix Schizophrenia #34267

Merged
merged 34 commits into from
Oct 3, 2019
Merged

Fix Schizophrenia #34267

merged 34 commits into from
Oct 3, 2019

Commits on Sep 27, 2019

  1. Fix schizophrenia 

    Allow various effects while holding a weapon.
    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    d18bc02 View commit details
    Browse the repository at this point in the history

  2. Buff schizophrenia point gain

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    ef20495 View commit details
    Browse the repository at this point in the history

  3. Add delusion snippets and grandiosity

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    54eb5eb View commit details
    Browse the repository at this point in the history

  4. Update src/player.cpp 

    Co-Authored-By: BevapDin <tho_ki@gmx.de>
    @zachary-kaelan @BevapDin
    zachary-kaelan and BevapDin committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    b513a17 View commit details
    Browse the repository at this point in the history

  5. Create snippets file and add schizo_self_talk category

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    3843bca View commit details
    Browse the repository at this point in the history

  6. Convert broken limb and talk to self to use snippets

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    cd25684 View commit details
    Browse the repository at this point in the history

  7. Add broken_limb snippet category to health_msgs

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    a7590a0 View commit details
    Browse the repository at this point in the history

  8. Add schizo_weapon_talk snippet categories

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    644f142 View commit details
    Browse the repository at this point in the history

  9. Convert weapon hallucinations to use snippets

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    0be5de2 View commit details
    Browse the repository at this point in the history

  10. Add schizo_delusion snippet categories

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    f2cc049 View commit details
    Browse the repository at this point in the history

  11. Convert delusions to use snippets and rebalance morale

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    b3be028 View commit details
    Browse the repository at this point in the history

  12. Make thorazine actually useful and realistic, and remove formication … 

    …apply message
    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    630ac2c View commit details
    Browse the repository at this point in the history

  13. Revert "Make thorazine actually useful and realistic, and remove form… 

    …ication apply message"

This reverts commit 630ac2c.
    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    51dd886 View commit details
    Browse the repository at this point in the history

  14. Make thorazine actually useful and realistic

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    da94713 View commit details
    Browse the repository at this point in the history

  15. Add schizo_formication snippet category

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    007e717 View commit details
    Browse the repository at this point in the history

  16. Convert formication to use snippets, and make numbers less harsh

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    50f8e70 View commit details
    Browse the repository at this point in the history

  17. Add schizo_self_shout snippet category

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    21e649d View commit details
    Browse the repository at this point in the history

  18. Convert self shout to work with snippets

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    68306d1 View commit details
    Browse the repository at this point in the history

  19. Make valium prevent schizophrenia shakes

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    27d08bc View commit details
    Browse the repository at this point in the history

  20. Add schizo_weapon_drop snippet category

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    c3cc8b9 View commit details
    Browse the repository at this point in the history

  21. Convert weapon drop to work with snippets, and move up done_effect fo… 

    …r future effects
    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    f890419 View commit details
    Browse the repository at this point in the history

  22. Remove broken_limb snippet category from health_msgs

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    52dced1 View commit details
    Browse the repository at this point in the history

  23. Add broken_limb snippet category

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    f318ec0 View commit details
    Browse the repository at this point in the history

  24. Add shout translation support 

    Co-Authored-By: BevapDin <tho_ki@gmx.de>
    @zachary-kaelan @BevapDin
    zachary-kaelan and BevapDin committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    2973503 View commit details
    Browse the repository at this point in the history

  25. Remove extra comma

    @zachary-kaelan
    zachary-kaelan committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    be8202b View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2019

  1. Fix delusion snips and formatting

    @zachary-kaelan
    zachary-kaelan committed Sep 28, 2019
    Configuration menu
    Copy the full SHA
    464311d View commit details
    Browse the repository at this point in the history

  2. Add starting thorazine for schizophrenic trait

    @zachary-kaelan
    zachary-kaelan committed Sep 28, 2019
    Configuration menu
    Copy the full SHA
    f1e765c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'patch-1' of https://github.com/zachary-kaelan/Cataclysm… 

    …-DDA into patch-1
    @zachary-kaelan
    zachary-kaelan committed Sep 28, 2019
    Configuration menu
    Copy the full SHA
    3cf0d8e View commit details
    Browse the repository at this point in the history

  4. Linted schizophrenia.json

    @zachary-kaelan
    zachary-kaelan committed Sep 28, 2019
    Configuration menu
    Copy the full SHA
    59ae00d View commit details
    Browse the repository at this point in the history

  5. Lint effects.json

    @zachary-kaelan
    zachary-kaelan committed Sep 28, 2019
    Configuration menu
    Copy the full SHA
    b345e07 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2019

  1. RNG styling issue 

    Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
    @zachary-kaelan @ZhilkinSerg
    zachary-kaelan and ZhilkinSerg committed Oct 1, 2019
    Configuration menu
    Copy the full SHA
    ac458da View commit details
    Browse the repository at this point in the history

  2. Astyle format

    @zachary-kaelan
    zachary-kaelan committed Oct 1, 2019
    Configuration menu
    Copy the full SHA
    293524a View commit details
    Browse the repository at this point in the history

  3. Astyle merge

    @zachary-kaelan
    zachary-kaelan committed Oct 1, 2019
    Configuration menu
    Copy the full SHA
    5c29828 View commit details
    Browse the repository at this point in the history

  4. Astyle, again

    @zachary-kaelan
    zachary-kaelan committed Oct 1, 2019
    Configuration menu
    Copy the full SHA
    a35dcf0 View commit details
    Browse the repository at this point in the history