Добавление SCP 007, SCP-208, SCP 492, SCP 527, SCP 2020 и SCP 4449 - #1064
Open
666XxttimurkaxX666 wants to merge 43 commits into
Open
666XxttimurkaxX666 wants to merge 43 commits into
666XxttimurkaxX666 wants to merge 43 commits into
Conversation
Contributor
|
RSI Diff Bot; head commit 493d1f1 merging into 15dcc22 Resources/Textures/_Scp/Clothing/Uniforms/scp208-uniform.rsi
Resources/Textures/_Scp/Mobs/Scp/scp-007.rsi
Resources/Textures/_Scp/Mobs/Scp/scp-2020.rsi
Resources/Textures/_Scp/Mobs/Scp/scp-208.rsi
Resources/Textures/_Scp/Mobs/Scp/scp-4449.rsi
Resources/Textures/_Scp/Mobs/Scp/scp-492.rsi
Resources/Textures/_Scp/Mobs/Scp/scp-527.rsi
Resources/Textures/_Scp/Objects/Research/research_material.rsi
Resources/Textures/_Scp/Structures/Wallmounts/scp-posters.rsi
Resources/Textures/_Scp/Structures/Wallmounts/signs-directional.rsi
|
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:
📝 WalkthroughWalkthroughДобавлены SCP-007, SCP-492, SCP-527, SCP-2020 и SCP-4449 как игровые сущности с ghost-ролями, экипировкой и спавнерами. Добавлены исследовательский материал, бумажные предметы, постеры, знаки, действие прыжка, локализации и обновление правила SCP-173. ChangesSCP-сущности, роли и спавн
Estimated code review effort: 4 (Complex) | ~45 minutes Merge Risk: 🟡 Moderate · up to PR добавляет новые SCP-сущности, роли, предметы, вывески и локализацию, но текущая версия всё ещё может показывать игрокам плейсхолдеры и неполные описания, использовать несогласованные идентификаторы, отображать служебные маркеры в меню спавна и содержать неверные визуальные или текстовые данные. Слияние следует отложить до исправления этих конкретных проблем. Possibly related PRs
Suggested labels: Suggested reviewers: Sequence Diagram(s)sequenceDiagram
participant SpawnScp
participant RandomSpawner
participant ScpEntity
participant GhostRole
SpawnScp->>RandomSpawner: Выбор прототипа SCP
RandomSpawner->>ScpEntity: Создание SCP-007, SCP-492, SCP-527, SCP-2020 или SCP-4449
ScpEntity->>GhostRole: Передача роли призраку
Important Pre-merge checks failedPlease resolve all errors before merging. Addressing warnings is optional. ❌ Failed checks (2 errors, 1 warning)
✅ Passed checks (8 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
added
📚 Изменения: Локализация 📚
📦 YAML | Прототип 📦
🧊 Нет C# 🧊
labels
![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: 13
🤖 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/mobs/player/scp/main/scp007.ftl`:
- Line 1: The localization key ent-Scp007 is still using the placeholder value,
so replace it with the final display name text for the SCP entity. Update the
value in the scp007.ftl entry to a proper localized name such as SCP-007,
keeping the ent-* key unchanged and aligned with the English intent.
In `@Resources/Locale/en-US/_strings/_scp/roles/scp.ftl`:
- Around line 16-20: Update the en-US locale strings in the SCP roles block so
the job titles match the rest of the file’s English formatting: change the
quoted titles in job-name-scp007 and job-name-scp527 from guillemets to standard
double quotes, and restore the capital P in Abdominal Planet. Keep the existing
key names and only normalize the localized values in the relevant SCP entries.
In `@Resources/Locale/en-US/_strings/_scp/scp/scp007.ftl`:
- Line 2: The description string for ghost-role-information-scp007-description
reads unnaturally because it says “in stomach area”; update the English
localization text in the scp007 entry to a natural phrasing like “in the stomach
area” while keeping the fallback wording aligned with the intended English
meaning.
In
`@Resources/Locale/ru-RU/_prototypes/_scp/entities/mobs/player/scp/main/scp007.ftl`:
- Line 1: The ru-RU prototype entry for ent-Scp007 still contains a placeholder
value, so replace the ??? in the localization string with the final entity name
and keep it aligned with the English intent, such as SCP-007. Update the
scp007.ftl prototype translation so the ent-Scp007 key no longer renders as a
draft placeholder in the Russian locale.
In
`@Resources/Locale/ru-RU/_prototypes/_scp/entities/mobs/player/scp/main/scp527.ftl`:
- Line 1: Replace the placeholder value for ent-Scp527 in the SCP-527
localization prototype with the finalized Russian entity name instead of ???,
using the same key and keeping the fallback text aligned with the English
intent. Update the localized string in scp527.ftl so the ent-Scp527 entry
renders a real name like SCP-527 rather than a broken placeholder.
In `@Resources/Locale/ru-RU/_strings/_scp/paper/wondertainmentPapers.ftl`:
- Line 31: The Russian localization string in the paper/wondertainmentPapers
entry has a grammar issue in the closing clause, where the second part lacks an
explicit subject or natural verb phrasing. Update that sentence so it matches
the meaning of the original by using a natural construction with «вы» in the
phrase after «а», and review the full line in the related localized string entry
for smoothness and consistency.
In `@Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp007.yml`:
- Around line 1-4: Replace the placeholder fallback text in the Scp007 prototype
by adding proper English fallback strings directly in the YAML: update the
Scp007 entity’s name to a real value instead of “???” and add a description
field alongside it. Keep the `id: Scp007` prototype entry intact and ensure the
fallback `name` and `description` are present in the prototype itself so
toolshed/editor and localization misses still show valid text.
In `@Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp1508.yml`:
- Around line 132-133: Scp1508PaperFlyer is currently blocked by Scp1508’s hand
whitelist, so the spawn item cannot be equipped as intended. Update the Scp1508
definition to either add the appropriate paper allowance to the whitelist used
for inhand items, or move Scp1508PaperFlyer to a slot/container path that
Scp1508 can actually use. Use the Scp1508 prototype and Scp1508PaperFlyer
definition to verify the item matches the allowed components/tags before keeping
it in inhand.
In `@Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp527.yml`:
- Around line 1-4: Replace the placeholder fallback values in the Scp527
prototype: update the Scp527 entity so its YAML includes a real English fallback
name instead of the current placeholder in the name field, and add a description
field directly on the prototype. Make the change in the Scp527 entity definition
so both name and description exist alongside the localization setup, matching
the repo’s prototype fallback contract.
In `@Resources/Prototypes/_Scp/Entities/Objects/ScpParts/parts.yml`:
- Around line 100-112: `ScpDirtLump` is inheriting only from `BaseScpMaterial`,
so it is missing the research-artifact behavior expected by the guide. Update
the `ScpDirtLump` entity definition in the parts prototype so it also inherits
from `BaseScpResearchMaterial` (as used by `Scp999Jelly` and `Scp173Shard`),
keeping its existing sprite/tag setup intact. Make sure the parent chain
includes the research base that provides `BaseScpArtifactMajor`, `GuideHelp`,
`Damageable`, and `DamageOverlay`.
In `@Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml`:
- Around line 145-159: Replace the existing Fire edit markers in the
ScpInteractTool/GuideHelp block with the Sunrise edit marker scheme used for
fork-specific changes. Update the comment markers around the ScpResearchAdvanced
and ScpSpawnInteractDoAfterEvent section to use Sunrise-Edit / Sunrise edit
start-end wording so the markers match the repository’s non-_Scp convention.
In `@Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml`:
- Around line 197-211: The edit markers in the Surgery prototype block use the
wrong prefix; replace the current Fire markers with the repository-standard
Sunrise markers so the section is wrapped with Sunrise-Edit / Sunrise edit
start-end style comments. Update the marker text around the ScpInteractTool and
GuideHelp block, keeping the same content but aligning the identifying comments
with the existing Sunrise convention used outside _Scp.
- Around line 198-210: Move the SCP-007 добыча behavior off the shared
BaseScissors prototype and into the concrete Retractor prototype instead. The
ScpInteractTool and GuideHelp block currently applied in the surgery prototypes
should be removed from the common parent so Hemostat and BoneSetter do not
inherit ScpDirtLump spawning; then add the same ScpInteractTool/GuideHelp
configuration specifically under Retractor.
🪄 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: abef15f7-08b2-41c5-8568-599217953f98
⛔ Files ignored due to path filters (7)
Resources/Textures/_Scp/Mobs/Scp/scp-007.rsi/scp-007.pngis excluded by!**/*.pngResources/Textures/_Scp/Mobs/Scp/scp-527.rsi/scp-527.pngis excluded by!**/*.pngResources/Textures/_Scp/Objects/Research/research_material.rsi/scp-dirt.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Wallmounts/scp-posters.rsi/scp007.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Wallmounts/scp-posters.rsi/scp527.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Wallmounts/signs-directional.rsi/007.pngis excluded by!**/*.pngResources/Textures/_Scp/Structures/Wallmounts/signs-directional.rsi/527.pngis excluded by!**/*.png
📒 Files selected for processing (39)
Resources/Locale/en-US/_prototypes/_scp/entities/mobs/player/scp/main/scp007.ftlResources/Locale/en-US/_prototypes/_scp/entities/objects/scpparts/parts.ftlResources/Locale/en-US/_prototypes/_scp/entities/objects/specific/wondertainmentPapers.ftlResources/Locale/en-US/_prototypes/_scp/entities/structures/wallmounts/signs/posters.ftlResources/Locale/en-US/_prototypes/_scp/entities/structures/wallmounts/signs/signs.ftlResources/Locale/en-US/_strings/_scp/paper/wondertainmentPapers.ftlResources/Locale/en-US/_strings/_scp/roles/scp.ftlResources/Locale/en-US/_strings/_scp/scp/scp007.ftlResources/Locale/en-US/_strings/_scp/scp/scp527.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/mobs/player/scp/main/scp007.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/mobs/player/scp/main/scp527.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/objects/scpparts/parts.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/objects/specific/wondertainmentPapers.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/structures/wallmounts/signs/posters.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/structures/wallmounts/signs/signs.ftlResources/Locale/ru-RU/_strings/_scp/paper/wondertainmentPapers.ftlResources/Locale/ru-RU/_strings/_scp/roles/scp.ftlResources/Locale/ru-RU/_strings/_scp/scp/scp007.ftlResources/Locale/ru-RU/_strings/_scp/scp/scp527.ftlResources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.ymlResources/Prototypes/Entities/Objects/Specific/Medical/surgery.ymlResources/Prototypes/_Scp/Entities/Markers/scp.ymlResources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp007.ymlResources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp1508.ymlResources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp527.ymlResources/Prototypes/_Scp/Entities/Objects/Scp/scp124.ymlResources/Prototypes/_Scp/Entities/Objects/ScpParts/parts.ymlResources/Prototypes/_Scp/Entities/Objects/Specific/wondertainmentPapers.ymlResources/Prototypes/_Scp/Entities/Structures/Wallmounts/Signs/posters.ymlResources/Prototypes/_Scp/Entities/Structures/Wallmounts/Signs/signs.ymlResources/Prototypes/_Scp/Roles/Jobs/SCP/ghostrole.ymlResources/Prototypes/_Scp/Roles/play_time_trackers.ymlResources/Prototypes/_Scp/tags.ymlResources/ServerInfo/_Scp/Guidebook/Research/ResearchAdvanced.xmlResources/Textures/_Scp/Mobs/Scp/scp-007.rsi/meta.jsonResources/Textures/_Scp/Mobs/Scp/scp-527.rsi/meta.jsonResources/Textures/_Scp/Objects/Research/research_material.rsi/meta.jsonResources/Textures/_Scp/Structures/Wallmounts/scp-posters.rsi/meta.jsonResources/Textures/_Scp/Structures/Wallmounts/signs-directional.rsi/meta.json
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 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/Mobs/Player/Scp/Main/scp173.yml`:
- Around line 54-56: Restore Critical in the requiredMobStates list for the
SCP-173 collision damage prototype, and adjust the whitelist logic only for mobs
that truly lack a Dead threshold if needed. The issue is in the SCP-173 YAML
definition under requiredMobStates, so update that configuration to allow
targets in Critical to keep taking collision damage instead of becoming immune
after the first hit.
🪄 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: 50e211b4-1820-4a71-a50e-8d1e4c65680f
📒 Files selected for processing (8)
Resources/Locale/en-US/_strings/_scp/roles/scp.ftlResources/Locale/en-US/_strings/_scp/scp/scp007.ftlResources/Prototypes/Entities/Objects/Specific/Medical/surgery.ymlResources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp007.ymlResources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp173.ymlResources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp527.ymlResources/Prototypes/_Scp/Entities/Mobs/Player/Scp/base_scp.ymlResources/Prototypes/_Scp/Entities/Objects/ScpParts/parts.yml
Contributor
|
Contributor
Author
|
исправил |
Contributor
|
Этот PR содержит конфликты, пожалуйста, разрешите их, прежде чем мы сможем его оценить. |
Contributor
|
Рыбаголовый нет, планетарный да |
666XxttimurkaxX666
changed the title
Contributor
|
Этот PR содержит конфликты, пожалуйста, разрешите их, прежде чем мы сможем его оценить. |
Contributor
Author
|
это пизда |
Contributor
Author
|
@WardexOfficial бляяя прошу прими хотя бы для ивентов уже 2 ивентолога ждут |
Contributor
|
Этот PR содержит конфликты, пожалуйста, разрешите их, прежде чем мы сможем его оценить. |
Contributor
Author
пашол |
Contributor
|
Этот PR содержит конфликты, пожалуйста, разрешите их, прежде чем мы сможем его оценить. |
Contributor
|
Этот PR содержит конфликты, пожалуйста, разрешите их, прежде чем мы сможем его оценить. |
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
3 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.
Краткое описание | Short description
типо 5 разумных адекватных (и 1 не совсем) челика для рп
https://scpfoundation.net/scp-007
https://scpfoundation.net/scp-208
https://scpfoundation.net/scp-492
https://scpfoundation.net/scp-527
https://scpfoundation.net/scp-2020
https://scpfoundation.net/scp-4449
Ссылка на багрепорт/Предложение | Related Issue/Bug Report
Медиа (Видео/Скриншоты) | Media (Video/Screenshots)
Changelog
🆑 timur
Summary by CodeRabbit
Summary by CodeRabbit
Новые возможности
Исправления