Merge remote-tracking branch 'upstream/master' into sandplanet_crunch…

…_gun

.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,6 +70,7 @@ jobs:
           ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
 
       - name: Annotate Lints
+        if: always()
         uses: yogstation13/DreamAnnotate@v2
         with:
           outputFile: output-annotations.txt
@@ -83,7 +84,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:
@@ -105,7 +106,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
@@ -135,7 +136,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/rerun_flaky_tests.yml

@@ -0,0 +1,37 @@
+name: Rerun/Report Flaky Tests
+on:
+  workflow_run:
+    workflows: [Checks]
+    types:
+    - completed
+
+permissions:
+  actions: write
+  contents: write
+  issues: write
+
+jobs:
+  rerun_flaky_tests:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.run_attempt == 1 }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Rerun flaky tests
+      uses: actions/github-script@v6
+      with:
+        script: |
+          const { rerunFlakyTests } = await import('${{ github.workspace }}/tools/pull_request_hooks/rerunFlakyTests.js')
+          await rerunFlakyTests({ github, context })
+  report_flaky_tests:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.run_attempt == 2 }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Report flaky tests
+      uses: actions/github-script@v6
+      with:
+        script: |
+          const { reportFlakyTests } = await import('${{ github.workspace }}/tools/pull_request_hooks/rerunFlakyTests.js')
+          await reportFlakyTests({ github, context })

_maps/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)
@@ -1051,7 +1050,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"

_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm

@@ -1509,10 +1509,6 @@
 	},
 /area/ruin/jungle/cavecrew/dormitories)
 "sJ" = (
-/obj/item/clothing/head/crown/fancy{
-	pixel_y = 9;
-	pixel_x = 6
-	},
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},

_maps/RandomRuins/JungleRuins/jungle_paradise.dmm

@@ -5181,7 +5181,7 @@
 	pixel_x = 7;
 	pixel_y = 6
 	},
-/obj/structure/fireaxecabinet{
+/obj/structure/cabinet/fireaxe{
 	pixel_y = 28
 	},
 /turf/open/floor/mineral/titanium,

_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm

@@ -150,10 +150,6 @@
 	pixel_x = -5;
 	pixel_y = 12
 	},
-/obj/item/clothing/head/witchunter{
-	pixel_y = 13;
-	pixel_x = -5
-	},
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit,
 /area/overmap_encounter/planetoid/lava/explored)

_maps/RandomRuins/ReebeRuins/reebe_floating_island.dmm

@@ -28,9 +28,7 @@
 /obj/item/ammo_casing/caseless/arrow/bronze,
 /obj/item/ammo_casing/caseless/arrow/bronze,
 /obj/item/ammo_casing/caseless/arrow/bronze,
-/obj/item/clothing/suit/bronze,
 /obj/item/clothing/head/bronze,
-/obj/item/clothing/shoes/bronze,
 /mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/crystal,
 /turf/open/floor/bronze,
 /area/ruin/reebe)