forked from CleverRaven/Cataclysm-DDA
-
Notifications
You must be signed in to change notification settings - Fork 0
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
add itemgroup, add the variant #1
Closed
GuardianDll
wants to merge
795
commits into
Cataclysmo091:STI_Tactical_DS_2011_10mm
from
GuardianDll:STI_Tactical_DS_2011_10mm_fixed
Closed
add itemgroup, add the variant #1
GuardianDll
wants to merge
795
commits into
Cataclysmo091:STI_Tactical_DS_2011_10mm
from
GuardianDll:STI_Tactical_DS_2011_10mm_fixed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Brigandine ALLOWS_TAIL adjustments
Unhardcode sleep nightmares
Balance Mind Over Matter waves for Defense Mode
…-LLVM-git-COMPILING-VS-VCPKG
* Fix weapon prof learning EoC * Thank you bot Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…ategory-fix Mutagen chelator shold have the category 'mutagen'
…-mages [Magiclysm] Mi-goify Mi-go Mages
Fix semi-auto AK nested group
Update formatter tools for color support
* big ol' commit * Small fix to alchemy stuff + Turkish cookbook fix + dictionary expansion
This allows them to be used in any recipe requiring cheese, such as a deluxe sandwich.
…leverRaven#69244) * bulk pickup * fix * volume limit * refactor * refactor
…itamin-mass Display vitamins by mass in item descriptions
* change Inferno Grenade fuse * Update inferno grenade casing
Adding missing wp proficiencies (part 4)
add pecorino and marscapone to the cheese recipe component
…-looks-like Fix looks_like for glass door fridge
Hand axes aren't great
…69545) * Make activity_level mandatory, depreciate "fake" * mandatory activity levels for base dda recipes * mandatory activity level for dda camp recipes * Improve activity_level error by specifying recipe source * Mandatory activity levels for mods * Clear up the last remnants of fake activity level * Ferret out some remaining errors hiding in test_data * (docs) Make it clear that activity_level is mandatory * Another one
…Raven#69578) * [Xedra Evolved] Update wordings for maintainted spells * Artifact Spawn desc * Formatting Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…rmor-suits-and-faraday Chainmail update suits and faraday, reference CleverRaven#69251
…paration Separated personal bare bones base recipes into separate file
…wns-while-spawning-monsters Bugfix: Prevent infinite loop when spawning monsters
* Camps can handle crafting liquid * Add liquid dumping spots to de/serialization
…CleverRaven#69496) * math_parser: fix debug messages * math_parser: safely convert variable to numbers * math_parser/eoc: standadise diag. function code establish and follow some conventions in code and documentation * add myself to reviewers list for math_parser
Adding Physiology (Part 7/7)
* luggy boi Co-Authored-By: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update migration_items.json * Update data/json/items/gunmod/mount.json Co-authored-by: Vaskritaya <metroidfan121@gmail.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Co-authored-by: Vaskritaya <metroidfan121@gmail.com>
* drop_on_map returns item_locations * Selective hauling * Add keybinding for old-style quick toggle of hauling (major cargo cult coding warning) * New approach * Abort quick toggle on no items * push -> emplace * handle overflow * Turn off hauling if autohaul is turned off with nothing in the list * Save state to save file * Select items to haul * Forbid selecting container contents * Speed up opening selector with many items hauled * Skip autohaul after making manual selection * Overflow trim more * Move overflow trim to activity * Allow empty selection * Global haul key stops/starts hauling for easy double tap
* message * is_valid * is_avatar * test * document * Update doc/EFFECT_ON_CONDITION.md Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> * Update doc/EFFECT_ON_CONDITION.md Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> * player_see * fix * doc and example * can_see_location * dynamic_line_string_keys * sort --------- Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>
* avoid friendly fire * doc * fix * fix
* Add ability to see NPC personality traits in the dialog window * NPCs automatically populate personality traits * Add some stock personality traits * Add documentation for personality_score traits * A series of unfortunate mistakes, now corrected Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…en#69524) * Update bionics.json * Update bionics.json * Update bionics.json
…sion_fix Fix the Old Guard representative mission
Added fungaloid weakpoints and proficiencies
Packages were deprecated that core vcpkg functionality relied on. Update vcpkg to a commit where they handle that.
* refactor and fix evaluate_enemy * Cleanup, simplify until maths working * add estimate_armour function refactor/rewrite... nearly... complete * add perception and pain effect * asstile * Update npcmove.cpp * Add some more debug messages for testing * simplify calc by tallying allies vs enemies Uncover still more issues in the process * this might work now * logic and formatting 1. add colour to messages for easier reading 2. adjust error in perception calculation 3. running away NPCs are valued lower. * Colourize debug log because why not * fix another math error monster HP was backwards. Also updates more colours. * math errors math errors aaaah melee and ranged weapons were not in even vague parity on evaluation. Did not fix that, but did make it tolerable for now. * scale ally threat same as enemy threat missed a scalar * Add a bleeding assessment to threat.
Merged in CleverRaven#69580 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes all the bugs in CleverRaven#68638