load - #1459
Draft
drenk28 wants to merge 5 commits into
Draft
Conversation
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
Bot
added
S: Merge Conflict
S: Untriaged
No C#
Contributor
WalkthroughPR расширяет набор лоад-аутов капитана (новые комбинезоны, головные уборы, внешняя одежда, рюкзаки, перчатки и бонус-предметы) через captain.yml и loadout_groups.yml, затем прописывает их в role_loadouts.yml. Параллельно для всех ролей унифицирован стандартный хвост groups (backmen-комплект + Survival + BreathTool), а строки локализации ru-RU упрощены до кратких названий элементов экипировки. ChangesРасширение лоад-аутов капитана
Стандартизация role_loadouts и очистка локализации
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes Poem
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 inconclusive)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
⚔️ Resolve merge conflicts
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 4
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@Resources/Locale/ru-RU/backmen/preferences/loadout-groups.ftl`:
- Around line 16-23: The Russian localization file is missing 12 translation
entries for loadout group keys that are defined in the English locale. Add
translations for the following missing keys to
Resources/Locale/ru-RU/backmen/preferences/loadout-groups.ftl:
loadout-group-belt, loadout-group-captain-shoes, loadout-group-common-backpack,
loadout-group-ears, loadout-group-gloves, loadout-group-id,
loadout-group-medical-eyewear, loadout-group-neck, loadout-group-pockets,
loadout-group-security-eyes, loadout-group-shoes, and
loadout-group-survival-mask. Each key should be followed by its Russian
translation to ensure players see localized group names instead of untranslated
identifiers in the UI.
In `@Resources/Locale/ru-RU/preferences/loadout-groups.ftl`:
- Line 72: The Russian localization for loadout-group-clown-shoes contains a
misspelling where "Ботники" is used instead of the correct word "Ботинки".
Locate the loadout-group-clown-shoes entry in the file and change the
translation value from "Ботники" to "Ботинки" to fix the spelling error.
In `@Resources/Prototypes/Loadouts/Jobs/Command/captain.yml`:
- Around line 170-183: The bonus item loadouts PlushieJobCaptain, ToyCaptain,
and DrinkFlask are incorrectly assigned to the outerClothing equipment slot,
creating a conflict with the primary CaptainOuterClothing assignment. For each
of these three loadouts, move the bonus items (PlushieLizardJobCaptain,
ToyFigurineCaptain, and DrinkFlask respectively) from the outerClothing slot to
their appropriate equipment slots based on their item type to resolve the
loadout conflicts.
In `@Resources/Prototypes/Loadouts/loadout_groups.yml`:
- Around line 198-204: The loadoutGroup with id "CaptainShoes" has an
inconsistent identifier that does not match the role wiring reference in
role_loadouts.yml which expects "CaptainGlasses". The loadouts within this group
(CaptainGloves, SheriffGloves, CaptainWhiteGloves) and the name field
"loadout-group-captain-glasses" both indicate this group is for glasses, not
shoes. Change the id field from "CaptainShoes" to "CaptainGlasses" to align with
the actual role reference and the group's purpose.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: 28b315be-3420-4e0e-8000-f76fedb4d1bc
📒 Files selected for processing (7)
Resources/Locale/ru-RU/_backmen/preferences/loadout-groups.ftlResources/Locale/ru-RU/backmen/preferences/loadout-groups.ftlResources/Locale/ru-RU/corvax/preferences/loadout-groups.ftlResources/Locale/ru-RU/preferences/loadout-groups.ftlResources/Prototypes/Loadouts/Jobs/Command/captain.ymlResources/Prototypes/Loadouts/loadout_groups.ymlResources/Prototypes/Loadouts/role_loadouts.yml
Comment on lines
+16
to
23
| loadout-group-blueshield-hat = Головной убор | ||
| loadout-group-blueshield-eyes = Очки | ||
| loadout-group-blueshield-neck = Шея | ||
| loadout-group-blueshield-jumpsuit = Униформа | ||
| loadout-group-blueshield-backpack = Рюкзак | ||
| loadout-group-blueshield-outer = Верхняя одежда | ||
| loadout-group-blueshield-shoes = Ботинки | ||
| # Virilogist |
Contributor
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
set -euo pipefail
keys=(
"loadout-group-captain-shoes"
"loadout-group-survival-mask"
"loadout-group-gloves"
"loadout-group-id"
"loadout-group-ears"
"loadout-group-pockets"
"loadout-group-neck"
"loadout-group-security-eyes"
"loadout-group-belt"
"loadout-group-medical-eyewear"
"loadout-group-common-backpack"
"loadout-group-shoes"
)
for k in "${keys[@]}"; do
echo "=== $k ==="
rg -n --fixed-strings "$k" -g '*.yml' -g '*.ftl' || true
echo
doneRepository: Rxup/space-station-14
Length of output: 4019
🏁 Script executed:
# Check the Russian locale file for loadout-group keys
cat -n Resources/Locale/ru-RU/backmen/preferences/loadout-groups.ftl | head -30Repository: Rxup/space-station-14
Length of output: 1363
🏁 Script executed:
# Compare keys between English and Russian locale files
echo "=== Keys in English locale ===" && \
rg '^\s*loadout-group-' Resources/Locale/en-US/backmen/preferences/loadout-groups.ftl | grep -oE 'loadout-group-[a-z-]+' | sort | uniq > /tmp/en_keys.txt && \
wc -l /tmp/en_keys.txt && \
echo && \
echo "=== Keys in Russian locale ===" && \
rg '^\s*loadout-group-' Resources/Locale/ru-RU/backmen/preferences/loadout-groups.ftl | grep -oE 'loadout-group-[a-z-]+' | sort | uniq > /tmp/ru_keys.txt && \
wc -l /tmp/ru_keys.txt && \
echo && \
echo "=== Keys in English but NOT in Russian ===" && \
comm -23 /tmp/en_keys.txt /tmp/ru_keys.txt || trueRepository: Rxup/space-station-14
Length of output: 493
Русская локализация не содержит 12 переводов активных групп лоадаутов.
В файле Resources/Locale/ru-RU/backmen/preferences/loadout-groups.ftl отсутствуют переводы для следующих ключей, которые используются в прототипах и определены в английской локали:
loadout-group-beltloadout-group-captain-shoesloadout-group-common-backpackloadout-group-earsloadout-group-glovesloadout-group-idloadout-group-medical-eyewearloadout-group-neckloadout-group-pocketsloadout-group-security-eyesloadout-group-shoesloadout-group-survival-mask
При выборе этих групп в UI русские игроки увидят не локализованные идентификаторы. Добавьте переводы в русский файл локали.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@Resources/Locale/ru-RU/backmen/preferences/loadout-groups.ftl` around lines
16 - 23, The Russian localization file is missing 12 translation entries for
loadout group keys that are defined in the English locale. Add translations for
the following missing keys to
Resources/Locale/ru-RU/backmen/preferences/loadout-groups.ftl:
loadout-group-belt, loadout-group-captain-shoes, loadout-group-common-backpack,
loadout-group-ears, loadout-group-gloves, loadout-group-id,
loadout-group-medical-eyewear, loadout-group-neck, loadout-group-pockets,
loadout-group-security-eyes, loadout-group-shoes, and
loadout-group-survival-mask. Each key should be followed by its Russian
translation to ensure players see localized group names instead of untranslated
identifiers in the UI.
| loadout-group-clown-jumpsuit = Униформа | ||
| loadout-group-clown-backpack = Рюкзак | ||
| loadout-group-clown-outerclothing = Верхняя одежда | ||
| loadout-group-clown-shoes = Ботники |
Contributor
There was a problem hiding this comment.
Исправьте опечатку в локализации.
На Line 72 используется Ботники; корректно Ботинки.
Предложение правки
-loadout-group-clown-shoes = Ботники
+loadout-group-clown-shoes = Ботинки📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| loadout-group-clown-shoes = Ботники | |
| loadout-group-clown-shoes = Ботинки |
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@Resources/Locale/ru-RU/preferences/loadout-groups.ftl` at line 72, The
Russian localization for loadout-group-clown-shoes contains a misspelling where
"Ботники" is used instead of the correct word "Ботинки". Locate the
loadout-group-clown-shoes entry in the file and change the translation value
from "Ботники" to "Ботинки" to fix the spelling error.
Comment on lines
+170
to
+183
| - type: loadout | ||
| id: PlushieJobCaptain | ||
| equipment: | ||
| outerClothing: PlushieLizardJobCaptain | ||
|
|
||
| - type: loadout | ||
| id: ToyCaptain | ||
| equipment: | ||
| outerClothing: ToyFigurineCaptain | ||
|
|
||
| - type: loadout | ||
| id: DrinkFlask | ||
| equipment: | ||
| outerClothing: DrinkFlask |
Contributor
There was a problem hiding this comment.
Бонусные предметы заведены в слот outerClothing, что ломает выбор верхней одежды.
На Line 173, Line 178 и Line 183 бонусы (PlushieLizardJobCaptain, ToyFigurineCaptain, DrinkFlask) назначены в outerClothing. Это конфликтует с CaptainOuterClothing и приводит к некорректному применению loadout (перезапись/неэкипировка).
Предложение правки
- type: loadout
id: PlushieJobCaptain
equipment:
- outerClothing: PlushieLizardJobCaptain
+ pocket1: PlushieLizardJobCaptain
- type: loadout
id: ToyCaptain
equipment:
- outerClothing: ToyFigurineCaptain
+ pocket1: ToyFigurineCaptain
- type: loadout
id: DrinkFlask
equipment:
- outerClothing: DrinkFlask
+ pocket1: DrinkFlask📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| - type: loadout | |
| id: PlushieJobCaptain | |
| equipment: | |
| outerClothing: PlushieLizardJobCaptain | |
| - type: loadout | |
| id: ToyCaptain | |
| equipment: | |
| outerClothing: ToyFigurineCaptain | |
| - type: loadout | |
| id: DrinkFlask | |
| equipment: | |
| outerClothing: DrinkFlask | |
| - type: loadout | |
| id: PlushieJobCaptain | |
| equipment: | |
| pocket1: PlushieLizardJobCaptain | |
| - type: loadout | |
| id: ToyCaptain | |
| equipment: | |
| pocket1: ToyFigurineCaptain | |
| - type: loadout | |
| id: DrinkFlask | |
| equipment: | |
| pocket1: DrinkFlask |
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@Resources/Prototypes/Loadouts/Jobs/Command/captain.yml` around lines 170 -
183, The bonus item loadouts PlushieJobCaptain, ToyCaptain, and DrinkFlask are
incorrectly assigned to the outerClothing equipment slot, creating a conflict
with the primary CaptainOuterClothing assignment. For each of these three
loadouts, move the bonus items (PlushieLizardJobCaptain, ToyFigurineCaptain, and
DrinkFlask respectively) from the outerClothing slot to their appropriate
equipment slots based on their item type to resolve the loadout conflicts.
Comment on lines
+198
to
+204
| - type: loadoutGroup | ||
| id: CaptainShoes | ||
| name: loadout-group-captain-glasses | ||
| loadouts: | ||
| - CaptainGloves | ||
| - SheriffGloves | ||
| - CaptainWhiteGloves |
Contributor
There was a problem hiding this comment.
Несогласованный id группы капитана с role wiring.
На Line 199 группа объявлена как CaptainShoes, но в Resources/Prototypes/Loadouts/role_loadouts.yml (Line 10) используется CaptainGlasses. Из-за этого ссылка на группу для капитана не совпадает с объявлением.
Предложение правки
- type: loadoutGroup
- id: CaptainShoes
+ id: CaptainGlasses
name: loadout-group-captain-glasses
loadouts:
- CaptainGloves
- SheriffGloves
- CaptainWhiteGloves🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@Resources/Prototypes/Loadouts/loadout_groups.yml` around lines 198 - 204, The
loadoutGroup with id "CaptainShoes" has an inconsistent identifier that does not
match the role wiring reference in role_loadouts.yml which expects
"CaptainGlasses". The loadouts within this group (CaptainGloves, SheriffGloves,
CaptainWhiteGloves) and the name field "loadout-group-captain-glasses" both
indicate this group is for glasses, not shoes. Change the id field from
"CaptainShoes" to "CaptainGlasses" to align with the actual role reference and
the group's purpose.
drenk28
marked this pull request as draft
June 23, 2026 02:50
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary by CodeRabbit
Новые функции
Рефакторинг