Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge #1554

Merged
merged 2 commits into from
Nov 25, 2023
Merged

Merge #1554

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
BYOND_MINOR: "1589"
SPACEMAN_DMM_VERSION: suite-1.7.3
RUST_G_REPO: "ss220-space/rust-g-tg"
RUST_G_VERSION: "2.0.0-ss220"
RUST_G_VERSION: "3.0.0-ss220"

jobs:
PreFlight:
Expand Down Expand Up @@ -104,7 +104,6 @@ jobs:
path: ~/.byond/bin/librust_g.so
key: "rust_g-${{ env.RUST_G_REPO }}-${{ env.RUST_G_VERSION }}"
- name: Install rust_g
if: steps.Setup-rust_g-cache.outputs.cache-hit != 'true'
run: ./scripts/install-rust_g.sh
- name: Run Tests
env:
Expand Down Expand Up @@ -143,7 +142,6 @@ jobs:
path: ~/.byond/bin/librust_g.so
key: "rust_g-${{ env.RUST_G_REPO }}-${{ env.RUST_G_VERSION }}"
- name: Install rust_g
if: steps.Setup-rust_g-cache.outputs.cache-hit != 'true'
run: ./scripts/install-rust_g.sh
- name: Run Tests
env:
Expand Down Expand Up @@ -182,7 +180,6 @@ jobs:
path: ~/.byond/bin/librust_g.so
key: "rust_g-${{ env.RUST_G_REPO }}-${{ env.RUST_G_VERSION }}"
- name: Install rust_g
if: steps.Setup-rust_g-cache.outputs.cache-hit != 'true'
run: ./scripts/install-rust_g.sh
- name: Run Tests
env:
Expand Down
16 changes: 0 additions & 16 deletions html/changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -566,22 +566,6 @@ <h3 class="author">Обновления Azzy:</h3>
<div class="changes bgimages16">
<div class="log maptweak">Medical now has a wall fire-locker, right above the Chemistry door. This will open to the vent west of it.</div>
</div>

<h2 class="date">23.09 - 2023</h2>
<h3 class="author">Обновления LordNest:</h3>
<div class="changes bgimages16">
<div class="log maptweak">Added another away map with a crashed shuttle on it</div>
</div>
<h3 class="author">Обновления SierraKomodo:</h3>
<div class="changes bgimages16">
<div class="log tweak">The threshhold for the cryo interface displaying a temperature n warning (orange) colors adjusted to 170, matching the effective temperature limit of cryoxadone and clonexadone.</div>
<div class="log imageadd">Cryo tubes now have color-coded lights, indicating power status and temperature status. Blue = powered but turned off. Green = powered and safe. Yellow/orange = powered and above 170. Red = powered and above 237K (0C). No light = Unpowered.</div>
<div class="log imageadd">Cryo tube lights are now emmissive.</div>
</div>
<h3 class="author">Обновления SuhEugene:</h3>
<div class="changes bgimages16">
<div class="log bugfix">Fixed multitile doors opacity.</div>
</div>
</div></div>
<div class="icons-by">Icons by <a target="_blank" href="https://icons8.com">Icons8</a></div>
</body></html>
4 changes: 0 additions & 4 deletions scripts/install-rust_g-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,4 @@ set -euo pipefail

sudo dpkg --add-architecture i386
sudo apt update || true
sudo apt remove -y libssl1.1:amd64 || true
sudo apt install libgcc-s1:i386
sudo apt install -o APT::Immediate-Configure=false libc6:i386
wget http://ftp.de.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.1_1.1.1n-0+deb10u6_i386.deb
sudo dpkg -i libssl1.1_1.1.1n-0+deb10u6_i386.deb