Merge branch 'shiptest-ss13:master' into master

.github/workflows/stale.yml

@@ -13,13 +13,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/stale@v4
+      - uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-pr-message: "This PR has been inactive for a month. This means it is at risk of being auto closed in a week, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself"
           days-before-stale: 30
           days-before-close: 7
-          days-before-issue-stale: -1
-          stale-pr-label: "Stale"
           exempt-pr-labels: "RED LABEL, Test Merged, Test Merge Candidate, Stale Exempt"
           exempt-draft-pr: true
+
+          stale-issue-message: "This flaky fail has not been detected in 7 days. If it doesn't show up again in another 7 days, it will be auto-closed."
+          only-issue-labels: "🤖 Flaky Test Report"
+          days-before-issue-stale: 7
+

Dockerfile

@@ -34,7 +34,7 @@ RUN git init \
     && git remote add origin \$AUXMOS_REPO \
     && git fetch --depth 1 origin \$AUXMOS_VERSION" \
     && git checkout FETCH_HEAD \
-    && env PKG_CONFIG_ALLOW_CROSS=1 cargo build --release --target=i686-unknown-linux-gnu --features "all_reaction_hooks,katmos"
+    && env PKG_CONFIG_ALLOW_CROSS=1 cargo build --release --target=i686-unknown-linux-gnu --features "citadel_reactions,katmos"
 
 # Install nodejs which is required to deploy Shiptest
 FROM base as node

_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm

@@ -256,7 +256,7 @@
 /obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /obj/structure/table/wood,
 /obj/item/melee/baton/cattleprod/loaded,
-/obj/item/storage/backpack/duffelbag/med/surgery,
+/obj/item/storage/case/surgery,
 /turf/open/floor/plasteel/white,
 /area/ruin/powered/icemoon/lodge/residential)
 "dV" = (
@@ -2033,9 +2033,9 @@
 	name = "equipment locker";
 	req_access_txt = "1"
 	},
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier,
+/obj/item/clothing/suit/armor/vest/frontier,
 /obj/item/clothing/head/helmet/bulletproof/x11/frontier,
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier,
+/obj/item/clothing/suit/armor/vest/frontier,
 /obj/item/clothing/head/helmet/bulletproof/x11/frontier,
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/gloves/combat,
@@ -2229,7 +2229,7 @@
 /area/ruin/powered/icemoon/lodge/mainhall)
 "Gn" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine{
+/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine{
 	pixel_x = 6;
 	pixel_y = 12
 	},
@@ -2548,11 +2548,11 @@
 	pixel_y = 12;
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine{
-	pixel_x = 6;
-	pixel_y = 12
-	},
 /obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine{
+	pixel_y = 12;
+	pixel_x = 5
+	},
 /turf/open/floor/wood/ebony,
 /area/ruin/powered/icemoon/lodge/cellar)
 "LC" = (