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.

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

Update latest codes #6

Merged
merged 100 commits into from
Aug 27, 2019
Merged

Commits on Aug 17, 2019

  1. .45 pistols

    Adds the pistols, ditches the USP45's suppressor.
    tenmillimaster committed Aug 17, 2019
    Configuration menu
    Copy the full SHA
    8bc6b4e View commit details
    Browse the repository at this point in the history
  2. item groups, mk23 size

    Updated Mk 23 size, added items
    tenmillimaster committed Aug 17, 2019
    Configuration menu
    Copy the full SHA
    969a161 View commit details
    Browse the repository at this point in the history
  3. fix item id

    tenmillimaster committed Aug 17, 2019
    Configuration menu
    Copy the full SHA
    52e611b View commit details
    Browse the repository at this point in the history
  4. grammar

    tenmillimaster committed Aug 17, 2019
    Configuration menu
    Copy the full SHA
    2d76f08 View commit details
    Browse the repository at this point in the history
  5. Added Mk23 to military spawns

    which is essentially a USP 45
    tenmillimaster committed Aug 17, 2019
    Configuration menu
    Copy the full SHA
    a934ca8 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2019

  1. Configuration menu
    Copy the full SHA
    eda113d View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2019

  1. astyle

    Hymore246 committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    3d57e23 View commit details
    Browse the repository at this point in the history
  2. astyle again

    Hymore246 committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    fe98d61 View commit details
    Browse the repository at this point in the history
  3. Even more astyle

    Hymore246 committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    2c8c786 View commit details
    Browse the repository at this point in the history
  4. Update src/martialarts.cpp

    Co-Authored-By: Alexey Mostovoy <[email protected]>
    Hymore246 and Alexey Mostovoy authored Aug 22, 2019
    Configuration menu
    Copy the full SHA
    e18b7a0 View commit details
    Browse the repository at this point in the history
  5. Update src/melee.cpp

    Co-Authored-By: Alexey Mostovoy <[email protected]>
    Hymore246 and Alexey Mostovoy authored Aug 22, 2019
    Configuration menu
    Copy the full SHA
    943887d View commit details
    Browse the repository at this point in the history
  6. yet more astyle

    Hymore246 committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    a78339f View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2019

  1. Configuration menu
    Copy the full SHA
    078a251 View commit details
    Browse the repository at this point in the history
  2. Cleaning up snippets.json

    Kanexan committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    947a927 View commit details
    Browse the repository at this point in the history
  3. Fix node name

    `plural_name` - > `name_plural`
    ZhilkinSerg committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    8dc1497 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    531c6a0 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #33448 from Hymore246/rebalance-judo

    Martial Arts Rebalance for Judo
    Rivet-the-Zombie authored Aug 24, 2019
    Configuration menu
    Copy the full SHA
    b215f78 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    37e1627 View commit details
    Browse the repository at this point in the history
  7. Move splitting vehicle move into horizontal and vertical into map::mo…

    …ve_vehicle.
    
    So the caller does not have to do it. At least one caller (from `monster::shove_vehicle`) did not do this.
    BevapDin committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    7507200 View commit details
    Browse the repository at this point in the history
  8. Better error reporting from map::move_vehicle:

    Add two separate checks for 1) empty displacement vector and 2) for displacement vector being too large.
    
    Changed third check into an assertion as it is ensured by the splitting code above.
    BevapDin committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    cac4f1d View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    7372b14 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    6af2056 View commit details
    Browse the repository at this point in the history
  11. Fix "resin_cord is undefed" (#33504)

    * Make repair_actions non-static.
    
    Put them into `Item_factory` and clear and reset them on each game resetting.
    
    * Also clear Item_factory::misc_tools
    BevapDin authored and ZhilkinSerg committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    e6f1833 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    aeacdc9 View commit details
    Browse the repository at this point in the history
  13. Add mission for claire isherwood npc (#33498)

    * add unique book reward
    
    herbal remedy book, survival skill.
    
    * add mission
    
    and slight map adjustements for trade.
    curstwist authored and ZhilkinSerg committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    6e300c8 View commit details
    Browse the repository at this point in the history
  14. Make Sweet Tooth a starting trait (#33477)

    * Changed Sweet Tooth to be a starting trait
    
    * Added Sweet Tooth starting trait to NPCs
    
    Removed ANTIJUNK from possible starting traits, created a new trait group with both PROJUNK and ANTIJUNK and added that group to possible starting traits. Possibility 5 because of allergy.
    ebolite authored and ZhilkinSerg committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    5c7083b View commit details
    Browse the repository at this point in the history
  15. Add survival kit (#33428)

    * Add a survival kit
    
    * add to item groups
    
    * change description to not be written by Mario
    
    * fix another spelling error
    
    * give survivor zombie a small chance of dropping a survivor kit
    
    * give survivor zombie a small chance of dropping a survival kit
    
    * implemented suggestions by @Maddremor
    
    * remove irrelevant flag
    
    * handflares instead of flare gun
    
    * add Pocket Survival Guide to kit
    ampersand55 authored and ZhilkinSerg committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    e1e05ce View commit details
    Browse the repository at this point in the history
  16. fix mana inefficiency (#33454)

    Highmongrel authored and KorGgenT committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    2d04960 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    06fcf52 View commit details
    Browse the repository at this point in the history
  18. Commas

    Kanexan committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    d545f3c View commit details
    Browse the repository at this point in the history
  19. Fix a spell name in Magiclysm

    Qrox committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    73e6ea1 View commit details
    Browse the repository at this point in the history
  20. Too many commas

    Kanexan committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    e38ea5a View commit details
    Browse the repository at this point in the history
  21. Technique name change

    Hymore246 committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    1962fae View commit details
    Browse the repository at this point in the history
  22. adjust spawns for mi-go

    curstwist committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    7199a82 View commit details
    Browse the repository at this point in the history
  23. Merge pull request #33514 from Qrox/fix-scroll-name

    Fix a spell name in Magiclysm
    ZhilkinSerg authored Aug 24, 2019
    Configuration menu
    Copy the full SHA
    490ce3d View commit details
    Browse the repository at this point in the history
  24. Merge pull request #33513 from Qrox/motd-zh-cn

    Update the Simplified Chinese translation of MOTD
    ZhilkinSerg authored Aug 24, 2019
    Configuration menu
    Copy the full SHA
    5545c5e View commit details
    Browse the repository at this point in the history
  25. CRIT Expansion update (#31090)

    Soupster89 authored and ZhilkinSerg committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    e442b42 View commit details
    Browse the repository at this point in the history
  26. Update data/json/techniques.json

    Co-Authored-By: ampersand55 <[email protected]>
    Hymore246 and ampersand55 authored Aug 24, 2019
    Configuration menu
    Copy the full SHA
    262ecd1 View commit details
    Browse the repository at this point in the history
  27. Update data/json/techniques.json

    Co-Authored-By: ampersand55 <[email protected]>
    Hymore246 and ampersand55 authored Aug 24, 2019
    Configuration menu
    Copy the full SHA
    738d65a View commit details
    Browse the repository at this point in the history
  28. Eating raw fat is dangerous

    Remove double parasite specification
    
    Co-Authored-By: ZhilkinSerg <[email protected]>
    Update data/json/items/comestibles/carnivore.json
    
    Co-Authored-By: ZhilkinSerg <[email protected]>
    TheShadowFerret and ZhilkinSerg committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    a4763d4 View commit details
    Browse the repository at this point in the history
  29. Add wooden rack furniture

    Adds a simple wooden rack, meant to provide an option for storage that
    doesn't need metal resources, and is potentially accessible to
    characters playing wilderness games.
    anothersimulacrum committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    d8953f0 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2019

  1. Lint RetroDays tileset config (#33527)

    This reduces the length of the tileset config by roughly 14,000 lines.
    There's no pressing need for it, I just accidentally linted the file,
    and wanted to just go ahead and lint it instead of back out of linting
    it.
    anothersimulacrum authored and kevingranade committed Aug 25, 2019
    Configuration menu
    Copy the full SHA
    984f345 View commit details
    Browse the repository at this point in the history
  2. Update Retrodays tileset

    Add planters, autoclaves, dishwashers, and colored doors.
    anothersimulacrum committed Aug 25, 2019
    Configuration menu
    Copy the full SHA
    d443c93 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d88e727 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e64fb89 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #33506 from BevapDin/fej

    Fix calling map::move_vehicle with a combined horizontal and vertical movement
    kevingranade authored Aug 25, 2019
    Configuration menu
    Copy the full SHA
    10672e1 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #33502 from ZhilkinSerg/fix-name-plural

    Fix minor typos related to plural names
    kevingranade authored Aug 25, 2019
    Configuration menu
    Copy the full SHA
    e29aa34 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #33501 from Kanexan/Snippets-Rework

    Cleaning up snippets.json
    kevingranade authored Aug 25, 2019
    Configuration menu
    Copy the full SHA
    8ea2938 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #33449 from LaVeyanFiend/Fatparasites

    Eating raw fat is dangerous
    Rivet-the-Zombie authored Aug 25, 2019
    Configuration menu
    Copy the full SHA
    47cc8b6 View commit details
    Browse the repository at this point in the history
  9. Fixes to the photo description

    Qrox committed Aug 25, 2019
    Configuration menu
    Copy the full SHA
    cb7ff9a View commit details
    Browse the repository at this point in the history
  10. Merge pull request #33528 from anothersimulacrum/retrodays-update

    Update Retrodays tileset
    ZhilkinSerg authored Aug 25, 2019
    Configuration menu
    Copy the full SHA
    47ddfce View commit details
    Browse the repository at this point in the history
  11. Merge pull request #33530 from Qrox/fix-photo-desc

    Fixes to the photo description
    ZhilkinSerg authored Aug 25, 2019
    Configuration menu
    Copy the full SHA
    50eb071 View commit details
    Browse the repository at this point in the history
  12. Merge pull request #33523 from anothersimulacrum/wooden-rack

    Add wooden rack furniture
    ZhilkinSerg authored Aug 25, 2019
    Configuration menu
    Copy the full SHA
    03f943b View commit details
    Browse the repository at this point in the history
  13. Fix and jsonize item dropping and trap conversion in trap-vehicle int…

    …eraction (#33459)
    
    * JSONize trap-vehicle run-over drops and trap conversions
    
    Also fix item duplication when traps are run over by vehicles
    
    * Keep known traps known, and make seen traps in action known
    
    * Fix double barrel shotgun trap turning into single barrel shotgun trap when run over by vehicles
    
    * Fix vehicle triggering traps when moving off them
    
    * Update gfx configs
    
    * Apply suggestions from code review
    
    Co-Authored-By: ZhilkinSerg <[email protected]>
    Qrox and ZhilkinSerg committed Aug 25, 2019
    Configuration menu
    Copy the full SHA
    ab9996b View commit details
    Browse the repository at this point in the history
  14. Adds steel mill location (#33383)

    * Create steel_foundry.json
    
    * Steel Mill
    
    * Update steel_mill_z2.json
    
    * format fixes
    
    * overmap edits
    
    * Update data/json/mapgen/steel_mill/steel_mill_z2.json
    
    Co-Authored-By: anothersimulacrum <[email protected]>
    
    * Update data/json/mapgen/steel_mill/steel_mill_z2.json
    
    Co-Authored-By: anothersimulacrum <[email protected]>
    
    * Overmap fixes and misc. edits.
    
    * Typo in mapgen
    
    * Fixes and Updates
    
    * Update data/json/mapgen_palettes/steel_mill_palette.json
    
    Co-Authored-By: ZhilkinSerg <[email protected]>
    
    * Update data/json/mapgen_palettes/steel_mill_palette.json
    
    Co-Authored-By: ZhilkinSerg <[email protected]>
    
    * Update data/json/mapgen_palettes/steel_mill_palette.json
    
    Co-Authored-By: ZhilkinSerg <[email protected]>
    Kanexan and ZhilkinSerg committed Aug 25, 2019
    Configuration menu
    Copy the full SHA
    a344a2d View commit details
    Browse the repository at this point in the history
  15. Add real summary regular expression (#33531)

    * Add real summary regular expression
    kevingranade authored and ZhilkinSerg committed Aug 25, 2019
    Configuration menu
    Copy the full SHA
    b82aa76 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    2783181 View commit details
    Browse the repository at this point in the history
  17. Fix more translation and translation updating issues (#33433)

    * Fix translation update - skill names
    
    * Fix translation update - bionic names/descriptions
    
    * Remove some explicit `translated` calls
    
    * Fix translation update - recipe category names
    
    * Fix translation update - terrain bash sound descriptions
    
    * Fix translation - trap-vehicle collision sound description
    
    * Convert .pot file line endings to Unix on Windows
    
    * Suppress warning when nothing translatable is found in objects copying from other objects
    
    * Update translation documentation
    
    * Mark a string for translation
    
    * Fix translation update - vehicle part names
    
    * Fix translation update - text snippets
    
    * Update translation documentation
    
    * Use no_translation for debug text
    Qrox authored and ZhilkinSerg committed Aug 25, 2019
    Configuration menu
    Copy the full SHA
    60e0ca9 View commit details
    Browse the repository at this point in the history
  18. npcs: always restock on first trading conversation

    Fixes #33500
    
    NPC restock should be handled entirely through the trading code,
    so having npc::randomize() reset the restock time prevents NPCs
    from restocking when first loaded, which meant that faction
    shopkeepers were not stocking faction cash.
    
    Also, set the last restock time for new NPC to turn_zero, and
    clarify order of operations when checking last restock to make
    sure that NPC shopkeepers always restock the first time the
    player attempts to trade with them.
    mlangsdorf committed Aug 25, 2019
    Configuration menu
    Copy the full SHA
    df03c09 View commit details
    Browse the repository at this point in the history
  19. Added descriptions for copy-from, abstract, delete and extend

    Did some minor formatting of the page and added descriptions for copy-from, abstract, delete and extend. Tried to add the following to the file but apparently I hit a max file size (does not load the preview anymore):
    
    
    # FAQ
    
    ## What types support copy-from?
    To find out if a types supports copy-from, you need to know if it has implemented generic_factory. To find out if this is the case, do the following:
    * Open [init.cpp](https://github.com/CleverRaven/Cataclysm-DDA/blob/0f5f757236e2c9a019a6e40e6b62c3c7593ba7c6/src/init.cpp)
    * Find the line that mentions your type, for example `add( "gate", &gates::load );`
    * Copy the load function, in this case it would be *gates::load*
    * Use this in [the search bar on github](https://github.com/CleverRaven/Cataclysm-DDA/search?q=%22gates%3A%3Aload%22&unscoped_q=%22gates%3A%3Aload%22&type=Code) to find the file that contains *gates::load*
    * In the search results you find [gates.cpp](https://github.com/CleverRaven/Cataclysm-DDA/blob/5055b30aafc78e6846374a5387d0f5beee370a2b/src/gates.cpp). open it.
    * In gates.cpp, find the generic_factory line, it looks like this: `generic_factory<gate_data> gates_data( "gate type", "handle", "other_handles" );`
    * Since the generic_factory line is present, you can now conclude that it supports copy-from. 
    * If you don't find generic_factoy present, it does not support copy-from, as is the case for type vitamin (repeat the above steps and find that [vitamin.cpp](https://github.com/CleverRaven/Cataclysm-DDA/blob/6ee35bc57e8e5b33433807928485ef9c9a9df8f7/src/vitamin.cpp) does not contain generic_factoy)
    snipercup authored Aug 25, 2019
    Configuration menu
    Copy the full SHA
    d08476f View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    aca6649 View commit details
    Browse the repository at this point in the history
  21. Disallow certain activities while riding (#33165)

    * disallow certain activities while riding
    
    * file replaced in error
    
    * astylin
    
    * move comments back to where they referred to previously
    
    * full stop - punctuation
    
    * remove from handcuffs iuse, as it dosnt appear to be somethign the player activates
    
    * generalise messages
    
    * clang-tidy value stored is never read
    
    * commit to trigger rebuild
    
    * astyle
    davidpwbrown authored and kevingranade committed Aug 25, 2019
    Configuration menu
    Copy the full SHA
    20d267b View commit details
    Browse the repository at this point in the history
  22. add migo scout tower

    curstwist committed Aug 25, 2019
    Configuration menu
    Copy the full SHA
    579b334 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    b5fed6d View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2019

  1. Fix Marloss Voice Random Spawning

    The NPCs were generated without proper dialogues and faction alliegances, so this will disable their random generation for the time being.
    John-Candlebury committed Aug 26, 2019
    Configuration menu
    Copy the full SHA
    6affddd View commit details
    Browse the repository at this point in the history
  2. Merge pull request #33295 from tenmillimaster/45-military-pistols

    .45ACP military pistols
    Rivet-the-Zombie authored Aug 26, 2019
    Configuration menu
    Copy the full SHA
    5d0737e View commit details
    Browse the repository at this point in the history
  3. clang-tidy bugprone-use-after-move (#33557)

    * Enable bugprone-use-after-move
    
    Enable this clang-tidy check and deal with associated warnings.
    
    Mostly these were suppressions for things in the tests that are
    specifically testing move constructor semantics, but one case was a
    genuine latent bug.
    
    * Fix mismatched declaration name
    
    This error seems to have crept into master.
    jbytheway authored and ZhilkinSerg committed Aug 26, 2019
    Configuration menu
    Copy the full SHA
    19f0f67 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #33549 from curstwist/add-migo-scout-tower

    add migo scout tower
    ZhilkinSerg authored Aug 26, 2019
    Configuration menu
    Copy the full SHA
    badc312 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #33541 from curstwist/fix-static-npcs-spawning-for…

    …-random-npcs
    
    fix random npcs offering static npc missions
    ZhilkinSerg authored Aug 26, 2019
    Configuration menu
    Copy the full SHA
    cb6380f View commit details
    Browse the repository at this point in the history
  6. adjust and add missions for isherwood faction (#33537)

    * adjust and add missions for isherwood faction
    
    * remove pacified flag
    curstwist authored and ZhilkinSerg committed Aug 26, 2019
    Configuration menu
    Copy the full SHA
    4162137 View commit details
    Browse the repository at this point in the history
  7. npcs: always restock on first trading conversation (#33536)

    Fixes #33500
    
    NPC restock should be handled entirely through the trading code,
    so having npc::randomize() reset the restock time prevents NPCs
    from restocking when first loaded, which meant that faction
    shopkeepers were not stocking faction cash.
    
    Also, set the last restock time for new NPC to turn_zero, and
    clarify order of operations when checking last restock to make
    sure that NPC shopkeepers always restock the first time the
    player attempts to trade with them.
    ZhilkinSerg authored Aug 26, 2019
    Configuration menu
    Copy the full SHA
    0033303 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #33540 from snipercup/Update-JSON_INFO.MD-add-copy…

    …-from
    
    Added descriptions for copy-from, abstract, delete and extend
    ZhilkinSerg authored Aug 26, 2019
    Configuration menu
    Copy the full SHA
    2f740b6 View commit details
    Browse the repository at this point in the history
  9. Fix #33486 'All furniture storage became 1000L' by reverting furnitur…

    …e max_volume (#33534)
    
    * revert furniture max_volume to int units
    
    * revert furniture max_volume to int units in furniture.json
    ampersand55 authored and ZhilkinSerg committed Aug 26, 2019
    Configuration menu
    Copy the full SHA
    c5956b7 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #33552 from l29ah/panaceus-volume

    make Panaceus have the size of your thumbnail as described
    ZhilkinSerg authored Aug 26, 2019
    Configuration menu
    Copy the full SHA
    c2d51e5 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #33558 from John-Candlebury/marloss-voice

    Disable Marloss Voice Random Spawning
    ZhilkinSerg authored Aug 26, 2019
    Configuration menu
    Copy the full SHA
    3fdaf32 View commit details
    Browse the repository at this point in the history
  12. Change all instances of 'volume' in JSONs to be a metric string II: T…

    …he Empre Strikes Back (#33551)
    
    * update
    
    * fix acorn
    ampersand55 authored and ZhilkinSerg committed Aug 26, 2019
    Configuration menu
    Copy the full SHA
    dbdebf7 View commit details
    Browse the repository at this point in the history
  13. map palette consistency

    David Brown committed Aug 26, 2019
    Configuration menu
    Copy the full SHA
    40817b3 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    3d0a8b0 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    9636052 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    fbe7298 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    7c7229e View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    9a8ed72 View commit details
    Browse the repository at this point in the history
  19. Update crt_classes.json

    kevingranade authored Aug 26, 2019
    Configuration menu
    Copy the full SHA
    e885353 View commit details
    Browse the repository at this point in the history
  20. Update obsolete.json

    kevingranade authored Aug 26, 2019
    Configuration menu
    Copy the full SHA
    21b9133 View commit details
    Browse the repository at this point in the history
  21. Merge pull request #33566 from davidpwbrown/palette_fix

    Campground JSON map palette consistency
    ZhilkinSerg authored Aug 26, 2019
    Configuration menu
    Copy the full SHA
    0ddd684 View commit details
    Browse the repository at this point in the history
  22. Merge pull request #33572 from CleverRaven/kevingranade-remove-incons…

    …picuous
    
    Remove inconspicuous trait
    ZhilkinSerg authored Aug 26, 2019
    Configuration menu
    Copy the full SHA
    b4c8dff View commit details
    Browse the repository at this point in the history
  23. Merge pull request #33570 from ralreegorganon/practice-survival-when-…

    …harvesting
    
    Practice survival when harvesting
    ZhilkinSerg authored Aug 26, 2019
    Configuration menu
    Copy the full SHA
    94cfcd5 View commit details
    Browse the repository at this point in the history
  24. Doc: move json inheritance wiki page to json inheritance.md and updat…

    …e it (#33569)
    
    * Create JSON_INHERITANCE.md
    
    Made the contents look exactly like the wiki page https://github.com/CleverRaven/Cataclysm-DDA/wiki/Inheritance and also added a short guide on how to find out of the type you use in JSON is has copy-from supported.
    
    * Linked copy-from, delete, extend and abstract to the new inheritance.md file and removed the example of copy-from
    snipercup authored and kevingranade committed Aug 26, 2019
    Configuration menu
    Copy the full SHA
    d2e35e5 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    898a424 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2019

  1. Merge pull request #33510 from Hymore246/rebalance-karate

    Martial Arts Rebalance for Karate
    Rivet-the-Zombie authored Aug 27, 2019
    Configuration menu
    Copy the full SHA
    1f09a1c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    52d144a View commit details
    Browse the repository at this point in the history
  3. Granularize Cartridge Reloading Part 1: Gotta keep em separated (#33310)

    * from 1 came many (gunpowders)
    Gotta keep em separated
    * recipe to make uniform powder.
    * Gunpowder spawn chances
    * snippets, artillery powder desc
    * update min qty
    1lb is most common for powders
    * steel mesh sources
    * sieve recipe and req add
    * Powder overlap
    first attempt at getting powder overlap on paper. needs work still.
    * -BP 40mm
    * split pistol+shot powder
    * shotgun powder overlaps
    tenmillimaster authored and kevingranade committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    873872c View commit details
    Browse the repository at this point in the history
  4. Clean up homemade mags and guns (#33376)

    * hand fit mags
    * hk->H&K
    * casehead reqs
    * mag desc update
    * sheet strippers
    * delete .38 luty
    * axe 22, nerf 40, 762 and 762 recipes
    tenmillimaster authored and kevingranade committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    8e5411c View commit details
    Browse the repository at this point in the history
  5. Fixed "Evolution doesnt happen with initial day set at 30 #33450". (#…

    …33487)
    
    `upgrade_time` is counted in days, can't add turns to it.
    ipcyborg authored and kevingranade committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    d8f806f View commit details
    Browse the repository at this point in the history
  6. Make makeshift glaive fragile.

    Due to duct tape recipe.
    kevingranade authored Aug 27, 2019
    Configuration menu
    Copy the full SHA
    8e5b38a View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    74f4c5e View commit details
    Browse the repository at this point in the history
  8. Add new mission/talk effect u_learn_recipe (#33574)

    * Add u_learn_recipe effect and u_know_recipe condition
    
    * Add new mission MISSION_LEARN_ABOUT_CATTAIL_JELLY
    ralreegorganon authored and ZhilkinSerg committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    d0d3619 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    408d4af View commit details
    Browse the repository at this point in the history
  10. Merge pull request #33579 from CleverRaven/kevingranade-fragile-glaive

    Make makeshift glaive fragile.
    ZhilkinSerg authored Aug 27, 2019
    Configuration menu
    Copy the full SHA
    4c28ab2 View commit details
    Browse the repository at this point in the history
  11. Change throwable extinguisher to perish after use (#33561)

    * Change throwable extinguisher to perish after use
    
    * Fixup removal of throwable extinguisher
    artur-kink authored and ZhilkinSerg committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    f918a14 View commit details
    Browse the repository at this point in the history