Skip to content

Добавление шкафа с логотипом фонда#1044

Open
666XxttimurkaxX666 wants to merge 1 commit into
space-sunrise:masterfrom
666XxttimurkaxX666:add-scp-lockers
Open

Добавление шкафа с логотипом фонда#1044
666XxttimurkaxX666 wants to merge 1 commit into
space-sunrise:masterfrom
666XxttimurkaxX666:add-scp-lockers

Conversation

@666XxttimurkaxX666

@666XxttimurkaxX666 666XxttimurkaxX666 commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

Краткое описание | Short description

ну типо шкаф лол

Ссылка на багрепорт/Предложение | Related Issue/Bug Report

Медиа (Видео/Скриншоты) | Media (Video/Screenshots)

Скриншот-20260607-162842

Changelog

🆑 timur

  • add: Добавлен шкаф с логотипом фонда

Summary by CodeRabbit

Новые возможности

  • New Features
    • Добавлены новые типы шкафчиков и закрытых хранилищ с поддержкой различных визуальных состояний (открытое, закрытое, состояния дверей)
    • Добавлена локализация для английского и русского языков

@github-actions

github-actions Bot commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

RSI Diff Bot; head commit 28e6352 merging into d5005be
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_Scp/Structures/Storage/closet.rsi

State Old New Status
scp Added
scp_door Added
scp_icon Added
scp_open Added

Edit: diff updated after 28e6352

@coderabbitai

coderabbitai Bot commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

Warning

Review limit reached

@666XxttimurkaxX666, we couldn't start this review because you've reached your PR review rate limit.

More reviews will be available in 31 minutes and 58 seconds. Learn how PR review limits work.

Your organization has run out of usage credits. Purchase more in the billing tab.

⌛ How to resolve this issue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans include higher PR review limits than trial, open-source, and free plans. In all cases, reviews become available again over time. During sustained high-volume PR review activity, CodeRabbit may temporarily slow when the next review becomes available.

Please see our Fair Usage Limits Policy for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro

Run ID: 3326005d-4da6-4390-9a41-bb2f1df1e934

📥 Commits

Reviewing files that changed from the base of the PR and between 397a25d and 28e6352.

⛔ Files ignored due to path filters (4)
  • Resources/Textures/_Scp/Structures/Storage/closet.rsi/scp.png is excluded by !**/*.png
  • Resources/Textures/_Scp/Structures/Storage/closet.rsi/scp_door.png is excluded by !**/*.png
  • Resources/Textures/_Scp/Structures/Storage/closet.rsi/scp_icon.png is excluded by !**/*.png
  • Resources/Textures/_Scp/Structures/Storage/closet.rsi/scp_open.png is excluded by !**/*.png
📒 Files selected for processing (7)
  • Resources/Locale/en-US/_prototypes/_scp/entities/structures/storage/closets/closets.ftl
  • Resources/Locale/en-US/_prototypes/_scp/entities/structures/storage/closets/lockers/lockers.ftl
  • Resources/Locale/ru-RU/_prototypes/_scp/entities/structures/storage/closets/closets.ftl
  • Resources/Locale/ru-RU/_prototypes/_scp/entities/structures/storage/closets/lockers/lockers.ftl
  • Resources/Prototypes/_Scp/Entities/Structures/Storage/Closets/Lockers/lockers.yml
  • Resources/Prototypes/_Scp/Entities/Structures/Storage/Closets/closets.yml
  • Resources/Textures/_Scp/Structures/Storage/closet.rsi/meta.json
📝 Walkthrough

Walkthrough

PR добавляет две новые сущности хранилища для SCP-объектов: ScpClosetLogotype и ScpLockerLogotype. Для каждой добавлены локализованные строки на английском и русском языках, определения прототипов с компонентом EntityStorageVisuals для управления визуальными состояниями, и новые спрайт-состояния в текстурном файле.

Changes

SCP Storage Entities Addition

Layer / File(s) Summary
ScpClosetLogotype entity with localization
Resources/Prototypes/_Scp/Entities/Structures/Storage/Closets/closets.yml, Resources/Locale/en-US/_prototypes/_scp/entities/structures/storage/closets/closets.ftl, Resources/Locale/ru-RU/_prototypes/_scp/entities/structures/storage/closets/closets.ftl
Новая сущность ScpClosetLogotype наследует ScpClosetSteelBase с компонентом EntityStorageVisuals, определяющим состояния scp (закрытое основание), scp_open (открытая дверь) и scp_door (закрытая дверь). Локализованные строки на английском и русском наследуют базовое описание ent-LockerBase.
ScpLockerLogotype entity with localization
Resources/Prototypes/_Scp/Entities/Structures/Storage/Closets/Lockers/lockers.yml, Resources/Locale/en-US/_prototypes/_scp/entities/structures/storage/closets/lockers/lockers.ftl, Resources/Locale/ru-RU/_prototypes/_scp/entities/structures/storage/closets/lockers/lockers.ftl
Новая сущность ScpLockerLogotype наследует ScpLockerBase с компонентом EntityStorageVisuals, определяющим те же визуальные состояния. Локализованные строки на английском и русском наследуют базовое описание ent-LockerBase.
Shared sprite states configuration
Resources/Textures/_Scp/Structures/Storage/closet.rsi/meta.json
Добавлены четыре новых состояния в спрайт-набор: scp, scp_door, scp_icon и scp_open, где первые три определены с направлениями 4, а scp_icon — без направлений, обеспечивая визуальную поддержку для обеих новых сущностей хранилища.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Suggested labels

