Merge pull request #11917 from PsiOmegaDelta/dev

DME fixes.

.travis.yml

@@ -40,7 +40,7 @@ script:
   - python tools/TagMatcher/tag-matcher.py ../..
   - python tools/GenerateChangelog/ss13_genchangelog.py html/changelog.html html/changelogs
   - source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup
-  - echo "#define UNIT_TEST 1" > code/__defines/unit_testing.dm
+  - echo "#define UNIT_TEST 1" > code/_unit_testing.dm
   - cp config/example/* config/
   - DreamMaker baystation12.dme
   - DreamDaemon baystation12.dmb -invisible -trusted -core 2>&1 | tee log.txt

baystation12.dme

@@ -10,8 +10,8 @@
 #define DEBUG
 // END_PREFERENCES
 // BEGIN_INCLUDE
-#include "code\__defines\unit_testing.dm"
 #include "code\_macros.dm"
+#include "code\_unit_testing.dm"
 #include "code\global.dm"
 #include "code\hub.dm"
 #include "code\names.dm"
@@ -1867,9 +1867,9 @@
 #include "code\modules\wireless\interfaces.dm"
 #include "code\modules\xgm\xgm_gas_data.dm"
 #include "code\modules\xgm\xgm_gas_mixture.dm"
-#include "code\unit_tests\unit_test.dm"
 #include "code\unit_tests\mob_tests.dm"
-#include "code/unit_tests\zas_tests.dm"
+#include "code\unit_tests\unit_test.dm"
+#include "code\unit_tests\zas_tests.dm"
 #include "code\ZAS\_docs.dm"
 #include "code\ZAS\Airflow.dm"
 #include "code\ZAS\Atom.dm"

code/_unit_testing.dm

@@ -0,0 +1,10 @@
+/*
+ *
+ *   This file is used by Travis to indicate that Unit Tests are to be ran.
+ *   Do not add anything but the UNIT_TEST definition here as it will be overwritten by Travis when running tests.
+ *
+ *
+ *   Should you wish to edit set UNIT_TEST to 1 like so:
+ *   #define UNIT_TEST 1
+ */
+#define UNIT_TEST 0