Merge pull request #4473 from PolarisSS13/revert-4383-revert-4379-revert-4359-revert-4345-revert-4301-revert-4292-NOV17MAP_TEST

Revert "Revert "Revert "Revert "Revert "Revert "Switches us to the Southern Cross for testing""""""
This commit is contained in:
Anewbe
2017-12-30 17:44:14 -05:00
committed by GitHub
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -28,7 +28,7 @@ Notes for people who used ZAS before:
*/
//#define ZASDBG
//#define MULTIZAS
#define MULTIZAS
#define AIR_BLOCKED 1
#define ZONE_BLOCKED 2
#define BLOCKED 3
+1 -1
View File
@@ -2365,7 +2365,7 @@
#include "code\ZAS\Zone.dm"
#include "interface\interface.dm"
#include "interface\skin.dmf"
#include "maps\northern_star\northern_star.dm"
#include "maps\southern_cross\southern_cross.dm"
#include "maps\submaps\_readme.dm"
#include "maps\submaps\cave_submaps\cave.dm"
#include "maps\submaps\cave_submaps\cave_areas.dm"