Merge branch 'beta-dev' into spacies_riol

Signed-off-by: MrCat15352 <125268716+MrCat15352@users.noreply.github.com>

.github/CODEOWNERS

@@ -39,12 +39,11 @@
 
 # Sprite Maintainers
 
-# RalseiDreemuurr
-
-/icons/ @RalseiDreemuurr
-/whitesands/icons/ @RalseiDreemuurr
-/**/*.dmi @RalseiDreemuurr
+# ??
 
+/icons/ @MysticalFaceLesS
+/whitesands/icons/ @MysticalFaceLesS
+/**/*.dmi @MysticalFaceLesS
 
 # MAINTAINERS
 

.github/workflows/ci_suite.yml

@@ -11,7 +11,7 @@ on:
       - master
 jobs:
   run_linters:
-    if: ${{ ! contains(github.event.head_commit.message, '[ci skip]') }}
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Run Linters
     runs-on: ubuntu-22.04
     steps:
@@ -70,7 +70,6 @@ jobs:
           ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
 
       - name: Annotate Lints
-        if: always()
         uses: yogstation13/DreamAnnotate@v2
         with:
           outputFile: output-annotations.txt
@@ -84,7 +83,7 @@ jobs:
           cat check_regex_output.txt
 
   compile_all_maps:
-    if: ${{ ! contains(github.event.head_commit.message, '[ci skip]') }}
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Compile Maps
     runs-on: ubuntu-latest
     steps:
@@ -106,7 +105,7 @@ jobs:
           tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS -DFULL_INIT
 
   run_all_tests:
-    if: ${{ ! contains(github.event.head_commit.message, '[ci skip]') }}
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Integration Tests
     strategy:
       fail-fast: false
@@ -136,7 +135,7 @@ jobs:
 #      minor: ${{ matrix.minor }}
 
   test_windows:
-    if: ${{ ! contains(github.event.head_commit.message, '[ci skip]') }}
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Windows Build
     runs-on: windows-latest
     steps:

.github/workflows/codeowner_reviews.yml

@@ -0,0 +1,25 @@
+name: Codeowner Reviews
+
+# Controls when the workflow will run
+on: pull_request_target
+
+jobs:
+  assign-users:
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so the job can access it
+      - uses: actions/checkout@v3
+
+      #Parse the Codeowner file
+      - name: CodeOwnersParser
+        id: CodeOwnersParser
+        uses: tgstation/CodeOwnersParser@v1
+
+      #Request reviews
+      - name: Request reviews
+        if: steps.CodeOwnersParser.outputs.owners != ''
+        uses: tgstation/RequestReviewFromUser@v1
+        with:
+          separator: " "
+          users: ${{ steps.CodeOwnersParser.outputs.owners }}

.github/workflows/labeler.yml

@@ -26,6 +26,6 @@ jobs:
         if: github.event_name != 'push'
         uses: actions/labeler@v5
         with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          repo-token: "${{ secrets.TOKEN || secrets.GITHUB_TOKEN }}"
           sync-labels: true
           configuration-path: .github/labeler.yml

_maps/_mod_celadon/RandomRuins/BeachRuins/beach_fishing_hut.dmm

@@ -203,7 +203,6 @@
 "kj" = (
 /obj/structure/closet/cabinet,
 /obj/item/pneumatic_cannon/speargun,
-/obj/item/storage/backpack/magspear_quiver,
 /obj/item/melee/knife/hunting,
 /turf/open/floor/wood,
 /area/ruin/beach)
@@ -606,6 +605,25 @@
 	dir = 10
 	},
 /obj/structure/table/wood,
+/obj/item/throwing_star/magspear,
+/obj/item/throwing_star/magspear{
+	pixel_y = 2
+	},
+/obj/item/throwing_star/magspear{
+	pixel_y = 4
+	},
+/obj/item/throwing_star/magspear{
+	pixel_y = 6
+	},
+/obj/item/throwing_star/magspear{
+	pixel_y = 8
+	},
+/obj/item/throwing_star/magspear{
+	pixel_y = 10
+	},
+/obj/item/throwing_star/magspear{
+	pixel_y = 12
+	},
 /turf/open/floor/wood,
 /area/ruin/beach)
 "yV" = (
@@ -1051,7 +1069,6 @@
 "PB" = (
 /obj/structure/closet/cabinet,
 /obj/item/pneumatic_cannon/speargun,
-/obj/item/storage/backpack/magspear_quiver,
 /obj/item/melee/knife/hunting,
 /obj/machinery/light/small/directional/east{
 	light_color = "#d8b1b1"