Update to 0.C-6457-5337fb8f50 #48
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
This reverts commit 03d420c.
Adds blade, machete and survivor_machete to component options.
Changed name and description to match its purpose.
Added ability to be used on smgs and crossbows.
fix markdown link in MODDING documentation
Remove gasoline and disel from explosive recipes.
Restore sum of errors based dispersion.
* origin/pr/21041: new nulls
Add PR-24 to Eskrima martial art
Signed-off-by: Hal Gentz <zegentzy@gmail.com>
* origin/pr/20957: Fix overflow in advanced_inv.cpp Fix potential overflow in recalc_speed_bonus() Fix weight_capacity() overflow in player.cpp Revert PR #20672
…'origin/pr/21021' and 'origin/pr/21022' * origin/pr/20971: Don't apply electro-damage if electro-immune Remove is_elec_immune check from on_hurt Don't cancel activity if electricity-immune player is struck by it * origin/pr/20972: Add burst of flame case and no warning if heatsink or rm13 armor Suppress warning when stepping into fire for characters with Mycus Fireproofing * origin/pr/21021: Implement separate class for gun mod location: * origin/pr/21022: type fix Update recipe_food.json Update recipe_food.json Update recipe_food.json veggyaspic back to normal, comma added recipe_food.json
Buff RM451 Flamethrower item spawn chance
Translation template update
* origin/pr/20786: Nerf bullet explosions
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.
No description provided.