Ran "indent -npcs -npsl -nut -l78 -lp '{}'" on codebase to make the function calls have a consistent line length.
Merge branch 'formatting_reconciliation' of git+ssh://github.com/niffiwan/wcsaga into formatting_reconciliation

Conflicts:
	code/weapon/beam.cpp
	code/weapon/emp.cpp
	code/weapon/flak.cpp
	code/weapon/muzzleflash.cpp
	code/weapon/shockwave.cpp
	code/weapon/shockwave.h
	code/weapon/swarm.cpp
	code/weapon/trails.cpp
	code/weapon/weapon.h
	code/weapon/weapons.cpp