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

ЭТО ЖЕ ТАРХУН!!! #18

Closed
wants to merge 1 commit into from
+45 −0
Closed

ЭТО ЖЕ ТАРХУН!!! #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@
contents:
- id: DrinkCoffeeJug
- id: DrinkColaBottleFull
- id: DrinkTarragonBottleFull
- id: DrinkCreamCartonXL
- id: DrinkDrGibbJug
- id: DrinkEnergyDrinkJug
Expand Down
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 @@ -4,6 +4,7 @@
- DrinkCoconutWaterJug
- DrinkCoffeeJug
- DrinkColaBottleFull
- DrinkTarragonBottleFull
- DrinkCreamCartonXL
- DrinkDrGibbJug
- DrinkEnergyDrinkJug
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
DrinkCognacBottleFull: 4
DrinkCoconutWaterCarton: 3
DrinkColaBottleFull: 4
DrinkTarragonBottleFull: 3
DrinkEnergyDrinkCan: 8
DrinkMilkCarton: 2
DrinkCreamCarton: 5
Expand Down
18 changes: 18 additions & 0 deletions Resources/Prototypes/Corvax/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
View file
Open in desktop
Copy link

@NotSoDana NotSoDana Nov 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Бред планетарного масштаба.

  1. Нахуя напиток нужен если это тупо кола с другим цветом, которую вы ещё и запарентили, вы даже спрайт для него поленились сделать, не говоря уже о содержимом стакана
  2. Названия пишутся с маленькой буквы и в ФТЛах А НЕ В ПРОТОТИПЕ

Либо делайте качественно, либо не делайте вообще

Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,22 @@
- type: SolutionContainerVisuals
maxFillLevels: 10
fillBaseName: fill-
- type: Sealable

- type: entity
parent: DrinkColaBottleFull
id: DrinkTarragonBottleFull
name: Бутылка космического тархуна
description: Безалкогольный напиток... хотя кому надо описание?
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: Tarragon
Quantity: 100
- type: Label
currentLabel: тархун
- type: Sprite
sprite: Objects/Consumable/Drinks/space-up_bottle.rsi
- type: Sealable
Copy link
Collaborator

Choose a reason for hiding this comment

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

Убери это, обычно простого переоткрытия файла хватает
image

Copy link
Collaborator

@lzk228 lzk228 Nov 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

смотря где, в его редакторе это может быть не настроено

Copy link
Author

Choose a reason for hiding this comment

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

А на что это влияет?

24 changes: 24 additions & 0 deletions Resources/Prototypes/Corvax/Reagents/Consumable/Drink/soda.yml
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

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

Вы чё серьёзно сделали линк описания и названия реагента на фтл, но не сделали сам фтл?
image

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
- type: reagent
id: Tarragon
name: reagent-name-tarragon
parent: Cola
desc: reagent-desc-cola
physicalDesc: reagent-physical-desc-tarragon
flavor: reagent-name-tarragon
color: "#99bb43"
Copy link

Choose a reason for hiding this comment

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

тархуну бы цвет на более зеленый поменять, очень похож на рвоту

Copy link

Choose a reason for hiding this comment

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

тархуну бы цвет на более зеленый поменять, очень похож на рвоту

Он и на вкус примерной такой, фича.

Copy link

Choose a reason for hiding this comment

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

мнение тархунохейтера не учитывается

recognizable: true
metamorphicSprite:
sprite: Objects/Consumable/Drinks/colaglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 3
- !type:GenericStatusEffect
key: Drowsiness
time: 1.0
type: Remove
Copy link
Collaborator

Choose a reason for hiding this comment

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

Тоже самое что и выше

Loading