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

merge conflicts #7

Merged
merged 252 commits into from
Mar 15, 2022
Merged

merge conflicts #7

merged 252 commits into from
Mar 15, 2022
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Mar 1, 2022

  1. Update src/character_attire.cpp 

    Co-authored-by: akrieger <[email protected]>
    @KorGgenT @akrieger
    KorGgenT and akrieger authored Mar 1, 2022
    Configuration menu
    Copy the full SHA
    9356b97 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2022

  1. Fix bow_stabilizer_set

    Matthew Taylor committed Mar 4, 2022
    Configuration menu
    Copy the full SHA
    89122db View commit details
    Browse the repository at this point in the history

  2. Bring back millability of cattail rhizomes

    @DanielVartanov
    DanielVartanov committed Mar 4, 2022
    Configuration menu
    Copy the full SHA
    25a1996 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2022

  1. Remove redundant parentheses in item_contents.cpp (#55817)

    @BrettDong
    BrettDong authored Mar 5, 2022
    Configuration menu
    Copy the full SHA
    3f48036 View commit details
    Browse the repository at this point in the history

  2. Fix syntax error in pull request labeller workflow (#55818)

    @BrettDong
    BrettDong authored Mar 5, 2022
    Configuration menu
    Copy the full SHA
    158330a View commit details
    Browse the repository at this point in the history

  3. fixed odd question mark

    @bombasticSlacks
    bombasticSlacks committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    55609b9 View commit details
    Browse the repository at this point in the history

  4. Routine i18n updates on 05 March 2022

    @BrettDong
    BrettDong committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    4d8f8aa View commit details
    Browse the repository at this point in the history

  5. fix: label bot uses existing labels 

    so it knows how to use existing labels, however it does it when it feels
like it apparently, 'cause it just made new labels when I tested it in
my repo
    @casswedson
    casswedson committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    edf5060 View commit details
    Browse the repository at this point in the history

  6. fix: minor edit to rubik's '**' use 

    make all occurrences of '**' in rubik's dialogue similar to each other
    @casswedson
    casswedson committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    bf39712 View commit details
    Browse the repository at this point in the history

  7. fix: don't remove stuff pls

    @casswedson
    casswedson committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    411d137 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into use-old-labels

    @casswedson
    casswedson authored Mar 5, 2022
    Configuration menu
    Copy the full SHA
    d1e3846 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #55814 from DanielVartanov/bring-back-rhizome-milling 

    Restore millability of cattail rhizomes which was accidentally removed some time ago
    @Rivet-the-Zombie
    Rivet-the-Zombie authored Mar 5, 2022
    Configuration menu
    Copy the full SHA
    bd61d70 View commit details
    Browse the repository at this point in the history

  10. Add context to Fior Di Battaglia book

    @Faalagorn
    Faalagorn authored Mar 5, 2022
    Configuration menu
    Copy the full SHA
    b202c3b View commit details
    Browse the repository at this point in the history

  11. Aluminium → Aluminum

    @Faalagorn
    Faalagorn authored Mar 5, 2022
    Configuration menu
    Copy the full SHA
    b3e0b6f View commit details
    Browse the repository at this point in the history

  12. Add comma

    @Faalagorn
    Faalagorn authored Mar 5, 2022
    Configuration menu
    Copy the full SHA
    eb678f9 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA … 

    …into pr/52741
    @bombasticSlacks
    bombasticSlacks committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    4c6fedb View commit details
    Browse the repository at this point in the history

  14. Remove extra space

    @Faalagorn
    Faalagorn authored Mar 5, 2022
    Configuration menu
    Copy the full SHA
    acabd73 View commit details
    Browse the repository at this point in the history

  15. Holster iteration, worn shoe fixes, not selecting hands for weapon

    @bombasticSlacks
    bombasticSlacks committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    9a24e60 View commit details
    Browse the repository at this point in the history

  16. Update traps.json

    @Faalagorn
    Faalagorn authored Mar 5, 2022
    Configuration menu
    Copy the full SHA
    4dc1bce View commit details
    Browse the repository at this point in the history

  17. Update legacy_artifact_active.json

    @Faalagorn
    Faalagorn authored Mar 5, 2022
    Configuration menu
    Copy the full SHA
    2a325c1 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2022

  1. Change _ to space

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    64d5eb5 View commit details
    Browse the repository at this point in the history

  2. Carbon → carbon

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    7a947b0 View commit details
    Browse the repository at this point in the history

  3. magnum → Magnum

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    6033588 View commit details
    Browse the repository at this point in the history

  4. composition b → composition B

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    9de4f2a View commit details
    Browse the repository at this point in the history

  5. Update flask_glass description to match test_tube

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    5abca11 View commit details
    Browse the repository at this point in the history

  6. foodplace → Foodplace

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    ab542a6 View commit details
    Browse the repository at this point in the history

  7. Remove double disarmed

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    94351e4 View commit details
    Browse the repository at this point in the history

  8. pedals → petals

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    8af67f7 View commit details
    Browse the repository at this point in the history

  9. missed mutation damage, added option to sort to wear for debug purpos… 

    …es, moved worn to top not all (which is what it was before)
    @bombasticSlacks
    bombasticSlacks committed Mar 6, 2022
    Configuration menu
    Copy the full SHA
    0a0f851 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #181 from bombasticSlacks/My-version-worn-wrapper 

    My version worn wrapper
    @KorGgenT
    KorGgenT authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    62a16d3 View commit details
    Browse the repository at this point in the history

  11. claaaaaaaaaaaaaaaaang

    @bombasticSlacks
    bombasticSlacks committed Mar 6, 2022
    Configuration menu
    Copy the full SHA
    4d02375 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #182 from bombasticSlacks/My-version-worn-wrapper 

    claaaaaaaaaaaaaaaaang
    @KorGgenT
    KorGgenT authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    d8f27ba View commit details
    Browse the repository at this point in the history

  13. maybe

    @bombasticSlacks
    bombasticSlacks committed Mar 6, 2022
    Configuration menu
    Copy the full SHA
    845053d View commit details
    Browse the repository at this point in the history

  14. Merge pull request #183 from bombasticSlacks/My-version-worn-wrapper 

    Maybe this will work
    @KorGgenT
    KorGgenT authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    23afa85 View commit details
    Browse the repository at this point in the history

  15. Clang two return of the Clang

    @bombasticSlacks
    bombasticSlacks committed Mar 6, 2022
    Configuration menu
    Copy the full SHA
    657d38d View commit details
    Browse the repository at this point in the history

  16. Merge pull request #184 from bombasticSlacks/My-version-worn-wrapper 

    Clang 2 electric boogaloo
    @KorGgenT
    KorGgenT authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    c5f46b5 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #55858 from Faalagorn/patch-18 

    composition b → composition B
    @Rivet-the-Zombie
    Rivet-the-Zombie authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    cc9ccc4 View commit details
    Browse the repository at this point in the history

  18. Clean up itemgroups for mutagens in CRIT

    @Arokha
    Arokha committed Mar 6, 2022
    Configuration menu
    Copy the full SHA
    896e29e View commit details
    Browse the repository at this point in the history

  19. Remove double full stop

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    873c84b View commit details
    Browse the repository at this point in the history

  20. Change Aftershock fire modes to follow other

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    3ac5961 View commit details
    Browse the repository at this point in the history

  21. Remove double space from pair of santa gloves desc

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    a43a4af View commit details
    Browse the repository at this point in the history

  22. Add full stops to two exoskeletom descriptions

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    7355f58 View commit details
    Browse the repository at this point in the history

  23. Fix plural for a loose gameson vest

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    1ca7a1d View commit details
    Browse the repository at this point in the history

  24. Add missing full stop to plastic_straw

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    96dde5f View commit details
    Browse the repository at this point in the history

  25. Add full stop to walther_p22 description

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    4ee4aba View commit details
    Browse the repository at this point in the history

  26. M1991 → M1911

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    07e119d View commit details
    Browse the repository at this point in the history

  27. Remove _ from a visible item

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    ffbc9be View commit details
    Browse the repository at this point in the history

  28. SPAS 12 → SPAS-12

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    caf4783 View commit details
    Browse the repository at this point in the history

  29. picatinny → Picatinny

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    f7def20 View commit details
    Browse the repository at this point in the history

  30. Remove extra space

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    c3bcb01 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2022

  1. Automatically post a warning comment when translation files are changed

    @Qrox
    Qrox committed Mar 7, 2022
    Configuration menu
    Copy the full SHA
    b055ef9 View commit details
    Browse the repository at this point in the history

  2. Update grave.json (#55810)

    @Maleclypse
    Maleclypse authored Mar 7, 2022
    Configuration menu
    Copy the full SHA
    fd0520e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #55901 from Faalagorn/patch-38 

    Remove extra space
    @Rivet-the-Zombie
    Rivet-the-Zombie authored Mar 7, 2022
    Configuration menu
    Copy the full SHA
    48260d3 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #55828 from casswedson/use-old-labels 

    fix: label bot uses existing labels
    @kevingranade
    kevingranade authored Mar 7, 2022
    Configuration menu
    Copy the full SHA
    15d894d View commit details
    Browse the repository at this point in the history

  5. Fixed mix up of requirements for fish traps

    merrygin committed Mar 7, 2022
    Configuration menu
    Copy the full SHA
    940f742 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2022

  1. wrong non_functional

    @bombasticSlacks
    bombasticSlacks committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    8554d0c View commit details
    Browse the repository at this point in the history

  2. fix typo in football hobby description

    @nornagon
    nornagon authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    9c02c1e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #55933 from merrygin/fish-trap-fix 

    Fixed mix up of requirements for fish traps
    @Rivet-the-Zombie
    Rivet-the-Zombie authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    8150729 View commit details
    Browse the repository at this point in the history

  4. Consistently spell bubble wrap

    @haveric
    haveric committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    7fa7586 View commit details
    Browse the repository at this point in the history

  5. [DinoMod] readable name colors (#55869)

    @LyleSY
    LyleSY authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    debe92d View commit details
    Browse the repository at this point in the history

  6. goat (#55870) 

    Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>
    @LyleSY @Qrox
    LyleSY and Qrox authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    1954c2b View commit details
    Browse the repository at this point in the history

  7. Merge pull request #55861 from Faalagorn/patch-21 

    foodplace → Foodplace
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    99c0bc2 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #55862 from Faalagorn/patch-23 

    Remove double disarmed
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    2c82756 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #55863 from Faalagorn/patch-22 

    pedals → petals
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    29f8584 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #55875 from Faalagorn/patch-18 

    Remove double full stop
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    cd08390 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #55879 from Faalagorn/patch-24 

    Change Aftershock fire modes to follow other
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    f43b3d2 View commit details
    Browse the repository at this point in the history

  12. denatonuim → denatonium (#55860)

    @Faalagorn
    Faalagorn authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    8d4b6a7 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #55880 from Faalagorn/patch-25 

    Remove double space from pair of santa gloves desc
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    d4d4c10 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #55881 from Faalagorn/patch-26 

    Add full stops to two exoskeletom descriptions
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    1f6e7d5 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #55883 from Faalagorn/patch-27 

    Fix plural for a loose gameson vest
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    bba473c View commit details
    Browse the repository at this point in the history

  16. Merge pull request #55857 from Faalagorn/patch-17 

    magnum → Magnum
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    151973d View commit details
    Browse the repository at this point in the history

  17. Merge pull request #55834 from Faalagorn/patch-2 

    Aluminium → Aluminum
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    63f842c View commit details
    Browse the repository at this point in the history

  18. Update help to match the current game state (#55837)

    @Faalagorn
    Faalagorn authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    a09f8b6 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #55839 from Faalagorn/patch-7 

    Add comma to a sentence
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    79e6c51 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #55851 from Faalagorn/patch-11 

    Update traps.json
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    6580e37 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #55853 from Faalagorn/patch-13 

    Update legacy_artifact_active.json
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    48a203f View commit details
    Browse the repository at this point in the history

  22. Merge pull request #55835 from Faalagorn/patch-1 

    Add context to Fior Di Battaglia book
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    eb3f875 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #55856 from Faalagorn/patch-16 

    Carbon → carbon
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    1580f08 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #55889 from Faalagorn/patch-30 

    Add full stop to `plastic_straw` description
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    7dd9522 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #55890 from Faalagorn/patch-31 

    Add full stop to `walther_p22` description
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    18be42b View commit details
    Browse the repository at this point in the history

  26. Merge pull request #55895 from Faalagorn/patch-33 

    M1991 → M1911
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    da92f5e View commit details
    Browse the repository at this point in the history

  27. Merge pull request #55849 from Faalagorn/patch-10 

    Remove extra space from technique description
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    96bc714 View commit details
    Browse the repository at this point in the history

  28. Merge pull request #55854 from Faalagorn/patch-14 

    Change _ to space
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    29e6e4b View commit details
    Browse the repository at this point in the history

  29. Merge pull request #55898 from Faalagorn/patch-35 

    SPAS 12 → SPAS-12
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    84c9061 View commit details
    Browse the repository at this point in the history

  30. Merge pull request #55873 from Arokha/crtigclean 

    Clean up itemgroups for mutagens in CRIT
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    214f1ec View commit details
    Browse the repository at this point in the history

  31. Innert -> Inert (#55731) 

    Co-authored-by: Kevin Granade <[email protected]>
    @ccaviness @kevingranade
    ccaviness and kevingranade authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    600c896 View commit details
    Browse the repository at this point in the history

  32. Merge pull request #55825 from CleverRaven/i18n 

    Routine i18n updates on 05 March 2022
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    960fe0a View commit details
    Browse the repository at this point in the history

  33. Merge pull request #55827 from casswedson/minor-rubik-edit 

    fix: minor edit to rubik's '**' use
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    96e86ce View commit details
    Browse the repository at this point in the history

  34. Merge pull request #55948 from haveric/bubble-wrap 

    Consistently spell bubble wrap
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    bcb0477 View commit details
    Browse the repository at this point in the history

  35. Merge pull request #55946 from nornagon/patch-13 

    fix typo in football hobby description
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    0e3739b View commit details
    Browse the repository at this point in the history

  36. Merge pull request #55922 from Qrox/po 

    Automatically post a warning comment when translation files are changed
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    c54807e View commit details
    Browse the repository at this point in the history

  37. Improves Innawood, Aftershock, and Magiclysm interactions with flags (#… 

    …55906)
    @Light-Wave
    Light-Wave authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    f48ce91 View commit details
    Browse the repository at this point in the history

  38. Merge pull request #55899 from Faalagorn/patch-36 

    picatinny → Picatinny
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    881e7fd View commit details
    Browse the repository at this point in the history

  39. Merge pull request #55897 from Faalagorn/patch-34 

    Remove _ from a visible item
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    e3c2544 View commit details
    Browse the repository at this point in the history

  40. Fix the double definition bug (#55938)

    @Inglonias
    Inglonias authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    fa7b1ca View commit details
    Browse the repository at this point in the history

  41. Merge pull request #55942 from bombasticSlacks/migo-plates-fix 

    fix wrong non_functional for one of the migo plates
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    248afbf View commit details
    Browse the repository at this point in the history

  42. Fix double space between Mrs. Claus (#55884) 

    Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>
    @Faalagorn @Qrox
    Faalagorn and Qrox authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    bd2764b View commit details
    Browse the repository at this point in the history

  43. Merge pull request #55859 from Faalagorn/patch-19 

    Update flask_glass description to match test_tube
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    650d22c View commit details
    Browse the repository at this point in the history

  44. Merge pull request #55824 from bombasticSlacks/typofix 

    fixed odd question mark
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    ca02317 View commit details
    Browse the repository at this point in the history

  45. Merge pull request #55813 from ymber/stabilizers 

    Fix bow_stabilizer_set
    @ZhilkinSerg
    ZhilkinSerg authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    6e70cbe View commit details
    Browse the repository at this point in the history

  46. Spelling fixes (#55748)

    @vulpivia
    vulpivia authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    b6afc5a View commit details
    Browse the repository at this point in the history

  47. Recover oxygen over time when character can breathe

    @dseguin
    dseguin committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    8b526a2 View commit details
    Browse the repository at this point in the history

  48. Oxygen depletion unit tests

    @dseguin
    dseguin committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    a1884bc View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2022

  1. Sounds: add "indoor" and "night" fields for sound effects

    @dseguin
    dseguin committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    1a46a4d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #52741 from KorGgenT/worn-wrapper 

    Create a new wrapper class for worn items
    @kevingranade
    kevingranade authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    a1802d1 View commit details
    Browse the repository at this point in the history

  3. Merge adjacent wires and improve wire handling (#55218) 

    * Tag wiring as an appliance to ensure correct interaction menu
* Add max vehicle size for merged wires

Co-authored-by: Joshua Booth <[email protected]>
Co-authored-by: Kevin Granade <[email protected]>
    @Xenoamor @kevingranade
    3 people authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    b8428db View commit details
    Browse the repository at this point in the history

  4. Revise Fire drills (#55589)

    @oosyrag
    oosyrag authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    e4af8a3 View commit details
    Browse the repository at this point in the history

  5. Add nuts and bolts (#55649) 

    Co-authored-by: Kevin Granade <[email protected]>
    @Drew4484 @kevingranade
    Drew4484 and kevingranade authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    69b17b4 View commit details
    Browse the repository at this point in the history

  6. Fixed several errors in Hub 01 mapgen (port from BN) (#55715)

    @Night-Pryanik
    Night-Pryanik authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    d5e53ed View commit details
    Browse the repository at this point in the history

  7. Sounds: refactor/optimize sound effect search pattern

    @dseguin
    dseguin committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    b6d3b7f View commit details
    Browse the repository at this point in the history

  8. Migrate ACT_GUNMOD_ADD to the new activity actor system. (#55722)

    @ahmedcharles
    ahmedcharles authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    75f6658 View commit details
    Browse the repository at this point in the history

  9. Better dialog message variable handling (#55775) 

    Co-authored-by: Kevin Granade <[email protected]>
    @Ramza13 @kevingranade
    Ramza13 and kevingranade authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    08f7884 View commit details
    Browse the repository at this point in the history

  10. Fix appliance construction errors with debug hammerspace (#55811) 

    * Fix appliance construction errors with debug hammerspace

* Rename `is_app` variable

Co-authored-by: Zhilkin Serg <[email protected]>
    @dseguin @ZhilkinSerg
    dseguin and ZhilkinSerg authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    97843a3 View commit details
    Browse the repository at this point in the history

  11. Sounds: update documentation

    @dseguin
    dseguin committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    679ad63 View commit details
    Browse the repository at this point in the history

  12. Added multiple camp construction workers (#55816)

    @PatrikLundell
    PatrikLundell authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    7354e9d View commit details
    Browse the repository at this point in the history

  13. Merge pull request #55949 from dseguin/inc_oxygen 

    Recover oxygen over time
    @Rivet-the-Zombie
    Rivet-the-Zombie authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    195706c View commit details
    Browse the repository at this point in the history

  14. Code for ammo requiring melee techniques (#55820)

    @bombasticSlacks
    bombasticSlacks authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    b41e49c View commit details
    Browse the repository at this point in the history

  15. Small AFS bugfixes (#55831)

    @Maleclypse
    Maleclypse authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    970a508 View commit details
    Browse the repository at this point in the history

  16. Update mateirals to consistently use title case (#55836)

    @Faalagorn
    Faalagorn authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    e98a360 View commit details
    Browse the repository at this point in the history

  17. Whilst active → While active (#55844) 

    * Whilst → While

* Whilst → While
    @Faalagorn
    Faalagorn authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    e072465 View commit details
    Browse the repository at this point in the history

  18. Update feature_request.yaml (#55845) 

    "Suggest an idea or this project" lets add an f there.
    @Meandering-Breviger
    Meandering-Breviger authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    abb72ee View commit details
    Browse the repository at this point in the history

  19. Add ALLOWS_TALONS to RAP_TALONS (#55846)

    @Arokha
    Arokha authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    7c625ef View commit details
    Browse the repository at this point in the history

  20. Exodii cross faction gear (#55806) 

    Co-authored-by: Kevin Granade <[email protected]>
    @bombasticSlacks @kevingranade
    bombasticSlacks and kevingranade authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    0d887c2 View commit details
    Browse the repository at this point in the history

  21. Update effects.json (#55848)

    @Faalagorn
    Faalagorn authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    28c7101 View commit details
    Browse the repository at this point in the history

  22. Update altered_object_active.json (#55852)

    @Faalagorn
    Faalagorn authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    05ba5e3 View commit details
    Browse the repository at this point in the history

  23. Red → red (#55855)

    @Faalagorn
    Faalagorn authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    06a2cb0 View commit details
    Browse the repository at this point in the history

  24. More Metal Armor Updates (#55865) 

    * Adds block while worn
* Junk chain
    @Drew4484
    Drew4484 authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    39cd2e8 View commit details
    Browse the repository at this point in the history

  25. Remove obsolete and unusable Graphical Overmap mods (#55887)

    @AriaMoradi
    AriaMoradi authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    67dbaeb View commit details
    Browse the repository at this point in the history

  26. Add [ "HAMMER", 1 ] quality to mortar&pestle (#55888)

    @DanielVartanov
    DanielVartanov authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    c460657 View commit details
    Browse the repository at this point in the history

  27. Prioritize parent pocket: Add pocket selection tests

    @dseguin
    dseguin committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    052d92a View commit details
    Browse the repository at this point in the history

  28. Prioritize parent pocket: Deprioritize nested pockets

    @dseguin
    dseguin committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    878a987 View commit details
    Browse the repository at this point in the history

  29. Prioritize parent pocket: Ignore pocket settings on manual pickup

    @dseguin
    dseguin committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    abad588 View commit details
    Browse the repository at this point in the history

  30. Spawn Zombie Cops with small firearms more often and lower pick rate … 

    …of mx_military 'map extra' (#55908)

* Make cops drop more pistols but less rifles/shotguns
    @KurzedMetal
    KurzedMetal authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    7bbba8a View commit details
    Browse the repository at this point in the history

  31. Military Armor Item Groups (#55927)

    @Drew4484
    Drew4484 authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    c7ca063 View commit details
    Browse the repository at this point in the history

  32. Replace knife spear hint with spike on a stick (#55947)

    @haveric
    haveric authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    c02afe1 View commit details
    Browse the repository at this point in the history

  33. Quick and dirty fix for vertical peek bug (#55952) 

    * Fix peek quickly and dirtily

* Add initialization to `new_pos`

in order to prevent breaking horizontal peek.

* Fix astyle
    @sulyi
    sulyi authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    3fd76b2 View commit details
    Browse the repository at this point in the history

  34. [DinoMod] Albertonykus (#55955) 

    * albertonykus

* hatchling

* straight to adult

* egg

* spawn theropod eggs in dino locations

* dino spawn lists

* add to safe list

* egg monster groups

* wilderness spawns

* recipes use theropod eggs

* cooking components

* forage theropod eggs

* insectivore factions

* dictionary

* give looks_like
    @LyleSY
    LyleSY authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    3eee6db View commit details
    Browse the repository at this point in the history

  35. Fix test failure when LOCALIZE is disabled (#55956)

    @BrettDong
    BrettDong authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    c20aedc View commit details
    Browse the repository at this point in the history

  36. Armor balance guide (#55957) 

    * Start of work on balance and design doc

* most sections complete (or at least good enough)

* final edits

* more changes and clarity, plus vitals description
    @bombasticSlacks
    bombasticSlacks authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    a166404 View commit details
    Browse the repository at this point in the history

  37. Add swarm structure

    @Ramza13
    Ramza13 committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    a464647 View commit details
    Browse the repository at this point in the history

  38. Fix npc location var handling

    @Ramza13
    Ramza13 committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    9d49c27 View commit details
    Browse the repository at this point in the history

  39. Update npctalk.cpp

    @Ramza13
    Ramza13 committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    c138d9f View commit details
    Browse the repository at this point in the history

  40. Update nether.json

    @Ramza13
    Ramza13 committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    c766f91 View commit details
    Browse the repository at this point in the history

  41. Update nether.json

    @Ramza13
    Ramza13 committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    e4ced82 View commit details
    Browse the repository at this point in the history

  42. Update nether.json

    @Ramza13
    Ramza13 committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    1d451d2 View commit details
    Browse the repository at this point in the history

  43. fix for no wearing anything (#55967)

    @bombasticSlacks
    bombasticSlacks authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    cfb2da5 View commit details
    Browse the repository at this point in the history

  44. Added WATER_BREAK flag to matchbook (#55751)

    @Night-Pryanik
    Night-Pryanik authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    a4505a6 View commit details
    Browse the repository at this point in the history

  45. Grav Chute CBM (#55920)

    @Maleclypse
    Maleclypse authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    b5730f1 View commit details
    Browse the repository at this point in the history

  46. Merge pull request #55944 from dseguin/nested_pickup_settings 

    Pockets: prioritize parent over nested
    @kevingranade
    kevingranade authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    a01bfbe View commit details
    Browse the repository at this point in the history

  47. add a check for martial arts (#55958) 

    Put original check in parens and put "&& !is_martialarts" on the end. Also moved the declaration for the "is_martialarts" variable up so it could be used here.
    @catdach
    catdach authored Mar 9, 2022
    Configuration menu
    Copy the full SHA
    56af356 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2022

  1. Merge

    @haveric
    haveric committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    67ba473 View commit details
    Browse the repository at this point in the history

  2. Add roof furniture, adjusted downspouts, tweaked indoor furniture a bit

    @haveric
    haveric committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    652f196 View commit details
    Browse the repository at this point in the history

  3. Change basement fill to soil. Add roof trash items

    @haveric
    haveric committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    9f1d118 View commit details
    Browse the repository at this point in the history

  4. Put dirt under standing tanks to prevent auto roof over them

    @haveric
    haveric committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    9692015 View commit details
    Browse the repository at this point in the history

  5. Add occasional nested roof chunks

    @haveric
    haveric committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    0fd77bc View commit details
    Browse the repository at this point in the history

  6. Fix rug

    @haveric
    haveric committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    279eb4d View commit details
    Browse the repository at this point in the history

  7. Made Lamellar Cuirass more interesting (#55971) 

    * Made Lamellar Cuirass more interesting
* may as well go for it on 100% coverage
    @bombasticSlacks
    bombasticSlacks authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    1694938 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #55633 from dseguin/sound_indoor_night 

    Add "indoor" and "night" fields for sound effects
    @kevingranade
    kevingranade authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    89cd7c6 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #55847 from Ramza13/monster 

    Add new portal storm monster swarm structure
    @kevingranade
    kevingranade authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    04e6575 View commit details
    Browse the repository at this point in the history

  10. Lemat → LeMat (#55900)

    @Faalagorn
    Faalagorn authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    f34f3ac View commit details
    Browse the repository at this point in the history

  11. Merge branch 'CleverRaven:master' into engine-strength

    @haveric
    haveric authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    36690e0 View commit details
    Browse the repository at this point in the history

  12. Update advanced_inv_area.cpp (#55974) 

    Now can open non watertight container too.
    @3l3m01
    3l3m01 authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    b167e16 View commit details
    Browse the repository at this point in the history

  13. Kevlar Gambeson Complexify (#55976) 

    * moved kevlar gambeson more in line with other armors on normal
* updated to sum to 4.4 mm
    @bombasticSlacks
    bombasticSlacks authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    f6e961b View commit details
    Browse the repository at this point in the history

  14. typo fixes by faalagorn (#55982)

    @bombasticSlacks
    bombasticSlacks authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    1b16228 View commit details
    Browse the repository at this point in the history

  15. [DinoMod] scutellosaurus fixes

    @LyleSY
    LyleSY authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    9e257bd View commit details
    Browse the repository at this point in the history

  16. loose ammo 

    Update ammo.json

Update ammo.json

Update ammo.json
    @Maleclypse
    Maleclypse committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    bbd8ef4 View commit details
    Browse the repository at this point in the history

  17. New attunement spell (#55437) 

    * add fields for spell

* permafrost attunement

* description

* delete the range to better usability

* delete wrong part

* Update Permafrost_Mage.json

* Apply suggestions from code review

Co-authored-by: Curtis Merrill <[email protected]>

* Eroding

* Update effects.json

Co-authored-by: Curtis Merrill <[email protected]>
    @GuardianDll @KorGgenT
    GuardianDll and KorGgenT authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    82d6010 View commit details
    Browse the repository at this point in the history

  18. Pass item by reference when generating holster options

    @dseguin
    dseguin committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    dbafd5c View commit details
    Browse the repository at this point in the history

  19. Update stamina tests

    @haveric
    haveric committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    49d19e2 View commit details
    Browse the repository at this point in the history

  20. Update carnivore.json

    @kevingranade
    kevingranade authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    fbcccf5 View commit details
    Browse the repository at this point in the history

  21. Update carnivore.json

    @kevingranade
    kevingranade authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    f64f92d View commit details
    Browse the repository at this point in the history

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

    @kevingranade
    kevingranade authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    f9eb40f View commit details
    Browse the repository at this point in the history

  23. Fix worn wrapper warmth function not checking for bp coverage (#55973) 

    * add check for bp coverage to worn temperature calculations
    @Crupette
    Crupette authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    f0a49a0 View commit details
    Browse the repository at this point in the history

  24. Pass a copy of the item_location to the lambda in outfit::holster_opts 

    Co-authored-by: Qrox <[email protected]>
    @dseguin @Qrox
    dseguin and Qrox committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    03d0a2a View commit details
    Browse the repository at this point in the history

  25. Don't apply increased stamina burn if player is on a boat

    @Night-Pryanik
    Night-Pryanik committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    3e974a9 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #55988 from dseguin/fix_holster_crash 

    Fix crash when holstering items
    @kevingranade
    kevingranade authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    3f3b54d View commit details
    Browse the repository at this point in the history

  27. Merge pull request #55991 from CleverRaven/kevingranade-blood-no-quench 

    Blood isn't quenchy.
    @Rivet-the-Zombie
    Rivet-the-Zombie authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    640d061 View commit details
    Browse the repository at this point in the history

  28. ammo_type of .38 Super is 38super

    @Night-Pryanik
    Night-Pryanik committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    385e698 View commit details
    Browse the repository at this point in the history

  29. Don't restrict swapping positions to player allies only

    @Night-Pryanik
    Night-Pryanik committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    85cb735 View commit details
    Browse the repository at this point in the history

  30. [CR] Added a message notifying player about why he can't mine terrain… 

    …/furniture with bash resistance above maximum mining ability for a pickaxe/jackhammer (#55346)

* Added a message notifying player about why he can't mine terrain/furniture with bash resistance above maximum mining ability for a pickaxe/jackhammer

Co-authored-by: Kevin Granade <[email protected]>
    @Night-Pryanik @kevingranade
    Night-Pryanik and kevingranade authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    6621e88 View commit details
    Browse the repository at this point in the history

  31. Merge pull request #55501 from haveric/hunting-lodge-roof 

    Add roof to hunting lodge and cleanup unused features
    @kevingranade
    kevingranade authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    838d158 View commit details
    Browse the repository at this point in the history

  32. Merge pull request #55471 from haveric/engine-strength 

    Fix current stat calculation after modifying stats
    @kevingranade
    kevingranade authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    9f162ca View commit details
    Browse the repository at this point in the history

  33. Update 'Asked to train' name and description (#55468)

    @haveric
    haveric authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    025efb2 View commit details
    Browse the repository at this point in the history

  34. Fix grammar and consistency across tree descriptions (#55404)

    @haveric
    haveric authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    d2f6310 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2022

  1. Merge pull request #55985 from CleverRaven/LyleSY-patch-1 

    [DinoMod] scutellosaurus fixes
    @ZhilkinSerg
    ZhilkinSerg authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    8e1aaa0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #55995 from Night-Pryanik/38super 

    Now it's possible to load .38 Super into .38 Super magazines
    @ZhilkinSerg
    ZhilkinSerg authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    5d38b3f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #55992 from Night-Pryanik/dont-apply-increased-sta… 

    …mina-burn-if-on-boat

Don't apply increased stamina burn if player is on a boat on water
    @ZhilkinSerg
    ZhilkinSerg authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    a0c2908 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #56000 from Night-Pryanik/swap-positions-with-foll… 

    …ower

Allow swapping positions and moving out of the way for all types of friendly NPCs
    @ZhilkinSerg
    ZhilkinSerg authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    c28fcc8 View commit details
    Browse the repository at this point in the history

  5. Don't make player's feet wet when walking over scrap metal bridge (#5… 

    …6005)

* Added new `BRIDGE` flag to scrap metal bridge

* Don't drench player when moving on the bridge

* Don't drench player if waiting on the bridge

* Added documentation
    @Night-Pryanik
    Night-Pryanik authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    e93ba46 View commit details
    Browse the repository at this point in the history

  6. Gave MECH_DEFENSIVE flag to all three mechas in No Hope mod (#55989)

    @Night-Pryanik
    Night-Pryanik authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    53f9bd3 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #55987 from Maleclypse/Looted-Gunstores-loose-ammo 

    Adding loose ammo to looted gun stores
    @Rivet-the-Zombie
    Rivet-the-Zombie authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    53398d1 View commit details
    Browse the repository at this point in the history

  8. added missing n

    @bombasticSlacks
    bombasticSlacks committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    bafff19 View commit details
    Browse the repository at this point in the history

  9. Phone case variants

    @Maleclypse
    Maleclypse committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    ba259ae View commit details
    Browse the repository at this point in the history

  10. Correct “Code: Tests” tag name in auto labeller

    @BrettDong
    BrettDong authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    c2cd0e5 View commit details
    Browse the repository at this point in the history

  11. Revive MXE-MinGW experimental release build

    @BrettDong
    BrettDong committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    4ed25ca View commit details
    Browse the repository at this point in the history

  12. Fix compile error on Android

    @BrettDong
    BrettDong committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    34919cb View commit details
    Browse the repository at this point in the history

  13. Add ASCII picture to missing memory cards

    @Faalagorn
    Faalagorn authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    232824b View commit details
    Browse the repository at this point in the history

  14. Get values from preload object instead

    @dseguin
    dseguin committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    f700860 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #56032 from BrettDong/android 

    Fix compile error on Android
    @ZhilkinSerg
    ZhilkinSerg authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    e4e6681 View commit details
    Browse the repository at this point in the history

  16. Fixed beartrap disappearing after monster steps on it (#56022)

    @Night-Pryanik
    Night-Pryanik authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    d2a33f4 View commit details
    Browse the repository at this point in the history

  17. Tweaks to furniture bridges (#56019) 

    * Don't apply increased stamina burn when walking or waiting on "furniture bridges"

* Don't apply slowing down when walking over "furniture bridges"
    @Night-Pryanik
    Night-Pryanik authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    c705efd View commit details
    Browse the repository at this point in the history

  18. Don't let players climb up via downspouts or ropes when all their arm… 

    …s are broken (#56018)

* Don't let players climb up when all their arms are broken

* Stepladder is an exception

* Rope leading up and web leading up ain't an easy way to climb up (as it's implied by `LADDER` flag)

Also made stepladders, rope leading up and web leading up impossible for non-climbing monster to follow player.
    @Night-Pryanik
    Night-Pryanik authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    abb7240 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #56028 from Maleclypse/Variant-cell-phone-cases 

    Phone case variants
    @ZhilkinSerg
    ZhilkinSerg authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    1905179 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #56029 from CleverRaven/labeller 

    Correct “Code: Tests” tag name in auto labeller
    @ZhilkinSerg
    ZhilkinSerg authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    1aa49ff View commit details
    Browse the repository at this point in the history

  21. Merge pull request #56031 from CleverRaven/mxe 

    Revive MXE-MinGW experimental release build
    @ZhilkinSerg
    ZhilkinSerg authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    fada41b View commit details
    Browse the repository at this point in the history

  22. Use translated string for inf (#55975)

    @xuvatilavv
    xuvatilavv authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    b0a8d8c View commit details
    Browse the repository at this point in the history

  23. Fix os dependent implementation in compose.py

    @sulyi
    sulyi committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    adcfef9 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2022

  1. Allow holsters to store smaller guns

    @TheShadowFerret
    TheShadowFerret committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    816d3f9 View commit details
    Browse the repository at this point in the history

  2. Routine i18n updates on 12 March 2022

    @BrettDong
    BrettDong committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    13e1f90 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #56037 from dseguin/fix_sound_preload 

    Fix sfx preload
    @ZhilkinSerg
    ZhilkinSerg authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    70509e4 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #56046 from CleverRaven/i18n 

    Routine i18n updates on 12 March 2022
    @ZhilkinSerg
    ZhilkinSerg authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    61d1d89 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #56035 from Faalagorn/patch-1 

    Add ASCII picture to missing memory cards
    @ZhilkinSerg
    ZhilkinSerg authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    1377648 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #56024 from bombasticSlacks/more-typo-fixes 

    added missing n typo
    @ZhilkinSerg
    ZhilkinSerg authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    f172211 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #56039 from sulyi/compose_path_fix 

    Fix os dependent implementation in `compose.py`
    @ZhilkinSerg
    ZhilkinSerg authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    eb7d89d View commit details
    Browse the repository at this point in the history

  8. Merge pull request #56044 from TheShadowFerret/SmallerAllowedGuns 

    Decrease min_item_volume for holster to allow storing smaller service pistols
    @Rivet-the-Zombie
    Rivet-the-Zombie authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    b5427b0 View commit details
    Browse the repository at this point in the history

  9. Create nest_camptosaurus.json

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    f208473 View commit details
    Browse the repository at this point in the history

  10. guarantee maiasaura egg spawn

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    35720ab View commit details
    Browse the repository at this point in the history

  11. Create nest_parasaurolophus.json

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    e768179 View commit details
    Browse the repository at this point in the history

  12. Update npc_talk_test.cpp (#56050)

    @Maleclypse
    Maleclypse authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    3dcba5f View commit details
    Browse the repository at this point in the history

  13. Update basement_nested.json (#56049)

    @Maleclypse
    Maleclypse authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    d464d32 View commit details
    Browse the repository at this point in the history

  14. Rebalance powered exoskeletons (#55868)

    @Arokha
    Arokha authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    e987ae2 View commit details
    Browse the repository at this point in the history

  15. Create nest_corythosaurus.json

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    df72bae View commit details
    Browse the repository at this point in the history

  16. Create nest_edmontosaurus.json

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    53f8685 View commit details
    Browse the repository at this point in the history

  17. Add more auto labeling (#55830) 

    Co-authored-by: casswedson <[email protected]>
    @Maleclypse @casswedson
    Maleclypse and casswedson authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    d0e356a View commit details
    Browse the repository at this point in the history

  18. [DinoMod] anzu (#56006)

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    679f478 View commit details
    Browse the repository at this point in the history

  19. Create nest_pachycephalosaurus.json

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    f1f11c1 View commit details
    Browse the repository at this point in the history

  20. Create nest_pachyrhinosaurus.json

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    a5223f7 View commit details
    Browse the repository at this point in the history

  21. Create nest_pentaceratops.json

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    b5cbe05 View commit details
    Browse the repository at this point in the history

  22. Create nest_kosmoceratops.json

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    cfac63b View commit details
    Browse the repository at this point in the history

  23. Create nest_torosaurus.json

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    7942e26 View commit details
    Browse the repository at this point in the history

  24. Create nest_triceratops.json

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    e175013 View commit details
    Browse the repository at this point in the history

  25. Create nest_edmontonia.json

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    d06059e View commit details
    Browse the repository at this point in the history

  26. Create nest_nodosaurus.json

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    dda93c7 View commit details
    Browse the repository at this point in the history

  27. Create nest_ankylosaurus.json

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    e4909e1 View commit details
    Browse the repository at this point in the history

  28. Create nest_dyoplosaurus.json

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    100b1f6 View commit details
    Browse the repository at this point in the history

  29. Create nest_stegosaurus.json

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    9dcbf02 View commit details
    Browse the repository at this point in the history

  30. Create nest_scutellosaurus.json

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    d345589 View commit details
    Browse the repository at this point in the history

  31. Update misc.json 

    removed mod goats from monstegroups
    @Xaritscin
    Xaritscin authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    a05768d View commit details
    Browse the repository at this point in the history

  32. Update tropical_mammal.json 

    removed goats from mod as a new goat monster was added to vanilla game
    @Xaritscin
    Xaritscin authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    902780d View commit details
    Browse the repository at this point in the history

  33. Update map_extras.json

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    0bdb01d View commit details
    Browse the repository at this point in the history

  34. Merge branch 'CleverRaven:master' into more_dino_nests

    @LyleSY
    LyleSY authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    2514aef View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2022

  1. Update regional_overlay.json

    @LyleSY
    LyleSY authored Mar 13, 2022
    Configuration menu
    Copy the full SHA
    eca8c64 View commit details
    Browse the repository at this point in the history

  2. Rev vcpkg cachekeys again. 

    Something changed and the cache we've kept around forever isn't hitting right again.
    @akrieger
    akrieger committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    a42c51f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #56065 from Xaritscin/TropiCata-0.6f 

    TropiCata: remove goats from mod
    @Rivet-the-Zombie
    Rivet-the-Zombie authored Mar 13, 2022
    Configuration menu
    Copy the full SHA
    a7c2d6d View commit details
    Browse the repository at this point in the history

  4. Merge pull request #56073 from akrieger/rev_keys_again 

    Rev vcpkg cachekeys again.
    @ZhilkinSerg
    ZhilkinSerg authored Mar 13, 2022
    Configuration menu
    Copy the full SHA
    20b4ebb View commit details
    Browse the repository at this point in the history

  5. Minor fix to TRANSLATING guide 

    * Game uses a modified gettext now.
* There are now 50k+ strings (with mods), so marked that.
* You can switch language in game now, so noted that.
* Minor fix to Cataclysm not being uppercase.
    @Faalagorn
    Faalagorn authored Mar 13, 2022
    Configuration menu
    Copy the full SHA
    4e5cd5d View commit details
    Browse the repository at this point in the history

  6. Fix "language"

    @Faalagorn
    Faalagorn authored Mar 13, 2022
    Configuration menu
    Copy the full SHA
    06e03f7 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2022

  1. Merge branch 'CleverRaven:master' into more_dino_nests

    @LyleSY
    LyleSY authored Mar 14, 2022
    Configuration menu
    Copy the full SHA
    9496aab View commit details
    Browse the repository at this point in the history

  2. Merge pull request #56067 from LyleSY/more_dino_nests 

    [DinoMod] Saurischian dino nests
    @Rivet-the-Zombie
    Rivet-the-Zombie authored Mar 14, 2022
    Configuration menu
    Copy the full SHA
    ef1e34c View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2022

  1. Merge pull request #56075 from Faalagorn/patch-4 

    Minor fix to TRANSLATING guide
    @Rivet-the-Zombie
    Rivet-the-Zombie authored Mar 15, 2022
    Configuration menu
    Copy the full SHA
    d703f84 View commit details
    Browse the repository at this point in the history