diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
index 65615755ac4..0c91b56076c 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
@@ -243,7 +243,7 @@
/area/ruin/unpowered/misc_lavaruin)
"D" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/snacks/margheritaslice,
+/obj/item/reagent_containers/food/snacks/margheritapizzaslice,
/obj/item/trash/plate,
/turf/simulated/floor/wood{
nitrogen = 23;
diff --git a/code/__DEFINES/crafting.dm b/code/__DEFINES/crafting.dm
index 33c80e970cf..09b35c5d093 100644
--- a/code/__DEFINES/crafting.dm
+++ b/code/__DEFINES/crafting.dm
@@ -21,7 +21,6 @@
#define CAT_MISCFOOD "Misc. Food"
#define CAT_PASTRY "Pastries"
#define CAT_PIE "Pies"
-#define CAT_PIZZA "Pizzas"
#define CAT_SALAD "Salads"
#define CAT_SANDWICH "Sandwiches"
#define CAT_SOUP "Soups"
diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index c15b615fe0b..3e018425c68 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -1071,7 +1071,7 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
name = "Pizza Crate"
contains = list(/obj/item/pizzabox/margherita,
/obj/item/pizzabox/mushroom,
- /obj/item/pizzabox/meat,
+ /obj/item/pizzabox/pepperoni,
/obj/item/pizzabox/vegetable,
/obj/item/pizzabox/hawaiian)
cost = 60
diff --git a/code/game/objects/items/devices/pizza_bomb.dm b/code/game/objects/items/devices/pizza_bomb.dm
index 6f54b12d56a..5565f8487fd 100644
--- a/code/game/objects/items/devices/pizza_bomb.dm
+++ b/code/game/objects/items/devices/pizza_bomb.dm
@@ -21,7 +21,7 @@
desc = "It seems inactive."
icon_state = "pizzabox_bomb"
timer_set = 1
- timer = (input(user, "Set a timer, from one second to ten seconds.", "Timer", "[timer]") as num) * 10
+ timer = (input(user, "Set a timer, from one second to ten seconds.", "Timer", "[timer]") as num) SECONDS
if(!in_range(src, usr) || issilicon(usr) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || usr.restrained())
timer_set = 0
name = "pizza box"
@@ -40,7 +40,7 @@
if(!primed)
name = "pizza bomb"
desc = "OH GOD THAT'S NOT A PIZZA"
- icon_state = "pizzabox_bomb"
+ icon_state = "pizzabox_bomb_active"
audible_message("[bicon(src)] *beep* *beep*")
to_chat(user, "That's no pizza! That's a bomb!")
message_admins("[key_name_admin(usr)] has triggered a pizza bomb armed by [key_name_admin(armer)] at (JMP).")
diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm
index ea3055ad55e..a3626f938d5 100644
--- a/code/modules/food_and_drinks/food.dm
+++ b/code/modules/food_and_drinks/food.dm
@@ -48,7 +48,7 @@
new /obj/effect/decal/cleanable/ants(T)
antable = FALSE
desc += " It appears to be infested with ants. Yuck!"
- reagents.add_reagent("ants", 1) // Don't eat things with ants in i you weirdo.
+ reagents.add_reagent("ants", 1) // Don't eat things with ants in it you weirdo.
if(ant_timer)
deltimer(ant_timer)
else
diff --git a/code/modules/food_and_drinks/food/foods/pizza.dm b/code/modules/food_and_drinks/food/foods/pizza.dm
index b14ac7b2f5e..1f0b6157950 100644
--- a/code/modules/food_and_drinks/food/foods/pizza.dm
+++ b/code/modules/food_and_drinks/food/foods/pizza.dm
@@ -9,29 +9,30 @@
filling_color = "#BAA14C"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita
+// Margherita
+/obj/item/reagent_containers/food/snacks/sliceable/pizza/margheritapizza
name = "margherita pizza"
desc = "The golden standard of pizzas."
- icon_state = "pizzamargherita"
- slice_path = /obj/item/reagent_containers/food/snacks/margheritaslice
+ icon_state = "margheritapizza"
+ slice_path = /obj/item/reagent_containers/food/snacks/margheritapizzaslice
list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5)
-/obj/item/reagent_containers/food/snacks/margheritaslice
+/obj/item/reagent_containers/food/snacks/margheritapizzaslice
name = "margherita slice"
desc = "A slice of the classic pizza."
icon = 'icons/obj/food/pizza.dmi'
- icon_state = "pizzamargheritaslice"
+ icon_state = "margheritapizzaslice"
filling_color = "#BAA14C"
- list_reagents = list("nutriment" = 5)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
+// Meat Pizza
/obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza
name = "meat pizza"
desc = "A pizza with meat topping."
icon_state = "meatpizza"
slice_path = /obj/item/reagent_containers/food/snacks/meatpizzaslice
list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8)
- tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
+ tastes = list("crust" = 1, "cheese" = 1, "meat" = 1)
/obj/item/reagent_containers/food/snacks/meatpizzaslice
name = "meat pizza slice"
@@ -39,16 +40,16 @@
icon = 'icons/obj/food/pizza.dmi'
icon_state = "meatpizzaslice"
filling_color = "#BAA14C"
- tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
+ tastes = list("crust" = 1, "cheese" = 1, "meat" = 1)
+// Mushroom Pizza
/obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza
name = "mushroom pizza"
desc = "Very special pizza."
icon_state = "mushroompizza"
slice_path = /obj/item/reagent_containers/food/snacks/mushroompizzaslice
list_reagents = list("plantmatter" = 30, "vitamin" = 5)
- tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1)
-
+ tastes = list("crust" = 1, "cheese" = 1, "mushroom" = 1)
/obj/item/reagent_containers/food/snacks/mushroompizzaslice
name = "mushroom pizza slice"
@@ -56,16 +57,16 @@
icon = 'icons/obj/food/pizza.dmi'
icon_state = "mushroompizzaslice"
filling_color = "#BAA14C"
- tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1)
+ tastes = list("crust" = 1, "cheese" = 1, "mushroom" = 1)
+// Vegetable Pizza
/obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza
name = "vegetable pizza"
desc = "No Tomato Sapiens were harmed during the making of this pizza."
icon_state = "vegetablepizza"
slice_path = /obj/item/reagent_containers/food/snacks/vegetablepizzaslice
list_reagents = list("plantmatter" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5)
- tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "carrot" = 1, "vegetables" = 1)
-
+ tastes = list("crust" = 1, "tomato" = 1, "carrot" = 1, "vegetables" = 1)
/obj/item/reagent_containers/food/snacks/vegetablepizzaslice
name = "vegetable pizza slice"
@@ -73,15 +74,16 @@
icon = 'icons/obj/food/pizza.dmi'
icon_state = "vegetablepizzaslice"
filling_color = "#BAA14C"
- tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "carrot" = 1, "vegetables" = 1)
+ tastes = list("crust" = 1, "tomato" = 1, "carrot" = 1, "vegetables" = 1)
+// Hawaiian Pizza
/obj/item/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza
name = "hawaiian pizza"
desc = "Love it or hate it, this pizza divides opinions. Complete with juicy pineapple."
- icon_state = "hawaiianpizza" //NEEDED
+ icon_state = "hawaiianpizza"
slice_path = /obj/item/reagent_containers/food/snacks/hawaiianpizzaslice
list_reagents = list("protein" = 15, "tomatojuice" = 6, "plantmatter" = 20, "pineapplejuice" = 6, "vitamin" = 5)
- tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 1)
+ tastes = list("crust" = 1, "cheese" = 1, "pineapple" = 1)
/obj/item/reagent_containers/food/snacks/hawaiianpizzaslice
name = "hawaiian pizza slice"
@@ -89,8 +91,9 @@
icon = 'icons/obj/food/pizza.dmi'
icon_state = "hawaiianpizzaslice"
filling_color = "#e5b437"
- tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 1)
+ tastes = list("crust" = 1, "cheese" = 1, "pineapple" = 1)
+// Mac 'n' Cheese Pizza
/obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza
name = "mac 'n' cheese pizza"
desc = "Gastronomists have yet to classify this dish as 'pizza'."
@@ -98,7 +101,7 @@
slice_path = /obj/item/reagent_containers/food/snacks/macpizzaslice
list_reagents = list("nutriment" = 40, "vitamin" = 5) //More nutriment because carbs, but it's not any more vitaminicious
filling_color = "#ffe45d"
- tastes = list("crust" = 1, "tomato" = 1, "cheese" = 2, "pasta" = 1)
+ tastes = list("crust" = 1, "cheese" = 2, "pasta" = 1)
/obj/item/reagent_containers/food/snacks/macpizzaslice
name = "mac 'n' cheese pizza slice"
@@ -108,6 +111,125 @@
filling_color = "#ffe45d"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 2, "pasta" = 1)
+// Pepperoni Pizza
+/obj/item/reagent_containers/food/snacks/sliceable/pizza/pepperonipizza
+ name = "pepperoni pizza"
+ desc = "What did the pepperoni say to the pizza?"
+ icon_state = "pepperonipizza"
+ slice_path = /obj/item/reagent_containers/food/snacks/pepperonipizzaslice
+ list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8)
+ filling_color = "#ffe45d"
+ tastes = list("cheese" = 3, "pepperoni" = 3, "grease" = 1)
+
+/obj/item/reagent_containers/food/snacks/pepperonipizzaslice
+ name = "pepperoni pizza slice"
+ desc = "Nice to meat you!"
+ icon = 'icons/obj/food/pizza.dmi'
+ icon_state = "pepperonipizzaslice"
+ filling_color = "#ffe45d"
+ tastes = list("cheese" = 3, "pepperoni" = 3, "grease" = 1)
+
+// Cheese Pizza
+/obj/item/reagent_containers/food/snacks/sliceable/pizza/cheesepizza
+ name = "cheese pizza"
+ desc = "Cheese, bread, cheese, tomato, and cheese."
+ icon_state = "cheesepizza"
+ slice_path = /obj/item/reagent_containers/food/snacks/cheesepizzaslice
+ list_reagents = list("nutriment" = 40, "tomatojuice" = 6, "vitamin" = 5)
+
+/obj/item/reagent_containers/food/snacks/cheesepizzaslice
+ name = "cheese pizza slice"
+ desc = "Dangerously cheesy?"
+ icon = 'icons/obj/food/pizza.dmi'
+ icon_state = "cheesepizzaslice"
+ filling_color = "#BAA14C"
+ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 3)
+
+// Donk-pocket Pizza
+/obj/item/reagent_containers/food/snacks/sliceable/pizza/donkpocketpizza
+ name = "donk-pocket pizza"
+ desc = "Who thought this would be a good idea?"
+ icon_state = "donkpocketpizza"
+ slice_path = /obj/item/reagent_containers/food/snacks/donkpocketpizzaslice
+ list_reagents = list("nutriment" = 35, "tomatojuice" = 6, "vitamin" = 2, "weak_omnizine" = 6)
+ tastes = list("crust" = 1, "meat" = 1, "laziness" = 1)
+
+/obj/item/reagent_containers/food/snacks/donkpocketpizzaslice
+ name = "donk-pocket pizza slice"
+ desc = "Smells like lukewarm donk-pocket."
+ icon = 'icons/obj/food/pizza.dmi'
+ icon_state = "donkpocketpizzaslice"
+ filling_color = "#BAA14C"
+ tastes = list("crust" = 1, "meat" = 1, "laziness" = 1)
+
+// Dank Pizza
+/obj/item/reagent_containers/food/snacks/sliceable/pizza/dankpizza
+ name = "dank pizza"
+ desc = "The hippie's pizza of choice."
+ icon_state = "dankpizza"
+ slice_path = /obj/item/reagent_containers/food/snacks/dankpizzaslice
+ list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5, "cbd" = 6, "thc" = 6)
+ tastes = list("crust" = 1, "cheese" = 1, "special herbs" = 2)
+
+/obj/item/reagent_containers/food/snacks/dankpizzaslice
+ name = "dank pizza slice"
+ desc = "So good, man..."
+ icon = 'icons/obj/food/pizza.dmi'
+ icon_state = "dankpizzaslice"
+ filling_color = "#BAA14C"
+ tastes = list("crust" = 1, "cheese" = 1, "special herbs" = 2)
+
+// Firecracker Pizza
+/obj/item/reagent_containers/food/snacks/sliceable/pizza/firecrackerpizza
+ name = "firecracker pizza"
+ desc = "Tastes HOT HOT HOT!"
+ icon_state = "firecrackerpizza"
+ slice_path = /obj/item/reagent_containers/food/snacks/firecrackerpizzaslice
+ list_reagents = list("nutriment" = 30, "vitamin" = 5, "capsaicin" = 12)
+ tastes = list("crust" = 1, "cheese" = 1, "HOTNESS" = 1)
+
+/obj/item/reagent_containers/food/snacks/firecrackerpizzaslice
+ name = "firecracker pizza slice"
+ desc = "A spicy slice of something quite nice"
+ icon = 'icons/obj/food/pizza.dmi'
+ icon_state = "firecrackerpizzaslice"
+ filling_color = "#BAA14C"
+ tastes = list("crust" = 1, "cheese" = 1, "HOTNESS" = 1)
+
+// "Pesto" Pizza
+/obj/item/reagent_containers/food/snacks/sliceable/pizza/pestopizza
+ name = "\"pesto\" pizza"
+ desc = "Wait a second...this doesn't taste like pesto!"
+ icon_state = "pestopizza"
+ slice_path = /obj/item/reagent_containers/food/snacks/pestopizzaslice
+ list_reagents = list("nutriment" = 30, "tomatojuice" = 12, "vitamin" = 5, "wasabi" = 12)
+ tastes = list("tomato" = 1, "cheese" = 1, "wasabi" = 1)
+
+/obj/item/reagent_containers/food/snacks/pestopizzaslice
+ name = "\"pesto\" pizza slice"
+ desc = "Delicious and suspicious(ly green)."
+ icon = 'icons/obj/food/pizza.dmi'
+ icon_state = "pestopizzaslice"
+ filling_color = "#BAA14C"
+ tastes = list("tomato" = 1, "cheese" = 1, "wasabi" = 1)
+
+// Garlic Pizza
+/obj/item/reagent_containers/food/snacks/sliceable/pizza/garlicpizza
+ name = "garlic pizza"
+ desc = "Ahh, garlic. A universally loved ingredient, except possibly by vampires."
+ icon_state = "garlicpizza"
+ slice_path = /obj/item/reagent_containers/food/snacks/garlicpizzaslice
+ list_reagents = list("plantmatter" = 30, "vitamin" = 5, "garlic" = 12)
+ tastes = list("crust" = 1, "cheese" = 1, "garlic" = 1)
+
+/obj/item/reagent_containers/food/snacks/garlicpizzaslice
+ name = "garlic pizza slice"
+ desc = "What's not to love?"
+ icon = 'icons/obj/food/pizza.dmi'
+ icon_state = "garlicpizzaslice"
+ filling_color = "#BAA14C"
+ tastes = list("crust" = 1, "cheese" = 1, "garlic" = 1)
+
//////////////////////
// Boxes //
@@ -252,27 +374,43 @@
return
..()
+
/obj/item/pizzabox/margherita/Initialize(mapload)
- pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita(src)
+ . = ..()
+ pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/margheritapizza(src)
box_tag = "margherita deluxe"
- return ..()
/obj/item/pizzabox/vegetable/Initialize(mapload)
+ . = ..()
pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza(src)
box_tag = "gourmet vegetable"
- return ..()
/obj/item/pizzabox/mushroom/Initialize(mapload)
+ . = ..()
pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza(src)
box_tag = "mushroom special"
- return ..()
/obj/item/pizzabox/meat/Initialize(mapload)
+ . = ..()
pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza(src)
box_tag = "meatlover's supreme"
- return ..()
/obj/item/pizzabox/hawaiian/Initialize(mapload)
+ . = ..()
pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza(src)
box_tag = "Hawaiian feast"
- return ..()
+
+/obj/item/pizzabox/pepperoni/Initialize(mapload)
+ . = ..()
+ pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/pepperonipizza(src)
+ box_tag = "classic pepperoni"
+
+/obj/item/pizzabox/garlic/Initialize(mapload)
+ . = ..()
+ pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/garlicpizza(src)
+ box_tag = "triple garlic"
+
+/obj/item/pizzabox/firecracker/Initialize(mapload)
+ . = ..()
+ pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/firecrackerpizza(src)
+ box_tag = "extra spicy pie"
diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm
index 8c9307ae014..734da1bb065 100644
--- a/code/modules/food_and_drinks/recipes/recipes_oven.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm
@@ -1,4 +1,5 @@
+
// /datum/recipe/oven
/datum/recipe/oven/bun
@@ -215,16 +216,16 @@
qdel(P)
return being_cooked
+// Pizzas
/datum/recipe/oven/pizzamargherita
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
+ /obj/item/reagent_containers/food/snacks/grown/tomato,
+ /obj/item/reagent_containers/food/snacks/grown/tomato,
/obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/tomato
+ /obj/item/reagent_containers/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita
+ result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/margheritapizza
/datum/recipe/oven/meatpizza
items = list(
@@ -237,19 +238,7 @@
)
result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza
-/datum/recipe/oven/syntipizza
- items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh,
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh,
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/tomato
- )
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza
-
/datum/recipe/oven/mushroompizza
-
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/cheesewedge,
@@ -293,6 +282,80 @@
)
result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza
+/datum/recipe/oven/cheesepizza
+ items = list(
+ /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
+ /obj/item/reagent_containers/food/snacks/grown/tomato,
+ /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/reagent_containers/food/snacks/cheesewedge
+ )
+ result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/cheesepizza
+
+/datum/recipe/oven/pepperonipizza
+ items = list(
+ /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
+ /obj/item/reagent_containers/food/snacks/grown/tomato,
+ /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/reagent_containers/food/snacks/sausage
+ )
+ result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/pepperonipizza
+
+/datum/recipe/oven/donkpocketpizza
+ items = list(
+ /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
+ /obj/item/reagent_containers/food/snacks/grown/tomato,
+ /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/reagent_containers/food/snacks/donkpocket,
+ /obj/item/reagent_containers/food/snacks/donkpocket
+ )
+ result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/donkpocketpizza
+
+/datum/recipe/oven/dankpizza
+ items = list(
+ /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
+ /obj/item/reagent_containers/food/snacks/grown/tomato,
+ /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/reagent_containers/food/snacks/grown/cannabis,
+ /obj/item/reagent_containers/food/snacks/grown/cannabis,
+ /obj/item/reagent_containers/food/snacks/grown/cannabis,
+ /obj/item/reagent_containers/food/snacks/grown/cannabis
+ )
+ result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/dankpizza
+
+/datum/recipe/oven/firecrackerpizza
+ reagents = list("capsaicin" = 5)
+ items = list(
+ /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
+ /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/reagent_containers/food/snacks/grown/chili,
+ /obj/item/reagent_containers/food/snacks/grown/chili
+ )
+ result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/firecrackerpizza
+
+/datum/recipe/oven/pestopizza
+ reagents = list("wasabi" = 5)
+ items = list(
+ /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
+ /obj/item/reagent_containers/food/snacks/grown/tomato,
+ /obj/item/reagent_containers/food/snacks/grown/tomato,
+ /obj/item/reagent_containers/food/snacks/cheesewedge
+ )
+ result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/pestopizza
+
+/datum/recipe/oven/garlicpizza
+ reagents = list("garlic" = 5)
+ items = list(
+ /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
+ /obj/item/reagent_containers/food/snacks/grown/garlic,
+ /obj/item/reagent_containers/food/snacks/grown/garlic,
+ /obj/item/reagent_containers/food/snacks/cheesewedge
+ )
+ result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/garlicpizza
+
+
+
/datum/recipe/oven/amanita_pie
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index 852bf0bd170..8b35224df6b 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -150,10 +150,18 @@
var/list/blocked = list(/obj/item/reagent_containers/food/snacks,
/obj/item/reagent_containers/food/snacks/breadslice,
/obj/item/reagent_containers/food/snacks/sliceable,
- /obj/item/reagent_containers/food/snacks/margheritaslice,
+ /obj/item/reagent_containers/food/snacks/margheritapizzaslice,
/obj/item/reagent_containers/food/snacks/meatpizzaslice,
/obj/item/reagent_containers/food/snacks/mushroompizzaslice,
/obj/item/reagent_containers/food/snacks/vegetablepizzaslice,
+ /obj/item/reagent_containers/food/snacks/cheesepizzaslice,
+ /obj/item/reagent_containers/food/snacks/garlicpizzaslice,
+ /obj/item/reagent_containers/food/snacks/donkpocketpizzaslice,
+ /obj/item/reagent_containers/food/snacks/dankpizzaslice,
+ /obj/item/reagent_containers/food/snacks/macpizzaslice,
+ /obj/item/reagent_containers/food/snacks/firecrackerpizzaslice,
+ /obj/item/reagent_containers/food/snacks/pestopizzaslice,
+ /obj/item/reagent_containers/food/snacks/pepperonipizzaslice,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat/slab,
/obj/item/reagent_containers/food/snacks/grown,
diff --git a/code/modules/ruins/lavalandruin_code/pizzaparty.dm b/code/modules/ruins/lavalandruin_code/pizzaparty.dm
index 192a80e3e7f..58aebdf8115 100644
--- a/code/modules/ruins/lavalandruin_code/pizzaparty.dm
+++ b/code/modules/ruins/lavalandruin_code/pizzaparty.dm
@@ -1,8 +1,11 @@
/obj/effect/spawner/lootdrop/pizzaparty
name = "pizza bomb spawner"
- loot = list(/obj/item/pizzabox/margherita = 3,
- /obj/item/pizzabox/meat = 3,
- /obj/item/pizzabox/mushroom = 3,
+ loot = list(/obj/item/pizzabox/margherita = 2,
+ /obj/item/pizzabox/meat = 2,
+ /obj/item/pizzabox/mushroom = 1,
+ /obj/item/pizzabox/pepperoni = 2,
+ /obj/item/pizzabox/garlic = 1,
+ /obj/item/pizzabox/firecracker = 1,
/obj/item/pizza_bomb = 1)
lootdoubles = FALSE
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 647601ffaed..8753580dee6 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 1b7aeb2151b..4b3b7556bd7 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/obj/food/pizza.dmi b/icons/obj/food/pizza.dmi
index c26e792f2a0..6ddf2f00c6e 100644
Binary files a/icons/obj/food/pizza.dmi and b/icons/obj/food/pizza.dmi differ