Skip to content

Commit

Permalink
Merge branch 'master' into flashbang_bang_from_one_tile
Browse files Browse the repository at this point in the history
  • Loading branch information
MrCastmer committed Feb 25, 2024
2 parents 51dfae7 + 92cd358 commit d8c7dc9
Show file tree
Hide file tree
Showing 2,275 changed files with 300,320 additions and 157,315 deletions.
2 changes: 2 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ There is no strict process when it comes to merging pull requests. Pull requests

* While we have no issue helping contributors (and especially new contributors) bring reasonably sized contributions up to standards via the pull request review process, larger contributions are expected to pass a higher bar of completeness and code quality *before* you open a pull request. Maintainers may close such pull requests that are deemed to be substantially flawed. You should take some time to discuss with maintainers or other contributors on how to improve the changes.

* Any PR submitted after February 13th, 2024 must be accompanied by giving visual evidence (images, gifs, videos) of testing if the changes in the PR have any visual indication of changes. Omitting or filling out the testing part of the template with "I tested it" does not show these changes. Maintainers may hold your PR until testing is provided at the discretion of the Head Developers.

## Porting features/sprites/sounds/tools from other codebases

If you are porting features/tools from other codebases, you must give them credit where it's due. Typically, crediting them in your pull request and the changelog is the recommended way of doing it. Take note of what license they use though, porting stuff from AGPLv3 and GPLv3 codebases are allowed.
Expand Down
6 changes: 3 additions & 3 deletions .github/guides/HARDDELETES.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ So then, we want to temporarily remember to clear a reference when it's deleted

This is where I might lose you, but we're gonna use signals

`qdel()`, the proc that sets off this whole deletion business, sends a signal called `COMSIG_PARENT_QDELETING`
`qdel()`, the proc that sets off this whole deletion business, sends a signal called `COMSIG_QDELETING`

We can listen for that signal, and if we hear it clear whatever reference we may have

Expand All @@ -255,10 +255,10 @@ Here's an example
/somemob/proc/set_target(new_target)
if(target)
UnregisterSignal(target, COMSIG_PARENT_QDELETING) //We need to make sure any old signals are cleared
UnregisterSignal(target, COMSIG_QDELETING) //We need to make sure any old signals are cleared
target = new_target
if(target)
RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(clear_target)) //Call clear_target if target is ever qdel()'d
RegisterSignal(target, COMSIG_QDELETING, PROC_REF(clear_target)) //Call clear_target if target is ever qdel()'d
/somemob/proc/clear_target(datum/source)
SIGNAL_HANDLER
Expand Down
52 changes: 29 additions & 23 deletions .github/workflows/turdis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2

- name: Cache SpacemanDMM
uses: actions/cache@v1
with:
Expand All @@ -27,7 +27,7 @@ jobs:

- name: Setup Python
uses: actions/setup-python@v2

- name: Setup Rust
uses: hecrj/[email protected]

Expand All @@ -50,25 +50,25 @@ jobs:
id: linter
run: |
~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
- name: Annotate Linter
uses: yogstation13/DreamAnnotate@v2
if: always()
with:
with:
outputFile: output-annotations.txt

compile:
name: Compile All Maps
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2

- name: Install Dependencies
run: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt install libstdc++6:i386
- name: Restore Cache BYOND
uses: actions/cache@v1
with:
Expand All @@ -84,7 +84,7 @@ jobs:
echo "/home/runner/BYOND/byond/bin" >> $GITHUB_PATH
echo "LD_LIBRARY_PATH=/home/runner/BYOND/byond/bin:$LD_LIBRARY_PATH" >> $GITHUB_ENV
echo "MANPATH=/home/runner/BYOND/byond/man:$MANPATH" >> $GITHUB_ENV
- name: Compile All Maps
run: |
tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS
Expand All @@ -99,7 +99,7 @@ jobs:
- name: Find Maps
id: map_finder
run: |
echo "$(ls -mw0 _maps/*.json)" > maps_output.txt
echo "$(ls -mw0 _maps/yogstation.json)" > maps_output.txt
sed -i -e s+_maps/+\"+g -e s+.json+\"+g maps_output.txt
echo "Maps: $(cat maps_output.txt)"
echo "maps={\"paths\":[$(cat maps_output.txt)]}" >> $GITHUB_OUTPUT
Expand All @@ -113,30 +113,36 @@ jobs:
map: ${{ fromJSON(needs.find_all_maps.outputs.maps).paths }}
services:
mariadb:
image: mariadb
ports:
- 3306:3306
env:
MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: yes
image: mariadb
ports:
- 3306:3306
env:
MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: yes
concurrency:
group: ci-${{ github.ref }}-${{ matrix.map }}
cancel-in-progress: true
steps:
- uses: actions/checkout@v2

- name: Install Dependencies
run: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt install libstdc++6:i386 gcc-multilib g++-7 g++-7-multilib zlib1g:i386 libssl1.1 libssl1.1:i386
- name: Restore Cache BYOND
uses: actions/cache@v1
with:
path: ~/BYOND
key: ${{ runner.os }}-byond-${{ hashFiles('Dockerfile')}}
restore-keys: ${{ runner.os }}-byond


- name: Restore Cache Auxmos
uses: actions/cache@v1
with:
path: ~/.byond
key: auxmos-${{ hashFiles('dependencies.sh')}}

- name: Restore Yarn Cache
uses: actions/cache@v2
with:
Expand All @@ -152,26 +158,27 @@ jobs:
echo "MANPATH=/home/runner/BYOND/byond/man:$MANPATH" >> $GITHUB_ENV
cd $GITHUB_WORKSPACE
tools/travis/install_rust_g.sh
#tools/travis/install_extools.sh
sudo chmod 777 tools/travis/install_extools.sh
tools/travis/install_extools.sh
mysql -u root -h 127.0.0.1 -e 'CREATE DATABASE tg_travis;'
mysql -u root -h 127.0.0.1 tg_travis < SQL/tgstation_schema.sql
- name: Compile
run: |
tools/build/build --ci dm -DCIBUILDING
tools/travis/dm.sh -DTRAVISBUILDING -DANSICOLORS yogstation.dme || travis_terminate 1
- name: Prepare Artifacts
run: |
mkdir artifacts
cp yogstation.dmb artifacts
cp yogstation.rsc artifacts
- name: Upload Artifacts
uses: actions/upload-artifact@v1
with:
with:
name: DMB + RSC ${{matrix.map}}
path: ${{github.workspace}}/artifacts

- name: Run Tests
run: |
tools/travis/run_server.sh ${{ matrix.map }}
Expand All @@ -188,4 +195,3 @@ jobs:
contains(needs.*.result, 'failure')
|| contains(needs.*.result, 'cancelled')
}}
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"name": "Launch DreamSeeker",
"preLaunchTask": "Build All",
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
"dreamDaemon": true
"dreamDaemon": false
}
]
}
Loading

0 comments on commit d8c7dc9

Please sign in to comment.