AsteroidStation/-tg-station — pull request #1 by CorruptComputer (2014-12-23 02:20:16+00:00)
Title: Fixes the god awful merge conflict

Made the outside of the asteroid rock, so its harder to mine through
Same with the station
The head quarters are now on different APC's so they can turn off individually
This also fixed the head quarter lights starting off
Moved RD office
Moved Teleporter room
Moved research lab
Expanded Hydroponics
Added a second ore redemption machine to mining
Added some lights to dark areas
Fixed a problem with the SMES not charging
Fixed a couple spelling errors
Expanded robotics slightly
Fixed the broken disposal pipe outside of robotics
Made the places where emitters go more noticeable