Merge branch 'master' into xenoarch_redux

BeeStation · Oct 18, 2024 · 4704e2c · 4704e2c
2 parents 16d795a + b5dfa88
commit 4704e2c
Show file tree

Hide file tree

Showing 348 changed files with 4,103 additions and 3,830 deletions.
diff --git a/.github/workflows/stale_prs.yml b/.github/workflows/stale_prs.yml
@@ -14,7 +14,9 @@ jobs:
         stale-pr-message: "This PR has been marked as stale due to being in an unmergable state for 7 days. Please resolve any conflicts and add testing evidence, then contact a project maintainer to have the stale label removed."
         stale-pr-label: 'Stale'
         any-of-pr-labels: 'Needs Testing Evidence,Merge Conflict'
-        days-before-stale: 7
-        days-before-close: 5
+        days-before-stale: -1
+        days-before-close: -1
+        days-before-pr-stale: 7
+        days-before-pr-close: 5
         remove-pr-stale-when-updated: true
         labels-to-remove-when-unstale: 'Stale'
diff --git a/_maps/Prefab/Departments.dmm b/_maps/Prefab/Departments.dmm
diff --git a/_maps/RandomRooms/10x10/rdm_dorms.dmm b/_maps/RandomRooms/10x10/rdm_dorms.dmm
diff --git a/_maps/RandomRooms/10x10/rdm_organ_harvesting.dmm b/_maps/RandomRooms/10x10/rdm_organ_harvesting.dmm
diff --git a/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm b/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm
diff --git a/_maps/RandomRooms/10x10/sk_rdm070_pubbybar.dmm b/_maps/RandomRooms/10x10/sk_rdm070_pubbybar.dmm
diff --git a/_maps/RandomRooms/10x10/sk_rdm083_bigtheatre.dmm b/_maps/RandomRooms/10x10/sk_rdm083_bigtheatre.dmm
diff --git a/_maps/RandomRooms/10x10/sk_rdm098_graffitiroom.dmm b/_maps/RandomRooms/10x10/sk_rdm098_graffitiroom.dmm
diff --git a/_maps/RandomRooms/10x10/sk_rdm106_sanitarium.dmm b/_maps/RandomRooms/10x10/sk_rdm106_sanitarium.dmm
diff --git a/_maps/RandomRooms/10x10/sk_rdm129_beach.dmm b/_maps/RandomRooms/10x10/sk_rdm129_beach.dmm
diff --git a/_maps/RandomRooms/10x10/sk_rdm141_6sectorsdown.dmm b/_maps/RandomRooms/10x10/sk_rdm141_6sectorsdown.dmm
diff --git a/_maps/RandomRooms/10x10/sk_rdm142_olddiner.dmm b/_maps/RandomRooms/10x10/sk_rdm142_olddiner.dmm
diff --git a/_maps/RandomRooms/10x10/sk_rdm143_gamercave.dmm b/_maps/RandomRooms/10x10/sk_rdm143_gamercave.dmm
diff --git a/_maps/RandomRooms/10x10/sk_rdm144_smallmagician.dmm b/_maps/RandomRooms/10x10/sk_rdm144_smallmagician.dmm
diff --git a/_maps/RandomRooms/10x10/sk_rdm147_advbotany.dmm b/_maps/RandomRooms/10x10/sk_rdm147_advbotany.dmm