New food recipe: World Peazza (#35191)

* added world peazza

* fixed a comma in the pizza sprite json

* changed attribution comment on ArtisticRoomba's suggestion

* restored accidentally deleted line, thanks Tayrtahn

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 4b7805c3d3dd6aa382e8002c92eabf5750ffd5b3..fda7b85b75be94d31e865751fdac0b3b58b5667e 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
@@ -67,4 +67,5 @@
       - FoodBurgerCrazy
       - FoodPizzaArnoldSlice
       - FoodPizzaUraniumSlice
+      - FoodPizzaWorldpeasSlice
     rareChance: 0.05

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
index 8f476f92633f6358c0e1807ad55c17e30c55e644..9fe96a18a102598063b5976b5b65079ae903fa05 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -681,3 +681,55 @@
           Quantity: 0.8
         - ReagentId: Fiber
           Quantity: 1.5
+
+- type: entity
+  name: world peazza
+  parent: FoodPizzaBase
+  id: FoodPizzaWorldpeas
+  description: Modern diplomacy in the shape of a disc.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - bread
+      - numbingtranquility
+  - type: Sprite
+    layers:
+    - state: worldpeas
+  - type: SliceableFood
+    slice: FoodPizzaWorldpeasSlice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 45
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 20
+        - ReagentId: Happiness
+          Quantity: 12
+        - ReagentId: Pax
+          Quantity: 8
+
+- type: entity
+  name: slice of world peazza
+  parent: FoodPizzaSliceBase
+  id: FoodPizzaWorldpeasSlice
+  description: Dividing the world up is a small price to pay for harmony.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - bread
+      - numbingtranquility
+  - type: Sprite
+    layers:
+    - state: worldpeas-slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3.5
+        - ReagentId: Happiness
+          Quantity: 2
+        - ReagentId: Pax
+          Quantity: 1.5

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index fe690d8bd1d5e6605793d031ed96a303d0bd3daa..7dd402ae6dec1b7d0115b22c183120c215768bf0 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -273,6 +273,9 @@
     - id: FoodPizzaCotton
       prob: 0.10
       orGroup: Pizza
+    - id: FoodPizzaWorldpeas
+      prob: 0.05
+      orGroup: Pizza
     - id: KnifePlastic
   
 - type: entity

diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 2eeb3c392b2b11a34f1354048475fa370b39c5d9..28a47fdc21d4cbb756aaf5baf9dee3f0e4e3e09a 100644 (file)
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -718,6 +718,15 @@
     FoodDoughCottonFlat: 1
     CottonBol: 4
 
+- type: microwaveMealRecipe
+  id: RecipeWorldpeasPizza
+  name: world peazza recipe
+  result: FoodPizzaWorldpeas
+  time: 30
+  solids:
+    FoodDoughFlat: 1
+    FoodWorldPeas: 3
+
 #Italian
 - type: microwaveMealRecipe
   id: RecipeBoiledSpaghetti

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json
index 607a9cf8f3abef22c98119ca63a44c6965d61f94..1d7e8a01a5241ea4599470d87244d337ac16cb5c 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, Spicy Rock Pizza modified from margherita pizza by mkanke, cotton made by mlexf (discord 1143460554963427380)",
+  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, Spicy Rock Pizza modified from margherita pizza by mkanke, cotton made by mlexf (discord 1143460554963427380), world peazza modified from margherita by MisterImp (GitHub)",
   "size": {
     "x": 32,
     "y": 32
@@ -149,6 +149,12 @@
     },
     {
       "name": "uranium-slice"
+    },
+    {
+      "name": "worldpeas"
+    },
+    {
+      "name": "worldpeas-slice"
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/worldpeas-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/worldpeas-slice.png
new file mode 100644 (file)
index 0000000..5221671
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/worldpeas-slice.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/worldpeas.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/worldpeas.png
new file mode 100644 (file)
index 0000000..d521aa5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/worldpeas.png differ