From: MaxSMokeSkaarj <vnazarov@smokeofanarchy.ru>
Date: Sun, 12 Oct 2025 04:51:56 +0000 (+1000)
Subject: Merge branch 'master' of ssh://github/space-wizards/space-station-14
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=bade5492478bb43e0848074ce04ea0083f8063d4;p=space-station-14.git

Merge branch 'master' of ssh://github/space-wizards/space-station-14
---

bade5492478bb43e0848074ce04ea0083f8063d4
diff --cc Resources/Changelog/Changelog.yml
index 5065db7f9d,28a96750b4..3ba089894f
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@@ -1,72 -1,4 +1,4 @@@
 -Entries:
 +Entries:
- - author: jessicamaybe
-   changes:
-   - message: NPC Gorillas can now pry open doors and vault/smash tables!
-     type: Tweak
-   id: 8569
-   time: '2025-05-26T10:49:33.0000000+00:00'
-   url: https://github.com/space-wizards/space-station-14/pull/37822
- - author: ArtisticRoomba
-   changes:
-   - message: The TEG's efficiency in extracting power from gasses has been tweaked
-       to promote dual-loop designs that recycle the waste heat of gasses, and punish
-       "meta" single loop designs.
-     type: Tweak
-   id: 8570
-   time: '2025-05-26T11:53:19.0000000+00:00'
-   url: https://github.com/space-wizards/space-station-14/pull/37728
- - author: ArtisticRoomba
-   changes:
-   - message: The TEG now outputs smoother power when pressure across the circulators
-       flutter. (This was causing epilepsy in extreme circumstances).
-     type: Fix
-   id: 8571
-   time: '2025-05-26T12:07:50.0000000+00:00'
-   url: https://github.com/space-wizards/space-station-14/pull/37658
- - author: chromiumboy
-   changes:
-   - message: Sentry turret control panels can now be found adjacent to rooms containing
-       sentry turrets. Authorized personnel can use these panels to remotely monitor
-       and alter the settings of any linked sentry turrets.
-     type: Add
-   id: 8572
-   time: '2025-05-26T13:00:50.0000000+00:00'
-   url: https://github.com/space-wizards/space-station-14/pull/35235
- - author: metalgearsloth
-   changes:
-   - message: You no longer face items for a single frame when clicking while moving.
-     type: Tweak
-   id: 8573
-   time: '2025-05-27T11:34:24.0000000+00:00'
-   url: https://github.com/space-wizards/space-station-14/pull/37874
- - author: Simyon
-   changes:
-   - message: Capacitors and Matter bins have been combined into the Manipulator.
-     type: Remove
-   id: 8574
-   time: '2025-05-27T11:47:49.0000000+00:00'
-   url: https://github.com/space-wizards/space-station-14/pull/37725
- - author: PicklOH
-   changes:
-   - message: Gas Pipes are now named as such in the construction menu.
-     type: Tweak
-   id: 8575
-   time: '2025-05-27T16:26:30.0000000+00:00'
-   url: https://github.com/space-wizards/space-station-14/pull/37881
- - author: ProfRenderer
-   changes:
-   - message: Cluwne ID cards now have a job icon.
-     type: Tweak
-   id: 8576
-   time: '2025-05-27T16:39:52.0000000+00:00'
-   url: https://github.com/space-wizards/space-station-14/pull/37834
- - author: Moomoobeef
-   changes:
-   - message: Bookshelves now contain a more reasonable amount of books.
-     type: Tweak
-   id: 8577
-   time: '2025-05-27T21:21:39.0000000+00:00'
-   url: https://github.com/space-wizards/space-station-14/pull/37866
  - author: SlamBamActionman
    changes:
    - message: Seismic Charges now trigger the timer when sent a signal, instead of
diff --cc build.sh
index 866b4f01f8,0000000000..2ae7a5bbbc
mode 100755,000000..100755
--- a/build.sh
+++ b/build.sh
@@@ -1,42 -1,0 +1,53 @@@
 +#!/bin/bash
 +export EDITOR="/bin/nano";
 +
 +function updateRobustToolbox() {
 +	echo "Updating RobustToolbox...";
 +	cd RobustToolbox;
 +	git pull origin master;
 +	git fetch --tags origin master;
 +	export LATEST_VERSION_RTB=$(git describe --tags --abbrev=0);
 +	echo $LATEST_VERSION_RTB;
 +	git checkout $LATEST_VERSION_RTB;
 +	cd ..;
 +};
 +
 +function updateSS14() {
 +	git add .;
 +	git commit -m "Автообновление SS14";
 +	updateRobustToolbox;
 +	git add .;
 +	git commit -m "Автообновление RobustToolbox";
 +	git pull origin main;
 +	#git pull mirror main;
 +	git pull fetch master;
 +	git commit -m "Автообновление с вендора SS14";
 +	git push origin main;
 +	#git push --mirror ssh://git@github.com/MaxSMokeSkaarj/space-station-14;
 +};
 +
- function buildServer() {
++function buildServerRelease() {
 +	cd RobustToolbox;
 +       	git fetch --depth 1;
 +	cd ..;
 +	dotnet restore;
 +	dotnet build Content.Packaging --configuration Release --no-restore /m;
 +	dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64;
 +	dotnet run --project Content.Packaging client --no-wipe-release;
 +
 +};
 +
++function buildServerDebug() {
++	cd RobustToolbox;
++       	git fetch --depth 1;
++	cd ..;
++	dotnet restore;
++	dotnet build Content.Packaging --configuration Debug --no-restore /m;
++	dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64;
++	dotnet run --project Content.Packaging client --no-wipe-release;
++
++};
++
 +eval $1;
 +#updateSS14;
 +#buildServer;