BEF - Wall Charger / Map Changes

Uhh, first commit is old, second commit should reverse the first commit, and third commit is what I actually want pushed through..

If that makes any sense.

This does some tidying up to make things nicer and adds in the wall rechargers for energy weapons.