Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

недостающая канистра виски #449

Merged
merged 4 commits into from
Mar 4, 2024
Merged

недостающая канистра виски #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d23c38c
Update DrinkJugs.yml
JustKekc Mar 3, 2024
cf9149d
Update jugs.ftl
JustKekc Mar 3, 2024
c1145fd
Update beverage.yml
JustKekc Mar 3, 2024
f217146
Update ChangelogADT.yml
JustKekc Mar 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Resources/Changelog/ChangelogADT.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1373,3 +1373,9 @@ Entries:
- {message: Исправление конфликтного рецепта аголатина., type: Fix}
id: 55695 #костыль отображения в Обновлениях
time: '2024-03-02T14:14:00.0000000+00:00'

- author: JustKekc
changes:
- {message: Центральное командование вспомнило о недостающей канистре виски в раздатчиках алкоголя., type: Fix}
id: 55696 #костыль отображения в Обновлениях
time: '2024-03-03T19:04:00.0000000+00:00'
4 changes: 3 additions & 1 deletion Resources/Locale/ru-RU/ADT/Objects/specific/jugs.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,6 @@ ent-ADTDrinkAleCanister = канистра (эль)
ent-ADTDrinkMeadCanister = канистра (медовуха)
.desc = { ent-ADTCanister.desc }
ent-ADTDrinkAppleLiqueurCanister = канистра (яблочный ликёр)
.desc = { ent-ADTCanister.desc }
.desc = { ent-ADTCanister.desc }
ent-ADTDrinkWhiskeyCanister = канистра (виски)
.desc = { ent-ADTCanister.desc }
16 changes: 16 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/DrinkJugs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,3 +480,19 @@
- type: Drink
- type: Label
currentLabel: apple-liqueur-name

- type: entity
parent: ADTCanister
id: ADTDrinkWhiskeyCanister
name: cola canister
description: Cola. In space.
components:
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: Whiskey
Quantity: 600
- type: Drink
- type: Label
currentLabel: reagent-name-whiskey
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
- ADTDrinkSodaWaterCanister
- ADTDrinkBeerCanister
- ADTDrinkCoffeeLiqueurCanister
- ADTDrinkWhiskeyCanister
- ADTDrinkWineCanister
- ADTDrinkVodkaCanister
- ADTDrinkGinCanister
Expand Down
Loading