From 5f730ae30be50a6288af538f95c76444e66deca0 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 12 Jul 2024 13:41:32 -0700 Subject: [PATCH 1/5] PLEASE WORK PLEASE --- .../Objects/Consumable/Food/meals.yml | 21 ++++++++++++++++++ .../Recipes/Cooking/meal_recipes.yml | 9 ++++++++ .../Consumable/Food/meals.rsi/harpywings.png | Bin 0 -> 717 bytes .../Consumable/Food/meals.rsi/meta.json | 3 +++ 4 files changed, 33 insertions(+) create mode 100644 Resources/Textures/Objects/Consumable/Food/meals.rsi/harpywings.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 5fbfe9c09b2..5a37ab93312 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -609,3 +609,24 @@ Quantity: 4 - ReagentId: Vitamin Quantity: 4 + +- type: entity + name: harpy wings + parent: FoodMealBase + id: FoodHarpyWings + description: It's a bit stringy. + components: + - type: FlavorProfile + flavors: + - chicken + - type: Sprite + state: harpywings + - type: SolutionContainerManager + soultions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quanity: 13 + - ReagentId: Protein + Quanity: 7 \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index a5620fd8efe..2f280f6e46d 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1423,6 +1423,15 @@ FoodSnackChocolateBar: 2 FoodEgg: 3 +- type: microwaveMealRecipe + id: RecipeHarpyWings + name: harpy wings recipe + result: FoodHarpyWings + time: 15 + solids: + LeftLegHarpy: 1 + RightLegHarpy: 1 + #Donks i guess - type: microwaveMealRecipe id: RecipeWarmDonkpocket diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/harpywings.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/harpywings.png new file mode 100644 index 0000000000000000000000000000000000000000..e355802a95abfeb3372e0c1de211e641649f3028 GIT binary patch literal 717 zcmV;;0y6!HP)Px%he zIo~^=@rT<0s1#T2G^<-6 z0y#nS+z{-7BVgMC*eJa~Q&%GZqnG+>su0p5(&VbsgPRISu)MSctesp;`c@&WK zRU^3&dnA6&E{%EyZd`q9+D8Wy_~+g*_HdR|I$-)wh-&I;B>QODu(x&`RHd*N&>fHQ z^20{}wDL~?+Jn8!0vE?lvsmqX0$PAYpeNXib~_0`wt24+%e8=;x9)lXJ$^PJCG-S) z?T@3t)8|h_Y!j5vf$e}&fH!co?gUOT{_hHG2c);a7{qwOxCvI2GC9-UcX>eS*By`9 z4xp_7CzLWd^jyJgQ;1Mu(=CuC2hekcnyUO20RrtW?nu|0#gAU;$q2 Date: Fri, 12 Jul 2024 14:24:51 -0700 Subject: [PATCH 2/5] updated copyright in meta, fixed minor spelling mistake --- Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml | 2 +- Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 5a37ab93312..3ff3200fb5e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -622,7 +622,7 @@ - type: Sprite state: harpywings - type: SolutionContainerManager - soultions: + solutions: food: maxVol: 25 reagents: diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json index 3edbdf8e4c3..320257ad198 100644 --- a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, taco from https://github.com/ss220-space/Paradise/commit/6c9bd827610433093a79d814b96bd50f9cf12eec, corn in butter from im_kreks", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, taco from https://github.com/ss220-space/Paradise/commit/6c9bd827610433093a79d814b96bd50f9cf12eec, corn in butter from im_kreks, harpywings from dootythefrooty", "size": { "x": 32, "y": 32 From dde611e97b13cd3e396aa7a2d018fa47d9ee76c4 Mon Sep 17 00:00:00 2001 From: dootythefrooty <137359445+dootythefrooty@users.noreply.github.com> Date: Fri, 12 Jul 2024 14:54:17 -0700 Subject: [PATCH 3/5] review change Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: dootythefrooty <137359445+dootythefrooty@users.noreply.github.com> --- Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 3ff3200fb5e..b417bb6ccaa 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -629,4 +629,4 @@ - ReagentId: Nutriment Quanity: 13 - ReagentId: Protein - Quanity: 7 \ No newline at end of file + Quanity: 7 From 1d99d1fd7059a6ecb51c36bf427033a0fd0b034c Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 12 Jul 2024 18:04:33 -0700 Subject: [PATCH 4/5] i'm pretty bad at spelling --- .../Prototypes/Entities/Objects/Consumable/Food/meals.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 3ff3200fb5e..3a06b5ed4cd 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -627,6 +627,6 @@ maxVol: 25 reagents: - ReagentId: Nutriment - Quanity: 13 + Quantity: 13 - ReagentId: Protein - Quanity: 7 \ No newline at end of file + Quantity: 7 \ No newline at end of file From 267a423b77fe0919c7d9927346ea61d4f031ec86 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 12 Jul 2024 18:27:24 -0700 Subject: [PATCH 5/5] i am really dumb at this --- Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 3a06b5ed4cd..74277cf7ff4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -629,4 +629,4 @@ - ReagentId: Nutriment Quantity: 13 - ReagentId: Protein - Quantity: 7 \ No newline at end of file + Quantity: 7