Skip to content

Dark beer added#676

Merged
oldschoolotaku merged 9 commits into
corvax-team:masterfrom
NotSoDana:06-17-dark-beer
Jun 22, 2026
Merged

Dark beer added#676
oldschoolotaku merged 9 commits into
corvax-team:masterfrom
NotSoDana:06-17-dark-beer

Conversation

@NotSoDana

@NotSoDana NotSoDana commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

Описание PR

В игру добавлено пиво "Кайзерстаут™". Легендарный напиток можно найти в ассортименте АлкоМата и спавнере алкоголя. Также в раздатчик алкоголя добавлен целый бочонок всеми любимого тёмного пива!

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

Предложка. Я хочу пробухать всё.

Технические детали

Всё раскидано по нужным папочкам, добавлена отдельная локаль, в спавнеры и каталоги добавлен комментарий Corvax-WL

Медиа

Screenshot_269

Требования

Согласие с условиями

  • Я согласен с условиями LICENSE и CLA.

Критические изменения

Список изменений

🆑 Dezzzix

  • wl-add: Добавлено тёмное пиво "Кайзерстаут"

Summary by CodeRabbit

New Features

  • Added a new Dark Beer beverage, including a new complex flavor profile.
  • Introduced new drink variants: drinking glass, standard filled bottle, and filled XL growler.
  • Expanded drink availability across dispensers, vending inventories, crate service refills, and random drink spawners.
  • Added full Russian localization for the flavor, reagent name/description, and all Dark Beer entities.
  • Added new drink texture metadata for Dark Beer and its glass variant.

@github-actions

github-actions Bot commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

RSI Diff Bot; head commit 88a0c53 merging into 102a1f5
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added
icon_open Added
inhand-left-fill-1 Added
inhand-left-fill-2 Added
inhand-left-fill-3 Added
inhand-left Added
inhand-right-fill-1 Added
inhand-right-fill-2 Added
inhand-right-fill-3 Added
inhand-right Added

Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeerglass.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
fill-6 Added
icon Added
icon_empty Added

Edit: diff updated after 88a0c53

@coderabbitai

coderabbitai Bot commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

Warning

Review limit reached

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

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

Your organization has used up its prepaid credits, and credit purchases are no longer available. Enable the review add-on in the billing tab to keep reviews running — you're only billed for reviews past your plan's rate limits ($0.25/file).

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

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

🚦 How do rate limits work?

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

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, the refill rate gradually slows as usage increases. The highest same-day bursts are limited more strictly.

Please see our Fair Usage Limits Policy for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 0b6e16a6-fbe7-455b-b540-26c68b342987

📥 Commits

Reviewing files that changed from the base of the PR and between 3ac8152 and 88a0c53.

📒 Files selected for processing (2)
  • Resources/Prototypes/_WL/Entities/Objects/Consumable/Drinks/drinks.yml
  • Resources/Prototypes/_WL/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml
📝 Walkthrough

Walkthrough

Adds a new Dark Beer drink item to the game. This includes a DarkBeer reagent definition, a darkbeer complex flavor, three entity prototypes (glass, bottle, growler), RSI texture metadata for both bottle and glass sprites, and distribution wiring across the vending machine inventory, service crate, booze dispenser, and random alcohol spawner. Russian localization strings cover all new entries.

Changes

Dark Beer Drink Addition

Layer / File(s) Summary
DarkBeer reagent and flavor definition
Resources/Prototypes/_WL/Reagents/Consumable/Drink/drinks.yml, Resources/Prototypes/_WL/Flavors/flavors.yml
Defines the DarkBeer reagent inheriting BaseAlcohol with metamorphic glass sprite, 6 fill levels, color change, and fizziness 0.6. Adds the darkbeer Complex flavor entry with description key flavor-complex-darkbeer.
Entity prototypes and RSI texture metadata
Resources/Prototypes/_WL/Entities/Objects/Consumable/Drinks/drinks.yml, Resources/Prototypes/_WL/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml, Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi/meta.json, Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeerglass.rsi/meta.json
Adds DrinkDarkBeerGlass (30-vol glass), DrinkDarkBeerBottleFull (50-vol bottle), and DrinkDarkBeerBottleFullGrowler (150-vol growler) entity prototypes. Includes RSI metadata for both bottle and glass sprites enumerating all render states (icons, fill levels, and in-hand variants).
Distribution wiring
Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml, Resources/Prototypes/Catalog/Fills/Crates/service.yml, Resources/Prototypes/Entities/Structures/Dispensers/booze.yml, Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
Registers the bottle (qty 5) in BoozeOMatInventory, the growler in CrateServiceBoozeDispenser and BoozeDispenser storagebase, and both variants in RandomCommonAlcoholTable.
Russian localization
Resources/Locale/ru-RU/_WL/reagents/meta/consumable/drink/alcohol.ftl, Resources/Locale/ru-RU/_WL/flavors/flavor-profiles.ftl, Resources/Locale/ru-RU/_WL/prototypes/entities/objects/consumable/drinks/drinks_metamorphic.ftl, Resources/Locale/ru-RU/_WL/prototypes/entities/objects/consumable/drinks/drinks_bottles_glass.ftl
Adds Russian strings for reagent name/description, flavor profile text (как жжёная карамель), glass suffix (Тёмное пиво), and bottle/growler names and descriptions.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Suggested reviewers

  • tau27
  • Litogin

