#10 Перенос обновлений с Beta на Alpha сервер

.github/CODEOWNERS

@@ -4,43 +4,61 @@
 # In the event that multiple org members are to be informed of changes
 # to the same file or dir, add them to the end under Multiple Owners
 
-# MrCat15352
+# Teams
 
-/code/controllers/subsystem/shuttle.dm @MrCat15352
-/code/modules/shuttle/ @MrCat15352
-/code/modules/overmap/ @MrCat15352
+# Code Maintainers
+
+# MrCat15352, Mirag1993
+
+/strings/ @MrCat15352 @Mirag1993
+/tgui/ @MrCat15352 @Mirag1993
+/sound/ @MrCat15352 @Mirag1993
+/code/controllers/subsystem/shuttle.dm @MrCat15352 @Mirag1993
+/code/modules/shuttle/ @MrCat15352 @Mirag1993
+/code/modules/overmap/ @MrCat15352 @Mirag1993
+/code/game/objects/items/storage/ration.dm @MrCat15352 @Mirag1993
+/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm @MrCat15352 @Mirag1993
+/code/modules/food_and_drinks/food/ration.dm @MrCat15352 @Mirag1993
+/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @MrCat15352 @Mirag1993
+/code/modules/projectiles/ @MrCat15352 @Mirag1993
+/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @MrCat15352 @Mirag1993
+/**/*.dm @MrCat15352 @Mirag1993
 
-# Teams
 
 # Map Maintainers
+
+# molnizz
+
 /_maps/ @molnizz
+/code/controllers/subsystem/shuttle.dm @molnizz
+/code/modules/shuttle/ @molnizz
+/code/modules/overmap/ @molnizz
+/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @molnizz
+/**/*.dmm @molnizz
+
 
 # Sprite Maintainers
-/icons/ @MrCat15352
-/whitesands/icons/ @MrCat15352
 
-# CI and tool chains
+# RalseiDreemuurr
+
+/icons/ @RalseiDreemuurr
+/whitesands/icons/ @RalseiDreemuurr
+/**/*.dmi @RalseiDreemuurr 
 
-/tools/ @MysticalFaceLesS
 
 # MAINTAINERS
 
 # MysticalFaceLesS
 
-/code/game/objects/items/storage/ration.dm @MysticalFaceLesS
-/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm @MysticalFaceLesS
-/code/modules/food_and_drinks/food/ration.dm @MysticalFaceLesS
-/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @MysticalFaceLesS
-/code/modules/projectiles/ @MysticalFaceLesS
-/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @MysticalFaceLesS
+/tools/ @MysticalFaceLesS
+/.github/ @MysticalFaceLesS
+/SQL/ @MysticalFaceLesS
+/bin/ @MysticalFaceLesS
+/html/ @MysticalFaceLesS
+/strings/ @MysticalFaceLesS
+/tgui/ @MysticalFaceLesS
 /code/modules/unit_tests/icons/ @MysticalFaceLesS
 
-# molnizz
-
-/code/controllers/subsystem/shuttle.dm @molnizz
-/code/modules/shuttle/ @molnizz
-/code/modules/overmap/ @molnizz
-/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @molnizz
 
 # CONTRIBUTORS
 

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