From ea55883a3cdff2a9c4f42f166fee2a90b41977e5 Mon Sep 17 00:00:00 2001 From: Beck Date: Thu, 3 Oct 2024 11:28:22 -0700 Subject: [PATCH] first commit --- .../Objects/Consumable/Food/Baked/pie.yml | 39 +++++++++++++++++- .../Recipes/Cooking/meal_recipes.yml | 12 +++++- .../Consumable/Food/Baked/pie.rsi/meta.json | 8 +++- .../Food/Baked/pie.rsi/pumpkin-slice.png | Bin 0 -> 499 bytes .../Consumable/Food/Baked/pie.rsi/pumpkin.png | Bin 0 -> 600 bytes 5 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/pumpkin-slice.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/pumpkin.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml index c9ac4833431579..b86a4201e8b797 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -23,7 +23,7 @@ - ReagentId: Vitamin Quantity: 5 - type: Food #All pies here made with a pie tin; unless you're some kind of savage, you're probably not destroying this when you eat or slice the pie! - trash: + trash: - FoodPlateTin - type: SliceableFood count: 4 @@ -317,6 +317,43 @@ - Slice # Tastes like pie, meat. +- type: entity + name: pumpkin pie + parent: FoodPieBase + id: FoodPiePumpkin + description: Someone should turn this into a latte! + components: + - type: FlavorProfile + flavors: + - sweet + - pumpkin + - type: Sprite + layers: + - state: tin + - state: pumpkin + - type: SliceableFood + slice: FoodPiePumpkinSlice + - type: Tag + tags: + - Pie + +- type: entity + name: slice of pumpkin pie + parent: FoodPieSliceBase + id: FoodPiePumpkinSlice + components: + - type: FlavorProfile + flavors: + - sweet + - pumpkin + - type: Sprite + layers: + - state: pumpkin-slice + - type: Tag + tags: + - Pie + - Slice + - type: entity name: xeno pie parent: FoodPieBase diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 8dc25c1c7251dd..fa2b6573915d8b 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1062,6 +1062,16 @@ FoodMeat: 3 FoodPlateTin: 1 +- type: microwaveMealRecipe + id: RecipePumpkinPie + name: pumpkin pie recipe + result: FoodPiePumpkin + time: 15 + solids: + FoodDoughPie: 1 + FoodPumpkin: 1 + FoodPlateTin: 1 + #- type: microwaveMealRecipe # id: RecipePlumpPie # name: plump pie recipe @@ -1978,4 +1988,4 @@ solids: FoodCroissantRaw: 1 FoodButterSlice: 1 - ShardGlass: 1 \ No newline at end of file + ShardGlass: 1 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json index ced8d583736c3a..f4c658a17f4796 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/pie.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, mime tart slice and banana cream pie slice from rosysyntax under under CC BY-SA 4.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, mime tart slice and banana cream pie slice from rosysyntax under under CC BY-SA 4.0, the pumpkin and pumpkin slice are made by ss14nekow (Mute Maid) and are under CC BY-SA 4.0", "size": { "x": 32, "y": 32 @@ -95,6 +95,12 @@ { "name": "plump" }, + { + "name": "pumpkin" + }, + { + "name": "pumpkin-slice" + }, { "name": "tin" }, diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/pumpkin-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/pumpkin-slice.png new file mode 100644 index 0000000000000000000000000000000000000000..e462de6b654c318147b680e25f1059c62f28de44 GIT binary patch literal 499 zcmVtLEM_DRCyT3p|q;m_xz4EJ|^V$f+k4_5M|NfoA);n`O zj10ejd}h#{{1vYqEO4C!7>q&;3_=1t3@vVfgmr z7uaGc?k^17Tx<+qzkO!lWs?M&dIzt`L`A`^w*p{8-hKGOAgsj0ux8#=utRK$Yr#GS zSq_Q%13-#FX#o@!AiyVS$8h@4B?gK2?-*e54GMB%d<`)HLXzYFkQU^SczEtPgTNng zumd!@Uyy7T$UL$%!5ktg@sZ*63x0;s*6U=O12StAjE2By2#kin$PNJj&Z~-Q6TnoW p0000EWmrjOO-%qQ00008000000002eQ_Y literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/pumpkin.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/pumpkin.png new file mode 100644 index 0000000000000000000000000000000000000000..f2f18879448f8ef498b1765d6515bd676932c3bf GIT binary patch literal 600 zcmV-e0;m0nP)rD(u{f{TJ#^gopNCls<0x(U=j(NO#YuF4246e@HP zQ1Am$D6KjJ)e<2SDrz#$xfpR_Cdt}&A@9A+JNKS*&&&l>C1NZ#9R$S&uI zCwCXRCs+z*ZYvR?0@z;vxFH2kt3IB@xfZCvjd&g5*~h75UK-<}w_| zk^P~isXf_jRx?dgThNL%^UWNtc1uFS?im!(8+6T}Fb2sfL@+N#;r{%NPkv5!T^F`( zKlm*)6~KZNk;!C`bqm*l2yu%-NJuj7_k{@g#4Dzf{M0t{gQZfbDLHYW0tlc8;?n7~ zZx{x0&wtb#W605Ca3mXJSo|}q)AF#cCFyo)DWCzq6~e!KHS*Z9ET3elR0`#CnWU^I zR@1pwBPhkBQU?piDzNpAh^c(Pfxt*WT5pH613Cp&4k!nd1CPLg8&)pjkcyO^p8x;= m4rN$LW=%~1DgXcg2mk;800000(o>TF0000