Merge pull request #71 from Starfly-13/make-starfly-build-again

Make Starfly Build Again

.github/CODEOWNERS

@@ -4,22 +4,39 @@
 # 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
 
-# MarkSuckerberg
-/code/controllers/subsystem/shuttle.dm @MarkSuckerberg
-/code/modules/shuttle/ @MarkSuckerberg
-/code/modules/overmap/ @MarkSuckerberg
-
-# Teams
+# TEAMS
 
 # Map Maintainers
 /_maps/ @shiptest-ss13/maptainers
 
 # Sprite Maintainers
 /icons/ @shiptest-ss13/spritetainers
-/whitesands/icons/ @shiptest-ss13/spritetainers
 
 # CI and tool chains
 /tools/ @shiptest-ss13/admins
 
-#SIC SEMPER TYRANNIS
+
+# MAINTAINERS
+
+# FalloutFalcon
+
+/code/game/objects/items/storage/ration.dm @FalloutFalcon
+/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/reagents/chemistry/reagents/trickwine_reagents.dm @FalloutFalcon
+/code/modules/unit_tests/icons/ @FalloutFalcon
+
+# MarkSuckerberg
+
+/code/controllers/subsystem/shuttle.dm @MarkSuckerberg
+/code/modules/shuttle/ @MarkSuckerberg
+/code/modules/overmap/ @MarkSuckerberg
 /_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @MarkSuckerberg
+
+
+# CONTRIBUTORS
+
+
+# MULTIPLE OWNERS

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,7 +15,6 @@
 add: Added new things
 add: Added more things
 del: Removed old things
-tweak: tweaked a few things
 balance: rebalanced something
 fix: fixed a few things
 soundadd: added a new sound thingy

.github/workflows/build_linux.yml

@@ -0,0 +1,28 @@
+name: Build Linux
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  merge_group:
+    branches:
+      - master
+
+jobs:
+  build_linux:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    name: "Build (Linux)"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Project
+        uses: actions/checkout@v3
+
+      - name: Install BYOND
+        run: tools/starfly/ci/install_byond_linux.sh
+
+      - name: Build Project
+        run: |
+          source ${HOME}/BYOND/byond/bin/byondsetup
+          tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS -DFULL_INIT

.github/workflows/build_windows.yml

@@ -0,0 +1,25 @@
+name: Build Windows
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  merge_group:
+    branches:
+      - master
+
+jobs:
+  test_windows:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    name: "Build (Windows)"
+    runs-on: windows-latest
+    steps:
+      - name: Checkout Project
+        uses: actions/checkout@v3
+
+      - name: Build Project
+        run: pwsh tools/starfly/ci/build.ps1
+        env:
+          DM_EXE: "C:\\byond\\bin\\dm.exe"

Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM beestation/byond:515.1616 as base
+FROM beestation/byond:515.1633 as base
 
 # Install a MariaDB development package for the shared library
 FROM base as mariadb_library
@@ -20,8 +20,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/*
@@ -33,7 +33,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 --features all --target i686-unknown-linux-gnu
+    && cargo build --release --target i686-unknown-linux-gnu
 
 # Build auxmos
 FROM rust-build as auxmos
@@ -42,7 +42,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
 # NOTE: See: https://github.com/nodesource/distributions/discussions/1639

TODO-commits.txt

@@ -0,0 +1,42 @@
+
+X = compiles without errors
+- = introduces new compile errors
+^ = inherits compile errors; no new errors introduced
+@ = resolved without a cherry pick
+* = resolved
+! = skipped; not necessary to merge
+
+[@] c88b2633a20c83dfba5ed401df7f975242d99664    Update from Shiptest on 2024-05-07
+[@] 8edf84f54790db070c9ec563ed1227f7cda13d75    Updating computers
+[@] 3db454e5d0cc9c77473bd552eab947103102dc77    Changing How Hallucinations work
+[*] 559492835f9ba8f4f9a95ceaff8407bb103414dc    Updating the Mecha Icons
+[*] 17197b2c53a05738c56a1e0cd5cab6259401700a    Code/modules/mob/living/simple animal/hostile /syndicate
+[*] e2e37e2857adfae1d4b0c30582ca4c8bf4f765d1    updated revolver
+[*] c7796a52eb4abfe0983a637fff0783efaf976fe1    Constructable Suit Storage Units part 1
+[*] 5cdc04bcba1d594878be878d80ab713cb67278c8    Constructable Suit Storage Units part 2
+[@] 69820b0b662fad1657dfa6fdb3cda9427cfc4a19    Constructable Suit Storage Units part 3
+[*] 2dab8af3a192f6705c4d42e3fcb2a558a47803d6    Constructable Suit Storage Units part 4 (final)
+[*] de71c609003df6a255c22d50fe47100f827f76fc    Gun Lore Update
+[@] 4b727c9f03905a2d113e169474f23f11433df546    Armor value changes
+[@] 17efcbf73d4e15789f90bddfacea6286f950ab4d    Defib cargo/station
+[@] 61d82bda46ee76216524c12f73f71832a789b6ba    secret documents randomization
+[@] 21162817d06e60b8bcce6a4c970a9577643236dc    soul removal 1
+[*] 5dbf574b2fe63c492f5a27d2f4b2d0c47201ad3b    Makes Sinta'Unathi playable again.
+[*] 11b7bc7ea21c875d3a1b419ae5d3acd83a40ef50    Ship spawn adjustments
+[*] fa0eb54c7a03fcddb94de87450d3df2fe7264a76    Kills-legion-disease-cause-its-bad-and-weird
+[@] 21709d390eef4fa1cbab5af1d8d0919b978f8173    Mindbreaker Tweak
+[@] a0ae6ee50f7dcc336843897d508128518a6b1245    Ports-a-super-small-TG-signal-optimization
+[@] 4bb50ced53aff3902a0c87bd47ae63887d5efa2d    makes-plant-analyzer-usable
+[@] d830853fa2cf567ad15a167242698a16b86546ed    no-more-ammo-boxes-in-sec-belts
+[@] ee1c8e30a5b4afa865a37b82173a509b12d829b7    Fix-shadow-AP-bonus
+[*] 55268e0620e0af5d2e5f9cb50246c72e173c9325    SSD-Indicators-Will-Be-Real-In-2020-
+[@] 21fe09b54c2d2fa776b0a47b55740d2411e63403    respriting egg boxes
+[@] f165b98f242246de7a2ed737c074f155e57ccbe0    Knife-visibility-quick-fix
+[*] 44764d96d10f46c5e37a89160a64621779a4a841    Ports-'Command-bar-typing-indicators-(client-side-html-version)
+[!] f50415cec86c0ec80bac750f2201b5291f1f49ee    restores ballistic.dm   [[[fixes 1 error]]]
+
+[*] fe043b3614603fe5d28c69cb2dfe12c08ea66a7c    --> Restoring missing files...?
+
+[!] c3f892d6d78ac8db7802aed8a6fa84b87fc7dea1    direct lift
+[*] 38c812c433b3e2936e343199b26c4d3fcce51561    More files included, PGF to Epsilon Eridani conversion
+[!] cbdaaf98c0c1fb602cdcd9343fd127c286686808    I'm... rapidly losing confidence in this.