Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: CleverRaven/Cataclysm-DDA
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cdda-experimental-2024-07-09-1354
Choose a base ref
...
head repository: CleverRaven/Cataclysm-DDA
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cdda-experimental-2024-07-09-1636
Choose a head ref
  • 8 commits
  • 16 files changed
  • 6 contributors

Commits on Jul 9, 2024

  1. add missing threshes to NECC blacklist

    @anoobindisguise
    anoobindisguise authored Jul 9, 2024
    Configuration menu
    Copy the full SHA
    90c280d View commit details
    Browse the repository at this point in the history

  2. Audit Carnivore for items with volumes indivisible by 50ml (#74888) 

    * Audit Carnivore for items with volumes indivisible by 50ml

* weight adjustments

* Update data/json/items/comestibles/carnivore.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update carnivore.json

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    @Maleclypse @github-actions
    Maleclypse and github-actions[bot] authored Jul 9, 2024
    Configuration menu
    Copy the full SHA
    2bff1b7 View commit details
    Browse the repository at this point in the history

  3. Trap fixes and cyborg species fix (#74943) 

    * Trap fixes

* Update traps.json

* Update traps.json

* Update traps.json

* Move to correct folder

* Update data/mods/Xedra_Evolved/traps.json

* Update data/mods/Xedra_Evolved/traps.json

* Update data/mods/Xedra_Evolved/traps.json
    @Maleclypse
    Maleclypse authored Jul 9, 2024
    Configuration menu
    Copy the full SHA
    2796035 View commit details
    Browse the repository at this point in the history

  4. Main commit (#74935)

    @Holli-Git
    Holli-Git authored Jul 9, 2024
    Configuration menu
    Copy the full SHA
    1017476 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #74959 from anoobindisguise/patch-44 

    add missing threshes to NECC blacklist
    @Maleclypse
    Maleclypse authored Jul 9, 2024
    Configuration menu
    Copy the full SHA
    ce18429 View commit details
    Browse the repository at this point in the history

  6. [Xedra Evolved] Paraclesian fae cannot wield items made of steel or i… 

    …ron without problems (except Homullus) (#74956)

* Initial commit

* add moon's tears weapon
    @Standing-Storm
    Standing-Storm authored Jul 9, 2024
    Configuration menu
    Copy the full SHA
    00c66c8 View commit details
    Browse the repository at this point in the history

  7. [Magiclysm] Druid's Nature's Communion morale scales (#74954) 

    * Initial commit

* u_remove -> u_lose
    @Standing-Storm
    Standing-Storm authored Jul 9, 2024
    Configuration menu
    Copy the full SHA
    9465a50 View commit details
    Browse the repository at this point in the history

  8. more monster balance documentation (#73881) 

    * armor balance doc

* Update GAME_BALANCE.md

* some progress on vision

* finish vision doc

* melee dice

* aggression

* 10 means murder
    @LyleSY
    LyleSY authored Jul 9, 2024
    Configuration menu
    Copy the full SHA
    c57cd28 View commit details
    Browse the repository at this point in the history
Loading