фиксы неведомой непонятной фигни. +Обновил связку gen_build_info

Lost-Paradise-Project · Sep 4, 2024 · d60c5cf · d60c5cf
1 parent a742f4a
commit d60c5cf
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 38 deletions.
diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml
@@ -26,50 +26,41 @@ on:
     - 'RobustToolbox'
     - 'RobustToolbox/**'
 
-
 jobs:
   build:
     name: Test Packaging
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14'
+    if: github.actor != 'PJBot' && github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout Master
-        uses: actions/[email protected]
-
-      - name: Setup Submodule
-        run: |
-          git submodule update --init --recursive
-
-      - name: Pull engine updates
-        uses: space-wizards/[email protected]
+    - name: Checkout Master
+      uses: actions/[email protected]
 
-      - name: Update Engine Submodules
-        run: |
-          cd RobustToolbox/
-          git submodule update --init --recursive
+    - name: Setup Submodule
+      run: |
+        git submodule update --init --recursive
 
-      - name: Setup .NET Core
-        uses: actions/[email protected]
-        with:
-          dotnet-version: 8.0.100
+    - name: Pull engine updates
+      uses: space-wizards/[email protected]
 
-      - name: Install dependencies
-        run: dotnet restore
+    - name: Update Engine Submodules
+      run: |
+        cd RobustToolbox/
+        git submodule update --init --recursive
 
-      - name: Build Packaging
-        run: dotnet build Content.Packaging --configuration Release --no-restore /m
+    - name: Setup .NET Core
+      uses: actions/[email protected]
+      with:
+        dotnet-version: 8.0.x
 
-      - name: Package server
-        run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64
+    - name: Install dependencies
+      run: dotnet restore
 
-      - name: Package client
-        run: dotnet run --project Content.Packaging client --no-wipe-release
+    - name: Build Packaging
+      run: dotnet build Content.Packaging --configuration Release --no-restore /m
 
-      - name: Update Build Info
-        run: Tools/gen_build_info.py
+    - name: Package server
+      run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64
 
-      - name: Shuffle files around
-        run: |
-          mkdir "release/${{ github.sha }}"
-          mv release/*.zip "release/${{ github.sha }}"
+    - name: Package client
+      run: dotnet run --project Content.Packaging client --no-wipe-release
diff --git a/Content.Server/Atmos/Components/AirFilterComponent.cs b/Content.Server/Atmos/Components/AirFilterComponent.cs
@@ -1,5 +1,5 @@
 using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Atmos;
+using Content.Shared.Atmos;
 
 namespace Content.Server.Atmos.Components;
 

diff --git a/Content.Server/Atmos/Components/AirIntakeComponent.cs b/Content.Server/Atmos/Components/AirIntakeComponent.cs
@@ -1,5 +1,5 @@
 using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Atmos;
+using Content.Shared.Atmos;
 
 namespace Content.Server.Atmos.Components;
 

diff --git a/Content.Server/Destructible/Thresholds/Behaviors/PopupBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/PopupBehavior.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Popups;
 
-namespace Content.Server.Destructible.Thresholds.Behaviors;
+namespace Content.Server.Destructible.Thresholds.Behaviors;
 
 /// <summary>
 /// Shows a popup for everyone.

diff --git a/Content.Server/Objectives/ObjectivesSystem.cs b/Content.Server/Objectives/ObjectivesSystem.cs
@@ -1,5 +1,5 @@
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Rules.Components;
+using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Mind;
 using Content.Server.Shuttles.Systems;
 using Content.Shared.Cuffs.Components;

diff --git a/Resources/ServerInfo/Rules.txt b/Resources/ServerInfo/Rules.txt
@@ -1,4 +1,4 @@
-[color=#ff0000]YOU MUST BE AT LEAST 17 YEARS OF AGE TO PLAY ON DELTA-V SERVERS. ANY USERS SUSPECTED OF BEING UNDER 17 YEARS OF AGE WILL BE BANNED UNTIL THEY ARE OF AGE.[/color]
+[color=#ff0000]YOU MUST BE AT LEAST 17 YEARS OF AGE TO PLAY ON DELTA-V SERVERS. ANY USERS SUSPECTED OF BEING UNDER 17 YEARS OF AGE WILL BE BANNED UNTIL THEY ARE OF AGE.[/color]
 
 [color=#ff0000]DISCONNECTING FROM OR IGNORING/EVADING ADMIN-HELPS WILL RESULT IN AN APPEAL ONLY BAN.[/color]