Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into claymores
Browse files Browse the repository at this point in the history
  • Loading branch information
Sun-Soaked committed Jun 6, 2024
2 parents 0fc172a + 1a99384 commit 16259b3
Show file tree
Hide file tree
Showing 60 changed files with 6,779 additions and 4,373 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm @FalloutFalcon
/code/modules/food_and_drinks/food/ration.dm @FalloutFalcon
/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @FalloutFalcon
/code/modules/projectiles @FalloutFalcon
/code/modules/projectiles/ @FalloutFalcon
/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @FalloutFalcon
/code/modules/unit_tests/icons @FalloutFalcon
/code/modules/unit_tests/icons/ @FalloutFalcon

# MarkSuckerberg

Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM beestation/byond:515.1616 as base
FROM beestation/byond:515.1633 as base

# Install the tools needed to compile our rust dependencies
FROM base as rust-build
Expand All @@ -11,9 +11,9 @@ COPY dependencies.sh .
RUN dpkg --add-architecture i386 \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
curl ca-certificates gcc-multilib clang \
g++-multilib libc6-i386 zlib1g-dev:i386 \
libssl-dev:i386 pkg-config:i386 git \
curl ca-certificates gcc-multilib \
clang g++-multilib libc6-i386 \
zlib1g-dev:i386 pkg-config:i386 git \
&& /bin/bash -c "source dependencies.sh \
&& curl https://sh.rustup.rs | sh -s -- -y -t i686-unknown-linux-gnu --no-modify-path --profile minimal --default-toolchain \$RUST_VERSION" \
&& rm -rf /var/lib/apt/lists/*
Expand All @@ -25,7 +25,7 @@ RUN git init \
&& /bin/bash -c "source dependencies.sh \
&& git fetch --depth 1 origin \$RUST_G_VERSION" \
&& git checkout FETCH_HEAD \
&& cargo build --release --all-features --target i686-unknown-linux-gnu
&& cargo build --release --target i686-unknown-linux-gnu

# Build auxmos
FROM rust-build as auxmos
Expand Down
Loading

0 comments on commit 16259b3

Please sign in to comment.