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.

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

Rufood #738

Merged
merged 52 commits into from
Mar 18, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
53b6990
cheburek
21Melkuu Feb 12, 2024
3b94fdd
shawarma
21Melkuu Feb 12, 2024
1120d99
soup
21Melkuu Feb 13, 2024
0b8fdcd
fix
21Melkuu Feb 13, 2024
0cdadc6
svekla
21Melkuu Feb 14, 2024
474092e
compoti
21Melkuu Feb 14, 2024
8399435
flavors
21Melkuu Feb 14, 2024
e5e4987
meta
21Melkuu Feb 14, 2024
a270006
sprite fix
21Melkuu Feb 15, 2024
cfa8b74
recipes
21Melkuu Feb 15, 2024
d197001
spawner
21Melkuu Feb 15, 2024
dc38981
Fix
21Melkuu Feb 15, 2024
f57329e
fix
21Melkuu Feb 15, 2024
79a40cd
fix
21Melkuu Feb 15, 2024
5ba46db
fix
21Melkuu Feb 15, 2024
5a3f4f8
Fix reagent
21Melkuu Feb 15, 2024
a016fab
Fix cena
21Melkuu Feb 15, 2024
d8797e6
Update Resources/Locale/ru-RU/ss220/reagents/meta/drinks.ftl
21Melkuu Feb 15, 2024
7bb9352
Update Resources/Locale/ru-RU/ss220/reagents/meta/drinks.ftl
21Melkuu Feb 15, 2024
4f75f16
Update Resources/Locale/ru-RU/ss220/reagents/meta/juice.ftl
21Melkuu Feb 15, 2024
f9f2f7d
Update Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/sh…
21Melkuu Feb 15, 2024
d3b63c0
Update Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/sh…
21Melkuu Feb 15, 2024
03861f1
Update Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/so…
21Melkuu Feb 15, 2024
0f822d7
Update Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/so…
21Melkuu Feb 15, 2024
b51d421
fix meta+flavors
21Melkuu Feb 15, 2024
63927b3
Merge branch 'Rufood' of https://github.com/21Melkuu/space-station-14…
21Melkuu Feb 15, 2024
2b1905f
flavors
21Melkuu Feb 15, 2024
bd1d1ca
eblan
21Melkuu Feb 15, 2024
5896453
eblan x2
21Melkuu Feb 15, 2024
56e7d54
pngs
21Melkuu Feb 26, 2024
499c4b1
Update Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
21Melkuu Feb 28, 2024
4fa9abe
Update Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/…
21Melkuu Feb 28, 2024
480f681
Update Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/…
21Melkuu Feb 28, 2024
d96bfee
Update Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/pr…
21Melkuu Feb 28, 2024
9ac2fcf
Update Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/so…
21Melkuu Feb 28, 2024
c06721a
Update Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/so…
21Melkuu Feb 28, 2024
36cdc36
Update Resources/Prototypes/SS220/Hydroponics/seeds.yml
21Melkuu Feb 28, 2024
35948bb
Update Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/pr…
21Melkuu Feb 28, 2024
7f58468
Update Resources/Prototypes/SS220/Entities/Objects/Specific/Hydroponi…
21Melkuu Feb 28, 2024
a7a198d
Update Resources/Prototypes/SS220/Hydroponics/seeds.yml
21Melkuu Feb 28, 2024
47a7185
pngs2
21Melkuu Feb 29, 2024
c45573e
Merge branch 'Rufood' of https://github.com/21Melkuu/space-station-14…
21Melkuu Feb 29, 2024
f8d21c2
-inviz
21Melkuu Feb 29, 2024
d1ba1f7
manie velichiya)
21Melkuu Mar 7, 2024
190c19a
Update Resources/Textures/SS220/Objects/Consumable/Food/bowl.rsi/meta…
21Melkuu Mar 9, 2024
151dc0c
Update Resources/Textures/SS220/Objects/Consumable/Drinks/glass_berry…
21Melkuu Mar 9, 2024
cc8fadb
Update Resources/Textures/SS220/Objects/Consumable/Food/shawarma.rsi/…
21Melkuu Mar 9, 2024
98b4f80
123
21Melkuu Mar 9, 2024
c4ed98b
Merge branch 'Rufood' of https://github.com/21Melkuu/space-station-14…
21Melkuu Mar 9, 2024
a5bc2c0
fix 123
21Melkuu Mar 9, 2024
858f393
Merge branch 'master' into Rufood
21Melkuu Mar 16, 2024
ea837c0
Update cargo_vending.yml
21Melkuu Mar 16, 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: 5 additions & 1 deletion Resources/Locale/ru-RU/ss220/reagents/meta/drinks.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
reagent-name-glintwine = глинтвейн
reagent-desc-glintwine = Горячий алкогольный напиток на основе вина, родом из Нюрнберга.
reagent-desc-glintwine = Горячий алкогольный напиток на основе вина, родом из Нюрнберга.
reagent-name-apple-compote = яблочный компот
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
reagent-desc-apple-compote = Изготовлен из свежих яблок,по рецепту бабушки.
reagent-name-berry-compote = ягодный компот
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
reagent-desc-berry-compote = Изготовлен из свежих ягод, по рецепту бабушки.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/reagents/meta/juice.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
reagent-name-juice-beet = свекольный сок
reagent-desc-juice-beet = Сок свеклы
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockSeedsFilled
cost: 3375
cost: 3450
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
category: Hydroponics
group: market

Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/botany.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,4 @@
- id: GrapeSeeds
- id: WatermelonSeeds
- id: PeaSeeds
- id: BeetSeeds #ss220 seeds
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
BerrySeeds: 5
PeaSeeds: 5
CottonSeeds: 5
BeetSeeds: 5 #ss220 seeds
emaggedInventory:
FlyAmanitaSeeds: 1
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@
- FoodMealSoftTaco
- FoodMealCornInButter
- FoodSoupStew
- FoodSoupBorsch #ss220 cooking
- FoodSoupShchi #ss220 cooking
- FoodSoupOkroshka #ss220 cooking
- FoodSoupOkroshkaKvass #ss220 cooking
- FoodSaladVinaigrette #ss220 cooking
chance: 0.8
offset: 0.0
#rare
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
- FoodTacoFish
- FoodTacoBeefSupreme
- FoodTacoChickenSupreme
- FoodCheburek #ss220 cooking
chance: 0.8
offset: 0.0
#rare
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
- type: entity
parent: DrinkGlassBase
id: DrinkAppleCompote
name: яблочный компот
description: Изготовлен из свежих яблок.
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: AppleCompote
Quantity: 30
- type: Drink
- type: Sprite
sprite: SS220/Objects/Consumable/Drinks/glass_apple.rsi

