Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync with Upstream Shiptest 2023-12-12 #9

Merged
merged 35 commits into from
Dec 13, 2023
Merged

Sync with Upstream Shiptest 2023-12-12 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
8d094e9
Goliath Gupdate (#2432)
thgvr Dec 8, 2023
7fb9c9c
Automatic changelog generation for PR #2432 [ci skip]
actions-user Dec 8, 2023
01edcc5
Fixes improper call of Destroy() (#2576)
MarkSuckerberg Dec 8, 2023
89b2647
Automatic changelog generation for PR #2576 [ci skip]
actions-user Dec 8, 2023
35afc6d
Update wintercoats, sort files (#2550)
thgvr Dec 8, 2023
e08dca5
Automatic changelog generation for PR #2550 [ci skip]
actions-user Dec 8, 2023
2d7d066
Automatic changelog compile [ci skip]
actions-user Dec 9, 2023
6bb1360
Limits Riggs-class ships to one (#2577)
thgvr Dec 9, 2023
e8741bd
Automatic changelog generation for PR #2577 [ci skip]
actions-user Dec 9, 2023
e95b8a4
Automatic changelog compile [ci skip]
actions-user Dec 10, 2023
54adaa6
New vote sound, puts vote in examine blocks (#2579)
thgvr Dec 10, 2023
9c6031d
Automatic changelog generation for PR #2579 [ci skip]
actions-user Dec 10, 2023
be9299a
fix a few easy to spot hard deletes (#2580)
ZephyrTFA Dec 10, 2023
bf19ccb
Automatic changelog compile [ci skip]
actions-user Dec 11, 2023
69b37e5
Adjusts BYOND Skin Buttons (#2570)
MarkSuckerberg Dec 11, 2023
d44345a
Automatic changelog generation for PR #2570 [ci skip]
actions-user Dec 11, 2023
ec314b3
bowls/mushroom bowls now use fill icon stuff for their fillings (#2567)
SomeguyManperson Dec 11, 2023
e8ac673
Syndicate undersuits without alt appearances are no longer adjustable…
SomeguyManperson Dec 11, 2023
10b350d
Automatic changelog generation for PR #2565 [ci skip]
actions-user Dec 11, 2023
a3c9dad
Ends the centuries-old war between David the goliath and the Hyena tu…
SomeguyManperson Dec 11, 2023
3a655cf
Fixes APC icon weirdness (#2568)
SomeguyManperson Dec 11, 2023
de5deab
Multi-Color tails, small tail, and a new marking (#2542)
thgvr Dec 12, 2023
0c32be5
Automatic changelog generation for PR #2542 [ci skip]
actions-user Dec 12, 2023
85168be
Removes a duplicate air alarm on the Kansatsu (#2539)
JimKil3 Dec 12, 2023
ffde880
Automatic changelog generation for PR #2539 [ci skip]
actions-user Dec 12, 2023
5a6da28
Basic ship spawning queue (#2578)
MarkSuckerberg Dec 12, 2023
64c1a18
Automatic changelog generation for PR #2578 [ci skip]
actions-user Dec 12, 2023
8127df2
Splits unit tests into MULTIPLE concurrent jobs (#2487)
MarkSuckerberg Dec 12, 2023
764c85e
Messes with time itself (#2549)
MarkSuckerberg Dec 12, 2023
f84118d
Automatic changelog generation for PR #2549 [ci skip]
actions-user Dec 12, 2023
bc61ec7
Automatic changelog compile [ci skip]
actions-user Dec 12, 2023
f244ba9
ERT Minor Refactor, more ERTs, ERTs can now spawn on subshuttles (#2395)
meemofcourse Dec 12, 2023
738f4ac
Automatic changelog generation for PR #2395 [ci skip]
actions-user Dec 12, 2023
b917f4d
Removes telekinetic beaker cap manipulation (#2572)
SomeguyManperson Dec 12, 2023
eac9af4
Merge remote-tracking branch 'upstream/master' into upstream-sync-202…
blinkdog Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/ci_suite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,19 @@ jobs:
run_all_tests:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Integration Tests
strategy:
fail-fast: true
matrix:
arg: [
"BASIC_TESTS",
"CREATE_AND_DESTROY_TEST",
"PLANET_GEN_TEST",
"RUIN_PLACEMENT_TEST",
"SHIP_PLACEMENT_TEST"
]
uses: ./.github/workflows/run_integration_tests.yml
with:
arg: ${{ matrix.arg }}

# run_alternate_tests:
# if: "!contains(github.event.head_commit.message, '[ci skip]')"
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/run_integration_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ on:
minor:
required: false
type: string
arg:
required: false
default: ALL_TESTS
type: string
jobs:
run_integration_tests:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -54,7 +58,7 @@ jobs:
run: |
bash tools/ci/install_byond.sh
source $HOME/BYOND/byond/bin/byondsetup
tools/build/build --ci dm -DCIBUILDING -DANSICOLORS
tools/build/build --ci dm -DCIBUILDING -DANSICOLORS -D${{ inputs.arg }}
- name: Run Tests
run: |
source $HOME/BYOND/byond/bin/byondsetup
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/independent_rigger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
],
"map_path": "_maps/shuttles/independent/independent_rigger.dmm",
"roundstart": true,
"limit": 2,
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/captain/western",
Expand Down
Loading
Loading