From e1f3bdc7487a54f496e4a8b640eba68d12f91f9f Mon Sep 17 00:00:00 2001 From: mkanke-real Date: Wed, 24 Jul 2024 08:22:11 +0900 Subject: [PATCH] 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 --- .../Random/Food_Drinks/food_single.yml | 1 + .../Objects/Consumable/Food/Baked/pizza.yml | 73 ++++++++++++++++++ .../Recipes/Cooking/meal_recipes.yml | 11 +++ .../Consumable/Food/Baked/pizza.rsi/meta.json | 8 +- .../Food/Baked/pizza.rsi/uranium-pizza.png | Bin 0 -> 823 bytes .../Food/Baked/pizza.rsi/uranium-slice.png | Bin 0 -> 461 bytes 6 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-pizza.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-slice.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 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 0000000000000000000000000000000000000000..6fdb66c2dcaf3341265b5b1bf840ff95ded42d22 GIT binary patch literal 823 zcmV-71IYY|P)Px%@kvBMR9J=Wl1oTbaTLaXHyvuG63Pi5WFtm- zIp;gyd4LHMCQO(xVd8&8&SPD29_#Y2xqlNMAIni&*h72vWnCU=$oE5(8n?8os$mCxk^c>d1bvcmT9b^^ znn;aXBQrp$WpJ(*Zq(EC4l+;Wu;=wOj#pm;prcC-uhLOIA9Afx_Yk#$ z%3XDkYbELMHUOUc{4~sX4@Dkk+F<8CSJYZ;4R(gRE1<}Ov)IM?eH*bg*l9_OM=RHj z`xw2-T&qzd<^)8jSg%Og$pYw&heKz>K4-Cu4{rupon~iuNe2L1s?q^yuD%&Xs+H?} z3=DIzq&xiQxZ|W^M;&F?MNyPU*)akD_ODW8`_9$OoVN^~bwaKc8iS}q#&KP%3`B_6 zSRw=~=E8$c)T{(!f|HUVb1tvi9&zTxT@Kt61t6w?(Lx$37YM*WpOxjB(Q#_RLL*?( zoS&t^P!|BbgHHf>=yzaG2?DUP^l4P*zZ5Wf8ZW%-%1UcY3ZZvt`g*^xGNv{0V!?M^a|YVjLl6>$k>qZNkKVg|8y!JxA*Px$he#;#lnF%$6d?cz4sUX#t0fVMLdUK8YJel>>c?-Nt!~= z5a8-LR#17~0$(M7yhmOXcAR!~f4;S7zoA4T`B&ZmZsw>nV(^5900000NkvXXu0mjf DMM2F5 literal 0 HcmV?d00001 -- 2.52.0