Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…

…to wallet

.github/CODEOWNERS

@@ -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
 

Dockerfile

@@ -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
@@ -12,8 +12,8 @@ RUN dpkg --add-architecture i386 \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
     curl ca-certificates gcc-multilib \
-    g++-multilib libc6-i386 zlib1g-dev:i386 \
-    libssl-dev:i386 pkg-config:i386 git \
+    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/*
@@ -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
@@ -34,7 +34,7 @@ RUN git init \
     && git remote add origin \$AUXMOS_REPO \
     && git fetch --depth 1 origin \$AUXMOS_VERSION" \
     && git checkout FETCH_HEAD \
-    && cargo rustc --target=i686-unknown-linux-gnu --release --features all_reaction_hooks,katmos -- -C target-cpu=native
+    && env PKG_CONFIG_ALLOW_CROSS=1 cargo build --release --target=i686-unknown-linux-gnu --features "all_reaction_hooks,katmos"
 
 # Install nodejs which is required to deploy Shiptest
 FROM base as node

_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm

@@ -128,7 +128,6 @@
 /obj/structure/stone_tile/slab,
 /mob/living/simple_animal/hostile/megafauna/dragon/icemoon{
 	loot = list(/obj/structure/closet/crate/necropolis/dragon,/obj/item/keycard/gatedrop/drakelair);
-	crusher_loot = list(/obj/structure/closet/crate/necropolis/dragon/crusher,/obj/item/keycard/gatedrop/drakelair)
 	},
 /turf/open/indestructible/boss,
 /area/ruin)