Skip to content

Commit

Permalink
Merge branch 'master' into CMO-Hypospray-Limb-Check-Fix
Browse files Browse the repository at this point in the history
Signed-off-by: CRUNCH <[email protected]>
  • Loading branch information
Fordoxia authored Nov 13, 2024
2 parents 4051e90 + 513a60b commit 31349de
Show file tree
Hide file tree
Showing 989 changed files with 21,613 additions and 8,167 deletions.
7 changes: 5 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

# CI + Tooling
/.github/workflows/ @AffectedArc07
/code/modules/unit_tests/ @AffectedArc07
/tools/ci/ @AffectedArc07
_build_dependencies.sh @AffectedArc07

Expand All @@ -24,10 +23,14 @@ _build_dependencies.sh @AffectedArc07

# Executables that need to be security-cleared
dreamchecker.exe @AffectedArc07
milla.dll @AffectedArc07
rustlibs.dll @AffectedArc07
rust_g.dll @AffectedArc07

### S34NW

# TGUI stuff
/tgui/bin @S34NW


### Overrides for the above
/tools/ci/check_grep2.py @ParadiseSS13/commit-access
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: Build MILLA
name: Build Rust library
on:
issue_comment:
types: created

jobs:
build-milla:
build-rust:
if: |
github.event.issue.pull_request &&
(github.event.comment.body == '!build_milla') &&
(github.event.comment.body == '!build_rust') &&
((github.event.sender.id == github.event.issue.user.id) ||
(github.event.comment.author_association == 'COLLABORATOR') ||
(github.event.comment.author_association == 'MEMBER') ||
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
ref: ${{ env.PR_BRANCH }}
token: ${{ env.GH_TOKEN }}

- name: Build MILLA
- name: Build rustlibs
env:
BASE_BRANCH: ${{ github.event.repository.default_branch }}
BASE_REPOSITORY: ${{ github.repository }}
Expand All @@ -65,7 +65,7 @@ jobs:
git pull origin "$PR_BRANCH" --depth=$((ahead_by + 1))
git remote add upstream "https://github.com/$BASE_REPOSITORY.git"
git fetch upstream "$BASE_BRANCH" --depth=$((behind_by + 1))
cd milla
cd rust
# Get dependencies.
rustup target add i686-unknown-linux-gnu
Expand All @@ -79,13 +79,13 @@ jobs:
cargo build --release --target i686-pc-windows-gnu
# Copy the built targets to their checked-in locations.
cp target/i686-unknown-linux-gnu/release/libmilla.so ../tools/ci/libmilla_ci.so
cp target/i686-pc-windows-gnu/release/milla.dll ../milla.dll
cp target/i686-unknown-linux-gnu/release/librustlibs.so ../tools/ci/librustlibs_ci.so
cp target/i686-pc-windows-gnu/release/rustlibs.dll ../rustlibs.dll
git commit -a -m "Build MILLA" --allow-empty
git commit -a -m "Build Rust library" --allow-empty
git push origin
- name: Notify Failure
if: failure() && env.FAIL_NOTIFIED != 'true'
run: |
gh pr comment ${{ github.event.issue.html_url }} -b 'Building MILLA failed, see the action run log for details: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
gh pr comment ${{ github.event.issue.html_url }} -b 'Building Rust library failed, see the action run log for details: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ $RECYCLE.BIN
*.swp

# Rust output.
/milla/target/*
/rust/target/*
rustlibs_panic.txt

# mkdocs output.
site
13 changes: 6 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<img width="15%" alt="Discord" hspace="3%" src=".github/assets/discord-dark.png">
</picture>
</a>
<a href="https://codedocs.paradisestation.org">
<a href="https://devdocs.paradisestation.org">
<picture>
<source media="(prefers-color-scheme: dark)" srcset=".github/assets/book-light.png">
<source media="(prefers-color-scheme: light)" srcset=".github/assets/book-dark.png">
Expand Down Expand Up @@ -56,36 +56,35 @@
> [!TIP]
> Want to contribute for the first time but unsure where to start?<br>
> Join our Discord and check out the [#coding_chat](https://discord.com/channels/145533722026967040/145700319819464704) channel for helpful links and advice!<br>
> Alternatively, have a look at our community maintained [Getting Started Guide](./docs/contributing/getting_started.md)
> Alternatively, have a look at our community maintained [Getting Started Guide](https://devdocs.paradisestation.org/contributing/getting_started/)
# Useful Documents and Links

- ### [Dream Maker (DM) Reference](https://www.byond.com/docs/ref/)

This reference site by the creators of BYOND details information on the DM language, the syntax used, functionality of native procs, and a lot more. This is always useful to have on hand when contributing.

- ### [Autodocumentation Guide](./docs/references/autodoc.md)
- ### [Autodocumentation Guide](https://devdocs.paradisestation.org/references/autodoc/)

This guide shows you how to leave code comments that comply with "autodocumentation", a system designed to make everyone's lives easier when reading or reviewing code!

- ### [Code of Conduct](./docs/CODE_OF_CONDUCT.md)
- ### [Code of Conduct](https://devdocs.paradisestation.org/code_of_conduct/)

All contributors are expected to read our Code of Conduct before they take part in our community.

- ### [Contribution Guide](./docs/CONTRIBUTING.md)
- ### [Contribution Guide](https://devdocs.paradisestation.org/contributing/)

Not sure how to take part and contribute? This guide gives an overview of how to make comments, pull requests, and open issues.

This guide also sets out our code standards that we expect all submitted code to adhere to.

- ### [Community Maintained Guide to Contributing](https://paradisestation.org/wiki/index.php?title=Guide_to_Contributing)
- ### [Community Maintained Guide to Contributing](https://devdocs.paradisestation.org/contributing/getting_started/)

This community maintained guide covers how to set yourself up for success when attempting to contribute to Paracode.

> [!IMPORTANT]
> Paradise does not provide precompiled binaries, requiring you to build from source to host a local server.<br>
> Building Paradise is quick and simple, all you need to install is [BYOND](https://www.byond.com/download/).<br>
> You can learn more in our [Installation Guide](.github/DOWNLOADING.md).
- ### [Paradise Station Development Team Structure](https://www.paradisestation.org/dev/policy/)

Expand Down
2 changes: 1 addition & 1 deletion _build_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ export STABLE_BYOND_MINOR=1633
# Python version for mapmerge and other tools
export PYTHON_VERSION=3.11.6
# RUSTG version
export RUSTG_VERSION=v3.0.0-P
export RUSTG_VERSION=v3.4.0-P
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@
/turf/simulated/floor/plasteel/lavaland_air,
/area/ruin/powered/clownplanet)
"bf" = (
/turf/simulated/mineral/clown/volcanic,
/turf/simulated/mineral/volcanic/clown,
/area/ruin/powered/clownplanet)
"bg" = (
/obj/item/pickaxe,
Expand Down Expand Up @@ -1006,7 +1006,7 @@
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
/turf/simulated/mineral/clown/volcanic,
/turf/simulated/mineral/volcanic/clown,
/area/ruin/powered/clownplanet)
"pv" = (
/obj/machinery/light{
Expand Down
Loading

0 comments on commit 31349de

Please sign in to comment.