Skip to content

[Fix] Исправление ошибок.#2627

Open
Armorkillerd wants to merge 3 commits intoAdventureTimeSS14:masterfrom
Armorkillerd:120
Open

[Fix] Исправление ошибок.#2627
Armorkillerd wants to merge 3 commits intoAdventureTimeSS14:masterfrom
Armorkillerd:120

Conversation

@Armorkillerd
Copy link
Contributor

Описание PR

Снова вернул наши спрайты дроби;
Понизил время сна от приёма спящего карпа "Удар + Дизарм" с 2х секунд на 1 секунду (Твика в руководствах не требует всё равно 2 секунды занимает);
Исправил статы некоторых лекарств.

Почему / Баланс

Техническая информация

  • Изменения были протестированы на локальном сервере, и всё работает отлично.
  • PR закончен и требует просмотра изменений.

Медиа

Чейнджлог

🆑 Armorkillerd

  • revert: Вернул наши спрайты дроби.
  • fix: Исправил статы некоторых лекарств и напитков.

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Mar 15, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 97d1464a-b7b1-420f-952b-88466ebf0781

📥 Commits

Reviewing files that changed from the base of the PR and between aa9dc40 and 1a09af6.

📒 Files selected for processing (1)
  • Resources/Prototypes/Reagents/biological.yml
🚧 Files skipped from review as they are similar to previous changes (1)
  • Resources/Prototypes/Reagents/biological.yml

Walkthrough

Внесены множественные правки в прототипы: сокращена длительность ComboEffectSleep в ADTScrollSleepingCarp; ADTHungoverAngel изменён на наследование от BaseDrink с пересмотренным метаболизмом (AdjustTemperature, замена Poison→Toxin, добавлен статус Drunk и popup); добавлены/обновлены компоненты Sprite для множества дробовиковых и гранатных снарядов; отключены EmitSoundOnTrigger для GrenadeStinger и GrenadeShrapnel; пересмотрены блоки HealthChange/EvenHealthChange для ряда реагентов (DoctorsDelight, Ichor).

Possibly related PRs

Suggested labels

Changes: Sprites, Status: Needs Review, S: Untriaged

Suggested reviewers

  • Ratyyy
  • Unlumy
  • Schrodinger71
🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 inconclusive)

Check name Status Explanation Resolution
Title check ❓ Inconclusive Название на русском языке '[Fix] Исправление ошибок' слишком вагуэ и не описывает конкретные изменения PR. Уточните название, указав конкретные изменения, например: '[Fix] Восстановление спрайтов дроби и балансировка лекарств'.
✅ Passed checks (2 passed)
Check name Status Explanation
Description check ✅ Passed Описание PR соответствует содержимому changeset, включая восстановление спрайтов дроби, снижение времени сна и исправление статов лекарств.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
📝 Coding Plan
  • Generate coding plan for human review comments

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.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@Resources/Prototypes/Reagents/biological.yml`:
- Around line 187-194: Surround the entire HealthChange damage block (the
!type:HealthChange entry with damage -> groups: Burn/Brute/Toxin and types:
Bloodloss) with the ADT tweak markers by adding a comment line "#
ADT-Tweak-Start" immediately before the !type:HealthChange block and "#
ADT-Tweak-End" immediately after it so the change is clearly marked as an ADT
tweak outside /ADT/ directories.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 072cae7a-8954-46b2-b0d5-9604e3a01bcd

📥 Commits

Reviewing files that changed from the base of the PR and between 516c358 and aa9dc40.

📒 Files selected for processing (7)
  • Resources/Prototypes/ADT/Entities/Objects/Specific/material_args.yml
  • Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml
  • Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
  • Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
  • Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
  • Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
  • Resources/Prototypes/Reagents/biological.yml

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.

2 participants