From ac793fac059e1b530ef4696f9cea908e0a0a187c Mon Sep 17 00:00:00 2001
From: mkanke-real <mikekanke@gmail.com>
Date: Wed, 17 Jul 2024 13:53:53 +0900
Subject: [PATCH 1/6] Added all the parts to implement spicy rock pizza

---
 .../Random/Food_Drinks/food_single.yml        |  1 +
 .../Objects/Consumable/Food/Baked/pizza.yml   | 70 +++++++++++++++++++
 .../Recipes/Cooking/meal_recipes.yml          | 10 +++
 .../Consumable/Food/Baked/pizza.rsi/meta.json |  8 ++-
 4 files changed, 88 insertions(+), 1 deletion(-)

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 5cfe78c6d5a8cb..f325c084def629 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 f822fb7c2da866..a851995ffaa80c 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -547,3 +547,73 @@
         - 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: 5
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 100
+        - ReagentId: Radium
+          Quantity: 80
+
+- 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: 50
+        - ReagentId: Radium
+          Quantity: 10
+
+# 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 0a8ff18aad8f02..cc1f31a4e466aa 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -590,6 +590,16 @@
     FoodDonkpocketWarm: 3
     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: 1
 
 #Italian
 - type: microwaveMealRecipe
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 f42362b2545516..1f03575c683d14 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json
@@ -136,7 +136,13 @@
     },
     {
       "name": "box-inhand-left",
-      "directions": 4
+      "directions": 4,
+    },
+    {
+      "name": "uranium-pizza"
+    },
+    {
+      "name": "uranium-slice"
     }
   ]
 }

From 1feee44a5e90b96ae4ac81c9d45c0dc26f31d12a Mon Sep 17 00:00:00 2001
From: mkanke-real <mikekanke@gmail.com>
Date: Wed, 17 Jul 2024 14:00:28 +0900
Subject: [PATCH 2/6] Added sprites for pizza

---
 .../Food/Baked/pizza.rsi/uranium-pizza.png        | Bin 0 -> 823 bytes
 .../Food/Baked/pizza.rsi/uranium-slice.png        | Bin 0 -> 461 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 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/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)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%@kvBMR9J=Wl1oTbaTLaXHyvuG63Pi5WF<x8Ewjk!L0%)M7LDZuUD}jN%_7KJ
