Skip to content

Commit

Permalink
Merge branch 'shiptest-ss13:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
zimon9 authored Oct 7, 2024
2 parents 8da0ac1 + 3643e63 commit 035693b
Show file tree
Hide file tree
Showing 1,422 changed files with 77,600 additions and 62,977 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/rerun_flaky_tests.yml
Original file line number Diff line number Diff line change
@@ -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 })
4 changes: 2 additions & 2 deletions _maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@
/area/ruin/beach/complex)
"kK" = (
/obj/structure/closet/crate/bin,
/obj/item/reagent_containers/food/snacks/breadslice/moldy,
/obj/item/food/breadslice/moldy,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/concrete/slab_4,
/area/ruin/beach/complex)
Expand Down Expand Up @@ -1458,7 +1458,7 @@
/turf/open/floor/plasteel/mono,
/area/ruin/beach/complex)
"wV" = (
/obj/item/kitchen/knife/hunting{
/obj/item/melee/knife/hunting{
name = "machete";
pixel_y = 8;
desc = "Space vines HATE this one simple trick!"
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1232,7 +1232,7 @@
/obj/machinery/atmospherics/components/unary/passive_vent{
dir = 1
},
/obj/item/fireaxe{
/obj/item/melee/axe/fire{
name = "rusty fire axe"
},
/turf/open/floor/engine/airless,
Expand Down
11 changes: 4 additions & 7 deletions _maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,7 @@
"kj" = (
/obj/structure/closet/cabinet,
/obj/item/pneumatic_cannon/speargun,
/obj/item/storage/backpack/magspear_quiver,
/obj/item/kitchen/knife/hunting,
/obj/item/melee/knife/hunting,
/turf/open/floor/wood,
/area/ruin/beach)
"kr" = (
Expand Down Expand Up @@ -529,7 +528,7 @@
dir = 6
},
/obj/structure/table/reinforced,
/obj/item/kitchen/knife/butcher,
/obj/item/melee/knife/butcher,
/turf/open/floor/plastic,
/area/ruin/beach)
"wg" = (
Expand Down Expand Up @@ -1032,7 +1031,7 @@
"Os" = (
/obj/structure/table/wood/reinforced,
/obj/effect/turf_decal/corner/opaque/pink/diagonal,
/obj/item/kitchen/knife{
/obj/item/melee/knife/kitchen{
pixel_y = 12;
pixel_x = 9
},
Expand All @@ -1051,8 +1050,7 @@
"PB" = (
/obj/structure/closet/cabinet,
/obj/item/pneumatic_cannon/speargun,
/obj/item/storage/backpack/magspear_quiver,
/obj/item/kitchen/knife/hunting,
/obj/item/melee/knife/hunting,
/obj/machinery/light/small/directional/east{
light_color = "#d8b1b1"
},
Expand Down Expand Up @@ -1244,7 +1242,6 @@
/turf/open/water/beach/deep,
/area/overmap_encounter/planetoid/beachplanet/explored)
"Vt" = (
/obj/item/nullrod/carp,
/obj/structure/bed/dogbed,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood/walnut,
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/BeachRuins/beach_float_resort.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
"eZ" = (
/obj/item/melee/roastingstick,
/obj/item/roastingstick,
/turf/open/floor/wood{
light_range = 2
},
Expand Down Expand Up @@ -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
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1628,7 +1628,7 @@
/obj/effect/turf_decal/weather/sand{
dir = 5
},
/obj/item/melee/roastingstick,
/obj/item/roastingstick,
/obj/item/reagent_containers/food/snacks/sausage,
/turf/open/floor/plating/dirt{
light_range = 2
Expand Down Expand Up @@ -2304,7 +2304,7 @@
/obj/effect/turf_decal/weather/sand{
dir = 8
},
/obj/item/melee/roastingstick,
/obj/item/roastingstick,
/turf/open/floor/plating/dirt{
light_range = 2
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/area/ruin/beach/piratecrash/storage)
"af" = (
/obj/structure/table/wood,
/obj/item/kitchen/knife,
/obj/item/melee/knife/kitchen,
/obj/effect/turf_decal/corner/opaque/black/diagonal,
/obj/effect/turf_decal/siding/wood{
dir = 1
Expand All @@ -37,7 +37,7 @@
},
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/fishfry,
/obj/item/kitchen/knife/shiv{
/obj/item/melee/knife/shiv{
pixel_x = -6;
pixel_y = 5
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
},
/obj/structure/table/wood/reinforced,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
/obj/item/food/breadslice/moldy{
pixel_x = 3;
pixel_y = 6
},
Expand Down Expand Up @@ -393,7 +393,7 @@
pixel_x = 9;
pixel_y = -1
},
/obj/item/gun/ballistic/automatic/assault/p16/minutemen{
/obj/item/gun/ballistic/automatic/assault/cm82{
pixel_y = 7;
pixel_x = -9
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@
/area/ruin/unpowered/crashed_holemaker)
"oC" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/kitchen/knife,
/obj/item/melee/knife/kitchen,
/turf/open/floor/wood{
icon_state = "wood-broken7"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down Expand Up @@ -332,7 +332,7 @@
/obj/item/restraints/legcuffs/beartrap,
/obj/item/reagent_containers/glass/bottle/venom,
/obj/item/reagent_containers/glass/bottle/curare,
/obj/item/kitchen/knife/combat/survival,
/obj/item/melee/knife/survival,
/obj/effect/decal/cleanable/dirt,
/obj/item/reagent_containers/food/snacks/meat/slab/human,
/obj/item/reagent_containers/food/snacks/meat/slab/human,
Expand Down Expand Up @@ -384,7 +384,7 @@
/obj/effect/decal/cleanable/blood/gibs/torso,
/obj/structure/safe,
/obj/item/ammo_box/a12g/slug,
/obj/item/kitchen/knife/combat,
/obj/item/melee/knife/combat,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
Expand Down
28 changes: 2 additions & 26 deletions _maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -367,23 +367,6 @@
initial_gas_mix = "ICEMOON_ATMOS"
},
/area/ruin/unpowered)
"sf" = (
/obj/structure/table/wood,
/obj/item/nullrod{
block_chance = 50;
desc = "This massive chart appears to be the layout of a SolGov outpost. It's covered in marks, scribbles in a language you don't recognize, and several stains. It's unusually sturdy.";
icon_state = "blueprints";
item_state = "blueprints";
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi';
name = "facility blueprints";
pixel_y = 10;
righthand_file = 'icons/mob/inhands/items_righthand.dmi';
w_class = 5
},
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS"
},
/area/ruin/unpowered)
"si" = (
/obj/structure/flora/rock/jungle,
/obj/structure/flora/grass/jungle/b,
Expand Down Expand Up @@ -1248,13 +1231,6 @@
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/ruin/unpowered)
"Zs" = (
/obj/structure/table/wood,
/obj/item/banhammer,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS"
},
/area/ruin/unpowered)

(1,1,1) = {"
aW
Expand Down Expand Up @@ -2252,7 +2228,7 @@ Hb
aW
WH
jy
Zs
ib
WH
WH
WH
Expand Down Expand Up @@ -2284,7 +2260,7 @@ Hb
aW
Br
ib
sf
ib
WH
WH
fB
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
pixel_x = 6;
pixel_y = -6
},
/obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag{
/obj/item/gun/ballistic/automatic/pistol/ringneck/no_mag{
name = "bible gun";
pixel_x = -7;
pixel_y = -8;
Expand Down Expand Up @@ -3198,8 +3198,8 @@
/obj/structure/closet/wardrobe/chaplain_black{
populate = 0
},
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/structure/spacevine{
name = "vines"
},
Expand Down
12 changes: 6 additions & 6 deletions _maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5613,9 +5613,9 @@
/obj/structure/closet,
/obj/item/clothing/suit/armor/ngr/captain,
/obj/item/clothing/under/syndicate/ngr/officer,
/obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/gun/ballistic/automatic/pistol/ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/turf/open/floor/wood{
icon_state = "wood-broken2"
},
Expand Down Expand Up @@ -5787,9 +5787,9 @@
/area/overmap_encounter/planetoid/jungle/explored)
"Nh" = (
/obj/structure/filingcabinet,
/obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/gun/ballistic/automatic/pistol/ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/turf/open/floor/mineral/plastitanium,
/area/ruin/jungle/starport/tower)
"Nj" = (
Expand Down
6 changes: 1 addition & 5 deletions _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down Expand Up @@ -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"
},
Expand Down
Loading

0 comments on commit 035693b

Please sign in to comment.