Merge branch 'master' into icelodge

.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

@@ -67,6 +67,11 @@
 	},
 /turf/open/water/beach/deep,
 /area/overmap_encounter/planetoid/beachplanet/explored)
+"eB" = (
+/obj/item/storage/box/ammo/c38,
+/obj/structure/closet/crate/wooden,
+/turf/open/floor/wood,
+/area/ruin/beach)
 "eJ" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
@@ -200,13 +205,6 @@
 /obj/structure/railing/corner,
 /turf/open/water/beach/deep,
 /area/overmap_encounter/planetoid/beachplanet/explored)
-"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)
 "kr" = (
 /obj/effect/turf_decal/weather/sand/corner{
 	dir = 1
@@ -281,11 +279,6 @@
 	},
 /turf/open/floor/plating/asteroid/sand,
 /area/overmap_encounter/planetoid/cave/explored)
-"mq" = (
-/obj/item/ammo_box/c38_box,
-/obj/structure/closet/crate/wooden,
-/turf/open/floor/wood,
-/area/ruin/beach)
 "my" = (
 /obj/effect/turf_decal/weather/sand{
 	dir = 5
@@ -746,12 +739,27 @@
 	},
 /turf/open/floor/wood/ebony,
 /area/overmap_encounter/planetoid/beachplanet/explored)
+"CJ" = (
+/obj/structure/closet/cabinet,
+/obj/item/pneumatic_cannon/speargun,
+/obj/item/melee/knife/hunting,
+/obj/machinery/light/small/directional/east{
+	light_color = "#d8b1b1"
+	},
+/turf/open/floor/wood,
+/area/ruin/beach)
 "CV" = (
 /obj/machinery/grill,
 /obj/effect/turf_decal/corner/opaque/pink/diagonal,
 /obj/effect/decal/cleanable/cobweb,
 /turf/open/floor/plastic,
 /area/ruin/beach)
+"DG" = (
+/obj/structure/closet/cabinet,
+/obj/item/pneumatic_cannon/speargun,
+/obj/item/melee/knife/hunting,
+/turf/open/floor/wood,
+/area/ruin/beach)
 "DL" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -1048,16 +1056,6 @@
 /obj/effect/turf_decal/siding/white/corner,
 /turf/open/water/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)