Poem

🐇 A dark beer flows, rich, burnt, and sweet,
New bottles spawned for tables to greet,
The growler fills, the vending hums on,
Тёмное пиво at dusk until dawn—
The bunny toasts with foam on its snout! 🍺

🚥 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 The title 'Dark beer added' directly reflects the main change: adding a dark beer variant to the game with multiple supporting components.
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.

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

✨ 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: 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/Catalog/VendingMachines/Inventories/boozeomat.yml`:
- Line 51: In the boozeomat.yml file on the line with DrinkDarkBeerBottleFull
inventory entry, the comment marker contains a Cyrillic character С instead of a
Latin C. Replace the Cyrillic С with a Latin C in the marker comment so it reads
Corvax-WL instead of Сorvax-WL. This ensures exact-match tooling and policy
checks can properly identify and match the marker comment.
🪄 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: defaults

Review profile: CHILL

Plan: Pro

Run ID: f3c01cd1-0a09-44ff-810d-47afb1b70bc3

📥 Commits

Reviewing files that changed from the base of the PR and between 102a1f5 and 0ceb0a4.

⛔ Files ignored due to path filters (24)
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi/fill-1.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi/fill-2.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi/fill-3.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi/fill-4.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi/fill-5.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi/icon.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi/icon_empty.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi/icon_open.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi/inhand-left-fill-1.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi/inhand-left-fill-2.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi/inhand-left-fill-3.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi/inhand-left.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi/inhand-right-fill-1.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi/inhand-right-fill-2.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi/inhand-right-fill-3.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi/inhand-right.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeerglass.rsi/fill-1.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeerglass.rsi/fill-2.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeerglass.rsi/fill-3.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeerglass.rsi/fill-4.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeerglass.rsi/fill-5.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeerglass.rsi/fill-6.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeerglass.rsi/icon.png is excluded by !**/*.png
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeerglass.rsi/icon_empty.png is excluded by !**/*.png
📒 Files selected for processing (14)
  • Resources/Locale/ru-RU/_WL/flavors/flavor-profiles.ftl
  • Resources/Locale/ru-RU/_WL/prototypes/entities/objects/consumable/drinks/drinks_bottles_glass.ftl
  • Resources/Locale/ru-RU/_WL/prototypes/entities/objects/consumable/drinks/drinks_metamorphic.ftl
  • Resources/Locale/ru-RU/_WL/reagents/meta/consumable/drink/alcohol.ftl
  • Resources/Prototypes/Catalog/Fills/Crates/service.yml
  • Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
  • Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
  • Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
  • Resources/Prototypes/_WL/Entities/Objects/Consumable/Drinks/drinks.yml
  • Resources/Prototypes/_WL/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml
  • Resources/Prototypes/_WL/Flavors/flavors.yml
  • Resources/Prototypes/_WL/Reagents/Consumable/Drink/drinks.yml
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeer.rsi/meta.json
  • Resources/Textures/_WL/Objects/Consumable/Drinks/darkbeerglass.rsi/meta.json

Comment thread Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml Outdated
@oldschoolotaku

Copy link
Copy Markdown
Collaborator

кайзергансштаут

@NotSoDana

Copy link
Copy Markdown
Contributor Author

Бля чё с тестами нормально же общались

@tau27 tau27 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

норм

@NotSoDana

Copy link
Copy Markdown
Contributor Author

Всё пофиксил

@oldschoolotaku oldschoolotaku merged commit b819178 into corvax-team:master Jun 22, 2026
5 checks passed
@coderabbitai coderabbitai Bot mentioned this pull request Jun 23, 2026
3 tasks
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