From 7fdb5e1f658c2a9a88ebb3fc6bf0a97a84e0f56e Mon Sep 17 00:00:00 2001
From: Casey <a.roaming.shadow@gmail.com>
Date: Sun, 2 Oct 2022 14:19:28 -0400
Subject: [PATCH 1/2] Merge pull request #13831 from
 VOREStation/upstream-merge-8709

[MIRROR] moved sdmm defines to as early as possible in env [ABLE TO BE MERGED]
---
 code/{__defines/spaceman_dmm.dm => __spaceman_dmm.dm} | 7 ++++---
 vorestation.dme                                       | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)
 rename code/{__defines/spaceman_dmm.dm => __spaceman_dmm.dm} (85%)

diff --git a/code/__defines/spaceman_dmm.dm b/code/__spaceman_dmm.dm
similarity index 85%
rename from code/__defines/spaceman_dmm.dm
rename to code/__spaceman_dmm.dm
index 94f1743377..51b09cd036 100644
--- a/code/__defines/spaceman_dmm.dm
+++ b/code/__spaceman_dmm.dm
@@ -1,7 +1,8 @@
-// Interfaces for the SpacemanDMM linter, define'd to nothing when the linter
-// is not in use.
+/**
+* SpacemanDMM dreamchecker extensions for suite 1.7
+* <https://github.com/SpaceManiac/SpacemanDMM/tree/suite-1.7/src/dreamchecker>
+*/
 
-// The SPACEMAN_DMM define is set by the linter and other tooling when it runs.
 #ifdef SPACEMAN_DMM
 	#define RETURN_TYPE(X) set SpacemanDMM_return_type = X
 	#define SHOULD_CALL_PARENT(X) set SpacemanDMM_should_call_parent = X
diff --git a/vorestation.dme b/vorestation.dme
index 91b69dc113..129f19fc90 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -10,6 +10,7 @@
 #define DEBUG
 // END_PREFERENCES
 // BEGIN_INCLUDE
+#include "code\__spaceman_dmm.dm"
 #include "code\_away_mission_tests.dm"
 #include "code\_macros.dm"
 #include "code\_macros_vr.dm"
@@ -89,7 +90,6 @@
 #include "code\__defines\shields.dm"
 #include "code\__defines\shuttle.dm"
 #include "code\__defines\sound.dm"
-#include "code\__defines\spaceman_dmm.dm"
 #include "code\__defines\span_vr.dm"
 #include "code\__defines\species_languages.dm"
 #include "code\__defines\species_languages_vr.dm"