[pull] master from CleverRaven:master #27
Merged
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
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
github-actions
bot
added
[C++]
[JSON]
[Markdown]
[Python]
<Documentation>
Code: Tests
EOC: Effects On Condition
Fields / Furniture / Terrain / Traps
NPC / Factions
Missions
Mutations / Traits / Professions/ Hobbies
Translation
Mods: Aftershock
Mods: Magiclysm
Mods: Xedra Evolved
Mechanics: Enchantments / Spells
Monsters
Mods
Mods: Mind Over Matter
labels
[MoM] Add variable to Lifting Field update EoC
[Xedra Evolved] Wolves Can't Talk
[Xedra Evolved] Add werewolf start scenario
Add jack-o'-lantern recipe byproducts
Prevent automatic assignment of hotkeys to passive mutations
* Add PHASE_DISTANCE to Astral Projection * Remove custom wall-passing power
* Initial commit * grammar fixes * Add spawn groups + fixes
Fix driveway of in-construction house_01
…g restrictions (#75891) * Add must wake up near humans fae ban * Adjustments * EoC to prevent purifying away food traits * Fix spelling error * Fix parentheses * contat -> contact * Check for threshold too
* Fix the security container mission * Lint Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: Anton Simakov <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* fail to feed, initial commit * refine calculations, add field for guns also, add debug tool to damage items * add jams, apply not a single jam, but random from group * move quick fixing to aim activity actor * better calculations for jam chance * swap fault functions because github do not show them correctly * mics changes * Prevent loop of "fixed fail to feed - found the gun failed to feed" * mics changes * mics changes * finishing bits * document thing * add manual fault fixes * Astyle Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Apply suggestions from code review --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Made human products get human 'vitamin' and vitamin inheritance * Update data/json/items/comestibles/carnivore.json Co-authored-by: Karol1223 <[email protected]> --------- Co-authored-by: Karol1223 <[email protected]>
ImGui to respect `fonts.json`
Fix superglue density
Fix python speedloader
#75852) * Add sleep_data * Add comfort calculations * Rework handle_action::sleep() * Add sleep aid msg to avatar::try_to_sleep Add fall asleep msg to Character::fall_asleep * Cleanup old functions, add comfort to json * Fix code and json errors * Move sleep messaging into sleep.h/cpp * Commented code * Documented comfort data and conditions * Fix typo in mutations.json * Update msvc-full-features/Cataclysm-lib-vcpkg-static.vcxproj * Appease clang-tidy * Fix discomfort messaging * Renamed comfort_data::condition::category to ccategory to appease GCC --------- Co-authored-by: Maleclypse <[email protected]>
Fixes the condition for Hub-01 to repair salvaged exoskeletons
* Initial commit * Homullus * Salamander * Generalized fae bans * humnan -> human
Knut-Aage-Hofseth
merged commit 8f2271d
into
Knut-Aage-Hofseth:master
3 of 5 checks passed
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.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )