Fix bionic toggling
Bathroom improvements
Fix
Fix 2
Merge pull request #1 from CleverRaven/master

update 30/11/14
removed unused deathcam junk
added ability to change deathcam settings [always/ask/never] in options menu
Fixed linoleum broken pattern
Update mapgen_functions.cpp
Fixes bad "wool" object (should be "felt_patch")
Merge pull request #10292 from Coolthulhu/woolfix

Fixes bad "wool" object (should be "felt_patch")
Merge remote-tracking branches 'dda/pr/10283' and 'dda/pr/10291' into dda-master

* dda/pr/10283:
  Update mapgen_functions.cpp
  Fixed linoleum broken pattern
  Fix 2
  Fix
  Bathroom improvements

* dda/pr/10291:
  added ability to change deathcam settings [always/ask/never] in options menu
  removed unused deathcam junk
Volume fix for raw lasagne.
Remove some unecessary debug statements that were appearing in profiling as a major source of overhead.
Merge pull request #10294 from kevingranade/trim-logging

Remove some unecessary debug statements
Craftable and constructable folding frame
Replaced scrap metal with plastic chunk in legrig recipe
Merge branch 'lasagne' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge
Merge branch 'folding' of https://github.com/jokermatt999/Cataclysm-DDA into merge
Merge branch 'legrig-plastic-buckles' of https://github.com/SpongeTheGlaive/Cataclysm-DDA into merge