From: MaxSMokeSkaarj Date: Sat, 18 Jan 2025 04:21:42 +0000 (+1000) Subject: Revert "test" X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=056c54a83eaa13d2bfce0c406deedf194a973e71;p=space-station-14.git Revert "test" This reverts commit 09ef8036ed42825df2abc01abb5d7bc20bf2fc1e. --- diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 3a6129c7a6..491c4075e4 100644 --- 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 0adfee7d0e..b5b4c609f2 100644 --- 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 d035843a23..3808a93074 100644 --- 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 87babfa2a6..7889604f90 100644 --- 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 08e5dd6d0a..8c2ff84dd1 100644 --- 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 e60ca74a37..507fcb8bd9 100644 --- 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"; /// /// 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 6a20a50315..a330abe231 100644 --- 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 88af0ca505..59ba795359 100644 --- 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 a63359afd6..b9d61f3942 100755 --- 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()