Updates map, adding new stuff in soon.
Adds the new entry screen.
Adds the telescience lab. I'm going to start an overhaul of the Research area and Security/Cargo Area soon. Right now everything's pretty compact so there's not much room to expand when /tg/ adds stuff. So I'm going to rearrange those areas to facilitate that better. I'll add the prison mining camp when I get that done.
Derp.
Merge branch 'master' of https://github.com/AndroidSFV/UMcS
Energy Pistol

An Energy pistol that has less to fire put can be put in your pocket.
New Gun Location

I added a new gun location as they take 10 sprites per energy gun. I
also moved the energy pistol to it along with added the "gun" sprites to
the left and right hands.
Merge branch 'master' of https://github.com/AndroidSFV/UMcS
Grammar fixes

Fix'd grammar as I'm not good at what I speak.
Merge branch 'master' of https://github.com/AndroidSFV/UMcS

Conflicts:
	icons/uristicons.dmi
Fix

Swimsuit remove fix and map
Fix 2.0

Please
Fix 2.1

Yes.
Merge pull request #77 from Nienhaus/master

Energy Pistol