Research Director Whimsy

I thought I might as well push this, it is getting the same error as the
HoP Whimsy, I'm not sure what to do about that.
Icon fix
Code fix
Research Whimsy

Finally.
Merge branch 'master' of https://github.com/AndroidSFV/UMcS

Conflicts:
	maps/Glloydstation.dmm
Merge branch 'master' of https://github.com/AndroidSFV/UMcS

Conflicts:
	maps/Glloydstation.dmm
Fix stuff

Fixed stuff to be able to pull.
Fix more.
Merge branch 'master' of https://github.com/AndroidSFV/UMcS
Derp.
Merge pull request #74 from Nienhaus/master

Research Director Whimsy
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.
Updating an incorrect forum URL, and changing ban appeals to point at Glloyd.
Merge pull request #79 from kg333/master

Updating an incorrect forum URL, and changing ban appeals to point at Glloyd