Merge remote-tracking branch 'upstream/master' into fixing-space

BeeStation · Sep 11, 2024 · f504fea · f504fea
2 parents 18bfd88 + 534b7cc
commit f504fea
Show file tree

Hide file tree

Showing 191 changed files with 61,622 additions and 60,378 deletions.
diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
@@ -4,8 +4,6 @@ on:
     branches:
     - master
     - 'project/**'
-    - 'gh-readonly-queue/master/**'
-    - 'gh-readonly-queue/project/**'
   pull_request:
     branches:
     - master

diff --git a/__odlint.dm b/__odlint.dm
@@ -0,0 +1,10 @@
+// This file is included right at the start of the DME.
+// Its purpose is to enable multiple lints (pragmas) that are supported by OpenDream to better validate the codebase
+// These are essentially nitpicks the DM compiler should pick up on but doesnt
+
+#if defined(CIBUILDING) && defined(OPENDREAM)
+// This is in a separate file as a hack to avoid SpacemanDMM
+// evaluating the #pragma lines, even if its outside a block it cares about
+// (Also so people can code-own it. Shoutout to AA)
+#include "tools/ci/od_lints.dm"
+#endif
diff --git a/_maps/RandomRooms/10x5/sk_rdm091_skidrow.dmm b/_maps/RandomRooms/10x5/sk_rdm091_skidrow.dmm
diff --git a/_maps/RandomRooms/10x5/sk_rdm153_hobowithpeter.dmm b/_maps/RandomRooms/10x5/sk_rdm153_hobowithpeter.dmm
diff --git a/_maps/RandomRooms/3x5/sk_rdm023_boxclutter7.dmm b/_maps/RandomRooms/3x5/sk_rdm023_boxclutter7.dmm
diff --git a/_maps/RandomRooms/5x4/sk_rdm021_boxdinner.dmm b/_maps/RandomRooms/5x4/sk_rdm021_boxdinner.dmm
diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_11_hobobox.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_11_hobobox.dmm