Merge pull request tgstation#9796 from CorruptComputer/MergeConflicts…

…Suck

[Merge Ready] "AsteroidStation rises from the dead, try two!"

.travis.yml

@@ -9,6 +9,7 @@ env:
     - DM_MAPFILE="tgstation2"
     - DM_MAPFILE="metastation"
     - DM_MAPFILE="ministation"
+    - DM_MAPFILE="asteroidstation"
 
 before_install:
   - sudo apt-get update -qq

_maps/AsteroidStation.dm

@@ -0,0 +1,24 @@
+/*
+The /tg/ codebase currently requires you to have 7 z-levels of the same size dimensions.
+z-level order is important, the order you put them in inside this file will determine what z level number they are assigned ingame.
+Names of z-level do not matter, but order does greatly, for instances such as checking alive status of revheads on z1
+*/
+
+#if !defined(MAP_FILE)
+
+        #include "map_files\AsteroidStation\AsteroidStation.dmm"
+        #include "map_files\AsteroidStation\z2.dmm"
+        #include "map_files\generic\z3.dmm"
+        #include "map_files\generic\z4.dmm"
+        #include "map_files\AsteroidStation\z5.dmm"
+        #include "map_files\generic\z6.dmm"
+        #include "map_files\generic\z7.dmm"
+
+        #define MAP_FILE "AsteroidStation.dmm"
+        #define MAP_NAME "AsteroidStation"
+
+#elif !defined(MAP_OVERRIDE)
+
+	#warn a map has already been included, ignoring AsteroidStation.
+
+#endif

_maps/map_files/AsteroidStation/readme.dm

@@ -0,0 +1,6 @@
+/*
+	The contents of these files should not be ticked/included while compiling.
+
+	These files are only included, and compiled, when \_maps\Asteroidstation.dm is included; as these files are necessary to run Asteroidstation.
+	You do not have to tick them yourself, it will be automatically done by the asteroidstation.dm file.
+*/

config/admins.txt

@@ -70,6 +70,7 @@ cookingboy3 = Game Master
 limeliz = Game Master
 steelpoint = Game Master
 phil235 = Game Master
+CorruptComputer = Game Master
 xxnoob = Game Master
 tkdrg = Game Master
 Cuboos = Game Master

html/changelogs/CorruptComputer-Asteroidstation.yml

@@ -0,0 +1,6 @@
+author: CorruptComputer
+
+delete-after: True
+
+changes: 
+  - rscadd: "Readded Asteroidstation, now up to date, with solars, and generally better!"