Skip to content

Commit 73f4a14

Browse files
committed
Merge branch 'master' of github.com:Monkestation/Monkestation2.0 into i-wanna-be-the-hunter-not-the-hunted
2 parents f8abf07 + b463190 commit 73f4a14

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN apt-get install -y --no-install-recommends \
2020
COPY dependencies.sh .
2121

2222
RUN . ./dependencies.sh \
23-
&& curl "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip \
23+
&& curl -H "User-Agent: Monkestation2.0/1.0 CI Script" "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip \
2424
&& unzip byond.zip \
2525
&& cd byond \
2626
&& sed -i 's|install:|&\n\tmkdir -p $(MAN_DIR)/man6|' Makefile \

html/changelogs/AutoChangeLog-pr-6618.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

html/changelogs/archive/2025-05.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,6 @@
110110
- rscadd: You can now craft makeshift radio jammers.
111111
- balance: Radio jammers have had their cost lowered from 5 TC to 1 TC.
112112
- bugfix: Syndicate encryption keys properly protect against AoE radio jamming again.
113+
2025-05-11:
114+
Aniantan:
115+
- bugfix: Thrown eggs break on impact again

tools/ci/download_byond.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
set -e
33
source dependencies.sh
44
echo "Downloading BYOND version $BYOND_MAJOR.$BYOND_MINOR"
5-
curl "http://www.byond.com/download/build/$BYOND_MAJOR/$BYOND_MAJOR.${BYOND_MINOR}_byond.zip" -o C:/byond.zip
5+
curl -H "User-Agent: Monkestation2.0/1.0 CI Script" "http://www.byond.com/download/build/$BYOND_MAJOR/$BYOND_MAJOR.${BYOND_MINOR}_byond.zip" -o C:/byond.zip

tools/ci/install_byond.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ else
1414
rm -rf "$HOME/BYOND"
1515
mkdir -p "$HOME/BYOND"
1616
cd "$HOME/BYOND"
17-
curl "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip
17+
curl -H "User-Agent: Monkestation2.0/1.0 CI Script" "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip
1818
unzip byond.zip
1919
rm byond.zip
2020
cd byond

0 commit comments

Comments
 (0)