Merge remote-tracking branch 'refs/remotes/origin/odlinting' into odl…

…inting
cmss13-devs · Oct 13, 2023 · ba5282d · ba5282d
2 parents 4cec25b + 48839b9
commit ba5282d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/code/__odlint.dm b/code/__odlint.dm
@@ -6,6 +6,6 @@
 #ifdef OPENDREAM
 // These are in their own file as you need to do it with an include as a hack to avoid
 // SpacemanDMM evaluating the #pragma lines, even if its outside a block it cares about
-#include "../tools/ci/lints.dm"
+#include "__pragmas.dm"
 #endif
 #endif
diff --git a/tools/ci/lints.dm → code/__pragmas.dm b/tools/ci/lints.dm → code/__pragmas.dm
diff --git a/tools/ci/validate_dme.py b/tools/ci/validate_dme.py
@@ -19,7 +19,7 @@
     r'code/__HELPERS/BSQL/**/*.dm',
 
     # Included as part of OD lints
-    r'tools/ci/lints.dm'
+    r'code/__pragmas.dm'
 ]
 
 lines = []