- type: entity
parent: DrinkGlassBase
id: DrinkBerryСompote
name: ягодный компот
description: Изготовлен из свежих ягод.
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: BerryСompote
Quantity: 30
- type: Drink
- type: Sprite
sprite: SS220/Objects/Consumable/Drinks/glass_berry.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
- type: entity
parent: FoodInjectableBase
id: FoodCheburekBase
abstract: true
components:
- type: FlavorProfile
flavors:
- meaty
- type: Food
transferAmount: 3
- type: Sprite
sprite: SS220/Objects/Consumable/Food/cheburek.rsi
- type: SolutionContainerManager
solutions:
food:
maxVol: 15
reagents:
- ReagentId: Nutriment
Quantity: 6
- ReagentId: Vitamin
Quantity: 4
- type: Item
sprite: SS220/Objects/Consumable/Food/cheburek.rsi
- type: Tag
tags:
- Meat

- type: entity
name: чебурек
parent: FoodCheburekBase
id: FoodCheburek
description: Хрустящее и сочное мясо в тонком тесте - настоящий восточный вкус.
components:
- type: Food
- type: Sprite
state: cheburek
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
- type: entity
name: свекла
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
parent: FoodProduceBase
id: Foodbeet
description: Сочная и полезная свекла - отличный выбор для салатов и гарниров.
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: FlavorProfile
flavors:
- beets
- type: SolutionContainerManager
solutions:
food:
maxVol: 14
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Vitamin
Quantity: 4
- type: Sprite
sprite: SS220/Objects/Specific/Hydroponics/beet.rsi
- type: Produce
seedId: beet
- type: Extractable
juiceSolution:
reagents:
- ReagentId: JuiceBeet
Quantity: 10
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
- type: entity
parent: FoodInjectableBase
id: FoodShawarmaBase
abstract: true
components:
- type: FlavorProfile
flavors:
- shawarma
- type: Food
transferAmount: 3
- type: Sprite
sprite: SS220/Objects/Consumable/Food/shawarma.rsi
- type: SolutionContainerManager
solutions:
food:
maxVol: 15
reagents:
- ReagentId: Nutriment
Quantity: 6
- ReagentId: Vitamin
Quantity: 4
- type: Item
sprite: SS220/Objects/Consumable/Food/shawarma.rsi
- type: Tag
tags:
- Meat

- type: entity
name: шаурма
parent: FoodShawarmaBase
id: FoodShawarma
description: Аппетитная начинка, завернутая в лаваш - шаурма, которая всегда поднимает настроение.
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: Food
- type: Sprite
state: shawarma

