6 игрушек от комьюнити#664
Open
Kolontarev wants to merge 17 commits into
Open
Conversation
github-actions
Bot
added
Resprite
Contributor
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
WalkthroughВ PR добавлена новая серия плюшевых предметов для персонажей Kolontarev. Обновлены Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
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: 3
🤖 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/Imperial/Kolontarev/CommunityPlushe.ftl`:
- Line 48: In the plushie-KolontarevEvgenyFedotov-1 localization string, correct
the typo in the Russian word "Копоративного" by adding the missing letter 'р' to
make it "Корпоративного" (referring to Corporate Law). This is a simple
character correction in the existing string to fix the misspelled Russian word.
In `@Resources/Prototypes/Imperial/Kolontarev/CommunityPlushie.yml`:
- Around line 153-167: The name property in the KolontarevEvgenyFedotov entity
is incorrectly set to "BasePlushieCharacter", which appears to be a copy-paste
error from the base prototype. Replace this generic name with the actual
character name "Evgeny Fedotov" (or use a localized FTL equivalent if needed) in
the name field of the KolontarevEvgenyFedotov entity definition to ensure the
plushie displays the correct name in the game UI.
In `@Resources/Textures/Imperial/Kolontarev/anna.rsi/meta.json`:
- Line 3: The license field in the meta.json file contains a custom string that
does not match any of the allowed enumeration values defined in the RSI schema.
Replace the current license value with one of the valid options from the schema
(such as CC-BY-3.0, CC-BY-4.0, CC-BY-SA-3.0, CC-BY-SA-4.0, CC-BY-NC-3.0,
CC-BY-NC-4.0, CC-BY-NC-SA-3.0, CC-BY-NC-SA-4.0, CC0-1.0, ICLA, or IELA). If you
need to preserve the author attribution information, add it to the copyright
field instead, as the license field is strictly validated against the enumerated
schema values and the validator validate_rsis.py will reject non-compliant
values.
🪄 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: Organization UI
Review profile: ASSERTIVE
Plan: Pro
Run ID: f219adeb-1214-4ade-9564-c15cfb21bdef
⛔ Files ignored due to path filters (18)
Resources/Textures/Imperial/Kolontarev/anna.rsi/icon.pngis excluded by!**/*.pngResources/Textures/Imperial/Kolontarev/anna.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/Imperial/Kolontarev/anna.rsi/inhand-right.pngis excluded by!**/*.pngResources/Textures/Imperial/Kolontarev/fedotov.rsi/icon.pngis excluded by!**/*.pngResources/Textures/Imperial/Kolontarev/fedotov.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/Imperial/Kolontarev/fedotov.rsi/inhand-right.pngis excluded by!**/*.pngResources/Textures/Imperial/Kolontarev/gennady.rsi/icon.pngis excluded by!**/*.pngResources/Textures/Imperial/Kolontarev/gennady.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/Imperial/Kolontarev/gennady.rsi/inhand-right.pngis excluded by!**/*.pngResources/Textures/Imperial/Kolontarev/keiko.rsi/icon.pngis excluded by!**/*.pngResources/Textures/Imperial/Kolontarev/keiko.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/Imperial/Kolontarev/keiko.rsi/inhand-right.pngis excluded by!**/*.pngResources/Textures/Imperial/Kolontarev/probkin.rsi/icon.pngis excluded by!**/*.pngResources/Textures/Imperial/Kolontarev/probkin.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/Imperial/Kolontarev/probkin.rsi/inhand-right.pngis excluded by!**/*.pngResources/Textures/Imperial/Kolontarev/stefan.rsi/icon.pngis excluded by!**/*.pngResources/Textures/Imperial/Kolontarev/stefan.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/Imperial/Kolontarev/stefan.rsi/inhand-right.pngis excluded by!**/*.png
📒 Files selected for processing (8)
Resources/Locale/ru-RU/Imperial/Kolontarev/CommunityPlushe.ftlResources/Prototypes/Imperial/Kolontarev/CommunityPlushie.ymlResources/Textures/Imperial/Kolontarev/anna.rsi/meta.jsonResources/Textures/Imperial/Kolontarev/fedotov.rsi/meta.jsonResources/Textures/Imperial/Kolontarev/gennady.rsi/meta.jsonResources/Textures/Imperial/Kolontarev/keiko.rsi/meta.jsonResources/Textures/Imperial/Kolontarev/probkin.rsi/meta.jsonResources/Textures/Imperial/Kolontarev/stefan.rsi/meta.json
изменил лицензию
изменил лицензию
изменил лицензию
изменил лицензию
изменил лицензию
изменил лицензию
Добавил все 6 игрушек в случайный спавнер комьюнити игрушек
Contributor
There was a problem hiding this comment.
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
Resources/Prototypes/Imperial/Kolontarev/CommunityPlushie.yml (1)
39-39: 📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick winУберите нецензурные комментарии из прототипа.
На Line 39 и Line 99 комментарии содержат ненормативную лексику; лучше заменить на нейтральные технические пометки.
Also applies to: 99-99
🤖 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/Imperial/Kolontarev/CommunityPlushie.yml` at line 39, The comment on the hideSpawnMenu property and another location (Line 99) contain profanity and should be replaced with neutral technical comments. Remove the vulgar language from both comment locations and replace them with appropriate technical notes that describe what the code does or any concerns about functionality in a professional manner.
🤖 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.
Outside diff comments:
In `@Resources/Prototypes/Imperial/Kolontarev/CommunityPlushie.yml`:
- Line 39: The comment on the hideSpawnMenu property and another location (Line
99) contain profanity and should be replaced with neutral technical comments.
Remove the vulgar language from both comment locations and replace them with
appropriate technical notes that describe what the code does or any concerns
about functionality in a professional manner.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: ASSERTIVE
Plan: Pro
Run ID: 1d850301-4b1d-4658-ac8f-1f8bb58cc0e4
📒 Files selected for processing (9)
Resources/Locale/ru-RU/Imperial/Kolontarev/CommunityPlushe.ftlResources/Prototypes/Imperial/Kolontarev/CommunityPlushie.ymlResources/Prototypes/Imperial/Other/TFG/Toughguys/plushie_spawner.ymlResources/Textures/Imperial/Kolontarev/anna.rsi/meta.jsonResources/Textures/Imperial/Kolontarev/fedotov.rsi/meta.jsonResources/Textures/Imperial/Kolontarev/gennady.rsi/meta.jsonResources/Textures/Imperial/Kolontarev/keiko.rsi/meta.jsonResources/Textures/Imperial/Kolontarev/probkin.rsi/meta.jsonResources/Textures/Imperial/Kolontarev/stefan.rsi/meta.json
убрал комментарий
The-Fiafi
requested changes
Jun 23, 2026
| ### Custom Item | ||
|
|
||
| - type: entity | ||
| hideSpawnMenu: true # <--- помоему она не работает |
Contributor
There was a problem hiding this comment.
Уберите, этого поля уже давно нет, используйте категории
Убрал нерабочие поля, заменил существующим аналогом
Contributor
There was a problem hiding this comment.
♻️ Duplicate comments (1)
Resources/Prototypes/Imperial/Kolontarev/CommunityPlushie.yml (1)
73-76: 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick winЗамените устаревшее
hideSpawnMenuнаcategories: [ HideSpawnMenu ].В базовой сущности всё ещё используется
hideSpawnMenu: true; по прошлому ревью это поле уже неактуально и должно быть заменено на категории (иначе настройка может игнорироваться).💡 Предлагаемый фикс
- type: entity parent: PlushieFumoJunko - hideSpawnMenu: true + categories: [ HideSpawnMenu ] id: BasePlushieKolontarev name: BasePlushieCharacter#!/bin/bash # Проверка использования hideSpawnMenu и categories в прототипах сущностей. # Ожидание: для новых/актуальных сущностей должен использоваться categories: [ HideSpawnMenu ]. rg -n --glob '*.yml' '^\s*hideSpawnMenu\s*:\s*true\b' Resources/Prototypes rg -n --glob '*.yml' '^\s*categories\s*:\s*\[\s*HideSpawnMenu\s*\]' Resources/Prototypes🤖 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/Imperial/Kolontarev/CommunityPlushie.yml` around lines 73 - 76, The entity BasePlushieKolontarev in the YAML file is using the deprecated hideSpawnMenu field which should be replaced with the categories approach for consistency with the current codebase standards. Remove the line hideSpawnMenu: true from the entity definition and add categories: [ HideSpawnMenu ] in its place to properly hide the entity from the spawn menu using the updated category-based system.
🤖 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.
Duplicate comments:
In `@Resources/Prototypes/Imperial/Kolontarev/CommunityPlushie.yml`:
- Around line 73-76: The entity BasePlushieKolontarev in the YAML file is using
the deprecated hideSpawnMenu field which should be replaced with the categories
approach for consistency with the current codebase standards. Remove the line
hideSpawnMenu: true from the entity definition and add categories: [
HideSpawnMenu ] in its place to properly hide the entity from the spawn menu
using the updated category-based system.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: ASSERTIVE
Plan: Pro
Run ID: 2575f7cf-ca8f-4fa8-8a8f-647671ec15cc
📒 Files selected for processing (1)
Resources/Prototypes/Imperial/Kolontarev/CommunityPlushie.yml
Я петух
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
Resources/Prototypes/Imperial/Kolontarev/CommunityPlushie.yml (1)
38-68: 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick winСделайте бутылки различимыми по имени.
KolontarevChemistryBottleChlorineиKolontarevChemistryBottleFluorineсейчас обе отображаются какbottle. У плюшки Стефана они лежат вместе, поэтому по инвентарю нельзя понять, где смесь, а где чистый фтор.Предлагаемое исправление
- type: entity id: KolontarevChemistryBottleChlorine categories: [ HideSpawnMenu ] suffix: Kolontarev - name: bottle + name: chlorine and fluorine bottle parent: BaseChemistryBottleFilled components: - type: SolutionContainerManager solutions: drink: maxVol: 30 reagents: - ReagentId: Chlorine Quantity: 15 - ReagentId: Fluorine Quantity: 15 - type: entity id: KolontarevChemistryBottleFluorine categories: [ HideSpawnMenu ] suffix: Kolontarev - name: bottle + name: fluorine bottle parent: BaseChemistryBottleFilled components: - type: SolutionContainerManager solutions: drink: maxVol: 30 reagents: - ReagentId: Fluorine Quantity: 30🤖 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/Imperial/Kolontarev/CommunityPlushie.yml` around lines 38 - 68, The two entity prototypes, KolontarevChemistryBottleChlorine and KolontarevChemistryBottleFluorine, both use the same displayed name, which makes them indistinguishable in inventory. Update their name fields in the CommunityPlushie prototype definitions so each bottle has a unique, descriptive name that reflects its contents, keeping the rest of the SolutionContainerManager setup unchanged.
🤖 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/Prototypes/Imperial/Kolontarev/CommunityPlushie.yml`:
- Around line 74-75: `BasePlushieKolontarev` is inheriting from
`PlushieFumoJunko`, which pulls in Junko-specific behavior like `Speech` and
`SpeakOnTrigger` with the `FumoJunko` pack. Change the parent of
`BasePlushieKolontarev` in `CommunityPlushie.yml` to a neutral base plushie
prototype, or add explicit overrides to remove the inherited speech logic, so
Kolontarev plushies do not reuse Junko-specific components.
---
Outside diff comments:
In `@Resources/Prototypes/Imperial/Kolontarev/CommunityPlushie.yml`:
- Around line 38-68: The two entity prototypes,
KolontarevChemistryBottleChlorine and KolontarevChemistryBottleFluorine, both
use the same displayed name, which makes them indistinguishable in inventory.
Update their name fields in the CommunityPlushie prototype definitions so each
bottle has a unique, descriptive name that reflects its contents, keeping the
rest of the SolutionContainerManager setup unchanged.
🪄 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: Organization UI
Review profile: ASSERTIVE
Plan: Pro
Run ID: 70fbb368-2c42-4f82-8ec5-0d52a93772a1
📒 Files selected for processing (1)
Resources/Prototypes/Imperial/Kolontarev/CommunityPlushie.yml
Comment on lines
+74
to
+75
| parent: PlushieFumoJunko | ||
| id: BasePlushieKolontarev |
Contributor
There was a problem hiding this comment.
📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
set -euo pipefail
echo "Searching for PlushieFumoJunko definition..."
rg -n -C4 '^\s*id:\s*PlushieFumoJunko\b|^\s*parent:\s*PlushieFumoJunko\b' Resources
echo
echo "Candidate plushie prototype files:"
fd -i 'plushie*.yml' Resources/Prototypes
echo
echo "If the definition is found above, inspect the full prototype block and compare"
echo "its inherited components/fields against BasePlushieKolontarev to confirm that"
echo "Junko-specific behavior is not being reused accidentally."Repository: imperial-space/SS14-public
Length of output: 10630
🏁 Script executed:
#!/bin/bash
set -euo pipefail
echo "BasePlushieKolontarev block:"
sed -n '73,110p' Resources/Prototypes/Imperial/Kolontarev/CommunityPlushie.yml
echo
echo "PlushieFumoJunko block:"
sed -n '312,356p' Resources/Prototypes/Imperial/Crook/plushies.yml
echo
echo "Nearby children of PlushieFumoJunko:"
sed -n '357,470p' Resources/Prototypes/Imperial/Crook/plushies.ymlRepository: imperial-space/SS14-public
Length of output: 5225
Смените родителя на нейтральный базовый прототип
BasePlushieKolontarev наследует PlushieFumoJunko, поэтому в колонтаревские плюшки попадут Junko-специфичные компоненты, включая Speech и SpeakOnTrigger с паком FumoJunko. Лучше вынести общий базовый слой без этой логики или переопределить её явно.
🤖 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/Imperial/Kolontarev/CommunityPlushie.yml` around lines
74 - 75, `BasePlushieKolontarev` is inheriting from `PlushieFumoJunko`, which
pulls in Junko-specific behavior like `Speech` and `SpeakOnTrigger` with the
`FumoJunko` pack. Change the parent of `BasePlushieKolontarev` in
`CommunityPlushie.yml` to a neutral base plushie prototype, or add explicit
overrides to remove the inherited speech logic, so Kolontarev plushies do not
reuse Junko-specific components.
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
2 participants
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.
О ПР`е
Тип: feat
Изменения: Добавление 6 новых игрушек
Технические детали
Добавлено 6 игрушек Для всех есть свои спрайты (в руке и в пространстве):
Добавлена локализация для игрушек а так же фразы для них.
Добавлены 2 бутылочки с реагентами (15 хлор + 15 фтор, 30 фтор). Они находятся в игрушке Стефана
Изменения кода официальных разработчиков
Нет
Summary by CodeRabbit
Примечания к выпуску