Pretty sure I lost track of commits here
Moved debug steam devices to Code/Steam/Magic
Organized steam assets.
Merge branch 'master' of github.com:Aryn/Lost-Worlds
Fixed get_turf optimizations, locs does not exist on non-movable atoms.
Resolved conservation of energy with cyclic pump setups.
 - Exchanged the pipe system for a simpler one suited for a centralized power grid.
 - Added locked doors and keys.
index on master: b561848  - Exchanged the pipe system for a simpler one suited for a centralized power grid.  - Added locked doors and keys.
On master: Stasis
Simplified steam pipes, added locked doors, moved everything into a main event loop.
Merge commit '1a5c4846655d8957858f7c805df8427064c77a00'

Conflicts:
	Code/Steam/Pipes.dm
	Code/_Enum/_Math.dm
	Icons/Ship/Equipment/Steam/Pipe.dmi
	Lost Worlds IV.dme
	Maps/Test.New.dmm
	Maps/backup/Test.New.dmm
Fixed the map and a couple game.Start calls.
Merge branch 'master' of github.com:Aryn/Lost-Worlds

Conflicts:
	Code/Game/Starting/Vote.dm
	Code/System/World.dm
	Code/_Enum/_Math.dm
	Lost Worlds IV.dme