fetching upstream #33
Open
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
Unhardcode mx_clay_deposit
eoc: clear deferred math on type errors too
- item info color tags would render if they are first character after a line wrap
…where Cannibals are pariahs 2
Items in transparent pockets on the map illuminate surroundings
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Make monsters being able to evaluate enchantment conditions
Routine i18n updates on 28 December 2024
Mark some specific furnitures/terrains examine as always allowed in faction territory
Unhardcode burned ground extras
…iano Revert "pianos give piano wire on disassembly"
typified stuff
* works! sound should be functional within ncurses without TILES=1 * style changes * updated CMake and cleaned up Makefile to support new feature * updated docs to reflect new feature --------- Co-authored-by: Jodi McJodson <[email protected]>
Bugfix kickboxing and boxing technique conditions
Check validity of plant data on load
* Initial commit * Add fire healing spell * Further increase cold weakness * Add burning venom * Fix spelling
* Initial price adjustment * Add missing notation * Rarer guns are less expensive * Revert SL8 changes * Bring Bullpup prices to that of AR15 While harder to maintain, the bullpups provide more barrel length in a smaller package, making up for that shortcoming * make mini-14 less expensive Price reduced due to harder to find mags and spare parts * Make AUG less expensive Price reduced to that of a semi-automatic due to harder to acquire mags and parts
* Audit Magiclysm organization * Move fantasy species in mutation paths * Delete obsolete.json from items folder, merge contents into existing files. * Lint Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Kick Test * Kick Test * Kick Test --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Fix NPC rules window scaling for small terminal sizes
* Initial commit * Initial commit
* typified cata_tiles and sdl_tiles * const + comment
* Innawoods trails fix * Update data/mods/innawood/mapgen/trail.json 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>
* Update tool_armor.json Applied values from #78798 (comment) Changed: thermal socks power draw thermal suit power draw, battery flag, and default battery thermal gloves power draw thermal mask power draw thermal outfit power draw * Update tool_armor.json Moved all thermal electric gear up one battery tier (ultralight/small -> medium, medium -> heavy) * Update TE gear power draw in tool_armor.json Increased power draw for TE gear to a total of 9 W from 5 W. * Update thermal electric gear in tool_armor.json Changed thermal electric gear power draws to a total of 8 W with a different ratio equalizing power draw between the balaclava, gloves, and socks. Added MEDIUM_BATTERY flags to the TE suit and outfit.
…ndom range function -Remove random from those that clearly should never have had it applied (and don't return their search range either)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
put foil wrappers inside of the roll
Routine tileset updates on 01 January 2025
* obsolete makeshift_solar_farm * Update data/json/mapgen/godco/nested.json Co-authored-by: Procyonae <[email protected]> --------- Co-authored-by: Maleclypse <[email protected]> Co-authored-by: Procyonae <[email protected]>
* Update firefighting.json * Update woodworking.json * Update data/json/items/tool/firefighting.json
Remove mission search radius from most missions
* Initial commit * Kick tests
Aftershock: Gameified EMP mechanics
* brigandine gloves fix * changes mirror armor's subcategory to CSC_ARMOR_TORSO from _HEAD
* make char_kiln item deployable * add missing space * make portablwe own item, add to cpp * fix furn size * fix wording and wrong kiln size * spacing and comment * astyle --------- Co-authored-by: marilynias <[email protected]>
* Initial commit * Ierde are friendly to worms, worms are neutral to ierde
[Aftershock] Fix Frontier Cyromask uses wrong battery
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.
Summary
Category "Brief description"
Purpose of change
Describe the solution
Describe alternatives you've considered
Testing
Additional context