updates to current source.
this fixes a few problems with building due to my changes with
warp functions and ship variables.
also updated a few other files for various other problems
Revert "updates to current source."

This reverts commit cf6b252da47963f7b2bb0bbb658b03fe412d5ca1.
Revert "Revert "updates to current source.""

This reverts commit e562cff6fd2ccfe10f2d2f01c4231f68324fdde9.