Апстрим с Санрайза / Оффов

.agents/rules/ss14-codebase-prefix-detection.md

@@ -20,12 +20,12 @@ Don't start editing vanilla files until these three values ​​are defined.
 
 Define a fork by collecting all concrete signals before choosing:
 
-1. Git remote repository slug: the last repository name in the remote URL, for example `project-fire` in `space-sunrise/project-fire`.
+1. Git remote repository slug: the last repository name in the remote URL, for example `project-fire` in `makura-games/project-fire`.
 2. The name of the repository root folder and the path of the working directory.
 3. Which forked project folder is actually present in the code base (`_Sunrise`, `_Scp`, `_Fish`, `_Lust`) near the files being changed.
 4. The nearest existing edit markers in the adjacent code.
 
-Do not infer the fork from the GitHub organization or owner name alone. `space-sunrise` is an organization name, not proof that the codebase is Sunrise. If the repository slug is `project-fire` or the active project folder is `_Scp`, select Fire even when the owner is `space-sunrise`.
+Do not infer the fork from the GitHub organization or owner name alone. `makura-games` is an organization name, not proof that the codebase is Sunrise. If the repository slug is `project-fire` or the active project folder is `_Scp`, select Fire even when the owner is `makura-games`.
 
 If the signals diverge:
 
@@ -39,7 +39,7 @@ Select the first line that matches the exact repository slug, the name of the ro
 
 | Match | Prefix | Project folder | Single-line marker | Block markers | Note |
 | --- | --- | --- | --- | --- | --- |
-| `sunrise-station/space-station-14`, `space-sunrise/sunrise-station`, `sunrise-station`, `_Sunrise` | `Sunrise` | `_Sunrise` | `Sunrise-Edit` | `Sunrise edit start/end`, `Sunrise added start/end` | For new single placemarks, default to `Sunrise-Edit`. |
+| `sunrise-station/space-station-14`, `makura-games/sunrise-station`, `sunrise-station`, `_Sunrise` | `Sunrise` | `_Sunrise` | `Sunrise-Edit` | `Sunrise edit start/end`, `Sunrise added start/end` | For new single placemarks, default to `Sunrise-Edit`. |
 | `fire-station/project-fire`, `project-fire`, `fire-station`, `_Scp` | `Fire` | `_Scp` | `Fire edit`, `Fire added` | `Fire edit start/end`, `Fire added start/end` | For Fire, single edit/add marks are different. |
 | `fish-station`, `_Fish` | `Fish` | `_Fish` | `FIsh edit` | Use local file style | Don't automatically normalize the legacy token case. |
 | `lust-lustation`, `_Lust` | `Lust` | `_Lust` | `Lust edit` | Use local file style | If there is already a block-style nearby inside Lust, follow it. |

.agents/skills/ss14-upstream-maintenance/SKILL.md

@@ -31,7 +31,7 @@ To clearly separate vanilla code from our modifications, a special project folde
 2. **Partial classes:** Extensions of vanilla classes (see below).
 3. **Assets:** New sprites, sounds, textures.
 
-The selected project folder is a consequence of the active fork, not of the subsystem being touched. If the active fork is Fire, write new project code under `_Scp`. Do not move new files to `_Sunrise` just because the repository owner is `space-sunrise`, the original code came from Sunrise, or the change is a vanilla hook.
+The selected project folder is a consequence of the active fork, not of the subsystem being touched. If the active fork is Fire, write new project code under `_Scp`. Do not move new files to `_Sunrise` just because the repository owner is `makura-games`, the original code came from Sunrise, or the change is a vanilla hook.
 
 > [!TIP]
 > **Isolation principle:**

.coderabbit.yaml

@@ -27,8 +27,8 @@ reviews:
          Use `.agents/rules/*.md` and `.agents/skills/*/SKILL.md` as the Codex-facing review knowledge base.
          Treat `.agents/` as the canonical source tree. Treat `.agent/`, `.claude/`, `.cursor/`, and `.github/` as compatibility bridge trees.
          Prefer repository-specific rules and skills over generic framework advice or web-derived guidance when they conflict.
