Skip to content

Atmos and Sabre#1475

Closed
drenk28 wants to merge 9 commits into
Rxup:masterfrom
drenk28:Atmos
Closed

Atmos and Sabre#1475
drenk28 wants to merge 9 commits into
Rxup:masterfrom
drenk28:Atmos

Conversation

@drenk28

@drenk28 drenk28 commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

Summary by CodeRabbit

  • Новые возможности
    • Добавлены атмосферные утеплённые перчатки и магнитные ботинки.
    • Предметы включены в заполнение соответствующих шкафчиков снабжения.
  • Локализация
    • Добавлены и переведены названия и описания для новых предметов на английском и русском.
  • Изменения баланса
    • Пересмотрены параметры электрошокера и капитанской сабли для более предсказуемого боя.
  • Оформление
    • Добавлены новые метаданные RSI/спрайтов для обновлённой экипировки.

@drenk28
drenk28 requested a review from Rxup as a code owner July 2, 2026 21:43
@github-actions github-actions Bot added S: Untriaged size/M Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. No C# Нету кода. Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation and removed S: Untriaged size/M labels Jul 2, 2026
@github-actions

github-actions Bot commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

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

Resources/Textures/Backmen/Clothing/Hands/Gloves/insulated_gloves.rsi

State Old New Status
equipped-HAND Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Backmen/Clothing/Shoes/Boots/magboots_atmos.rsi

State Old New Status
equipped-FEET-reptilian Added
equipped-FEET-vox Added
equipped-FEET Added
icon-on Added
icon Added
inhand-left Added
inhand-right Added
on-equipped-FEET-reptilian Added
on-equipped-FEET-vox Added
on-equipped-FEET Added
on-inhand-left Added
on-inhand-right Added

Edit: diff updated after 66a72cd

@coderabbitai

coderabbitai Bot commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

Warning

Review limit reached

@drenk28, you've reached your PR review limit, so we couldn't start this review.

Next review available in: 58 minutes

Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available.
You're only billed for reviews past your plan's rate limits ($0.25/file).

How can I continue?

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.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews.

How do review limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 89add575-3cc0-46dd-95af-75ef74fcbd78

📥 Commits

Reviewing files that changed from the base of the PR and between db3e3b1 and 66a72cd.