z=pq+|(Q9D~U6f&kMcHG~1UdAA2tubQb77RGV%S5}z#$TIipfrkTQg2Jy;d#mw>tm-
zIp;gyd4LHMCQO(xVd8&8&SPD29_#Y2xqlNMAIni&*h<DXTY3uqh_qvEGpU|VCVz`p
zrq?OI%lT<QyQ)g6#X@f=gyW7A8iO=ddnv8bxw_XoCVtZqo!Y`yzUO$(&j-MtVvQ7v
zAtt5(AWXQWDxC?5Hv9*@kmp9rw&2e!gw6So=Y}E=9gE8V*jSoK;-X{%E&bfP;^);c
zEG^d2<`~@fmw2OUjvM_D5u~R;94C?h=naLUmF2ln;{t|#t`=vp3oYA%df_Ml$EqAW
z-@1oDOFsZf^*)wP0WL+RCi07IN>72vWnCU=$oE5(8n?8os$mCxk^c>d1bvcmT9b^^
znn;aXB<Pdu+b+Xb<CYI?IU+%yw5zHNW@U+7*5${0QhpRbW01FJy(EnXHD6<5S^~{4
zEi_%I2S6Rn3Qs5P>Qrp$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%-<O>%1UcY3ZZvt`g<FO|X5EmDn
zIx->*^xGNv{0V!?M^a|YVjLl6>$k>qZNkKVg|8y!JxA*<Z^{4w002ovPDHLkV1m1$
BbYTDh

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..de619c3a137385b7039b5838f87f2135a8b9c270
GIT binary patch
literal 461
zcmV;;0W$uHP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$he<?1R9J=Wl+P=}VI0R_lND}8WF<9iBIQC`**J&`7bQ0-7bWFD?GJEex$Z<c
zksot#;X*m6NzB?0Y-sjXYGmw3J?iVQC_l0vRxZ!$`1J01zn;(Y^ngSnkw_$x0_b!P
zsm0o><i8~}xrBC{cD1)(fr|(@_6S}!qt|LtgrI(1M_;0jgECVloVo+Rs(B_IOS1A(
zf@{~uj5GXWS5|?`wE?x!Qi=60MLL!w5sBk+#L#QC04PGxv^q$8^aOxJB+gQe4YNT*
zDCqgM9CEmV$NMP2M>#;#lnF%$6d?cz4sUX#t0fVM<F|BCEzSr9Jw$J=e=W~RVE^<9
z$K*0ctyTEjjG4vlE$Y{GpM%E__}h#h#jaf+-P7Kz6VB-k%#9n=*V{05=LjgJFuV9I
z6B->LdUK8YJel>>c?-Nt!~<c*CVFUSF@yIUY~`8q!^f<5{bzx9i4Ic*0A02Y(7&>=
z5a8-LR#17~0$(M7yhmOXcAR!~f4;S7zoA4T`B&ZmZsw>nV(^5900000NkvXXu0mjf
DMM2F5

literal 0
HcmV?d00001


From cafc268cfc240c58dcf20a13f9d558acf24519b8 Mon Sep 17 00:00:00 2001
From: mkanke-real <mikekanke@gmail.com>
Date: Wed, 17 Jul 2024 14:22:58 +0900
Subject: [PATCH 3/6] Fixed coma formatting in meta.json for pizzas

---
 .../Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 1f03575c683d14..df1a1ab83c6388 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json
@@ -136,7 +136,7 @@
     },
     {
       "name": "box-inhand-left",
-      "directions": 4,
+      "directions": 4
     },
     {
       "name": "uranium-pizza"

From 7c2271c3d99d55ffd6aab6cdf44b049ea1a6d7a9 Mon Sep 17 00:00:00 2001
From: mkanke-real <mikekanke@gmail.com>
Date: Thu, 18 Jul 2024 10:08:05 +0900
Subject: [PATCH 4/6] Fix formatting and rebalance reagent quantities in
 pizza.yml

---
 .../Objects/Consumable/Food/Baked/pizza.yml       | 15 +++++++++------
 .../Prototypes/Recipes/Cooking/meal_recipes.yml   |  3 ++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
index a851995ffaa80c..cd66a41c3403c6 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -572,16 +572,17 @@
   - type: PointLight
     enabled: true
     radius: 2
-
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 5
+        maxVol: 40
         reagents:
         - ReagentId: Nutriment
-          Quantity: 100
+          Quantity: 20
         - ReagentId: Radium
-          Quantity: 80
+          Quantity: 16
+        - ReagentId: Uranium
+          Quantity: 4
 
 - type: entity
   name: slice of spicy rock pizza
@@ -612,8 +613,10 @@
         maxVol: 5
         reagents:
         - ReagentId: Nutriment
-          Quantity: 50
+          Quantity: 2.5
         - ReagentId: Radium
-          Quantity: 10
+          Quantity: 2
+        - ReagentId: Uranium
+          Quantity: 0.5
 
 # 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 cc1f31a4e466aa..b09200559988d2 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -590,6 +590,7 @@
     FoodDonkpocketWarm: 3
     FoodCheeseSlice: 1
     FoodTomato: 1
+
 - type: microwaveMealRecipe
   id: RecipeUraniumPizza
   name: spicy rock pizza recipe
@@ -599,7 +600,7 @@
     FoodDoughFlat: 1
     FoodChiliPepper: 2
     FoodTomato: 2
-    SheetUranium1: 1
+    SheetUranium1: 2
 
 #Italian
 - type: microwaveMealRecipe

From 352c907407d95aeb80480210134541e40e7353f8 Mon Sep 17 00:00:00 2001
From: mkanke-real <mikekanke@gmail.com>
Date: Thu, 18 Jul 2024 10:14:12 +0900
Subject: [PATCH 5/6] Flipped Uranium and Radium values to be the correct ratio

---
 .../Entities/Objects/Consumable/Food/Baked/pizza.yml      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
index cd66a41c3403c6..55bf7f994ab579 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -580,9 +580,9 @@
         - ReagentId: Nutriment
           Quantity: 20
         - ReagentId: Radium
-          Quantity: 16
-        - ReagentId: Uranium
           Quantity: 4
+        - ReagentId: Uranium
+          Quantity: 16
 
 - type: entity
   name: slice of spicy rock pizza
@@ -615,8 +615,8 @@
         - ReagentId: Nutriment
           Quantity: 2.5
         - ReagentId: Radium
-          Quantity: 2
-        - ReagentId: Uranium
           Quantity: 0.5
+        - ReagentId: Uranium
+          Quantity: 2
 
 # Tastes like crust, tomato, cheese, radiation.

From ae1890caf166be95e2f5de8818f33444c6be9b71 Mon Sep 17 00:00:00 2001
From: mkanke-real <mikekanke@gmail.com>
Date: Tue, 23 Jul 2024 14:41:28 +0900
Subject: [PATCH 6/6] Updated meta.json file to have credit for sprite

---
 .../Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 df1a1ab83c6388..cb676a06ef78d6 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