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

New cooked meatball sprite + make meatballs cookable #2003

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
49 changes: 29 additions & 20 deletions Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@
name: food-sequence-content-chicken
skewer:
name: food-sequence-content-chicken
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-meat

Expand Down Expand Up @@ -548,7 +548,7 @@
name: food-sequence-content-lizard
skewer:
name: food-sequence-content-lizard
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-tail

Expand Down Expand Up @@ -713,7 +713,7 @@
name: food-sequence-content-snake
skewer:
name: food-sequence-content-snake
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-snake

Expand Down Expand Up @@ -815,7 +815,7 @@
name: food-sequence-content-tomato
skewer:
name: food-sequence-content-tomato
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-tomato

Expand Down Expand Up @@ -903,6 +903,10 @@
name: food-sequence-burger-content-raw-meat
taco:
name: food-sequence-content-raw-meat
# Frontier: Cookable meatball. Delicious.
- type: Construction
graph: meatballNF
node: start

- type: entity
name: slimeball
Expand Down Expand Up @@ -1002,7 +1006,7 @@
name: food-sequence-content-meat
skewer:
name: food-sequence-content-meat
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-meat

Expand Down Expand Up @@ -1047,7 +1051,7 @@
name: food-sequence-content-meat
skewer:
name: food-sequence-content-meat
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-meat

Expand Down Expand Up @@ -1164,7 +1168,7 @@
name: food-sequence-content-chicken
skewer:
name: food-sequence-content-chicken
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-meat

Expand Down Expand Up @@ -1206,7 +1210,7 @@
name: food-sequence-content-chicken
skewer:
name: food-sequence-content-chicken
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-meat

Expand Down Expand Up @@ -1248,7 +1252,7 @@
name: food-sequence-content-duck
skewer:
name: food-sequence-content-duck
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-meat

Expand Down Expand Up @@ -1402,7 +1406,7 @@
name: food-sequence-content-lizard
skewer:
name: food-sequence-content-lizard
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-tail-cooked

Expand Down Expand Up @@ -1448,6 +1452,7 @@
- Cooked
- Meat
- type: Sprite
sprite: _NF/Objects/Consumable/Food/meat.rsi # Frontier: New cooked sprite
state: meatball-cooked
- type: SolutionContainerManager
solutions:
Expand All @@ -1459,7 +1464,7 @@
Quantity: 5
- type: FoodSequenceElement
sprite:
sprite: Objects/Consumable/Food/meat.rsi
sprite: _NF/Objects/Consumable/Food/meat.rsi # Frontier: New cooked sprite
state: meatball-cooked
entries:
burger:
Expand All @@ -1468,9 +1473,13 @@
name: food-sequence-content-meat
skewer:
name: food-sequence-content-meat
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-meat
# Frontier: Cookable meatball. Delicious.
- type: Construction
graph: meatballNF
node: cooked

# Cutlets

Expand Down Expand Up @@ -1508,7 +1517,7 @@
name: food-sequence-content-meat
skewer:
name: food-sequence-content-meat
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-meat
- type: Construction
Expand Down Expand Up @@ -1626,7 +1635,7 @@
name: food-sequence-content-chicken
skewer:
name: food-sequence-content-chicken
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-meat
- type: Construction
Expand Down Expand Up @@ -1668,7 +1677,7 @@
name: food-sequence-content-duck
skewer:
name: food-sequence-content-duck
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-meat
- type: Construction
Expand Down Expand Up @@ -1713,7 +1722,7 @@
name: food-sequence-content-lizard
skewer:
name: food-sequence-content-lizard
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-tail
- type: Construction
Expand Down Expand Up @@ -1990,7 +1999,7 @@
name: food-sequence-content-chicken
skewer:
name: food-sequence-content-chicken
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-meat
- type: Construction
Expand Down Expand Up @@ -2030,7 +2039,7 @@
name: food-sequence-content-duck
skewer:
name: food-sequence-content-duck
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-meat
- type: Construction
Expand Down Expand Up @@ -2071,7 +2080,7 @@
name: food-sequence-content-lizard
skewer:
name: food-sequence-content-lizard
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-tail-cooked
- type: Construction
Expand Down Expand Up @@ -2140,4 +2149,4 @@
name: food-sequence-content-xeno
- type: Construction
graph: XenoCutlet
node: xeno cutlet
node: xeno cutlet
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
- type: constructionGraph
id: meatballNF
start: start
graph:
- node: start
edges:
- to: cooked
completed:
- !type:PlaySound
sound: /Audio/Effects/sizzle.ogg
steps:
- minTemperature: 354
- node: cooked
entity: FoodMeatMeatballCooked
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions Resources/Textures/_NF/Objects/Consumable/Food/meat.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "meatball-cooked taken from Goonstation at https://github.com/goonstation/goonstation/commit/29bbfc12ddb348a0ff65009936b8d82ee047996e, made by Erinexx (binarysudoku)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "meatball-cooked"
}
]
}
Loading