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

Jump to bottom

Drinks cartons fix and weh & buzz update #357

Merged
merged 2 commits into from
Jun 3, 2024
Merged

Drinks cartons fix and weh & buzz update #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
231bd8f
Drinks-Cartons-Update
lAstronautl Jun 1, 2024
02b4d54
Juice Sec remove
lAstronautl Jun 2, 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
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/consumable/drinks-cartons.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ent-DrinkJuiceCatDespairCarton = cat despair juice
.desc = Чем больше вы вглядываетесь в сок, тем больше вы хотите закрыть это окно осмотра. Погодите, окно осмотра?
ent-DrinkJuiceMoffCarton = мофф сок
.desc = Рекомендуется всеми мофф. Бззз!
ent-DrinkJuicelemonCarton = лимонный сок
ent-DrinkJuiceLemonCarton = лимонный сок
.desc = Это напиток, который не только освежает, но и переносит вас в удивительные дали космоса. Его ярко-жёлтый цвет напоминает о солнечных лучах, а свежесть лимона добавляет нотки кислоты и энергии.
ent-DrinkJuiceWatermelonCarton = арбузный сок
.desc = Это удивительный напиток, который сочетает в себе сладость спелого арбуза и таинственную энергию космоса. Его ярко-красный цвет напоминает о красоте красных планет, а сладкий вкус арбуза дарит ощущение летнего солнца и свежести.
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
DrinkJuiceWatermelonCarton: 3
DrinkJuiceWehCarton: 1
DrinkJuiceMoffCarton: 1
DrinkJuiceSecCarton: 1
# Starshine-end
emaggedInventory:
DrinkPoisonWinebottleFull: 2
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Reagents/fun.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,10 @@
Poison:
metabolismRate: 0.25
effects:
- !type:HealthChange
damage:
types:
Poison: 0.25
- !type:Emote
emote: Weh
showInChat: true
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Starshine/Reagents/fun.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
Poison:
metabolismRate: 0.25
effects:
- !type:HealthChange
damage:
types:
Poison: 0.25
- !type:Emote
emote: Buzzing
showInChat: true
Expand Down
Loading