From: mkanke-real Date: Tue, 23 Jul 2024 23:22:11 +0000 (+0900) Subject: Add spicy rock pizza (#30116) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=e1f3bdc7487a54f496e4a8b640eba68d12f91f9f;p=space-station-14.git Add spicy rock pizza (#30116) * Added all the parts to implement spicy rock pizza * Added sprites for pizza * Fixed coma formatting in meta.json for pizzas * Fix formatting and rebalance reagent quantities in pizza.yml * Flipped Uranium and Radium values to be the correct ratio * Updated meta.json file to have credit for sprite --- 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 5cfe78c6d5..f325c084de 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 @@ -78,5 +78,6 @@ - FoodMeatRatdoubleKebab - FoodMeatSnakeKebab - FoodPizzaArnoldSlice + - FoodPizzaUraniumSlice - FoodTacoRat 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 f822fb7c2d..55bf7f994a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml @@ -547,3 +547,76 @@ - ReagentId: Vitamin Quantity: 1 # Tastes like stale crust, rancid cheese, mushroom. + +- type: entity + name: spicy rock pizza + parent: FoodPizzaBase + id: FoodPizzaUranium + description: Spicy pizza covered in peppers and uranium. + components: + - type: FlavorProfile + flavors: + - spicy + - cheesy + - oily + - bread + - type: Sprite + layers: + - state: uranium-pizza + - type: SliceableFood + slice: FoodPizzaUraniumSlice + - type: Tag + tags: + - Meat + - Pizza + - type: PointLight + enabled: true + radius: 2 + - type: SolutionContainerManager + solutions: + food: + maxVol: 40 + reagents: + - ReagentId: Nutriment + Quantity: 20 + - ReagentId: Radium + Quantity: 4 + - ReagentId: Uranium + Quantity: 16 + +- type: entity + name: slice of spicy rock pizza + parent: FoodPizzaSliceBase + id: FoodPizzaUraniumSlice + description: A glowing slice of spicy rock pizza. + components: + - type: FlavorProfile + flavors: + - spicy + - cheesy + - oily + - bread + - type: Sprite + layers: + - state: uranium-slice + - type: Tag + tags: + - Meat + - Pizza + - Slice + - type: PointLight + enabled: true + radius: 2 + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 2.5 + - ReagentId: Radium + Quantity: 0.5 + - ReagentId: Uranium + Quantity: 2 + +# Tastes like crust, tomato, cheese, radiation. diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 0a8ff18aad..b092005599 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -591,6 +591,17 @@ FoodCheeseSlice: 1 FoodTomato: 1 +- type: microwaveMealRecipe + id: RecipeUraniumPizza + name: spicy rock pizza recipe + result: FoodPizzaUranium + time: 30 + solids: + FoodDoughFlat: 1 + FoodChiliPepper: 2 + FoodTomato: 2 + SheetUranium1: 2 + #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 f42362b254..cb676a06ef 100644 --- 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", + "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", "size": { "x": 32, "y": 32 @@ -137,6 +137,12 @@ { "name": "box-inhand-left", "directions": 4 + }, + { + "name": "uranium-pizza" + }, + { + "name": "uranium-slice" } ] } diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-pizza.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-pizza.png new file mode 100644 index 0000000000..6fdb66c2dc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-pizza.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-slice.png new file mode 100644 index 0000000000..de619c3a13 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-slice.png differ