Merge branch 'master' of https://github.com/Venuska1117/Paradise

.github/workflows/ci.yml

@@ -37,6 +37,18 @@ jobs:
         with:
           outputFile: output-annotations.txt
 
+  odlint:
+    name: Lint with OpenDream
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup OD
+        run: |
+          bash tools/ci/setup_od.sh
+      - name: Run OD
+        run: |
+          bash tools/ci/run_od.sh
+
   compile_all_maps:
     name: Compile All Maps
     runs-on: ubuntu-20.04

.gitignore

@@ -55,3 +55,5 @@ __pycache__/
 
 # Tools some of us like to keep in the repo
 dmm-tools.exe
+OpenDream
+paradise.json

__odlint.dm

@@ -0,0 +1,16 @@
+// 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
+
+#ifndef SPACEMAN_DMM
+#ifdef OPENDREAM
+/*
+	For the person who asks
+	"AA, why are these in their own file?"
+	Quite simple
+	1. I can codeown that file
+	2. 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"
+#endif
+#endif

_maps/map_files/Delta/delta.dmm

@@ -85645,7 +85645,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/effect/spawner/random_spawners/dirt_rare,
+/obj/effect/spawner/random_spawners/dirt_maybe,
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
 "jIs" = (
@@ -96726,7 +96726,7 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/obj/effect/spawner/random_spawners/dirt_rare,
+/obj/effect/spawner/random_spawners/dirt_maybe,
 /obj/structure/flora/junglebush,
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)