⛔ Files ignored due to path filters (16)
  • Resources/Textures/Backmen/Clothing/Hands/Gloves/insulated_gloves.rsi/equipped-HAND.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Clothing/Hands/Gloves/insulated_gloves.rsi/icon.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Clothing/Hands/Gloves/insulated_gloves.rsi/inhand-left.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Clothing/Hands/Gloves/insulated_gloves.rsi/inhand-right.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Clothing/Shoes/Boots/magboots_atmos.rsi/equipped-FEET-reptilian.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Clothing/Shoes/Boots/magboots_atmos.rsi/equipped-FEET-vox.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Clothing/Shoes/Boots/magboots_atmos.rsi/equipped-FEET.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Clothing/Shoes/Boots/magboots_atmos.rsi/icon-on.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Clothing/Shoes/Boots/magboots_atmos.rsi/icon.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Clothing/Shoes/Boots/magboots_atmos.rsi/inhand-left.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Clothing/Shoes/Boots/magboots_atmos.rsi/inhand-right.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Clothing/Shoes/Boots/magboots_atmos.rsi/on-equipped-FEET-reptilian.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Clothing/Shoes/Boots/magboots_atmos.rsi/on-equipped-FEET-vox.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Clothing/Shoes/Boots/magboots_atmos.rsi/on-equipped-FEET.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Clothing/Shoes/Boots/magboots_atmos.rsi/on-inhand-left.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Clothing/Shoes/Boots/magboots_atmos.rsi/on-inhand-right.png is excluded by !**/*.png
📒 Files selected for processing (5)
  • Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
  • Resources/Prototypes/_Backmen/Entities/Clothing/Hands/gloves.yml
  • Resources/Prototypes/_Backmen/Entities/Clothing/Shoes/magboots.yml
  • Resources/Textures/Backmen/Clothing/Hands/Gloves/insulated_gloves.rsi/meta.json
  • Resources/Textures/Backmen/Clothing/Shoes/Boots/magboots_atmos.rsi/meta.json

Walkthrough

Добавлены новые предметы экипировки для атмос-техников, обновлены параметры тазера и капитанской сабли, а также сдвинут указатель подмодуля RobustToolbox.

Changes

Новая экипировка атмос-техника

Layer / File(s) Summary
Утеплённые перчатки атмосов: прототип, локализация, текстуры
Resources/Prototypes/ASLEEP/Entities/Clothing/Hands/gloves.yml, Resources/Locale/en-US/prototypes/asleep/entities/clothing/hands/gloves.ftl, Resources/Locale/ru-RU/prototypes/asleep/entities/clothing/hands/groves.ftl, Resources/Textures/ASLEEP/Clothing/Hands/Gloves/insulated_gloves.rsi/meta.json
Добавлена сущность InsulatedGlovesAtmos, строки локализации и метаданные RSI.
Магнитные ботинки атмоса: прототип, локализация, текстуры
Resources/Prototypes/ASLEEP/Entities/Clothing/Shoes/magboots.yml, Resources/Locale/en-US/prototypes/asleep/entities/clothing/shoes/magboots.ftl, Resources/Locale/ru-RU/prototypes/asleep/entities/clothing/shoes/magboots.ftl, Resources/Textures/ASLEEP/Clothing/Shoes/magboots_atmos.rsi/meta.json
Добавлена сущность ClothingShoesBootsMagAtmos, строки локализации и метаданные RSI.
Добавление в лут локера инженера
Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
В FillLockerAtmospherics.table.children добавлены InsulatedGlovesAtmos и ClothingShoesBootsMagAtmos.

Правки баланса оружия

Layer / File(s) Summary
Тазер: параметры выстрела
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
В WeaponTaser обновлён компонент Gun.
Капитанская сабля: урон, отражение, размер хранения
Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
В CaptainSabre изменены урон, отражение и параметры Item.

Обновление подмодуля RobustToolbox

Layer / File(s) Summary
Сдвиг указателя подмодуля
RobustToolbox
Изменён зафиксированный коммит подмодуля Subproject.

Estimated code review effort: 2 (Simple) | ~10 minutes

Poem

Я — кролик, и прыжком приветствую вас,
Перчатки и ботинки готовы в тот же час.
Тазер и сабля слегка поменяли тон,
А подмодуль сдвинулся — и встал в новый фон.
Морковный хруст, и мир опять хорош 🐇

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed Заголовок кратко и точно отражает основные изменения: атмосферное снаряжение и правки сабли.
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.
✨ 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.

@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

🧹 Nitpick comments (3)
Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml (1)

171-171: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low value

Небольшая несогласованность форматирования комментария.

Здесь два пробела перед #Asleep, тогда как на строке 162 — один. Не влияет на функциональность.

🤖 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/Catalog/Fills/Lockers/engineer.yml` at line 171, The
comment formatting in the engineer locker prototype is inconsistent because the
`ClothingShoesBootsMagAtmos` entry has extra spacing before the inline comment.
Update the comment alignment in the relevant fill entry so it matches the
surrounding style used elsewhere in the same prototype section, keeping the `id`
entry and `#Asleep` comment neatly aligned.
Resources/Locale/ru-RU/prototypes/asleep/entities/clothing/hands/groves.ftl (1)

1-2: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low value

Опечатка в имени файла: groves.ftl вместо gloves.ftl.

Файл ru-RU локализации назван иначе, чем зеркальный en-US-путь (.../hands/gloves.ftl), что нарушает соглашение о зеркалировании путей локализации между языками и усложняет навигацию/поиск.

🤖 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/prototypes/asleep/entities/clothing/hands/groves.ftl`
around lines 1 - 2, The localization file name is misspelled as groves.ftl,
which breaks the mirrored path convention with the corresponding gloves.ftl
file. Rename the file to gloves.ftl so the ru-RU prototype path matches the
en-US structure, and verify any references to this locale file continue to
resolve through the same mirrored directory layout.
Resources/Prototypes/ASLEEP/Entities/Clothing/Hands/gloves.yml (1)

4-5: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low value

Неудачная формулировка англ. названия/описания.

name: insulated gloves atmos звучит грамматически некорректно для англоязычного текста (в отличие от аккуратной ru-RU локализации "Утеплённые перчатки атмосов"). Стоит переформулировать, например atmos insulated gloves или atmospheric technician's insulated gloves.

🤖 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/ASLEEP/Entities/Clothing/Hands/gloves.yml` around lines
4 - 5, The English localization in the gloves prototype has an awkward,
ungrammatical item name/description. Update the ASLEEP gloves entry by adjusting
the localized fields in the gloves prototype so the label reads naturally in
English, using the existing item definition for insulated atmos gear as the
reference; for example, rephrase the name to something like “atmos insulated
gloves” or “atmospheric technician’s insulated gloves,” and make sure the
description matches that wording.
🤖 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/ASLEEP/Entities/Clothing/Hands/gloves.yml`:
- Around line 13-15: In the TemperatureProtection block for the gloves entity,
the heatingCoefficient value is incorrectly above 1.0 and makes the item worse
than no protection. Update the gloves definition to use a sub-1.0
heatingCoefficient in line with other insulated/protective clothing, checking
the intended balance for this ASLEEP gloves prototype and keeping
coolingCoefficient unchanged unless the design requires otherwise.
- Around line 11-12: The Insulated prototype in gloves.yml is using an
unsupported field, so the protection setting is ignored. Update the Insulated
definition to use only valid InsulatedComponent data fields (such as
Coefficient) or remove the invalid preventOpperatinGuns entry, and verify the
prototype still maps correctly to InsulatedComponent in the clothing gloves
prototype.

---

Nitpick comments:
In `@Resources/Locale/ru-RU/prototypes/asleep/entities/clothing/hands/groves.ftl`:
- Around line 1-2: The localization file name is misspelled as groves.ftl, which
breaks the mirrored path convention with the corresponding gloves.ftl file.
Rename the file to gloves.ftl so the ru-RU prototype path matches the en-US
structure, and verify any references to this locale file continue to resolve
through the same mirrored directory layout.

In `@Resources/Prototypes/ASLEEP/Entities/Clothing/Hands/gloves.yml`:
- Around line 4-5: The English localization in the gloves prototype has an
awkward, ungrammatical item name/description. Update the ASLEEP gloves entry by
adjusting the localized fields in the gloves prototype so the label reads
naturally in English, using the existing item definition for insulated atmos
gear as the reference; for example, rephrase the name to something like “atmos
insulated gloves” or “atmospheric technician’s insulated gloves,” and make sure
the description matches that wording.

In `@Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml`:
- Line 171: The comment formatting in the engineer locker prototype is
inconsistent because the `ClothingShoesBootsMagAtmos` entry has extra spacing
before the inline comment. Update the comment alignment in the relevant fill
entry so it matches the surrounding style used elsewhere in the same prototype
section, keeping the `id` entry and `#Asleep` comment neatly aligned.
🪄 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: 9999cc82-61b0-4c5c-a3e4-0b7396fc0e4d

📥 Commits

Reviewing files that changed from the base of the PR and between ed64e4b and b226566.

⛔ Files ignored due to path filters (16)
  • Resources/Textures/ASLEEP/Clothing/Hands/Gloves/insulated_gloves.rsi/equipped-HAND.png is excluded by !**/*.png
  • Resources/Textures/ASLEEP/Clothing/Hands/Gloves/insulated_gloves.rsi/icon.png is excluded by !**/*.png
  • Resources/Textures/ASLEEP/Clothing/Hands/Gloves/insulated_gloves.rsi/inhand-left.png is excluded by !**/*.png
  • Resources/Textures/ASLEEP/Clothing/Hands/Gloves/insulated_gloves.rsi/inhand-right.png is excluded by !**/*.png
  • Resources/Textures/ASLEEP/Clothing/Shoes/magboots_atmos.rsi/equipped-FEET-reptilian.png is excluded by !**/*.png
  • Resources/Textures/ASLEEP/Clothing/Shoes/magboots_atmos.rsi/equipped-FEET-vox.png is excluded by !**/*.png
  • Resources/Textures/ASLEEP/Clothing/Shoes/magboots_atmos.rsi/equipped-FEET.png is excluded by !**/*.png
  • Resources/Textures/ASLEEP/Clothing/Shoes/magboots_atmos.rsi/icon-on.png is excluded by !**/*.png
  • Resources/Textures/ASLEEP/Clothing/Shoes/magboots_atmos.rsi/icon.png is excluded by !**/*.png
  • Resources/Textures/ASLEEP/Clothing/Shoes/magboots_atmos.rsi/inhand-left.png is excluded by !**/*.png
  • Resources/Textures/ASLEEP/Clothing/Shoes/magboots_atmos.rsi/inhand-right.png is excluded by !**/*.png
  • Resources/Textures/ASLEEP/Clothing/Shoes/magboots_atmos.rsi/on-equipped-FEET-reptilian.png is excluded by !**/*.png
  • Resources/Textures/ASLEEP/Clothing/Shoes/magboots_atmos.rsi/on-equipped-FEET-vox.png is excluded by !**/*.png
  • Resources/Textures/ASLEEP/Clothing/Shoes/magboots_atmos.rsi/on-equipped-FEET.png is excluded by !**/*.png
  • Resources/Textures/ASLEEP/Clothing/Shoes/magboots_atmos.rsi/on-inhand-left.png is excluded by !**/*.png
  • Resources/Textures/ASLEEP/Clothing/Shoes/magboots_atmos.rsi/on-inhand-right.png is excluded by !**/*.png
📒 Files selected for processing (11)
  • Resources/Locale/en-US/prototypes/asleep/entities/clothing/hands/gloves.ftl
  • Resources/Locale/en-US/prototypes/asleep/entities/clothing/shoes/magboots.ftl
  • Resources/Locale/ru-RU/prototypes/asleep/entities/clothing/hands/groves.ftl
  • Resources/Locale/ru-RU/prototypes/asleep/entities/clothing/shoes/magboots.ftl
  • Resources/Prototypes/ASLEEP/Entities/Clothing/Hands/gloves.yml
  • Resources/Prototypes/ASLEEP/Entities/Clothing/Shoes/magboots.yml
  • Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
  • Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
  • Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
  • Resources/Textures/ASLEEP/Clothing/Hands/Gloves/insulated_gloves.rsi/meta.json
  • Resources/Textures/ASLEEP/Clothing/Shoes/magboots_atmos.rsi/meta.json

Comment thread Resources/Prototypes/ASLEEP/Entities/Clothing/Hands/gloves.yml Outdated
Comment thread Resources/Prototypes/ASLEEP/Entities/Clothing/Hands/gloves.yml Outdated
@github-actions github-actions Bot added the size/M label Jul 7, 2026

@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.

♻️ Duplicate comments (1)
Resources/Prototypes/ASLEEP/Entities/Clothing/Hands/gloves.yml (1)

1-21: 🎯 Functional Correctness | 🟠 Major | 🏗️ Heavy lift

Отсутствует компонент Insulated — перчатки не защищают от удара током.

Прошлый ревью-коммент указывал на некорректное поле preventOpperatinGuns в компоненте Insulated (InsulatedComponent поддерживает только Coefficient). В текущей версии компонент Insulated полностью удалён из прототипа вместо исправления поля. В итоге сущность называется "insulated gloves" и позиционируется как защитная экипировка атмос-техника, но по факту не защищает от электрошока — только от температуры (TemperatureProtection). Это выглядит как побочный эффект предыдущего фикса, а не осознанное решение.

Предлагаемое исправление
   - type: TemperatureProtection
     heatingCoefficient: 0.050
     coolingCoefficient: 0.8
+  - type: Insulated
+    coefficient: 0
   - type: Butcherable

Стоит уточнить корректное значение coefficient (по аналогии с ванильными изолированными перчатками) перед мёржем.

🤖 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/ASLEEP/Entities/Clothing/Hands/gloves.yml` around lines
1 - 21, The insulated gloves prototype lost its electric shock protection
because the Insulated component was removed from InsulatedGlovesAtmos in
gloves.yml. Restore the Insulated component on this entity and set the correct
coefficient value consistent with the vanilla insulated gloves behavior, while
keeping the existing TemperatureProtection and other components intact. Use the
InsulatedGlovesAtmos prototype as the anchor when updating the components list.
🤖 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/ASLEEP/Entities/Clothing/Hands/gloves.yml`:
- Around line 1-21: The insulated gloves prototype lost its electric shock
protection because the Insulated component was removed from InsulatedGlovesAtmos
in gloves.yml. Restore the Insulated component on this entity and set the
correct coefficient value consistent with the vanilla insulated gloves behavior,
while keeping the existing TemperatureProtection and other components intact.
Use the InsulatedGlovesAtmos prototype as the anchor when updating the
components list.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 23a4ef5f-2eaf-4d09-ba04-83f2dd1fb0d8

📥 Commits

Reviewing files that changed from the base of the PR and between b226566 and 4572076.

📒 Files selected for processing (1)
  • Resources/Prototypes/ASLEEP/Entities/Clothing/Hands/gloves.yml

@github-actions

Copy link
Copy Markdown
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@drenk28
drenk28 marked this pull request as draft July 14, 2026 03:22
@drenk28 drenk28 closed this Jul 14, 2026
@drenk28
drenk28 deleted the Atmos branch July 14, 2026 03:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. No C# Нету кода. S: Merge Conflict size/M

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant