Skip to content

Commit

Permalink
[MIRROR] Fixes custom pizzas magically generating dairy products and …
Browse files Browse the repository at this point in the history
…vegetables. (#2230)

* Fixes custom pizzas magically generating dairy products and vegetables. (#81683)

## About The Pull Request
This fix is for pizzabreads being made into a custom pizza that
magically become dairy and vegetable based foods, even if you added
neither.
## Why It's Good For The Game
People with dairy allergies and those that may not like vegetables, I
guess?

(This one has vegetables, 'cause I added tofu)

![image](https://github.com/tgstation/tgstation/assets/53197594/20624972-6cf8-42b5-be6a-06ba123e5aee)

## Changelog
:cl:
fix: makes custom pizzas dairy and vegetable free, unless you choose to
add them.
/:cl:

* Fixes custom pizzas magically generating dairy products and vegetables.

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: xXPawnStarrXx <[email protected]>
  • Loading branch information
3 people authored Mar 2, 2024
1 parent 35c02ba commit 645dcfa
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/items/food/dough.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

/obj/item/food/pizzabread/Initialize(mapload)
. = ..()
AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/pizza/margherita, CUSTOM_INGREDIENT_ICON_SCATTER, max_ingredients = 12)
AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/pizza, CUSTOM_INGREDIENT_ICON_SCATTER, max_ingredients = 12)

/obj/item/food/doughslice
name = "dough slice"
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/food/lizard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,7 @@
//Pizza Dishes
/obj/item/food/pizza/flatbread
icon = 'icons/obj/food/lizard.dmi'
icon_state = null
slice_type = null

/obj/item/food/pizza/flatbread/rustic
Expand Down
13 changes: 9 additions & 4 deletions code/game/objects/items/food/pizza.dm
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
// Pizza (Whole)
/obj/item/food/pizza
name = "pizza"
icon = 'icons/obj/food/pizza.dmi'
w_class = WEIGHT_CLASS_NORMAL
max_volume = 80
icon_state = "pizzamargherita"
food_reagents = list(
/datum/reagent/consumable/nutriment = 28,
/datum/reagent/consumable/nutriment/protein = 3,
/datum/reagent/consumable/tomatojuice = 6,
/datum/reagent/consumable/nutriment/vitamin = 5,
)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
foodtypes = GRAIN | DAIRY | VEGETABLES
tastes = list("crust" = 1, "tomato" = 1)
foodtypes = GRAIN
venue_value = FOOD_PRICE_CHEAP
crafting_complexity = FOOD_COMPLEXITY_2
/// type is spawned 6 at a time and replaces this pizza when processed by cutting tool
var/obj/item/food/pizzaslice/slice_type
slice_type = /obj/item/food/pizzaslice
///What label pizza boxes use if this pizza spawns in them.
var/boxtag = ""

/obj/item/food/pizza/raw
foodtypes = GRAIN | DAIRY | VEGETABLES | RAW
foodtypes = GRAIN | RAW
slice_type = null
crafting_complexity = FOOD_COMPLEXITY_2

Expand All @@ -34,9 +37,11 @@

// Pizza Slice
/obj/item/food/pizzaslice
name = "pizza slice"
icon = 'icons/obj/food/pizza.dmi'
food_reagents = list(/datum/reagent/consumable/nutriment = 5)
foodtypes = GRAIN | DAIRY | VEGETABLES
icon_state = "pizzamargheritaslice"
foodtypes = GRAIN
w_class = WEIGHT_CLASS_SMALL
decomp_type = /obj/item/food/pizzaslice/moldy
crafting_complexity = FOOD_COMPLEXITY_2
Expand Down

0 comments on commit 645dcfa

Please sign in to comment.