-"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"
-	},
-/turf/open/floor/wood,
-/area/ruin/beach)
 "PC" = (
 /obj/effect/turf_decal/weather/sand{
 	dir = 10
@@ -2188,9 +2186,9 @@ sz
 ut
 Ty
 oS
-mq
-kj
-PB
+eB
+DG
+CJ
 ut
 BW
 BN

_maps/RandomRuins/BeachRuins/beach_float_resort.dmm

@@ -1314,10 +1314,10 @@
 /area/ruin/beach/float_resort)
 "Ja" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/ketchup{
+/obj/item/reagent_containers/condiment/ketchup{
 	pixel_y = 18
 	},
-/obj/item/reagent_containers/food/condiment/mayonnaise{
+/obj/item/reagent_containers/condiment/mayonnaise{
 	pixel_x = -8;
 	pixel_y = 16
 	},

_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm

@@ -666,13 +666,8 @@
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
-/obj/item/ammo_box/c38_box{
-	pixel_x = 10;
-	pixel_y = 8
-	},
-/obj/item/ammo_box/c38_box{
-	pixel_x = 10
-	},
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38,
 /obj/structure/sign/poster/contraband/energy_swords{
 	pixel_x = -32
 	},

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm

@@ -242,9 +242,9 @@
 /obj/item/reagent_containers/food/snacks/fishmeat/carp,
 /obj/item/reagent_containers/food/snacks/fishmeat/carp,
 /obj/item/reagent_containers/food/snacks/fishmeat/carp,
-/obj/item/reagent_containers/food/condiment/pack/ketchup,
-/obj/item/reagent_containers/food/condiment/pack/ketchup,
-/obj/item/reagent_containers/food/condiment/pack/ketchup,
+/obj/item/reagent_containers/condiment/pack/ketchup,
+/obj/item/reagent_containers/condiment/pack/ketchup,
+/obj/item/reagent_containers/condiment/pack/ketchup,
 /obj/effect/turf_decal/corner/opaque/black{
 	dir = 1
 	},
@@ -383,7 +383,7 @@
 "EF" = (
 /obj/effect/decal/cleanable/blood/gibs/torso,
 /obj/structure/safe,
-/obj/item/ammo_box/a12g/slug,
+/obj/item/storage/box/ammo/a12g_slug,
 /obj/item/melee/knife/combat,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,

_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm

@@ -1034,7 +1034,7 @@
 /obj/item/reagent_containers/food/snacks/rationpack,
 /obj/item/reagent_containers/food/snacks/rationpack,
 /obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_x = -8;
 	pixel_y = 5
 	},
@@ -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_interceptor.dmm

@@ -41,7 +41,7 @@
 	dir = 5
 	},
 /obj/item/stack/cable_coil/cut/green,
-/obj/item/reagent_containers/food/condiment/peppermill,
+/obj/item/reagent_containers/condiment/peppermill,
 /turf/open/floor/plating/rust,
 /area/ruin/jungle/interceptor/starhall)
 "au" = (
@@ -992,9 +992,9 @@
 /obj/structure/closet/wall/directional/east,
 /obj/item/reagent_containers/food/snacks/meat/slab/monkey,
 /obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/rice,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/rice,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ruin/jungle/interceptor/starhall)
 "hO" = (
@@ -2887,7 +2887,7 @@
 	icon_state = "1-2"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = 5;
 	pixel_y = 5
 	},
@@ -3050,7 +3050,7 @@
 /obj/item/clothing/under/rank/security/officer/blueshirt,
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/shoes/jackboots,
-/obj/item/ammo_box/c9mm,
+/obj/item/storage/box/ammo/c9mm,
 /obj/machinery/light/small/broken/directional/north,
 /obj/effect/turf_decal/corner/transparent/bar/three_quarters{
 	dir = 4

_maps/RandomRuins/JungleRuins/jungle_paradise.dmm

@@ -1465,19 +1465,19 @@
 	pixel_x = 9
 	},
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_x = -3;
 	pixel_y = 6
 	},
 /obj/item/reagent_containers/glass/beaker{
 	pixel_x = -2
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
 	pixel_x = -8;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
 	pixel_x = -8;
 	pixel_y = 12
@@ -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_abandonedlisteningpost.dmm

@@ -2100,11 +2100,11 @@
 	pixel_y = 29;
 	pixel_x = -2
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_y = 17;
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_y = 17;
 	pixel_x = 4
 	},
@@ -2549,7 +2549,7 @@
 	pixel_y = 7;
 	pixel_x = -9
 	},
-/obj/item/reagent_containers/food/condiment/bbqsauce{
+/obj/item/reagent_containers/condiment/bbqsauce{
 	pixel_y = 6;
 	pixel_x = 7
 	},

_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm

@@ -92,7 +92,7 @@
 	name = "armory locker";
 	req_one_access_txt = "1"
 	},
-/obj/item/ammo_box/a12g,
+/obj/item/storage/box/ammo/a12g_buckshot,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/unpowered/crashed_starwalker)
 "bL" = (
@@ -942,7 +942,7 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/structure/closet/crate/secure/gear,
-/obj/item/ammo_box/c10mm/surplus,
+/obj/item/storage/box/ammo/c10mm_surplus,
 /obj/item/weaponcrafting/stock,
 /obj/item/weaponcrafting/stock{
 	pixel_x = -6
@@ -3133,7 +3133,7 @@
 /obj/structure/closet/secure_closet/freezer/kitchen/wall{
 	pixel_y = 29
 	},
-/obj/item/reagent_containers/food/condiment/rice,
+/obj/item/reagent_containers/condiment/rice,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel,
 /area/ruin/unpowered/crashed_starwalker)