Pulls the plug on Omegastation

TJatPBnJ · Sep 20, 2018 · 04aa4ba · 04aa4ba
1 parent f209d04
commit 04aa4ba
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 363 deletions.
diff --git a/README.md b/README.md
@@ -91,12 +91,11 @@ https://github.com/tgstation/tgstation-server
 
 ## MAPS
 
-/tg/station currently comes equipped with five maps.
+/tg/station currently comes equipped with four maps.
 
 * [BoxStation (default)](https://tgstation13.org/wiki/Boxstation)
 * [MetaStation](https://tgstation13.org/wiki/MetaStation)
 * [DeltaStation](https://tgstation13.org/wiki/DeltaStation)
-* [OmegaStation](https://tgstation13.org/wiki/OmegaStation)
 * [PubbyStation](https://tgstation13.org/wiki/PubbyStation)
 
 

diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
@@ -8,7 +8,6 @@
 		#include "map_files\debug\runtimestation.dmm"
 		#include "map_files\Deltastation\DeltaStation2.dmm"
 		#include "map_files\MetaStation\MetaStation.dmm"
-		#include "map_files\OmegaStation\OmegaStation.dmm"
 		#include "map_files\PubbyStation\PubbyStation.dmm"
 		#include "map_files\BoxStation\BoxStation.dmm"
 		#include "map_files\YogStation\Yogstation.dmm"

diff --git a/_maps/omegastation.dm b/_maps/omegastation.dm
diff --git a/_maps/omegastation.json b/_maps/omegastation.json
diff --git a/_maps/shuttles/arrival_omega.dmm b/_maps/shuttles/arrival_omega.dmm
diff --git a/code/modules/jobs/map_changes/map_changes.dm b/code/modules/jobs/map_changes/map_changes.dm
@@ -1,10 +1,13 @@
 //this needs to come after the job_types subfolder to keep the correct ordering
 
+<<<<<<< HEAD
 #include "..\..\..\..\_maps\map_files\Deltastation\job_changes.dm"
 #undef JOB_MODIFICATION_MAP_NAME
 #include "..\..\..\..\_maps\map_files\MetaStation\job_changes.dm"
 #undef JOB_MODIFICATION_MAP_NAME
 #include "..\..\..\..\_maps\map_files\OmegaStation\job_changes.dm"
 #undef JOB_MODIFICATION_MAP_NAME
+=======
+>>>>>>> 0ef2572108... Merge pull request #40352 from 81Denton/remove-omega
 #include "..\..\..\..\_maps\map_files\PubbyStation\job_changes.dm"
 #undef JOB_MODIFICATION_MAP_NAME