cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 13:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tgstation/master' into upstream-2025-11-29

Browse Source 
# Conflicts:
#	_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
#	_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm
#	_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
#	_maps/map_files/tramstation/tramstation.dmm
#	code/_onclick/hud/new_player.dm
#	code/datums/components/squashable.dm
#	code/datums/diseases/advance/symptoms/heal.dm
#	code/datums/diseases/chronic_illness.dm
#	code/datums/status_effects/buffs.dm
#	code/datums/status_effects/debuffs/drunk.dm
#	code/datums/status_effects/debuffs/stamcrit.dm
#	code/game/machinery/computer/crew.dm
#	code/game/objects/items/devices/scanners/health_analyzer.dm
#	code/game/objects/items/wall_mounted.dm
#	code/game/turfs/closed/indestructible.dm
#	code/modules/admin/view_variables/filterrific.dm
#	code/modules/antagonists/heretic/influences.dm
#	code/modules/cargo/orderconsole.dm
#	code/modules/client/preferences.dm
#	code/modules/events/space_vines/vine_mutations.dm
#	code/modules/mob/dead/new_player/new_player.dm
#	code/modules/mob/living/carbon/human/death.dm
#	code/modules/mob/living/carbon/human/species_types/jellypeople.dm
#	code/modules/mob/living/damage_procs.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob_spawn/ghost_roles/mining_roles.dm
#	code/modules/mob_spawn/mob_spawn.dm
#	code/modules/projectiles/ammunition/energy/laser.dm
#	code/modules/projectiles/guns/ballistic/launchers.dm
#	code/modules/projectiles/guns/energy/laser.dm
#	code/modules/reagents/chemistry/machinery/chem_dispenser.dm
#	code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
#	code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
#	code/modules/reagents/chemistry/reagents/medicine_reagents.dm
#	code/modules/surgery/healing.dm
#	code/modules/unit_tests/designs.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	tgui/packages/tgui/interfaces/ChemDispenser.tsx
This commit is contained in:
nevimer
2025-11-29 22:49:21 -05:00
parent 4519d710d3 2bf063c693
commit baf3837ae8
1185 changed files with 39068 additions and 32028 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/auto_changelog.yml
+1 -1
View File
@@ -14,7 +14,7 @@ jobs:
if: github.event.pull_request.merged == true
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Generate App Token
id: app-token-generation
.github/workflows/autowiki.yml
+1 -1
View File
@@ -20,7 +20,7 @@ jobs:
echo "SECRETS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
- name: Checkout
if: steps.secrets_set.outputs.SECRETS_ENABLED
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Install BYOND
if: steps.secrets_set.outputs.SECRETS_ENABLED
uses: ./.github/actions/restore_or_install_byond
.github/workflows/codeowner_reviews.yml.disabled
+1 -1
View File
@@ -12,7 +12,7 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so the job can access it
- uses: actions/checkout@v5
- uses: actions/checkout@v6
#Parse the Codeowner file on non draft PRs
- name: CodeOwnersParser
.github/workflows/collect_data.yml
+1 -1
View File
@@ -27,7 +27,7 @@ jobs:
required_build_versions: ${{ steps.setup_required_build_versions.outputs.required_build_versions }}
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Find Maps
id: map_finder
run: |
.github/workflows/compare_screenshots.yml
+1 -1
View File
@@ -8,7 +8,7 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Setup directory
run: mkdir -p artifacts
# If we ever add more artifacts, this is going to break, but it'll be obvious.
.github/workflows/compile_all_maps.yml
+2 -2
View File
@@ -14,7 +14,7 @@ jobs:
timeout-minutes: 5
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Setup Bun
uses: ./.github/actions/setup_bun
- name: Restore BYOND from Cache
@@ -35,7 +35,7 @@ jobs:
timeout-minutes: 7
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Setup Bun
uses: ./.github/actions/setup_bun
- name: Restore BYOND from Cache
.github/workflows/compile_changelogs.yml
+1 -1
View File
@@ -35,7 +35,7 @@ jobs:
- name: "Checkout"
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
fetch-depth: 25
persist-credentials: false
.github/workflows/discord_discussions.yml
+1 -1
View File
@@ -34,7 +34,7 @@ jobs:
dotnet-quality: ga
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Build Tgstation.DiscordDiscussions
run: dotnet publish -c Release -o discord_discussions_bins tools/Tgstation.DiscordDiscussions/Tgstation.DiscordDiscussions.csproj
.github/workflows/gbp.yml.disabled
+3 -3
View File
@@ -12,7 +12,7 @@ jobs:
issues: write # to apply labels
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Run Auto Labeler
uses: actions/github-script@v7
with:
@@ -40,7 +40,7 @@ jobs:
echo "ACTIONS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
- name: Checkout
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Setup git
if: steps.value_holder.outputs.ACTIONS_ENABLED
run: |
@@ -48,7 +48,7 @@ jobs:
git config --global user.email "<>"
- name: Checkout alternate branch
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
ref: "gbp-balances" # The branch name
path: gbp-balances
.github/workflows/gbp_collect.yml.disabled
+2 -2
View File
@@ -18,7 +18,7 @@ jobs:
echo "ACTIONS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
- name: Checkout
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Setup git
if: steps.value_holder.outputs.ACTIONS_ENABLED
run: |
@@ -26,7 +26,7 @@ jobs:
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
- name: Checkout alternate branch
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
ref: "gbp-balances" # The branch name
path: gbp-balances
.github/workflows/generate_documentation.yml
+1 -1
View File
@@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-22.04
concurrency: gen-docs
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Setup cache
uses: actions/cache@v4
with:
.github/workflows/remove_guide_comments.yml
+1 -1
View File
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Remove guide comments
uses: actions/github-script@v7
with:
.github/workflows/rerun_flaky_tests.yml
+2 -2
View File
@@ -10,7 +10,7 @@ jobs:
if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.run_attempt == 1 }}
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Rerun flaky tests
uses: actions/github-script@v7
with:
@@ -22,7 +22,7 @@ jobs:
if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.run_attempt == 2 }}
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Report flaky tests
uses: actions/github-script@v7
with:
.github/workflows/run_integration_tests.yml
+1 -1
View File
@@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 25
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Restore BYOND from Cache
uses: ./.github/actions/restore_or_install_byond
with:
.github/workflows/run_linters.yml
+1 -1
View File
@@ -9,7 +9,7 @@ jobs:
timeout-minutes: 5
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Restore SpacemanDMM cache
uses: actions/cache@v4
with:
.github/workflows/setup_build_artifact.yml
+1 -1
View File
@@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04
timeout-minutes: 5
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Setup Bun
uses: ./.github/actions/setup_bun
- name: Restore BYOND from Cache
.github/workflows/show_screenshot_test_results.yml
+1 -1
View File
@@ -25,7 +25,7 @@ jobs:
echo "SECRETS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
- name: Checkout
if: steps.secrets_set.outputs.SECRETS_ENABLED
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Prepare module
if: steps.secrets_set.outputs.SECRETS_ENABLED
run: |
.github/workflows/test_merge_bot.yml
+1 -1
View File
@@ -23,7 +23,7 @@ jobs:
echo "GET_TEST_MERGES_URL=$SECRET_EXISTS" >> $GITHUB_OUTPUT
- name: Checkout
if: steps.secrets_set.outputs.GET_TEST_MERGES_URL
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Prepare module
if: steps.secrets_set.outputs.GET_TEST_MERGES_URL
run: |
.github/workflows/tgs_test.yml
+1 -1
View File
@@ -64,7 +64,7 @@ jobs:
dotnet-version: 8.0.x
- name: Checkout Repository
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Test TGS Integration
run: dotnet run -c Release --project tools/tgs_test ${{ github.repository }} /tgs_instances/tgstation ${{ env.TGS_API_PORT }} ${{ github.event.pull_request.head.sha || github.sha }} ${{ secrets.GITHUB_TOKEN }} ${{ env.PR_NUMBER }}
.github/workflows/update_tgs_dmapi.yml
+1 -1
View File
@@ -14,7 +14,7 @@ jobs:
pull-requests: write
steps:
- name: Clone
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Branch
run: |