From: MaxSMokeSkaarj <vnazarov@smokeofanarchy.ru>
Date: Sat, 17 May 2025 08:16:35 +0000 (+1000)
Subject: Автообновление SS14
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=4fc04383b22435e31dc2e7f733c024d905b9493b;p=space-station-14.git

Автообновление SS14
---

diff --git a/.gitattributes b/.gitattributes
index 6292d191fa..173dad3f65 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -62,3 +62,6 @@ Resources/Maps/**.yml merge=mapping-merge-driver
 #*.PDF   diff=astextplain
 #*.rtf   diff=astextplain
 #*.RTF   diff=astextplain
+
+build.sh merge=ours
+.github/workflow
diff --git a/RobustToolbox b/RobustToolbox
index 62b4714f1f..db7de0a99f 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 62b4714f1f260cf90db915776e6200c28e8018ff
+Subproject commit db7de0a99f928840140e9f0af87ac9ebad6df130
diff --git a/build.sh b/build.sh
index 8a00673b06..d625af117d 100755
--- a/build.sh
+++ b/build.sh
@@ -12,18 +12,6 @@ function updateRobustToolbox() {
 	cd ..;
 };
 
-function updateCorvaxRepo() {
-	cd Corvax-SS14;
-	git pull origin master;
-	cd ..;
-};
-
-function updateMr0maksRepo() {
-	cd Mr0maks-SS14;
-	git pull origin master-ru;
-	cd ..;
-};
-
 function updateSS14() {
 	git add .;
 	git commit -m "Автообновление SS14";
@@ -33,11 +21,6 @@ function updateSS14() {
 	git pull origin main;
 	git pull fetch master;
 	git commit -m "Автообновление с вендора SS14";
-	#updateCorvaxRepo;
-	#cp Corvax-SS14/Resources/Locale/ru-RU Resources/Locale -r;
-	#cp Corvax-SS14/Resources/ServerInfo/Guidebook Resources/ServerInfo -r;
-	#git add .;
-	#git commit -m "Автообновление переводов";
 	git push origin main;
 	git push --mirror ssh://git@github.com/MaxSMokeSkaarj/space-station-14;
 };