Merge branch 'ss14Starlight:Starlight' into roboticist

ss14Starlight · Jan 15, 2025 · 42e9847 · 42e9847
2 parents effbb3d + e765568
commit 42e9847
Show file tree

Hide file tree

Showing 5 changed files with 3,036 additions and 1,565 deletions.
diff --git a/.github/workflows/close-master-pr.yml b/.github/workflows/close-master-pr.yml
@@ -8,6 +8,10 @@ jobs:
   run:
     runs-on: ubuntu-latest
     if: ${{github.head_ref == 'master' || github.head_ref == 'main' || github.head_ref == 'develop' || github.head_ref == 'Starlight'}}
+    permissions:
+      contents: read
+      pull-requests: write
+      issues: write
 
     steps:    
     - uses: superbrothers/close-pull-request@v3

diff --git a/Resources/Changelog/ChangelogStarlight.yml b/Resources/Changelog/ChangelogStarlight.yml
@@ -2220,4 +2220,48 @@ Entries:
   id: 312
   time: '2025-01-13T13:23:55.000000+00:00'
   url: https://github.com/ss14Starlight/space-station-14/pull/233
+- author: Conflee
+  changes:
+  - message: OASIS - Fixed broken Docks.
+    type: Fix
+  id: 313
+  time: '2025-01-14T16:57:05.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/236
+- author: Conflee
+  changes:
+  - message: OASIS - Added redundant wiring to areas, and fixed a broken pipe in zoo.
+    type: Fix
+  id: 314
+  time: '2025-01-14T16:57:05.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/236
+- author: Conflee
+  changes:
+  - message: OASIS - Added Blue Shield Officer room between Janitor and Chapel, where
+      it is a 10 second walk from Bridge.
+    type: Add
+  id: 315
+  time: '2025-01-14T16:57:05.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/236
+- author: Conflee
+  changes:
+  - message: CORE - Fixed broken Docks.
+    type: Fix
+  id: 316
+  time: '2025-01-14T16:57:05.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/236
+- author: Conflee
+  changes:
+  - message: CORE - Added Blue Shield Officer room below Janitor, where it is a 20
+      second walk from Bridge.
+    type: Add
+  id: 317
+  time: '2025-01-14T16:57:05.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/236
+- author: Conflee
+  changes:
+  - message: CORE - Added needed job slots to Core.
+    type: Add
+  id: 318
+  time: '2025-01-14T16:57:05.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/236