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
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 pull request #74 from Nienhaus/master

Research Director Whimsy
Fixes swimsuits for women

At the cost of the super-duper female cuts for jumpsuits, which change
half a dozen pixels at most. Still, women will be able to wear the
*female* swimsuits now, along with Glloyd's navy uniforms and the HoP/RD
whimsy outfits.