Shuttle windows replaced with reskinned reinforced glass windows. Number of doors into cockpit reduced to 1.

Fitness room rearranged to make more sense, with glass around pool.

Conflicts:
	maps/tgstation2.dmm
tg's solars update
Fixed some bugged intents
Merge pull request #94 from Hellhound1/master

final merge merge
Merge pull request #95 from Hellhound1/master

ATM Enhancement Merge
Fix not being able to open the playerpanel of aliens due to a runtime.
Fixes a nano runtime when the oldMob is null during a user_transfer

Conflicts:
	code/modules/nano/nanomanager.dm
Moved more destructive events later in the round
Added a random delay to mass hallucination announcement, made hallucinations more severe
Merge pull request #184 from alex-gh/event_delay

Event tweaks
Merge pull request #96 from ZomgPonies/master

Merge with ponies
Merge pull request #7 from melandor0/master

merge with sigurd