Merge remote-tracking branch 'BeeStation/master' into ERTports

BeeStation · Nov 18, 2024 · 5cf3f7b · 5cf3f7b
2 parents d436151 + aad5050
commit 5cf3f7b
Show file tree

Hide file tree

Showing 918 changed files with 81,857 additions and 610,846 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/SQL/beestation_schema.sql b/SQL/beestation_schema.sql
@@ -505,7 +505,7 @@ CREATE TABLE IF NOT EXISTS `SS13_schema_revision` (
   `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`major`,`minor`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (7, 2);
+INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (7, 3);
 
 
 

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