Update brazier description
bathtub, oven, cupboards pushable
Modified crafting to not yield ALL THE THREAD! when disassembling string, and related madness
merge cleanup
Make the battery system bionic only consume as many batteries as needed
Remove some commented out code.
Remove trailing whitespace.
Correct handling of flamable liquids.
Fix indices used by crafting recipe definition macros, thanks Soron and veryinky for reporting.
Re-add fitted items to the definitions
Re-added leather trenchcoat recipe
Fix indexing errors in construction definition macros.
Fix construction recipe macros so they don't scribble all over the crafting recipes.
Added heatpack to map item spawns.
Merged manually across item indexing refactor by Kevin Granade.
Add one more missing fitted item def
Re-fix nail drop rate from deconstruction

Looks like the item refactor blew away my fix to nail drop rate, after changing how spawn_item works with charged items. Re-fixing.
One last case of nail over-generation
Fix segfault-causing typo in shocker zombie butchering
More item refactor bugfixes
Rename some arcane "cx"/"cy" variables