Revert "Upstream 25.02.26"

.github/workflows/update-wiki.yml

@@ -6,11 +6,15 @@ on:
     branches: [ master, jsondump ]
     paths:
       - '.github/workflows/update-wiki.yml'
-      - 'Content.Shared/**'
-      - 'Content.Server/**'
-      - 'Content.Client/**'
-      - 'Resources/**'
+      - 'Content.Shared/Chemistry/**.cs'
+      - 'Content.Server/Chemistry/**.cs'
+      - 'Content.Server/GuideGenerator/**.cs'
+      - 'Content.Server/Corvax/GuideGenerator/**.cs'
+      - 'Resources/Prototypes/Reagents/**.yml'
+      - 'Resources/Prototypes/Chemistry/**.yml'
+      - 'Resources/Prototypes/Recipes/Reactions/**.yml'
       - 'RobustToolbox/'
+      - 'Resources/Locale/**.ftl'
 
 jobs:
   update-wiki:
@@ -48,53 +52,52 @@ jobs:
       run: dotnet ./bin/Content.Server/Content.Server.dll --cvar autogen.destination_file=prototypes.json
       continue-on-error: true
 
-    # Проходит по всем JSON-файлам в директории BASE и загружает каждый файл как страницу в MediaWiki.
-    # Имя страницы формируется из относительного пути к файлу.
-    - name: Upload JSON files to wiki
-      shell: bash
-      run: |
-        set -euo pipefail
-
-        BASE="./bin/Content.Server/data"
-        ROOT="${{ secrets.WIKI_PAGE_ROOT }}"
-        API="${{ secrets.WIKI_ROOT_URL }}/api.php"
-        USER="${{ secrets.WIKI_BOT_USER }}"
-        PASS="${{ secrets.WIKI_BOT_PASS }}"
-
-        API="$(printf "%s" "$API" | tr -d '\r\n' | sed 's/[[:space:]]*$//')"
-        USER="$(printf "%s" "$USER" | tr -d '\r\n')"
-        PASS="$(printf "%s" "$PASS" | tr -d '\r\n')"
-        ROOT="$(printf "%s" "$ROOT" | tr -d '\r\n' | sed 's/[[:space:]]*$//')"
-
-        cookiejar="$(mktemp)"
-        trap 'rm -f "$cookiejar"' EXIT
-
-        login_token=$(curl -sS -c "$cookiejar" --data "action=query&meta=tokens&type=login&format=json" "$API" | jq -r '.query.tokens.logintoken')
-        curl -sS -c "$cookiejar" -b "$cookiejar" \
-          --data-urlencode "action=login" \
-          --data-urlencode "lgname=$USER" \
-          --data-urlencode "lgpassword=$PASS" \
-          --data-urlencode "lgtoken=$login_token" \
-          --data-urlencode "format=json" \
-          "$API" > /dev/null
-
-        find "$BASE" -type f -name '*.json' | while IFS= read -r file; do
-          rel="${file#$BASE/}"
-          rel="$(printf "%s" "$rel" | tr -d '\r\n' | sed 's/:/_/g')"
-          page="$ROOT/$rel"
-          echo "Uploading $rel → $page"
-
-          token=$(curl -sS -b "$cookiejar" --data "action=query&meta=tokens&format=json" "$API" | jq -r '.query.tokens.csrftoken')
-
-          curl -sS -b "$cookiejar" \
-            --data-urlencode "action=edit" \
-            --data-urlencode "title=$page" \
-            --data-urlencode "summary=Update $rel via GitHub Actions" \
-            --data-urlencode "text@${file}" \
-            --data-urlencode "token=$token" \
-            --data-urlencode "bot=true" \
-            --data-urlencode "minor=true" \
-            --data-urlencode "assert=bot" \
-            --data-urlencode "format=json" \
-            "$API" | jq -r '.'
-        done
+    - name: Upload chem_prototypes.json to wiki
+      uses: jtmullen/mediawiki-edit-action@v0.1.1
+      with:
+        wiki_text_file: ./bin/Content.Server/data/chem_prototypes.json
+        edit_summary: Update chem_prototypes.json via GitHub Actions
+        page_name: "${{ secrets.WIKI_PAGE_ROOT }}/chem_prototypes.json"
+        api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
+        username: ${{ secrets.WIKI_BOT_USER }}
+        password: ${{ secrets.WIKI_BOT_PASS }}
+
+    - name: Upload react_prototypes.json to wiki
+      uses: jtmullen/mediawiki-edit-action@v0.1.1
+      with:
+        wiki_text_file: ./bin/Content.Server/data/react_prototypes.json
+        edit_summary: Update react_prototypes.json via GitHub Actions
+        page_name: "${{ secrets.WIKI_PAGE_ROOT }}/react_prototypes.json"
+        api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
+        username: ${{ secrets.WIKI_BOT_USER }}
+        password: ${{ secrets.WIKI_BOT_PASS }}
+
+    - name: Upload entity_prototypes.json to wiki
+      uses: jtmullen/mediawiki-edit-action@v0.1.1
+      with:
+        wiki_text_file: ./bin/Content.Server/data/entity_prototypes.json
+        edit_summary: Update entity_prototypes.json via GitHub Actions
+        page_name: "${{ secrets.WIKI_PAGE_ROOT }}/entity_prototypes.json"
+        api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
+        username: ${{ secrets.WIKI_BOT_USER }}
+        password: ${{ secrets.WIKI_BOT_PASS }}
+
+    - name: Upload mealrecipes_prototypes.json to wiki
+      uses: jtmullen/mediawiki-edit-action@v0.1.1
+      with:
+        wiki_text_file: ./bin/Content.Server/data/mealrecipes_prototypes.json
+        edit_summary: Update mealrecipes_prototypes.json via GitHub Actions
+        page_name: "${{ secrets.WIKI_PAGE_ROOT }}/mealrecipes_prototypes.json"
+        api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
+        username: ${{ secrets.WIKI_BOT_USER }}
+        password: ${{ secrets.WIKI_BOT_PASS }}
+
+    - name: Upload loc.json to wiki
+      uses: jtmullen/mediawiki-edit-action@v0.1.1
+      with:
+        wiki_text_file: ./bin/Content.Server/data/loc.json
+        edit_summary: Update loc.json via GitHub Actions
+        page_name: "${{ secrets.WIKI_PAGE_ROOT }}/loc.json"
+        api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
+        username: ${{ secrets.WIKI_BOT_USER }}
+        password: ${{ secrets.WIKI_BOT_PASS }}

