From 837bbef7eee98b108ebb03ea5f362dedf740b12f Mon Sep 17 00:00:00 2001 From: Arimah Date: Fri, 13 Sep 2024 15:09:13 +0200 Subject: [PATCH 1/2] New cooked meatball sprite + cookable raw meatballs --- .../Entities/Objects/Consumable/Food/meat.yml | 49 +++++++++++------- .../Construction/Graphs/food/meatball.yml | 14 +++++ .../Food/meat.rsi/meatball-cooked.png | Bin 0 -> 494 bytes .../Consumable/Food/meat.rsi/meta.json | 14 +++++ 4 files changed, 57 insertions(+), 20 deletions(-) create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/Graphs/food/meatball.yml create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/meat.rsi/meatball-cooked.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/meat.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index 1e5da38f7f1..d5115280120 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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: @@ -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: @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -2140,4 +2149,4 @@ name: food-sequence-content-xeno - type: Construction graph: XenoCutlet - node: xeno cutlet \ No newline at end of file + node: xeno cutlet diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/food/meatball.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/food/meatball.yml new file mode 100644 index 00000000000..fada59b5ab9 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/food/meatball.yml @@ -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 diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/meat.rsi/meatball-cooked.png b/Resources/Textures/_NF/Objects/Consumable/Food/meat.rsi/meatball-cooked.png new file mode 100644 index 0000000000000000000000000000000000000000..bfa72e38495bf36ba2a67de0590f050012a33b7c GIT binary patch literal 494 zcmVpGhDk(0R9Hvtls!uWK@f(=py7lok|1KpefUTW{Ho<_RU_d*OKjD3^X!DEB#E-oB}^dBPOEX( znEwlY)X}~L>VETG4=UtlY^vV*REl^rfst+j?=8g8anYVs=m*6+Z|{`a+|hnvwFy8R z6zT&H4Z6jiV}vk5A}-nj?w$qMNGDp53QKN^$u$HF0YhM<1ik>qaGZs6)N7Fd000hU kSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$g7)gmh5!Hn literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/meat.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/meat.rsi/meta.json new file mode 100644 index 00000000000..69da853e37b --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Food/meat.rsi/meta.json @@ -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" + } + ] +} From fb585845627009a770a2bc0b707ba9bab42ade72 Mon Sep 17 00:00:00 2001 From: Arimah Date: Fri, 13 Sep 2024 15:55:58 +0200 Subject: [PATCH 2/2] End Frontier --- Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index d5115280120..bb42b644157 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -907,6 +907,7 @@ - type: Construction graph: meatballNF node: start + # End Frontier - type: entity name: slimeball @@ -1480,6 +1481,7 @@ - type: Construction graph: meatballNF node: cooked + # End Frontier # Cutlets