diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index ce0de49e504..46552fe782a 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -1999,7 +1999,8 @@ /obj/item/pizzabox/vegetable, /obj/item/pizzabox/mushroom, /obj/item/pizzabox/meat, - /obj/item/pizzabox/pineapple + /obj/item/pizzabox/pineapple, + /obj/item/pizzabox/pepperoni ) /obj/random/seed diff --git a/code/modules/cooking/recipes/recipes_baked.dm b/code/modules/cooking/recipes/recipes_baked.dm index 633142a0fae..25fba75ed30 100644 --- a/code/modules/cooking/recipes/recipes_baked.dm +++ b/code/modules/cooking/recipes/recipes_baked.dm @@ -76,6 +76,17 @@ ) result = /obj/item/reagent_containers/food/snacks/bacon_flatbread +/singleton/recipe/pepperonipizza + appliance = OVEN + fruit = list("tomato" = 2) + items = list( + /obj/item/reagent_containers/food/snacks/sliceable/flatdough, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/pepperoni + ) + reagent_mix = RECIPE_REAGENT_REPLACE // just in case + result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/pepperoni + /singleton/recipe/soywafers appliance = OVEN fruit = list("soybeans" = 1) @@ -165,4 +176,4 @@ /obj/item/reagent_containers/food/snacks/dough ) result = /obj/item/reagent_containers/food/snacks/moss_dumplings - result_quantity = 2 \ No newline at end of file + result_quantity = 2 diff --git a/code/modules/cooking/recipes/recipes_meat.dm b/code/modules/cooking/recipes/recipes_meat.dm index bc03fc9f52e..9e139cd1272 100644 --- a/code/modules/cooking/recipes/recipes_meat.dm +++ b/code/modules/cooking/recipes/recipes_meat.dm @@ -69,6 +69,15 @@ result = /obj/item/reagent_containers/food/snacks/sausage result_quantity = 2 +/singleton/recipe/pepperoni + appliance = SKILLET + reagents = list(/singleton/reagent/sodiumchloride = 1, /singleton/reagent/spacespice = 1) + items = list( + /obj/item/reagent_containers/food/snacks/sausage + ) + result = /obj/item/reagent_containers/food/snacks/pepperoni + result_quantity = 1 + /singleton/recipe/nugget appliance = FRYER reagents = list(/singleton/reagent/nutriment/flour = 5) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 4b4ba0f3f6b..39ab88e7204 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -985,6 +985,15 @@ reagents_to_add = list(/singleton/reagent/nutriment/protein = 6) +/obj/item/reagent_containers/food/snacks/pepperoni + name = "pepperoni" + desc = "A stick of pepperoni sausage." + icon_state = "pepperoni" + filling_color = "#DB0000" + bitesize = 2 + + reagents_to_add = list(/singleton/reagent/nutriment/protein = 6) + /obj/item/reagent_containers/food/snacks/jalapeno_poppers name = "jalapeno popper" desc = "A battered, deep-fried chili pepper" @@ -3279,6 +3288,29 @@ reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/drink/tomatojuice = 2, /singleton/reagent/oculine = 2) reagent_data = list(/singleton/reagent/nutriment = list("pizza crust" = 5, "eggplant" = 5, "carrot" = 5, "corn" = 5)) +/obj/item/reagent_containers/food/snacks/sliceable/pizza/pepperoni + name = "pepperoni pizza" + desc = "Who doesn't love a good pepperoni pizza after a hard day in the Chainlink?" + icon_state = "pepperonipizza" + slice_path = /obj/item/reagent_containers/food/snacks/pepperonipizzaslice + slices_num = 6 + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 10, /singleton/reagent/nutriment/protein = 44, /singleton/reagent/nutriment/protein/cheese = 10, /singleton/reagent/drink/tomatojuice = 6) + reagent_data = list(/singleton/reagent/nutriment = list("pizza crust" = 10, "tomato" = 10, "pepperoni" = 15)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/pepperonipizzaslice + name = "pepperoni pizza slice" + desc = "A slice of pepperoni pizza." + icon_state = "pepperonipizzaslice" + filling_color = "#BAA14C" + bitesize = 2 + center_of_mass = list("x"=18, "y"=13) + +/obj/item/reagent_containers/food/snacks/pepperonipizzaslice/filled + reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/nutriment/protein = 7, /singleton/reagent/nutriment/protein/cheese = 2, /singleton/reagent/drink/tomatojuice = 2) + reagent_data = list(/singleton/reagent/nutriment = list("pizza crust" = 5, "tomato" = 5)) + /obj/item/reagent_containers/food/snacks/sliceable/pizza/crunch name = "pizza crunch" desc = "This was once a normal pizza, but it has been coated in batter and deep-fried. Whatever toppings it once had are a mystery, but they're still under there, somewhere..." @@ -3359,7 +3391,7 @@ if( pizza ) var/image/pizzaimg = image(icon, icon_state = pizza.icon_state) - pizzaimg.pixel_y = -3 + pizzaimg.pixel_y = -2 add_overlay(pizzaimg) return @@ -3495,6 +3527,10 @@ pizza_type = /obj/item/reagent_containers/food/snacks/sliceable/pizza/pineapple boxtag = "Silversun Sunrise" +/obj/item/pizzabox/pepperoni + pizza_type = /obj/item/reagent_containers/food/snacks/sliceable/pizza/pepperoni + boxtag = "Pepperoni Power" + /obj/item/reagent_containers/food/snacks/sliceable/dionaroast name = "roast diona" desc = "It's like an enormous, leathery carrot. With an eye." diff --git a/html/changelogs/crunchypretzels-pizzatweak.yml b/html/changelogs/crunchypretzels-pizzatweak.yml new file mode 100644 index 00000000000..f766b0a7b55 --- /dev/null +++ b/html/changelogs/crunchypretzels-pizzatweak.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: crunchypretzels + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "New sprites for pizza and pizza boxes." + - rscadd: "Added pepperoni, and pepperoni pizza." diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index b7f4cbea6a9..47c835701e7 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/food_custom.dmi b/icons/obj/food_custom.dmi index af43a0b3b61..b94de3929ca 100644 Binary files a/icons/obj/food_custom.dmi and b/icons/obj/food_custom.dmi differ