Content.Client/Atmos/EntitySystems/AtmosphereSystem.cs

@@ -5,7 +5,7 @@
 
 namespace Content.Client.Atmos.EntitySystems;
 
-public sealed partial class AtmosphereSystem : SharedAtmosphereSystem
+public sealed class AtmosphereSystem : SharedAtmosphereSystem
 {
     public override void Initialize()
     {

Content.Client/BarSign/BarSignSystem.cs

@@ -0,0 +1,53 @@
+using Content.Client.BarSign.Ui;
+using Content.Shared.BarSign;
+using Content.Shared.Power;
+using Robust.Client.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.BarSign;
+
+public sealed class BarSignSystem : VisualizerSystem<BarSignComponent>
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly UserInterfaceSystem _ui = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<BarSignComponent, AfterAutoHandleStateEvent>(OnAfterAutoHandleState);
+    }
+
+    private void OnAfterAutoHandleState(EntityUid uid, BarSignComponent component, ref AfterAutoHandleStateEvent args)
+    {
+        if (_ui.TryGetOpenUi<BarSignBoundUserInterface>(uid, BarSignUiKey.Key, out var bui))
+            bui.Update(component.Current);
+
+        UpdateAppearance(uid, component);
+    }
+
+    protected override void OnAppearanceChange(EntityUid uid, BarSignComponent component, ref AppearanceChangeEvent args)
+    {
+        UpdateAppearance(uid, component, args.Component, args.Sprite);
+    }
+
+    private void UpdateAppearance(EntityUid id, BarSignComponent sign, AppearanceComponent? appearance = null, SpriteComponent? sprite = null)
+    {
+        if (!Resolve(id, ref appearance, ref sprite))
+            return;
+
+        AppearanceSystem.TryGetData<bool>(id, PowerDeviceVisuals.Powered, out var powered, appearance);
+
+        if (powered
+            && sign.Current != null
+            && _prototypeManager.Resolve(sign.Current, out var proto))
+        {
+            SpriteSystem.LayerSetSprite((id, sprite), 0, proto.Icon);
+            sprite.LayerSetShader(0, "unshaded");
+        }
+        else
+        {
+            SpriteSystem.LayerSetRsiState((id, sprite), 0, "empty");
+            sprite.LayerSetShader(0, null, null);
+        }
+    }
+}

Content.Client/BarSign/Ui/BarSignBoundUserInterface.cs

@@ -19,27 +19,32 @@ protected override void Open()
         var sign = EntMan.GetComponentOrNull<BarSignComponent>(Owner)?.Current is { } current
             ? _prototype.Index(current)
             : null;
-        var allSigns = BarSignSystem.GetAllBarSigns(_prototype)
+        var allSigns = Shared.BarSign.BarSignSystem.GetAllBarSigns(_prototype)
             .OrderBy(p => Loc.GetString(p.Name))
             .ToList();
         _menu = new(sign, allSigns);
 
         _menu.OnSignSelected += id =>
         {
-            SendPredictedMessage(new SetBarSignMessage(id));
+            SendMessage(new SetBarSignMessage(id));
         };
 
         _menu.OnClose += Close;
         _menu.OpenCentered();
     }
 
-    public override void Update()
+    public void Update(ProtoId<BarSignPrototype>? sign)
     {
-        if (!EntMan.TryGetComponent<BarSignComponent>(Owner, out var signComp))
-            return;
-
-        if (_prototype.Resolve(signComp.Current, out var signPrototype))
+        if (_prototype.Resolve(sign, out var signPrototype))
             _menu?.UpdateState(signPrototype);
     }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (!disposing)
+            return;
+        _menu?.Dispose();
+    }
 }