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

JSONify dermatiks and make the pregnancy and birth actually suck #75284

Merged
merged 49 commits into from
Aug 29, 2024
Merged

JSONify dermatiks and make the pregnancy and birth actually suck #75284

merged 49 commits into from
Aug 29, 2024

Commits on Jul 10, 2024

  1. I have no idea what I'm doing

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    995f9dd View commit details
    Browse the repository at this point in the history

  2. will it work? damn well hope so!

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    f7cb739 View commit details
    Browse the repository at this point in the history

  3. ew

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    2eec761 View commit details
    Browse the repository at this point in the history

  4. update the docs while you're at it

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    863dd16 View commit details
    Browse the repository at this point in the history

  5. clang tidy guide my hand

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    34022b4 View commit details
    Browse the repository at this point in the history

  6. effects and EoCs oh my 

    Co-Authored-By: Anton Simakov <[email protected]>
    @Karol1223 @GuardianDll
    Karol1223 and GuardianDll committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    5e8afc1 View commit details
    Browse the repository at this point in the history

  7. maybe now?

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    3367d6a View commit details
    Browse the repository at this point in the history

  8. Update monster_attacks.json

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    0832a55 View commit details
    Browse the repository at this point in the history

  9. EOC bonanza

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    68fd906 View commit details
    Browse the repository at this point in the history

  10. clang tidy my beloved

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    e193ca3 View commit details
    Browse the repository at this point in the history

  11. typos

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    1d3fa7e View commit details
    Browse the repository at this point in the history

  12. maybe maybe maybe?

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    327983c View commit details
    Browse the repository at this point in the history

  13. maaaaaaaaybe?

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    74d377c View commit details
    Browse the repository at this point in the history

  14. maaaaaaaaaaaybe?

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    6c7c1d2 View commit details
    Browse the repository at this point in the history

  15. file organizing apparently

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    43b1cce View commit details
    Browse the repository at this point in the history

  16. applying some review stuff

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    2e8a8be View commit details
    Browse the repository at this point in the history

  17. clangy

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    125b71a View commit details
    Browse the repository at this point in the history

  18. are we going somewhere?

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    8410fec View commit details
    Browse the repository at this point in the history

  19. syntax for nerds

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    5a30417 View commit details
    Browse the repository at this point in the history

  20. JSONize formication 

    EOCs all done by Guardian

Co-Authored-By: Anton Simakov <[email protected]>
    @Karol1223 @GuardianDll
    Karol1223 and GuardianDll committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    8b2a963 View commit details
    Browse the repository at this point in the history

  21. EOC ID naming scheme

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    8cdb41f View commit details
    Browse the repository at this point in the history

  22. Update data/json/monster_special_attacks/monster_attacks.json 

    Co-authored-by: Uwuewsky <[email protected]>
    @Karol1223 @Uwuewsky
    Karol1223 and Uwuewsky committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    f6e62af View commit details
    Browse the repository at this point in the history

  23. we live in a bracket hell

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    83d9ac5 View commit details
    Browse the repository at this point in the history

  24. what the fuck is this syntax

    @Karol1223
    Karol1223 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    82c1ab9 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2024

  1. Allow piercing armor to provide preggers protection

    @zachary-kaelan
    zachary-kaelan committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    43b3957 View commit details
    Browse the repository at this point in the history

  2. Add sad face from giving birth to giant insect parasites

    @zachary-kaelan
    zachary-kaelan committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    4235845 View commit details
    Browse the repository at this point in the history

  3. Make itchiness hardcoded once again, 'cause that's a lotta work

    @zachary-kaelan
    zachary-kaelan committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    fcc9f81 View commit details
    Browse the repository at this point in the history

  4. Add dermatik larva size counter and corresponding effects for it

    @zachary-kaelan
    zachary-kaelan committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    2816ede View commit details
    Browse the repository at this point in the history

  5. Add EOCs for larva itching and birth

    @zachary-kaelan
    zachary-kaelan committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    6dd74b3 View commit details
    Browse the repository at this point in the history

  6. Rename dermatik_pregnancy to dermatik_visible

    @zachary-kaelan
    zachary-kaelan committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    87051b5 View commit details
    Browse the repository at this point in the history

  7. Remove the debug messages

    @zachary-kaelan
    zachary-kaelan committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    a8171dc View commit details
    Browse the repository at this point in the history

  8. Change formication chance and duration from the values used for debug… 

    … purposes
    @zachary-kaelan
    zachary-kaelan committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    ce6043e View commit details
    Browse the repository at this point in the history

  9. Make the itchy witchy message bad

    @zachary-kaelan
    zachary-kaelan committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    a6f932e View commit details
    Browse the repository at this point in the history

  10. Nerd the thirst drain

    @zachary-kaelan
    zachary-kaelan committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    78086ab View commit details
    Browse the repository at this point in the history

  11. Buffed the hunger drain and added increased metabolism

    @zachary-kaelan
    zachary-kaelan committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    045b8bc View commit details
    Browse the repository at this point in the history

  12. Change morale message

    @zachary-kaelan
    zachary-kaelan committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    0058921 View commit details
    Browse the repository at this point in the history

  13. Remove morale effect

    @zachary-kaelan
    zachary-kaelan committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    120357a View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2024

  1. Remove morale type

    @zachary-kaelan
    zachary-kaelan committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    fddac63 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. Whoopsie doopsie, removed the activation

    @zachary-kaelan
    zachary-kaelan committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    b29e506 View commit details
    Browse the repository at this point in the history

  2. Adjust suck range so that all bleeding is heavy bleeding, and lose so… 

    …me redcells during "birth"
    @zachary-kaelan
    zachary-kaelan committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    2903164 View commit details
    Browse the repository at this point in the history

  3. Prevent regen of blood and redcells while carrying dermatik

    @zachary-kaelan
    zachary-kaelan committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    99f3f90 View commit details
    Browse the repository at this point in the history

  4. It's lintin' time

    @zachary-kaelan
    zachary-kaelan committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    9f993db View commit details
    Browse the repository at this point in the history

  5. It's lintin' time 2

    @zachary-kaelan
    zachary-kaelan committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    3a5986b View commit details
    Browse the repository at this point in the history

  6. It's astylin' time

    @zachary-kaelan
    zachary-kaelan committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    fd92861 View commit details
    Browse the repository at this point in the history

  7. It's lintin' time 3

    @zachary-kaelan
    zachary-kaelan committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    de49ad6 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. JSON styling

    @zachary-kaelan
    zachary-kaelan authored Jul 30, 2024
    Configuration menu
    Copy the full SHA
    52a1b55 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. Merge remote-tracking branch 'upstream/master' into dermadumb

    @zachary-kaelan
    zachary-kaelan committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    e18282b View commit details
    Browse the repository at this point in the history

  2. Remove dermatik attack code again

    @zachary-kaelan
    zachary-kaelan committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    52626eb View commit details
    Browse the repository at this point in the history

  3. Remove deadly blood drain

    @zachary-kaelan
    zachary-kaelan committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    f243b17 View commit details
    Browse the repository at this point in the history