- type: entity
name: шаурма на гриле
parent: FoodShawarmaBase
id: FoodShawarmaOnGrill
description: Шаурма, которая поднимает настроение, но только круче!
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: Food
- type: Sprite
state: shawarmaGrill

119 changes: 119 additions & 0 deletions Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/soup.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
- type: entity
name: борщ
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
Copy link

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.

Отказано, в этом нет никого смысла.
Зачем мне менять старый, когда я могу создать новый

Copy link

Choose a reason for hiding this comment

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

Потому что если есть старый - новый не нужен, поменяй старый, потому что в новом нет смысла.

parent: FoodBowlBase
id: FoodSoupBorsch
description: Красный суп.
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: FlavorProfile
flavors:
- borsch
- type: Sprite
sprite: SS220/Objects/Consumable/Food/bowl.rsi
layers:
- state: bowl
- state: borsch
- type: SolutionContainerManager
solutions:
food:
maxVol: 15
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Vitamin
Quantity: 5

- type: entity
name: щи
parent: FoodBowlBase
id: FoodSoupShchi
description: Борщ с капусткой, но не красный.
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: FlavorProfile
flavors:
- shchi
- type: Sprite
sprite: SS220/Objects/Consumable/Food/bowl.rsi
layers:
- state: bowl
- state: shchi
- type: SolutionContainerManager
solutions:
food:
maxVol: 15
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Vitamin
Quantity: 5

- type: entity
name: окрошка
parent: FoodBowlBase
id: FoodSoupOkroshka
description: Холодный суп.
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: FlavorProfile
flavors:
- okroshka
- type: Sprite
sprite: SS220/Objects/Consumable/Food/bowl.rsi
layers:
- state: bowl
- state: okroshka
- type: SolutionContainerManager
solutions:
food:
maxVol: 15
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Vitamin
Quantity: 5

- type: entity
name: окрошка на квасе
parent: FoodBowlBase
id: FoodSoupOkroshkaKvass
description: По-настоящему освежающий салат.
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: FlavorProfile
flavors:
- okroshkaKvass
- type: Sprite
sprite: SS220/Objects/Consumable/Food/bowl.rsi
layers:
- state: bowl
- state: okroshkaKvass
- type: SolutionContainerManager
solutions:
food:
maxVol: 15
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Vitamin
Quantity: 5

- type: entity
name: винегрет
parent: FoodBowlBase
id: FoodSaladVinaigrette
description: Кладезь витаминов и микроэлементов. А почему тут нет вина?
components:
- type: FlavorProfile
flavors:
- vinaigrette
- type: Sprite
sprite: SS220/Objects/Consumable/Food/bowl.rsi
layers:
- state: bowl
- state: vinaigrette
- type: SolutionContainerManager
solutions:
food:
maxVol: 15
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Vitamin
Quantity: 5
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- type: entity
parent: SeedBase
name: пакет семян (свекла)
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
id: BeetSeeds
components:
- type: Seed
seedId: beet
- type: Sprite
sprite: SS220/Objects/Specific/Hydroponics/beet.rsi
34 changes: 34 additions & 0 deletions Resources/Prototypes/SS220/Flavors/flavors.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
- type: flavor
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
id: shawarma
flavorType: Complex
description: Ням. На вкус как мясо со свежими овощами в лаваше.

- type: flavor
id: borsch
flavorType: Complex
description: Ням. На вкус мясной бульон с овощами.
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved

- type: flavor
id: shchi
flavorType: Complex
description: Ням. На вкус кислый бульон с овощами.
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved

- type: flavor
id: okroshka
flavorType: Complex
description: Ням. Освежающий вкус мяса и овощей.
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved

- type: flavor
id: okroshkaKvass
flavorType: Complex
description: Ням. Освежающий вкус мяса и овощей с кислинкой.
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved

- type: flavor
id: vinaigrette
flavorType: Complex
description: Ням. На вкус соленые вареные овощи.
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved

- type: flavor
id: beets
flavorType: Complex
description: Ням. На как свекла.
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
25 changes: 25 additions & 0 deletions Resources/Prototypes/SS220/Hydroponics/seeds.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
- type: seed
id: beet
name: пакет семян (свекла)
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
noun: seeds-noun-seeds
displayName: свекла
21Melkuu marked this conversation as resolved.
Show resolved Hide resolved
plantRsi: SS220/Objects/Specific/Hydroponics/beet.rsi
packetPrototype: BeetSeeds
productPrototypes:
- Foodbeet
lifespan: 30
maturation: 10
production: 3
yield: 3
potency: 10
growthStages: 4
waterConsumption: 0.60
chemicals:
Nutriment:
Min: 1
Max: 10
PotencyDivisor: 10
Vitamin:
Min: 1
Max: 4
PotencyDivisor: 25
Loading
Loading