Merge remote-tracking branch 'refs/remotes/wizards/master'

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

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

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

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

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

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

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"
+      }
+    ]
+}

Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json

@@ -52,6 +52,9 @@
     {
       "name": "dough-pie"
     },
+    {
+      "name": "dough-rope"
+    },
     {
       "name": "dough-flat"
     },