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.

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

Merge translate master #1068

Merged
merged 83 commits into from
Jan 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
f10f6c3
Automatic changelog compile [ci skip]
tgstation-ci[bot] Jan 23, 2025
b53ced4
Add a SS13.check_tick lua function (#89081)
Absolucy Jan 23, 2025
36d8236
Automatic changelog for PR #89081 [ci skip]
tgstation-ci[bot] Jan 23, 2025
b71e9c1
Allow pAIs to withdraw their candidacy (#89120)
LikeLakers2 Jan 23, 2025
73aae3d
Automatic changelog for PR #89120 [ci skip]
tgstation-ci[bot] Jan 23, 2025
309eb46
Fixes malf ai screen (#89079)
jlsnow301 Jan 23, 2025
5cf2f1c
Automatic changelog for PR #89079 [ci skip]
tgstation-ci[bot] Jan 23, 2025
08d389d
Library admin refactor (#89097)
jlsnow301 Jan 23, 2025
6dee384
Basic Mob Vatbeast (#89158)
Jacquerel Jan 23, 2025
de4c1f8
Automatic changelog for PR #89158 [ci skip]
tgstation-ci[bot] Jan 23, 2025
5840459
Add Space Dragon to the banning panel (#89159)
Seefaaa Jan 23, 2025
1d0bed4
Automatic changelog for PR #89159 [ci skip]
tgstation-ci[bot] Jan 23, 2025
2aeeed0
Basic Dark Wizards (#89147)
Jacquerel Jan 23, 2025
c840470
Automatic changelog for PR #89147 [ci skip]
tgstation-ci[bot] Jan 23, 2025
9649c6d
Add the fancy block formatting to the Who, Adminwho, and Show Server …
Absolucy Jan 23, 2025
1db2aaa
Automatic changelog for PR #89099 [ci skip]
tgstation-ci[bot] Jan 23, 2025
876088b
Expands (further) on Rift Fishing by adding two new fish & more (#88860)
carlarctg Jan 23, 2025
4e55668
Automatic changelog for PR #88860 [ci skip]
tgstation-ci[bot] Jan 23, 2025
070e3f0
Adds Slime overcrowding because my byond client died once when flying…
StrangeWeirdKitten Jan 23, 2025
85473b8
Automatic changelog for PR #88935 [ci skip]
tgstation-ci[bot] Jan 23, 2025
92a585c
new icebox ruin: outpost 31 + megafauna (technically???) (#88714)
mc-oofert Jan 23, 2025
c0b2b53
Automatic changelog for PR #88714 [ci skip]
tgstation-ci[bot] Jan 23, 2025
89ead63
AIs can now examine. (#89146)
JohnFulpWillard Jan 23, 2025
4822411
Automatic changelog for PR #89146 [ci skip]
tgstation-ci[bot] Jan 23, 2025
ef60233
Removes the arbitrary limit of 10 maximum chat highlights (#89166)
Absolucy Jan 23, 2025
714f54a
Automatic changelog for PR #89166 [ci skip]
tgstation-ci[bot] Jan 23, 2025
c5c5446
Improved dooting for spectral instruments. New fantasy suffix. (#88489)
Ghommie Jan 23, 2025
bfdbe40
Automatic changelog for PR #88489 [ci skip]
tgstation-ci[bot] Jan 23, 2025
a3c60b6
Fixes weird baseball bat interaction with objects with throw_range 0 …
MX0739 Jan 23, 2025
3a4e243
Automatic changelog for PR #89168 [ci skip]
tgstation-ci[bot] Jan 23, 2025
2f13dd7
Fixes CI's limp (another hard del) (#89140)
vinylspiders Jan 23, 2025
e6aa185
Tether improvements and fixes (#89174)
SmArtKar Jan 23, 2025
bfbad49
Automatic changelog for PR #89174 [ci skip]
tgstation-ci[bot] Jan 23, 2025
155f0fe
Action palette no longer disappears while you have floating actions (…
SmArtKar Jan 23, 2025
bddec4d
Automatic changelog for PR #89175 [ci skip]
tgstation-ci[bot] Jan 23, 2025
8578e88
Fix BYOND cache not being handled properly in CI (#89180)
LikeLakers2 Jan 23, 2025
5cd41e5
Phobia regex should not be a global expression (#89162)
LikeLakers2 Jan 23, 2025
6e372f2
Automatic changelog for PR #89162 [ci skip]
tgstation-ci[bot] Jan 23, 2025
fec69ce
Fixes Undeleted SQL Query in Tutorial Code (#89172)
san7890 Jan 23, 2025
3cf0d6d
removes 3 smol instances of uselocalstate (#89129)
jlsnow301 Jan 23, 2025
5b5f3af
Removes vending products shortage station trait (#89121)
Likteer Jan 23, 2025
76dce99
Automatic changelog for PR #89121 [ci skip]
tgstation-ci[bot] Jan 23, 2025
121462a
Fixes reactions ending prematurely when nearing min conditions (#89109)
SyncIt21 Jan 23, 2025
8b6fa26
Automatic changelog for PR #89109 [ci skip]
tgstation-ci[bot] Jan 23, 2025
5d13bd8
Phobia rework (#89098)
Jacquerel Jan 23, 2025
5381f61
Automatic changelog for PR #89098 [ci skip]
tgstation-ci[bot] Jan 23, 2025
bae8283
Fixes a few bugs with stargazer targeting and attacks (#89068)
Exester509 Jan 23, 2025
f345450
Automatic changelog for PR #89068 [ci skip]
tgstation-ci[bot] Jan 23, 2025
34a4677
Automatic changelog compile [ci skip]
tgstation-ci[bot] Jan 24, 2025
ba4caa5
Comms console in TS (#89106)
jlsnow301 Jan 24, 2025
8f20e0f
Reagents ui in typescript (#89088)
jlsnow301 Jan 24, 2025
fcc6524
Ethereal wine charge gain adjusted to fit the new hunger drain stats.…
KingkumaArt Jan 24, 2025
bbf6bff
Automatic changelog for PR #89108 [ci skip]
tgstation-ci[bot] Jan 24, 2025
28872df
Tgui say: 516 compat (#88919)
jlsnow301 Jan 24, 2025
06b97c8
Automatic changelog for PR #88919 [ci skip]
tgstation-ci[bot] Jan 24, 2025
2c4648f
Refactors prefs window (#89000)
jlsnow301 Jan 24, 2025
ed7724b
Automatic changelog for PR #89000 [ci skip]
tgstation-ci[bot] Jan 24, 2025
ed9b161
Tech web into typescript (#89116)
jlsnow301 Jan 24, 2025
691b83e
Update CODEOWNERS (#89192)
LemonInTheDark Jan 24, 2025
44f4c23
Fix typo in path for cavesound3.ogg (#89181)
valzargaming Jan 24, 2025
624d015
Automatic changelog for PR #89181 [ci skip]
tgstation-ci[bot] Jan 24, 2025
e1bf410
Wound-related traits now balance out (#89090)
Absolucy Jan 24, 2025
bf0bbae
Automatic changelog for PR #89090 [ci skip]
tgstation-ci[bot] Jan 24, 2025
4e3b0c1
replace bubble sort with timsort for cameralist, filter then sort, mo…
Gaxeer Jan 24, 2025
749e9b0
Automatic changelog for PR #89087 [ci skip]
tgstation-ci[bot] Jan 24, 2025
85707b3
Cargo can source lethal shotgun shells at a premium via Imports. Reba…
necromanceranne Jan 24, 2025
8352c82
Automatic changelog for PR #89125 [ci skip]
tgstation-ci[bot] Jan 24, 2025
ea119b7
Modularizes the comms agent ruin on icebox (#89135)
EEASAS Jan 24, 2025
6ac4ac2
Automatic changelog for PR #89135 [ci skip]
tgstation-ci[bot] Jan 24, 2025
0bf83dc
Automatic changelog compile [ci skip]
tgstation-ci[bot] Jan 25, 2025
b1cab7c
Adds a search bar to the quirks menu (#89183)
StrangeWeirdKitten Jan 25, 2025
cb4288a
Automatic changelog for PR #89183 [ci skip]
tgstation-ci[bot] Jan 25, 2025
40c205b
Improvised explosives and pneumatic cannons recipes use the base pipe…
Profakos Jan 25, 2025
2e91f9e
Automatic changelog for PR #89096 [ci skip]
tgstation-ci[bot] Jan 25, 2025
fa39626
Fixes head IDs not giving large pointers while slotted into a wallet …
SmArtKar Jan 25, 2025
5a1b6c9
Automatic changelog for PR #1049 [ci skip]
ss220app[bot] Jan 25, 2025
4181564
Automatic changelog for PR #89177 [ci skip]
tgstation-ci[bot] Jan 25, 2025
288d755
Merge remote-tracking branch 'upstream/merge-upstream' into merge-ups…
Gaxeer Jan 25, 2025
56be14b
adjust interfaces to prefs refactor, adjust nanomaps to cameras fetch…
Gaxeer Jan 25, 2025
ed500ab
fix linter
Gaxeer Jan 25, 2025
12fd8b6
Merge Upstream 25.01.2025 (#1067)
Gaxeer Jan 25, 2025
cbad195
Automatic changelog for PR #1067 [ci skip]
ss220app[bot] Jan 25, 2025
43d81f2
Merge remote-tracking branch 'upstream/master' into translate
Gaxeer Jan 25, 2025
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
29 changes: 12 additions & 17 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@
/.github/guides/VISUALS.md @LemonInTheDark
/code/_onclick/hud/ @LemonInTheDark
/code/__DEFINES/layers.dm @LemonInTheDark
/code/__DEFINES/MC.dm @LemonInTheDark
/code/controllers/admin.dm @LemonInTheDark
/code/controllers/failsafe.dm @LemonInTheDark
/code/controllers/master.dm @LemonInTheDark
/code/controllers/subsystem.dm @LemonInTheDark
/code/controllers/subsystem/air.dm @LemonInTheDark
/code/controllers/subsystem/timer.dm @MrStonedOne

# Mothblocks

Expand Down Expand Up @@ -163,10 +170,6 @@
/code/modules/mob/living/carbon/carbon_update_icons.dm @Kapu1178
/code/modules/mob/living/carbon/human/human_update_icons.dm @Kapu1178

# MrStonedOne

/code/controllers/subsystem/timer.dm @MrStonedOne

# NamelessFairy

/code/modules/capture_the_flag/ @NamelessFairy
Expand All @@ -181,7 +184,7 @@

# MULTIPLE OWNERS

/SQL/ @Jordie0608 @MrStonedOne @scriptis
/SQL/ @Jordie0608 @scriptis

/_maps/ @EOBGames @Maurukas @MMMiracles @san7890 @ShizCalev

Expand All @@ -191,14 +194,6 @@

/code/__HELPERS/logging/ @dragomagol @ZephyrTFA

/code/__DEFINES/MC.dm @LemonInTheDark @MrStonedOne
/code/controllers/admin.dm @LemonInTheDark @MrStonedOne
/code/controllers/master.dm @LemonInTheDark @MrStonedOne
/code/controllers/failsafe.dm @LemonInTheDark @MrStonedOne
/code/controllers/subsystem.dm @LemonInTheDark @MrStonedOne

/code/controllers/subsystem/air.dm @LemonInTheDark @MrStonedOne

/code/modules/atmospherics/ @Ghilker @LemonInTheDark

/code/modules/client/preferences.dm @Mothblocks @ZephyrTFA
Expand All @@ -212,15 +207,15 @@

/code/modules/surgery/ @ExcessiveUseOfCobblestone @Ryll-Ryll

/tools/build/ @MrStonedOne @scriptis @stylemistake
/tools/tgs_scripts/ @Cyberboss @MrStonedOne @scriptis
/tools/build/ @scriptis @stylemistake
/tools/tgs_scripts/ @Cyberboss @scriptis

/tools/WebhookProcessor/ @BraveMole @TiviPlus

# Host Hell

/code/controllers/configuration/entries @MrStonedOne @scriptis
/config/ @MrStonedOne @scriptis
/code/controllers/configuration/entries @scriptis
/config/ @scriptis

# Expensive files that touching basically always cause performance problems
## Init times
Expand Down
51 changes: 51 additions & 0 deletions .github/actions/restore_or_install_byond/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# This is a reusable workflow to restore BYOND from a cache, or to install it otherwise.
name: Restore or Install BYOND
description: Attempts to restore a specified BYOND version from cache; if it can't, it installs it.

inputs:
major:
description: "The major BYOND version to install. Defaults to the BYOND_MAJOR specified in `dependencies.sh`."
required: false
type: string
minor:
description: "The minor BYOND version to install. Defaults to the BYOND_MINOR specified in `dependencies.sh`."
required: false
type: string

runs:
using: composite
steps:
- name: Configure BYOND version from inputs
if: ${{ inputs.major }}
shell: bash
run: |
echo "BYOND_MAJOR=${{ inputs.major }}" >> $GITHUB_ENV
echo "BYOND_MINOR=${{ inputs.minor }}" >> $GITHUB_ENV
- name: Configure BYOND version from dependencies.sh
if: ${{ !inputs.major }}
shell: bash
run: |
source dependencies.sh
echo "BYOND_MAJOR=$BYOND_MAJOR" >> $GITHUB_ENV
echo "BYOND_MINOR=$BYOND_MINOR" >> $GITHUB_ENV

# The use of `actions/cache/restore` and `actions/cache/save` here is deliberate, as we want to
# save the BYOND install to a cache as early as possible. If we used just `actions/cache`, it
# would only attempt to save the cache at the end of a job. This ensures that if a workflow run
# is cancelled, we already have a cache to restore from.
- name: Restore BYOND cache
id: restore_byond_cache
uses: actions/cache/restore@v4
with:
path: ~/BYOND
key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
- name: Install BYOND
if: ${{ !steps.restore_byond_cache.outputs.cache-hit }}
shell: bash
run: bash tools/ci/install_byond.sh
- name: Save BYOND cache
if: ${{ !steps.restore_byond_cache.outputs.cache-hit }}
uses: actions/cache/save@v4
with:
path: ~/BYOND
key: ${{ steps.restore_byond_cache.outputs.cache-primary-key }}
8 changes: 2 additions & 6 deletions .github/workflows/autowiki.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,16 @@ jobs:
- name: Checkout
if: steps.secrets_set.outputs.SECRETS_ENABLED
uses: actions/checkout@v4
- name: Restore BYOND cache
- name: Install BYOND
if: steps.secrets_set.outputs.SECRETS_ENABLED
uses: actions/cache@v4
with:
path: ~/BYOND
key: ${{ runner.os }}-byond-${{ hashFiles('dependencies.sh') }}
uses: ./.github/actions/restore_or_install_byond
- name: Install rust-g
if: steps.secrets_set.outputs.SECRETS_ENABLED
run: |
bash tools/ci/install_rust_g.sh
- name: Compile and generate Autowiki files
if: steps.secrets_set.outputs.SECRETS_ENABLED
run: |
bash tools/ci/install_byond.sh
source $HOME/BYOND/byond/bin/byondsetup
tools/build/build --ci autowiki
- name: Run Autowiki
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,10 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Restore BYOND cache
uses: actions/cache@v4
with:
path: ~/BYOND
key: ${{ runner.os }}-byond-${{ hashFiles('dependencies.sh') }}
- name: Restore BYOND from Cache
uses: ./.github/actions/restore_or_install_byond
- name: Compile All Maps
run: |
bash tools/ci/install_byond.sh
source $HOME/BYOND/byond/bin/byondsetup
tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS
- name: Check client Compatibility
Expand All @@ -176,7 +172,7 @@ jobs:
max-required-client-version: ${{needs.collect_data.outputs.max_required_byond_client}}

collect_data:
name: Collect data for other tasks
name: Collect data and setup caches for other tasks
needs: start_gate
runs-on: ubuntu-22.04
timeout-minutes: 5
Expand Down Expand Up @@ -204,6 +200,8 @@ jobs:
#the regex here does not filter out non-numbers because error messages about no input are less helpful then error messages about bad input (which includes the bad input)
run: |
echo "max_required_byond_client=$(grep -Ev '^[[:blank:]]{0,}#{1,}|^[[:blank:]]{0,}$' .github/max_required_byond_client.txt | tail -n1)" >> $GITHUB_OUTPUT
- name: Set up BYOND cache
uses: ./.github/actions/restore_or_install_byond

run_all_tests:
name: Integration Tests
Expand Down
16 changes: 5 additions & 11 deletions .github/workflows/run_integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ jobs:
sudo apt-get update
sudo apt-get install zlib1g-dev:i386
- uses: actions/checkout@v4
- name: Restore BYOND cache
uses: actions/cache@v4
with:
path: ~/BYOND
key: ${{ runner.os }}-byond-${{ hashFiles('dependencies.sh') }}
- name: Setup database
run: |
sudo systemctl start mysql
Expand All @@ -55,15 +50,14 @@ jobs:
- name: Install dreamluau
run: |
bash tools/ci/install_dreamluau.sh
- name: Configure version
run: |
echo "BYOND_MAJOR=${{ inputs.major }}" >> $GITHUB_ENV
echo "BYOND_MINOR=${{ inputs.minor }}" >> $GITHUB_ENV
if: ${{ inputs.major }}
- name: Restore BYOND from Cache
uses: ./.github/actions/restore_or_install_byond
with:
major: ${{ inputs.major }}
minor: ${{ inputs.minor }}
- name: Compile Tests
id: compile_tests
run: |
bash tools/ci/install_byond.sh
source $HOME/BYOND/byond/bin/byondsetup
tools/build/build --ci dm -DCIBUILDING -DANSICOLORS -Werror -ITG0001 -I"loop_checks"
- name: Run Tests
Expand Down
Loading
Loading