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

Добавление двух карамельных трости для готовки #2349

Merged
merged 4 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
Kirus59 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
- type: entity
name: карамелька
parent: FoodBakingBase
id: CaramelFood
description: Сладкая, хрустящая, вкусная, ломающая зубы
components:
- type: Sprite
sprite: SS220/Objects/Consumable/Food/caramel.rsi/
state: caramel
- type: Construction
graph: CandyBased
node: start
defaultTarget: caramel
- type: SolutionContainerManager
solutions:
food:
maxVol: 5
reagents:
- ReagentId: Nutriment
Quantity: 4
- ReagentId: Vitamin
Quantity: 1

- type: entity
name: заготовка карамельной трости
parent: FoodBakingBase
id: CaramelBasedFood
description: Всё будет, но не сразу
components:
- type: Sprite
sprite: SS220/Objects/Consumable/Food/caramel.rsi/
state: caramel-base
- type: Construction
graph: CandyBased
node: caramel
- type: SolutionContainerManager

- type: entity
name: красная карамельная трость
parent: FoodBakingBase
id: RedCaramelCaneFood
description: Точно не выдержит ваш вес
components:
- type: Sprite
sprite: SS220/Objects/Consumable/Food/caramel.rsi/
state: caramel-red
- type: SolutionContainerManager
solutions:
food:
maxVol: 10
reagents:
- ReagentId: Nutriment
Quantity: 8
- ReagentId: Vitamin
Quantity: 2
- type: MeleeWeapon
wideAnimationRotation: 0
damage:
types:
Piercing: 1
angle: 0
animation: WeaponArcThrust
soundHit:
path: /Audio/Weapons/bladeslice.ogg

- type: entity
name: зелёная карамельная трость
parent: FoodBakingBase
id: GreenCaramelCaneFood
description: Даже не пытайте опереться на неё
Kirus59 marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: Sprite
sprite: SS220/Objects/Consumable/Food/caramel.rsi/
state: caramel-green
- type: SolutionContainerManager
solutions:
food:
maxVol: 10
reagents:
- ReagentId: Nutriment
Quantity: 8
- ReagentId: Vitamin
Quantity: 2
- type: MeleeWeapon
wideAnimationRotation: 0
damage:
types:
Piercing: 1
angle: 0
animation: WeaponArcThrust
soundHit:
path: /Audio/Weapons/bladeslice.ogg

- type: entity
name: красно-зелёная карамельная трость
parent: FoodBakingBase
id: CaramelCaneGreenRedFood
description: Трость, украшенная цветными полосками и узорами.
components:
- type: Sprite
sprite: SS220/Objects/Consumable/Food/caramel.rsi/
state: caramel-green-red
- type: SolutionContainerManager
solutions:
food:
maxVol: 10
reagents:
- ReagentId: Nutriment
Quantity: 8
- ReagentId: Vitamin
Quantity: 2
- type: MeleeWeapon
wideAnimationRotation: 0
damage:
types:
Piercing: 1
angle: 0
animation: WeaponArcThrust
soundHit:
path: /Audio/Weapons/bladeslice.ogg

- type: entity
name: двойная карамельная трость
parent: FoodBakingBase
id: DoubleCaramelCaneFood
description: Устройте дуель на тростях!
components:
- type: Sprite
sprite: SS220/Objects/Consumable/Food/caramel.rsi/
state: double-caramel
- type: SolutionContainerManager
solutions:
food:
maxVol: 20
reagents:
- ReagentId: Nutriment
Quantity: 16
- ReagentId: Vitamin
Quantity: 4
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
- type: constructionGraph
id: CandyBased
start: start
graph:
- node: start
entity: CaramelFood
edges:
- to: caramel
steps:
- tool: Rolling
doAfter: 1
- node: caramel
entity: CaramelBasedFood
55 changes: 54 additions & 1 deletion Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml
Kirus59 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -168,4 +168,57 @@
FoodMeat: 3
FoodCheeseSlice: 1
FoodTomato: 1
#SS220 Spicy UPD end
#SS220 Spicy UPD end

Kirus59 marked this conversation as resolved.
Show resolved Hide resolved
#SS220 caramel cane start
- type: microwaveMealRecipe
id: Caramel
name: карамелька
result: CaramelFood
time: 15
reagents:
Sugar: 10
Water: 10

- type: microwaveMealRecipe
id: CaramelRed
name: карамелька красная
result: RedCaramelCaneFood
time: 15
reagents:
Grenadine: 5
solids:
CaramelBasedFood: 1

- type: microwaveMealRecipe
id: CaramelGreen
name: карамелька зелёная
result: GreenCaramelCaneFood
time: 15
reagents:
JuiceLime: 5
solids:
CaramelBasedFood: 1

- type: microwaveMealRecipe
id: CaramelGreenRed
name: карамелька зелёная
result: CaramelCaneGreenRedFood
time: 15
reagents:
Grenadine: 5
JuiceLime: 5
solids:
CaramelBasedFood: 1

- type: microwaveMealRecipe
id: double Caramel
name: двойная карамелька
result: DoubleCaramelCaneFood
time: 20
reagents:
Grenadine: 10
JuiceLime: 10
solids:
CaramelBasedFood: 2
#SS220 caramel cane end
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "sprite by dinazewwr (Discord) for SS220",
Kirus59 marked this conversation as resolved.
Show resolved Hide resolved
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "caramel"
},
{
"name": "caramel-base"
},
{
"name": "caramel-red"
},
{
"name": "caramel-green"
},
{
"name": "caramel-green-red"
},
{
"name": "double-caramel"
}
]
}
Loading