u #38
Merged
u #38
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
Changed CRT TV to LCD TV. Added large_lcd_screen. Made LCD TV drop a large_lcd_screen upon dissasembly.
Changed CRT TV to LCD TV. Added large_lcd_screen. Made LCD TV drop a large_lcd_screen upon dissasembly.
Fixed price of large_lcd_screen and added it to recipes and deconstruction when appropriate.
Adds deconstruction recipe for large_lcd_screen and small_lcd_screen and changes recipe for remote vehicle control to require a large LCD screen instead of a small LCD screen (because it would be incredibly difficult to drive a full-sized car with a tiny screen).
Alongside with other stuff I nearly forgot about.
crude_firestarter uses 5 energy, which seems to translate to 5 kJ. Since that's crude and inefficient, I made the CBM firestarter use 3 kJ.
Co-Authored-By: Jianxiang Wang (王健翔) <[email protected]>
`mgroup` was being dereferenced even when it is null, which is UB.
The `item` already provides the `itype` object, similar if you have the id to call `find_type`, we convert the result back into the original ID?
Remoe UB in debug overmap code:
Fix faulty bionic encumbrance description
Update No Antique Firearms mod
Currently, in progress crafts that lose their last component still exist, but with a volume of 0 as there is nothing in them. I've added this fix where if a player/npc bungles a craft and loses the last component of it (and the craft had components to start with), the craft item is removed from the game. fixes #34072
New players trying to repair an item sometimes discover the 'mend' option and try that. If they do so, try to guide them towards the correct interface with an informatory message in the log.
When manually firing a turret of a vehicle, the firing window shows a list of available turrets ("Turrets in range: 1"), followed by the list of those turrets. The turret names are names of items, which may contain the item status symbols ("||" or "\."), which in turn contain color tags.
The original code displayed the color tags as normal text. This fixes it to actually use the color tags to colorize the text.
…rafts Fix failed crafts with 0 volume
…g-a-world Fixed graphical artifact after creating a world in main menu
Routine i18n updates on 16 Nov 2019
* added candy_chocolate list amalgamated 10 candy items into list and replaced duplicate entries in various json lists * Update food.json * Update item_groups.json * Update item_groups.json
Fix turrets in vehicles displaying color tags in output
…5556) * game: don't dereference null pointers in swap_critters() swap_critters() dynamically casts the second creature to player * as other_npc and then checks if other_npc is in a vehicle. This will cause a crash if the second creature isn't a subclass of player, such as when the creature is a monster. Check for the validity of other_npc before derefencing it. * monster: use swap_critters() to swap a pet position in the pet menu Fixes #31538 the swap option in the pet menu wasn't unboarding the player correctly because it was rolling its own logic for swapping position. Use swap_critters() instead.
Help players discover how to repair
…-quick-fix Real cylinders have volume: Suppressor volume fix
…restart Fix Deconstruct Without Light at Night
Fix basecamp storage zone inventory
Remove other zone farming options, deduplication/inconsistency reduction
Change snippets to use string ids instead of hashes and to use the translation class
…uction Fixed detecting the final stage of the construction
* Make AIM width customizable * Special case for really low resolutions * Rewrote description
* initial progress * Create template from character. * tidy up code
Bug fix for mouse view #35324
Previously, slimesprings would spawn when you were above your healthy calories by a certain amount and the amount of water you had after it was processed through your digestive system would leave you with a thirst value less than 40. The hunger calculation didn't cause problems, but the thirst calculation did, because players could spawn lots of slimesprings, which would massively increase their thirst value, pushing them up to dehydrated. They were not actually dehydrated, because they had the water to recover in their digestive system, but nonetheless, this was a problem. This prevents that by also checking that the player's visible thirst value is less than a certain amount. It also makes it so that your 'true' thirst value must be -20 or less.
Fix astyle regression
Prevent slimespring spawning dehydration
Support item_locations on NPCs
* Initial XL Black Dragon armor addtions first addition of XL size BD armor * xl black dragon armor XL size BD armor * Update black_dragon_items.json * Update black_dragon_items.json * Update black_dragon_items.json * Update black_dragon_items.json * Update data/mods/Magiclysm/items/black_dragon_items.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/items/black_dragon_items.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/items/black_dragon_items.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/items/black_dragon_items.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/items/black_dragon_items.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/items/black_dragon_items.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/items/black_dragon_items.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/items/black_dragon_items.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/items/black_dragon_items.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/items/black_dragon_items.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/items/black_dragon_items.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/items/black_dragon_items.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/items/alchemy_items.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/items/black_dragon_items.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/items/black_dragon_items.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/items/black_dragon_items.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/items/black_dragon_items.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/items/black_dragon_items.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/items/black_dragon_items.json Co-Authored-By: Curtis Merrill <[email protected]>
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
Purpose of change
Describe the solution
Describe alternatives you've considered
Testing
Additional context