📦 YAML | Прототип 📦, 🧊 Нет C# 🧊, 🖌️ Спрайты 🖌️, 📚 Изменения: Локализация 📚

Suggested reviewers

  • ThereDrD0

Poem

🐰 Новые шкафчики SCP с логотипом блеска,
На русском, английском — вот местность чудесна!
Четыре спрайта в танце кружат,
Открыва двери, стоят и гудят,
Коммит простой, но визуально чист. ✨


Important

Pre-merge checks failed

Please resolve all errors before merging. Addressing warnings is optional.

❌ Failed checks (1 error)

Check name Status Explanation Resolution
Ss14 Yaml/Ftl Rules ❌ Error ScpClosetLogotype and ScpLockerLogotype lack mandatory English name/description YAML fields required by ss14-naming-conventions; all other entities in these files have them. Add English fallback name and description fields to both YAML entities, matching the pattern used by other entities like ScpClosetTool and ScpLockerDirector.
✅ Passed checks (9 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed Название точно отражает основное изменение в Pull Request — добавление нового шкафа с логотипом фонда (ScpClosetLogotype и ScpLockerLogotype) в прототипы, локализацию и текстуры.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Ss14 Bridge Sync ✅ Passed PR изменяет 3 правила и 42 навыка в .agent/, и все требуемые мосты (.agents/, .claude/, .cursor/, .github/) синхронизированы с правильными путями на источники.
Ss14 C# Rules ✅ Passed PR contains no C# files (.cs); check applies only to PRs with C# changes, per instructions. Not applicable.
Ss14 Prototype ↔ Ftl Parity ✅ Passed Новые прототипы ScpClosetLogotype и ScpLockerLogotype имеют соответствующие FTL-записи ent-ScpClosetLogotype и ent-ScpLockerLogotype с описаниями во всех затронутых локализациях (en-US, ru-RU).
Ss14 Prediction Safety ✅ Passed PR содержит только изменения ресурсных файлов (локализация, прототипы, текстуры). Отсутствуют изменения Content.Shared, predicted logic, или shared gameplay paths, к которым применяется эта проверка.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

🤖 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/_Scp/Entities/Structures/Storage/Closets/closets.yml`:
- Around line 112-119: The prototype entity ScpClosetLogotype is missing the
required English fallback fields; add top-level YAML keys name and description
for this entity (alongside the existing id/parent/components) so toolshed/editor
tooling can use them; update the ScpClosetLogotype block (the entity with
components EntityStorageVisuals and states
stateBaseClosed/stateDoorOpen/stateDoorClosed) to include explicit name: "..."
and description: "..." entries in English matching the pattern used by other
entities in this file.

In
`@Resources/Prototypes/_Scp/Entities/Structures/Storage/Closets/Lockers/lockers.yml`:
- Around line 547-554: The prototype ScpLockerLogotype (parent ScpLockerBase,
component EntityStorageVisuals) is missing the required English fallback fields
name and description; add top-level name and description keys with English text
directly into the YAML for ScpLockerLogotype (alongside existing FTL
localization entries) so toolshed/editor tooling can read them — ensure they are
simple string values (e.g., name: "SCP Locker" and description: "Standard SCP
locker") placed inside the ScpLockerLogotype mapping.
🪄 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: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro

Run ID: 1912c06c-66fe-45d3-8f30-0a14203f6eb4

📥 Commits

Reviewing files that changed from the base of the PR and between d5005be and 397a25d.

⛔ Files ignored due to path filters (4)
  • Resources/Textures/_Scp/Structures/Storage/closet.rsi/scp.png is excluded by !**/*.png
  • Resources/Textures/_Scp/Structures/Storage/closet.rsi/scp_door.png is excluded by !**/*.png
  • Resources/Textures/_Scp/Structures/Storage/closet.rsi/scp_icon.png is excluded by !**/*.png
  • Resources/Textures/_Scp/Structures/Storage/closet.rsi/scp_open.png is excluded by !**/*.png
📒 Files selected for processing (7)
  • Resources/Locale/en-US/_prototypes/_scp/entities/structures/storage/closets/closets.ftl
  • Resources/Locale/en-US/_prototypes/_scp/entities/structures/storage/closets/lockers/lockers.ftl
  • Resources/Locale/ru-RU/_prototypes/_scp/entities/structures/storage/closets/closets.ftl
  • Resources/Locale/ru-RU/_prototypes/_scp/entities/structures/storage/closets/lockers/lockers.ftl
  • Resources/Prototypes/_Scp/Entities/Structures/Storage/Closets/Lockers/lockers.yml
  • Resources/Prototypes/_Scp/Entities/Structures/Storage/Closets/closets.yml
  • Resources/Textures/_Scp/Structures/Storage/closet.rsi/meta.json

@MIDUZKA

MIDUZKA commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

@MorDast1 это пипец. Ты посматривай какие спрайты проходят, хорошо? Потому что это ну вообще прям, отборнейшее

@666XxttimurkaxX666

Copy link
Copy Markdown
Contributor Author

@MorDast1 это пипец. Ты посматривай какие спрайты проходят, хорошо? Потому что это ну вообще прям, отборнейшее

ачо тут не так

@WardexOfficial

Copy link
Copy Markdown
Collaborator

@666XxttimurkaxX666
Нужно что бы ты установил цифровую подпись своих коммитов на гитхабе (инструкция: https://emmanuelbernard.com/blog/2023/11/27/git-signing-ssh/) и вероятнее всего либо пересоздал все коммиты сам либо воспользовался rebase для подписи всех коммитов

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants