Merge pull request #3 from HypatiaStation/master

Minor map fix
Map bug fixes 3

Should /HOPEFULLY/ fix everything.
+Should fix admin/spec ops shuttle
+renamed some items and such
hot patch for fix 3

fixing small bug
Merge pull request #4 from HypatiaStation/master

repository update
Merge pull request #228 from TheNick5527/master

map update 3
Ignore

Ignore apartment code on master