Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
Browse files Browse the repository at this point in the history
…to metansing
  • Loading branch information
Zevotech committed Dec 12, 2024
2 parents 94702d5 + e0264c5 commit 434a364
Show file tree
Hide file tree
Showing 540 changed files with 46,479 additions and 72,662 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

16 changes: 8 additions & 8 deletions _maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
},
Expand Down Expand Up @@ -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" = (
Expand Down
Loading

0 comments on commit 434a364

Please sign in to comment.