Добавление бытовых вещей и структур#1093
Open
666XxttimurkaxX666 wants to merge 6 commits into
Open
Conversation
Contributor
Author
Contributor
Author
|
на картинке спрайты пожевало я хз почему |
Contributor
|
RSI Diff Bot; head commit 53fc520 merging into 1356d69 Resources/Textures/_Scp/Objects/Misc/calendar.rsi
Resources/Textures/_Scp/Objects/Misc/pencil.rsi
Resources/Textures/_Scp/Objects/Misc/photo_frame.rsi
Resources/Textures/_Scp/Objects/Misc/soap_bottle.rsi
Resources/Textures/_Scp/Objects/Misc/toilet_paper.rsi
Resources/Textures/_Scp/Objects/Misc/toothbrush.rsi
Resources/Textures/_Scp/Objects/Misc/toothbrush_holder.rsi
Resources/Textures/_Scp/Structures/Doors/MineralDoors/metal_door.rsi
Resources/Textures/_Scp/Structures/Furniture/coatrack.rsi
Resources/Textures/_Scp/Structures/Furniture/shower.rsi
Resources/Textures/_Scp/Structures/Furniture/table_sink.rsi
Resources/Textures/_Scp/Structures/Furniture/trashbin.rsi
Resources/Textures/_Scp/Structures/Machines/oven.rsi
|
Contributor
📝 WalkthroughWalkthroughДобавлены SCP-прототипы предметов, мебели, двери, Oven, мыла и столешницы с раковиной, их английская и русская локализация, компоненты взаимодействия и разрушения, машинная плата Oven, тег Toothbrush и метаданные RSI-ресурсов. ChangesSCP-сущности и локализация
Estimated code review effort: 3 (Moderate) | ~25 minutes Suggested labels: Suggested reviewers: Important Pre-merge checks failedPlease resolve all errors before merging. Addressing warnings is optional. ❌ Failed checks (1 error)
✅ Passed checks (10 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
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: 5
🤖 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/en-US/_prototypes/_scp/entities/objects/misc/toothbrush_holder.ftl`:
- Around line 4-5: Update the `.desc` value of `ent-ToothbrushHolderFilled` to
reference the `.desc` attribute of the base `ent-ToothbrushHolder` entity
instead of interpolating its default name.
In
`@Resources/Locale/en-US/_prototypes/_scp/entities/structures/furniture/shower.ftl`:
- Around line 1-2: Update the .desc entries for shower.ftl (lines 1-2),
coatrack.ftl (lines 1-2), toothbrush.ftl (lines 1-2), toothbrush_holder.ftl
(lines 1-2), trashbin.ftl (lines 1-2), and oven.ftl (lines 1-2) to describe only
observable appearance or tactile qualities: remove the shower’s usage
instruction and effect, remove the coatrack’s hanging purpose, replace the
toothbrush’s and holder’s functional phrases with visual details, remove the
trashbin’s disposal purpose, and replace the oven’s grilling/microwave
functionality with visual description.
In
`@Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/misc/toothbrush_holder.ftl`:
- Around line 4-5: Update the `.desc` attribute of `ent-ToothbrushHolderFilled`
to reference the `.desc` attribute of `ent-ToothbrushHolder`, not the entity’s
default name value.
In
`@Resources/Prototypes/_Scp/Entities/Structures/Doors/MaterialDoors/material_doors.yml`:
- Around line 28-35: Исправьте порядок ключей в конфигурации GenericVisualizer:
в блоке enum.DoorVisualLayers.Base разместите ключ слоя перед ключом состояния
enum.DoorVisuals.State, соблюдая порядок AppearanceKey → LayerKey →
AppearanceValueString. Сохраните существующие значения состояний Closed, Opened,
Opening и Closing без изменений.
In `@Resources/Prototypes/_Scp/Entities/Structures/Machines/oven.yml`:
- Around line 3-6: В YAML-прототипе печи измените порядок родителей в списке
parent: переместите наиболее специфичный KitchenElectricGrill после
BaseMachinePowered и ConstructibleMachine, чтобы он имел высший приоритет; не
изменяйте остальные свойства прототипа.
🪄 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: b0c36c1c-47fd-4373-b952-7ab8c50acff6
⛔ Files ignored due to path filters (31)
Resources/Audio/_Scp/Effects/shower_swirling.oggis excluded by!**/*.oggResources/Textures/_Scp/Objects/Misc/calendar.rsi/calendar.pngis excluded by!**/*.pngResources/Textures/_Scp/Objects/Misc/pencil.rsi/white.pngis excluded by!**/*.pngResources/Textures/_Scp/Objects/Misc/pencil.rsi/yellow.pngis excluded by!**/*.pngResources/Textures/_Scp/Objects/Misc/photo_frame.rsi/frame1.pngis excluded by!**/*.pngResources/Textures/_Scp/Objects/Misc/photo_frame.rsi/frame2.pngis excluded by!**/*.pngResources/Textures/_Scp/Objects/Misc/photo_frame.rsi/frame3.pngis excluded by!**/*.pngResources/Textures/_Scp/Objects/Misc/photo_frame.rsi/frame4.pngis excluded by!**/*.pngResources/Textures/_Scp/Objects/Misc/toilet_paper.rsi/paper.pngis excluded by!**/*.pngResources/Textures/_Scp/Objects/Misc/toothbrush.rsi/icon.pngis excluded by!**/*.pngResources/Textures/_Scp/Objects/Misc/toothbrush_holder.rsi/icon.pngis excluded by!**/*.pngResources/Textures/_Scp/Objects/Misc/toothbrush_holder.rsi/item-0.pngis excluded by!**/*.pngResources/Textures/_Scp/Objects/Misc/toothbrush_holder.rsi/item-1.pngis excluded by!**/*.pngResources/Textures/_Scp/Objects/Misc/toothbrush_holder.rsi/item-2.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Doors/MineralDoors/metal_door.rsi/closed.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Doors/MineralDoors/metal_door.rsi/open.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Furniture/coatrack.rsi/clothing-0.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Furniture/coatrack.rsi/clothing-1.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Furniture/coatrack.rsi/clothing-2.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Furniture/coatrack.rsi/clothing-3.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Furniture/coatrack.rsi/coatrack.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Furniture/shower.rsi/base.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Furniture/shower.rsi/water.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Furniture/trashbin.rsi/trashbin.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Furniture/trashbin.rsi/trashbin_open.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Machines/oven.rsi/high.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Machines/oven.rsi/low.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Machines/oven.rsi/medium.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Machines/oven.rsi/oven.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Machines/oven.rsi/running_unlit.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Machines/oven.rsi/unlit.pngis excluded by!**/*.png
📒 Files selected for processing (46)
Resources/Locale/en-US/_prototypes/_scp/entities/objects/misc/calendar.ftlResources/Locale/en-US/_prototypes/_scp/entities/objects/misc/pencil.ftlResources/Locale/en-US/_prototypes/_scp/entities/objects/misc/photo_frame.ftlResources/Locale/en-US/_prototypes/_scp/entities/objects/misc/toilet_paper.ftlResources/Locale/en-US/_prototypes/_scp/entities/objects/misc/toothbrush.ftlResources/Locale/en-US/_prototypes/_scp/entities/objects/misc/toothbrush_holder.ftlResources/Locale/en-US/_prototypes/_scp/entities/structures/doors/materialdoors/material_doors.ftlResources/Locale/en-US/_prototypes/_scp/entities/structures/furniture/coatrack.ftlResources/Locale/en-US/_prototypes/_scp/entities/structures/furniture/shower.ftlResources/Locale/en-US/_prototypes/_scp/entities/structures/furniture/trashbin.ftlResources/Locale/en-US/_prototypes/_scp/entities/structures/machines/oven.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/objects/misc/calendar.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/objects/misc/pencil.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/objects/misc/photo_frame.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/objects/misc/toilet_paper.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/objects/misc/toothbrush.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/objects/misc/toothbrush_holder.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/structures/doors/materialdoors/material_doors.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/structures/furniture/coatrack.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/structures/furniture/shower.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/structures/furniture/trashbin.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/structures/machines/oven.ftlResources/Prototypes/_Scp/Entities/Objects/Devices/Circuitboards/Machine/production.ymlResources/Prototypes/_Scp/Entities/Objects/Misc/calendar.ymlResources/Prototypes/_Scp/Entities/Objects/Misc/pencil.ymlResources/Prototypes/_Scp/Entities/Objects/Misc/photo_frame.ymlResources/Prototypes/_Scp/Entities/Objects/Misc/toilet_paper.ymlResources/Prototypes/_Scp/Entities/Objects/Misc/toothbrush.ymlResources/Prototypes/_Scp/Entities/Objects/Misc/toothbrush_holder.ymlResources/Prototypes/_Scp/Entities/Structures/Doors/MaterialDoors/material_doors.ymlResources/Prototypes/_Scp/Entities/Structures/Furniture/coatrack.ymlResources/Prototypes/_Scp/Entities/Structures/Furniture/shower.ymlResources/Prototypes/_Scp/Entities/Structures/Furniture/trashbin.ymlResources/Prototypes/_Scp/Entities/Structures/Machines/oven.ymlResources/Prototypes/_Scp/tags.ymlResources/Textures/_Scp/Objects/Misc/calendar.rsi/meta.jsonResources/Textures/_Scp/Objects/Misc/pencil.rsi/meta.jsonResources/Textures/_Scp/Objects/Misc/photo_frame.rsi/meta.jsonResources/Textures/_Scp/Objects/Misc/toilet_paper.rsi/meta.jsonResources/Textures/_Scp/Objects/Misc/toothbrush.rsi/meta.jsonResources/Textures/_Scp/Objects/Misc/toothbrush_holder.rsi/meta.jsonResources/Textures/_Scp/Structures/Doors/MineralDoors/metal_door.rsi/meta.jsonResources/Textures/_Scp/Structures/Furniture/coatrack.rsi/meta.jsonResources/Textures/_Scp/Structures/Furniture/shower.rsi/meta.jsonResources/Textures/_Scp/Structures/Furniture/trashbin.rsi/meta.jsonResources/Textures/_Scp/Structures/Machines/oven.rsi/meta.json
Contributor
Author
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.
Краткое описание | Short description
лол
Ссылка на багрепорт/Предложение | Related Issue/Bug Report
Медиа (Видео/Скриншоты) | Media (Video/Screenshots)
Changelog
🆑 timur
Summary by CodeRabbit