Revert "test"

This reverts commit 09ef8036ed42825df2abc01abb5d7bc20bf2fc1e.

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
index 3a6129c7a6bcc53ec31169fc67d9af4ced279325..491c4075e444b0c140ed8661322a8e755aca7174 100644 (file)
--- a/.github/workflows/benchmarks.yml
+++ b/.github/workflows/benchmarks.yml
@@ -30,7 +30,7 @@ jobs:
         script: |
           mkdir benchmark_run_content_${{ github.sha }}
           cd benchmark_run_content_${{ github.sha }}
-          git clone https://github.com/space-wizards/space-station-14.git repo_dir --recursive
+          git clone https://github.com/MaxSMokeSkaarj/space-station-14.git repo_dir --recursive
           cd repo_dir
           git checkout ${{ github.sha }}
           cd Content.Benchmarks

diff --git a/.github/workflows/labeler-review.yml b/.github/workflows/labeler-review.yml
index 0adfee7d0e5dbad6977516c007ecc2fb734367f0..b5b4c609f280f2de82adbb498c7a971fee0acde1 100644 (file)
--- a/.github/workflows/labeler-review.yml
+++ b/.github/workflows/labeler-review.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   add_label:
     # Change the repository name after you've made sure the team name is correct for your fork!
-    if: ${{ (github.repository == 'space-wizards/space-station-14') && (github.event.review.state == 'APPROVED') }}
+    if: ${{ (github.repository == 'MaxSMokeSkaarj/space-station-14') && (github.event.review.state == 'APPROVED') }}
     permissions:
       contents: read
       pull-requests: write

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index d035843a23549fe608722378ea0b9a86fd4cf1cf..3808a93074c4c4548032f285168e43ec55e0d494 100644 (file)
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -3,10 +3,7 @@ name: Publish
 concurrency:
   group: publish
 
-on:
-  workflow_dispatch:
-  # schedule:
-   # - cron: '0 10 * * *'
+on: [push]
 
 jobs:
   build:

diff --git a/.github/workflows/update-credits.yml b/.github/workflows/update-credits.yml
index 87babfa2a6881aab7a9eeb0baf6a042e3b53fc6b..7889604f90716e01823822694e51dd428d62e7a4 100644 (file)
--- a/.github/workflows/update-credits.yml
+++ b/.github/workflows/update-credits.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     # Hey there fork dev! If you like to include your own contributors in this then you can probably just change this to your own repo
     # Do this in dump_github_contributors.ps1 too into your own repo
-    if: github.repository == 'space-wizards/space-station-14'
+    if: github.repository == 'MaxSMokeSkaarj/space-station-14'
     
     steps:
       - uses: actions/checkout@v3.6.0

diff --git a/.gitmodules b/.gitmodules
index 08e5dd6d0af87f8aec550a1649c1e11d3e4cee4b..8c2ff84dd12b52f4c39ac5ffb7c8f4a129357465 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,8 @@
 [submodule "RobustToolbox"]
-       path = RobustToolbox
-       url = https://github.com/space-wizards/RobustToolbox.git
-       branch = master
\ No newline at end of file
+        path = RobustToolbox
+        url = https://github.com/space-wizards/RobustToolbox.git
+        branch = master
+[submodule "Corvax-SS14"]
+       path = Corvax-SS14
+       url = https://github.com/space-syndicate/space-station-14
+       branch = master

diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs
index e60ca74a37fab2b01e3662382e75f469b1d508af..507fcb8bd90a586258fc86367ca7995b9108932f 100644 (file)
--- a/Content.Shared/Localizations/ContentLocalizationManager.cs
+++ b/Content.Shared/Localizations/ContentLocalizationManager.cs
@@ -10,7 +10,7 @@ namespace Content.Shared.Localizations
         [Dependency] private readonly ILocalizationManager _loc = default!;
 
         // If you want to change your codebase's language, do it here.
-        private const string Culture = "en-US";
+        private const string Culture = "ru-RU";
 
         /// <summary>
         /// Custom format strings used for parsing and displaying minutes:seconds timespans.
@@ -44,7 +44,7 @@ namespace Content.Shared.Localizations
              * localization you should NOT modify these, instead add new functions specific to your language/culture.
              * This ensures the english translations continue to work as expected when fallbacks are needed.
              */
-            var cultureEn = new CultureInfo("en-US");
+            var cultureEn = new CultureInfo("ru-RU");
 
             _loc.AddFunction(cultureEn, "MAKEPLURAL", FormatMakePlural);
             _loc.AddFunction(cultureEn, "MANY", FormatMany);

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
index 6a20a503153b72cfec9b29043c80f03421561830..a330abe23141a8e87139baf2382b5bceb6eecfa1 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
@@ -122,6 +122,15 @@
   name: behonker
   parent: BaseMobBehonker
   id: MobBehonkerElectrical
+  suffix: "Electrical"
+  components:
+  - type: ElectricityAnomaly
+  - type: Electrified
+
+- type: entity
+  name: behonker
+  parent: BaseMobBehonker
+  id: MobBehonkerPyro
   suffix: "Pyro"
   components:
     - type: PyroclasticAnomaly
@@ -133,14 +142,6 @@
       releaseOnMaxSeverity: true
       spawnRadius: 0
 
-- type: entity
-  name: behonker
-  parent: BaseMobBehonker
-  id: MobBehonkerPyro
-  suffix: "Electrical"
-  components:
-  - type: ElectricityAnomaly
-  - type: Electrified
 
 - type: entity
   name: behonker

diff --git a/Resources/Prototypes/Guidebook/rules.yml b/Resources/Prototypes/Guidebook/rules.yml
index 88af0ca505cdb9550409d4c4dcb7fb372df645c3..59ba795359d4407f5c7f57b3c39fc4d8a14f4ec3 100644 (file)
--- a/Resources/Prototypes/Guidebook/rules.yml
+++ b/Resources/Prototypes/Guidebook/rules.yml
@@ -429,3 +429,9 @@
   ruleEntry: true
   priority: 100
   text: "/ServerInfo/Guidebook/ServerRules/BanDurations.xml"
+
+- type: guideEntry
+  id: SMoARuleset
+  name: guide-entry-rules-SMoA
+  ruleEntry: true
+  text: "/ServerInfo/Guidebook/ServerRules/PR.xml"

diff --git a/Tools/publish_multi_request.py b/Tools/publish_multi_request.py
index a63359afd6c424c42b88364a2efe2f4b8043e0ca..b9d61f39427f1efbd7670649da6654a1700ad1ed 100755 (executable)
--- a/Tools/publish_multi_request.py
+++ b/Tools/publish_multi_request.py
@@ -14,8 +14,8 @@ RELEASE_DIR = "release"
 # CONFIGURATION PARAMETERS
 # Forks should change these to publish to their own infrastructure.
 #
-ROBUST_CDN_URL = "https://wizards.cdn.spacestation14.com/"
-FORK_ID = "wizards"
+ROBUST_CDN_URL = "https://ss14.smokeofanarchy.ru/cdn/"
+FORK_ID = "main"
 
 def main():
     session = requests.Session()