-         When inferring the active fork from a git remote slug or GitHub repository identifier, ignore the owner or organization segment and use only the repository name plus the actual project folder and local edit markers. For example, evaluate `space-sunrise/project-fire` by `project-fire`, not by `space-sunrise`.
-         Do not hard-code Sunrise from the `space-sunrise` organization name. If the exact repository slug is `project-fire` or the active project folder is `_Scp`, review as Fire: use the `Fire` prefix, `_Scp` project folder, and `Fire edit` / `Fire added` markers. If the exact repository slug is `sunrise-station` or the active project folder is `_Sunrise`, review as Sunrise.
+         When inferring the active fork from a git remote slug or GitHub repository identifier, ignore the owner or organization segment and use only the repository name plus the actual project folder and local edit markers. For example, evaluate `makura-games/project-fire` by `project-fire`, not by `makura-games`.
+         Do not hard-code Sunrise from the `makura-games` organization name. If the exact repository slug is `project-fire` or the active project folder is `_Scp`, review as Fire: use the `Fire` prefix, `_Scp` project folder, and `Fire edit` / `Fire added` markers. If the exact repository slug is `sunrise-station` or the active project folder is `_Sunrise`, review as Sunrise.
          For a single-line upstream edit, a single-line marker in the active fork's native style is sufficient. Do not require `edit start/end` or `added start/end` blocks unless the fork edit spans multiple lines.
          Ignore a leading UTF-8 BOM (`U+FEFF`) at the start of a text file. Do not request BOM removal unless the PR is explicitly about file encoding.
     - path: "**/*.cs"
@@ -105,7 +105,7 @@ reviews:
         name: "SS14 fork/project folder selection"
         instructions: |
           Run this check for every PR that adds or moves fork-owned code, prototypes, assets, or upstream edit markers.
-          Determine the active fork using `.agents/rules/ss14-codebase-prefix-detection.md`. Ignore the GitHub owner or organization segment: `space-sunrise` alone must not imply Sunrise.
+          Determine the active fork using `.agents/rules/ss14-codebase-prefix-detection.md`. Ignore the GitHub owner or organization segment: `makura-games` alone must not imply Sunrise.
           Fail if exact Fire signals (`project-fire`, `_Scp`, or Fire markers) are reviewed as Sunrise or if new Fire-owned files are placed under `_Sunrise` instead of `_Scp`.
           Fail if exact Sunrise signals (`sunrise-station`, `_Sunrise`, or Sunrise markers) are reviewed as Fire or if new Sunrise-owned files are placed under `_Scp` instead of `_Sunrise`.
           Do not fail merely because the PR touches vanilla files. New fork logic still belongs in the active fork project folder, while vanilla files should contain only minimal hooks with the active fork's markers.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -5,7 +5,7 @@ body:
 - type: markdown
   attributes:
     value: |
-      Спасибо, что помогаете делать Sunrise Station лучше! Пожалуйста, заполните форму максимально подробно.
+      Спасибо, что помогаете делать Stellar Stories лучше! Пожалуйста, заполните форму максимально подробно.
 - type: textarea
   id: description
   attributes:

.github/PULL_REQUEST_TEMPLATE.md

@@ -38,7 +38,8 @@
 <!--
 === КАК ПИСАТЬ ЧЕЙНЖЛОГ ===
 
-[RU]
+[Подробная инструкция и полный пример](https://github.com/makura-games/sunrise-station/blob/master/Tools/_sunrise/changelog/README.md)
+
 1) Не считайте тип чейнжлога частью вашего предложения.
 add: Новая фича = ПЛОХО | add: Добавлена новая фича = ХОРОШО
 2) Подробно описывайте, что вы добавили и как это использовать. Все должно быть в меру.
@@ -47,10 +48,20 @@ fix: Исправлены мелочи = УЖАСНО | fix: Исправлен
 add: Добавлен новый хелпер-метод = ПЛОХО | НИЧЕГО НЕ ПИСАТЬ = ХОРОШО
 * Иногда чейнжлог не нужен. Просто удалите это поле.
 
+Добавляйте `media:` сразу после той записи, к которой относится изображение или видео:
+`add: Добавлена новая рыба`
+`media: ![Рыба в игре](https://example.org/fish.png)`
+`media: [Демонстрация механики](https://example.org/demo.webm)`
+
+Продолжайте текст записи на следующих строках; переносы сохранятся в Discord:
+`fix: Первая строка исправления`
+`Вторая строка той же записи`
+
 -->
 
 :cl: ВАШЕ_ИМЯ
 - add: ТЕКСТ
 - remove: ТЕКСТ
 - tweak: ТЕКСТ
 - fix: ТЕКСТ
+:end-cl:

.github/config.yml

@@ -1,5 +1,5 @@
 Project-Condor:
-  org: space-sunrise
+  org: makura-games
   project: 2
   inbox: Inbox
   labels:

.github/workflows/auto-locale.yml

@@ -16,7 +16,7 @@ permissions:
 jobs:
   update-locale:
     runs-on: ubuntu-latest
-    if: github.repository == 'space-sunrise/sunrise-station' # && github.event.pull_request.merged == true
+    if: github.repository == 'makura-games/sunrise-station' # && github.event.pull_request.merged == true
 
     steps:
       - name: Checkout repository