From 659010993fef23b707a646008495cf17f32af700 Mon Sep 17 00:00:00 2001 From: DrEnzyme Date: Mon, 24 Jun 2024 07:33:12 +1200 Subject: [PATCH 1/2] Add bagels (#24799) Bagels are made by using a rolling pin on a dough slice to make a dough rope, then cooking the dough rope in a microwave for 5 seconds. There are two types: a normal bagel and a poppyseed bagel. The poppyseed bagel requires a poppy and a dough rope and has a small (5u) quantity of Bicaridine inside of it in addition to its nutriment. Co-authored-by: Kevin Zheng --- .../Random/Food_Drinks/food_single.yml | 2 + .../Objects/Consumable/Food/Baked/bagel.yml | 49 ++++++++++++++++++ .../Objects/Consumable/Food/ingredients.yml | 18 +++++++ .../Construction/Graphs/food/doughrope.yml | 13 +++++ .../Recipes/Cooking/meal_recipes.yml | 18 +++++++ .../Food/Baked/bagel.rsi/bagel-poppy.png | Bin 0 -> 389 bytes .../Consumable/Food/Baked/bagel.rsi/bagel.png | Bin 0 -> 468 bytes .../Consumable/Food/Baked/bagel.rsi/meta.json | 17 ++++++ .../Food/ingredients.rsi/dough-rope.png | Bin 0 -> 386 bytes .../Consumable/Food/ingredients.rsi/meta.json | 3 ++ 10 files changed, 120 insertions(+) create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml create mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/food/doughrope.yml create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel-poppy.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-rope.png diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml index 829ae92fc9d..5cfe78c6d5a 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml @@ -13,6 +13,8 @@ state: plain - type: RandomSpawner prototypes: + - FoodBagel + - FoodBagelPoppy - FoodBurgerJelly - FoodBurgerCarp - FoodBurgerTofu diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml new file mode 100644 index 00000000000..8f23b6c7df9 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml @@ -0,0 +1,49 @@ +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_baked_whole.yml & food_baked_single.yml +# Base + +- type: entity + id: FoodBagelBase + parent: FoodInjectableBase + abstract: true + description: A delicious bagel. + components: + - type: FlavorProfile + flavors: + - bread + - type: Sprite + sprite: Objects/Consumable/Food/Baked/bagel.rsi + state: bagel + - type: SolutionContainerManager + solutions: + food: + maxVol: 7 + reagents: + - ReagentId: Nutriment + Quantity: 5 + +- type: entity + id: FoodBagel + name: bagel + parent: FoodBagelBase + +- type: entity + id: FoodBagelPoppy + parent: FoodBagelBase + name: poppy seed bagel + description: A delicious bagel topped with bicaridine-infused poppy seeds. + components: + - type: FlavorProfile + flavors: + - bread + - medicine + - type: Sprite + state: bagel-poppy + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Bicaridine + Quantity: 5 + - ReagentId: Nutriment + Quantity: 5 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index dcf2f3355ce..be23c2e43f6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -305,6 +305,24 @@ - type: Tag tags: - Slice + - type: Construction + graph: DoughRope + node: start + +- type: entity + name: dough rope + parent: FoodBakingBase + id: FoodDoughRope + description: A thin noodle of dough. Can be cooked into a bagel. + components: + - type: FlavorProfile + flavors: + - dough + - type: Sprite + state: dough-rope + - type: Construction + graph: DoughRope + node: rolled - type: entity name: cornmeal dough diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/food/doughrope.yml b/Resources/Prototypes/Recipes/Construction/Graphs/food/doughrope.yml new file mode 100644 index 00000000000..52a9a817cfd --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/food/doughrope.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: DoughRope + start: start + graph: + - node: start + entity: FoodDoughSlice + edges: + - to: rolled + steps: + - tool: Rolling + doAfter: 1 + - node: rolled + entity: FoodDoughRope \ 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 8cb4c551467..0a8ff18aad8 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -6,6 +6,24 @@ solids: FoodDoughSlice: 1 # one third of a standard bread dough recipe +#Bagels +- type: microwaveMealRecipe + id: RecipeBagel + name: bagel recipe + result: FoodBagel + time: 5 + solids: + FoodDoughRope: 1 # created by rolling a dough slice. + +- type: microwaveMealRecipe + id: RecipeBagelPoppy + name: poppyseed bagel recipe + result: FoodBagelPoppy + time: 5 + solids: + FoodDoughRope: 1 + PoppySeeds: 1 + #Burgers - type: microwaveMealRecipe diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel-poppy.png b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel-poppy.png new file mode 100644 index 0000000000000000000000000000000000000000..e9b8cc143d9977a3c8b3e0aa3729675d27bcefa6 GIT binary patch literal 389 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W*h@TpUD;nSF|tYt#J|&*0}6?k zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G}EByV>YhW{YAVDIwDAd!+FzhH=nd4zN=P~@Dai(^Q|oa7(=$p;Lw z4z6HbEY=g{V9UL%rR(PH+lwb&*~pOhsH-B=L`cbRB5Q_P-uW;$W%aa-hufLwvlbNl zn?xVh3@P`5B_7e+u)k{KW_K8H1;* KpUXO@geCxkG>F3h literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel.png b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel.png new file mode 100644 index 0000000000000000000000000000000000000000..1f36b3b186b324ac386496e6a83206831741cff3 GIT binary patch literal 468 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W*h@TpUD;nSF|taD>bKmU2ow@8 zag8Vm&QB{TPb^AhaQATm8lzB_TBKmCXHwX@!lvI6;RN#5=*4F5rJ!QSPQK_VqVe!&nC^9bo$1_nl1PZ!6KiaE(Y{F4tD zWF1_=x>&3y%E6Xe>T-#>F(A%c4 z!&KOKOGAeb_k(5gGqyF&;469Ge08A%%Xbz>>lqRsnCj&CSVb!poPXWdSEzjS?fk53 zvC(0&B2xs?LxWpa1SbFMJkBEaM=Zjv_5O`=2PbE#LuWa~+Px)LcN(qejI%FzH+zcC z;m6??y$9r74qW(Au!XBbL9w~5;n9HwulXl-7(O_j%3&wJXMgd_r6&5!hjSScrt%O*@3l<3LQHI7Jr=WH-%Ne xKywOrlR}$NvPq`c1YS2?iLD7&n*RT1eB~K>x^Zi7C@|<4JYD@<);T3K0RYrft4#m^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/meta.json new file mode 100644 index 00000000000..fcd9dc077d6 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Bagel and BagelPoppy were created by DrEnzyme", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bagel" + }, + { + "name": "bagel-poppy" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-rope.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-rope.png new file mode 100644 index 0000000000000000000000000000000000000000..864df464ccb78d8ff2f9b06697143c52594ff452 GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W*h@TpUD;nSF|vwS=U)7M0VpJ1 z;u=vBoS#-wo>-L1;O^rBG)AE;wMfBO&!n(*$wQzLj*!LpeYZeSkfJR z9T^xl_H+M9WCilslDyqr82*Fcg1yTpgG5S#{DL7O<`L4hK#|j)E{-7;bCQ4fCm%4# zI=F&$u~@*#rsvbYF$%8LVUYU!;D(jLt=(JrgQs;i8hv>5>EHZ#y9a>>oH{Q$2<82{ z`?$?U^nzopr0I`RYj{pDw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json index 6633b0b0bd6..b4317b0c76f 100644 --- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json @@ -52,6 +52,9 @@ { "name": "dough-pie" }, + { + "name": "dough-rope" + }, { "name": "dough-flat" }, From c41558aa6e3bc7c47df48dbfc39d24668b35d39b Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 23 Jun 2024 19:34:18 +0000 Subject: [PATCH 2/2] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 75d5ef5d965..52f0dd89743 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: osjarw - changes: - - message: Thin firelocks are now constructable/deconstructable - type: Fix - id: 6313 - time: '2024-04-06T01:55:31.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26745 - author: BITTERLYNX changes: - message: Rodents are more visually pleasing to burn @@ -3838,3 +3831,10 @@ id: 6812 time: '2024-06-23T17:31:34.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29178 +- author: DrEnzyme + changes: + - message: Add bagels and poppy seed bagels. + type: Add + id: 6813 + time: '2024-06-23T19:33:12.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/24799