Skip to content

Commit

Permalink
congruent with newfood 2
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tsar-Salat
Tsar-Salat committed Sep 19, 2023
1 parent 4484346 commit 851e7a2
Show file tree
Hide file tree
Showing 7 changed files with 131 additions and 92 deletions.
204 changes: 128 additions & 76 deletions code/game/objects/items/food/pizza.dm
View file
Original file line number Diff line number Diff line change
@@ -1,174 +1,235 @@

/////////////////////////////////////////////////PIZZA////////////////////////////////////////

// Pizza (Whole)
/obj/item/food/pizza
icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon = 'icons/obj/food/pizza.dmi'
w_class = WEIGHT_CLASS_NORMAL
slices_num = 6
volume = 80
list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
max_volume = 80
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)
foodtype = GRAIN | DAIRY | VEGETABLES

foodtypes = GRAIN | DAIRY | VEGETABLES
//burns_in_oven = TRUE
/// type is spawned 6 at a time and replaces this pizza when processed by cutting tool
var/obj/item/food/pizzaslice/slice_type

/obj/item/food/pizza/make_processable()
if(slice_type)
AddElement(/datum/element/processable, TOOL_KNIFE, slice_type, 6, 3 SECONDS, table_required = TRUE, /*screentip_verb = "Slice"*/)
AddElement(/datum/element/processable, TOOL_SAW, slice_type, 6, 4.5 SECONDS, table_required = TRUE, /*screentip_verb = "Slice"*/)
AddElement(/datum/element/processable, TOOL_SCALPEL, slice_type, 6, 6 SECONDS, table_required = TRUE, /*screentip_verb = "Slice"*/)

// Pizza Slice
/obj/item/food/pizzaslice
icon = 'icons/obj/food/pizzaspaghetti.dmi'
list_reagents = list(/datum/reagent/consumable/nutriment = 5)
foodtype = GRAIN | DAIRY | VEGETABLES
icon = 'icons/obj/food/pizza.dmi'
food_reagents = list(/datum/reagent/consumable/nutriment = 5)
foodtypes = GRAIN | DAIRY | VEGETABLES
w_class = WEIGHT_CLASS_SMALL

/obj/item/food/pizzaslice/make_processable()
AddElement(/datum/element/processable, TOOL_ROLLINGPIN, 1, 1 SECONDS, table_required = TRUE, /*screentip_verb = "Flatten"*/)

/obj/item/food/pizza/margherita
name = "pizza margherita"
desc = "The most cheezy pizza in galaxy."
icon_state = "pizzamargherita"
slice_path = /obj/item/food/pizzaslice/margherita
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
food_reagents = list(
/datum/reagent/consumable/nutriment = 25,
/datum/reagent/consumable/nutriment/protein = 8,
/datum/reagent/consumable/tomatojuice = 6,
/datum/reagent/consumable/nutriment/vitamin = 5
)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
foodtype = GRAIN | VEGETABLES

/obj/item/food/pizza/margherita/robo/Initialize(mapload)
bonus_reagents += list(/datum/reagent/nanomachines = 70)
return ..()
foodtypes = GRAIN | VEGETABLES | DAIRY
slice_type = /obj/item/food/pizzaslice/margherita

/obj/item/food/pizza/margherita/robo
food_reagents = list(
/datum/reagent/nanomachines = 70,
/datum/reagent/consumable/nutriment = 25,
/datum/reagent/consumable/nutriment/protein = 8,
/datum/reagent/consumable/tomatojuice = 6,
/datum/reagent/consumable/nutriment/vitamin = 5
)

/obj/item/food/pizzaslice/margherita
name = "margherita slice"
desc = "A slice of the most cheezy pizza in galaxy."
icon_state = "pizzamargheritaslice"
filling_color = "#FFA500"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
foodtype = GRAIN | VEGETABLES
foodtypes = GRAIN | VEGETABLES | DAIRY

/* Customfood
/obj/item/food/pizzaslice/margherita/Initialize(mapload)
. = ..()
AddComponent(/datum/component/customizable_reagent_holder, null, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 12)
*/

/obj/item/food/pizza/meat
name = "meatpizza"
desc = "Greasy pizza with delicious meat."
icon_state = "meatpizza"
slice_path = /obj/item/food/pizzaslice/meat
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 8)
list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 8)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
foodtype = GRAIN | VEGETABLES| DAIRY | MEAT
food_reagents = list(
/datum/reagent/consumable/nutriment = 25,
/datum/reagent/consumable/nutriment/protein = 8,
/datum/reagent/consumable/tomatojuice = 6,
/datum/reagent/consumable/nutriment/vitamin = 8
)
foodtypes = GRAIN | VEGETABLES| DAIRY | MEAT
slice_type = /obj/item/food/pizzaslice/meat

/obj/item/food/pizzaslice/meat
name = "meatpizza slice"
desc = "A nutritious slice of meatpizza."
icon_state = "meatpizzaslice"
filling_color = "#A52A2A"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT
foodtypes = GRAIN | VEGETABLES | DAIRY | MEAT

/obj/item/food/pizza/mushroom
name = "mushroom pizza"
desc = "Very special pizza."
icon_state = "mushroompizza"
slice_path = /obj/item/food/pizzaslice/mushroom
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 5)
food_reagents = list(
/datum/reagent/consumable/nutriment = 28,
/datum/reagent/consumable/nutriment/protein = 3,
/datum/reagent/consumable/nutriment/vitamin = 5
)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY
foodtypes = GRAIN | VEGETABLES | DAIRY
slice_type = /obj/item/food/pizzaslice/mushroom

/obj/item/food/pizzaslice/mushroom
name = "mushroom pizza slice"
desc = "Maybe it is the last slice of pizza in your life."
icon_state = "mushroompizzaslice"
filling_color = "#FFE4C4"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY
foodtypes = GRAIN | VEGETABLES | DAIRY

/obj/item/food/pizza/vegetable
name = "vegetable pizza"
desc = "No one of Tomatos Sapiens were harmed during making this pizza."
desc = "Not one of the Tomatos Sapiens were harmed during the making of this pizza."
icon_state = "vegetablepizza"
slice_path = /obj/item/food/pizzaslice/vegetable
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/medicine/oculine = 12, /datum/reagent/consumable/nutriment/vitamin = 5)
food_reagents = list(
/datum/reagent/consumable/nutriment = 25,
/datum/reagent/consumable/tomatojuice = 6,
/datum/reagent/medicine/oculine = 12,
/datum/reagent/consumable/nutriment/vitamin = 5
)
tastes = list("crust" = 1, "tomato" = 2, "cheese" = 1, "carrot" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY
foodtypes = GRAIN | VEGETABLES | DAIRY
slice_type = /obj/item/food/pizzaslice/vegetable

/obj/item/food/pizzaslice/vegetable
name = "vegetable pizza slice"
desc = "A slice of the most green pizza of all pizzas not containing green ingredients."
icon_state = "vegetablepizzaslice"
filling_color = "#FFA500"
tastes = list("crust" = 1, "tomato" = 2, "cheese" = 1, "carrot" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY
foodtypes = GRAIN | VEGETABLES | DAIRY

/obj/item/food/pizza/donkpocket
name = "donkpocket pizza"
desc = "Who thought this would be a good idea?"
icon_state = "donkpocketpizza"
slice_path = /obj/item/food/pizzaslice/donkpocket
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/medicine/omnizine = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
food_reagents = list(
/datum/reagent/consumable/nutriment = 20,
/datum/reagent/consumable/nutriment/protein = 15,
/datum/reagent/consumable/tomatojuice = 6,
/datum/reagent/medicine/omnizine = 10,
/datum/reagent/consumable/nutriment/vitamin = 5
)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD
foodtypes = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD
slice_type = /obj/item/food/pizzaslice/donkpocket

/obj/item/food/pizzaslice/donkpocket
name = "donkpocket pizza slice"
desc = "Smells like donkpocket."
icon_state = "donkpocketpizzaslice"
filling_color = "#FFA500"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD
foodtypes = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD

/obj/item/food/pizza/dank
name = "dank pizza"
desc = "The hippie's pizza of choice."
icon_state = "dankpizza"
slice_path = /obj/item/food/pizzaslice/dank
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
food_reagents = list(
/datum/reagent/consumable/nutriment = 25,
/datum/reagent/consumable/doctor_delight = 5,
/datum/reagent/consumable/tomatojuice = 6,
/datum/reagent/consumable/nutriment/vitamin = 5
)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY
foodtypes = GRAIN | VEGETABLES | DAIRY
slice_type = /obj/item/food/pizzaslice/dank

/obj/item/food/pizzaslice/dank
name = "dank pizza slice"
desc = "So good, man..."
icon_state = "dankpizzaslice"
filling_color = "#2E8B57"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY
foodtypes = GRAIN | VEGETABLES | DAIRY

/obj/item/food/pizza/sassysage
name = "sassysage pizza"
desc = "You can really smell the sassiness."
icon_state = "sassysagepizza"
slice_path = /obj/item/food/pizzaslice/sassysage
bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
food_reagents = list(
/datum/reagent/consumable/nutriment = 20,
/datum/reagent/consumable/nutriment/protein = 15,
/datum/reagent/consumable/tomatojuice = 6,
/datum/reagent/consumable/nutriment/vitamin = 6
)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY
foodtypes = GRAIN | VEGETABLES | DAIRY
slice_type = /obj/item/food/pizzaslice/sassysage

/obj/item/food/pizzaslice/sassysage
name = "sassysage pizza slice"
desc = "Deliciously sassy."
icon_state = "sassysagepizzaslice"
filling_color = "#FF4500"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
foodtype = GRAIN | VEGETABLES | DAIRY
foodtypes = GRAIN | VEGETABLES | DAIRY

/obj/item/food/pizza/pineapple
name = "\improper Hawaiian pizza"
desc = "The pizza equivalent of Einstein's riddle."
icon_state = "pineapplepizza"
slice_path = /obj/item/food/pizzaslice/pineapple
bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
food_reagents = list(
/datum/reagent/consumable/nutriment = 20,
/datum/reagent/consumable/nutriment/protein = 5,
/datum/reagent/consumable/tomatojuice = 6,
/datum/reagent/consumable/nutriment/vitamin = 6,
/datum/reagent/consumable/pineapplejuice = 8
)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 2, "ham" = 2)
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE
foodtypes = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE
slice_type = /obj/item/food/pizzaslice/pineapple

/obj/item/food/pizzaslice/pineapple
name = "\improper Hawaiian pizza slice"
desc = "A slice of delicious controversy."
icon_state = "pineapplepizzaslice"
filling_color = "#FF4500"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 2, "ham" = 2)
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE
foodtypes = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE

/obj/item/food/pizza/arnold
name = "\improper Arnold pizza"
desc = "Hello, you've reached Arnold's pizza shop. I'm not here now, I'm out killing pepperoni."
icon_state = "arnoldpizza"
slice_path = /obj/item/food/pizzaslice/arnold
bonus_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/iron = 10, /datum/reagent/medicine/omnizine = 30)
food_reagents = list(
/datum/reagent/consumable/nutriment = 25,
/datum/reagent/consumable/nutriment/protein = 9,
/datum/reagent/consumable/nutriment/vitamin = 6,
/datum/reagent/iron = 10,
/datum/reagent/medicine/omnizine = 30
)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2)
slice_type = /obj/item/food/pizzaslice/arnold

/obj/item/reagent_containers/food/snacks/proc/try_break_off(mob/living/M, mob/living/user) //maybe i give you a pizza maybe i break off your arm
/obj/item/food/proc/try_break_off(mob/living/M, mob/living/user) //maybe i give you a pizza maybe i break off your arm
if(prob(50) || (M != user) || !iscarbon(user) || HAS_TRAIT(user, TRAIT_NODISMEMBER))
return
var/obj/item/bodypart/l_arm = user.get_bodypart(BODY_ZONE_L_ARM)
Expand All @@ -180,7 +241,7 @@
user.visible_message("<span class='warning'>\The [src] breaks off [user]'s arm!</span>", "<span class='warning'>\The [src] breaks off your arm!</span>")
playsound(user,pick('sound/misc/desecration-01.ogg','sound/misc/desecration-02.ogg','sound/misc/desecration-01.ogg') ,50, TRUE, -1)

/obj/item/reagent_containers/food/snacks/proc/i_kill_you(obj/item/I, mob/user)
/obj/item/food/proc/i_kill_you(obj/item/I, mob/user)
if(istype(I, /obj/item/reagent_containers/food/snacks/pineappleslice))
to_chat(user, "<font color='red' size='7'>If you want something crazy like pineapple, I'll kill you.</font>") //this is in bigger text because it's hard to spam something that gibs you, and so that you're perfectly aware of the reason why you died
user.gib() //if you want something crazy like pineapple, i'll kill you
Expand All @@ -197,14 +258,12 @@
i_kill_you(I, user)
. = ..()


/obj/item/food/pizzaslice/arnold
name = "\improper Arnold pizza slice"
desc = "I come over, maybe I give you a pizza, maybe I break off your arm."
icon_state = "arnoldpizzaslice"
filling_color = "#A52A2A"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2)
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT
foodtypes = GRAIN | VEGETABLES | DAIRY | MEAT

/obj/item/food/pizzaslice/arnold/attack(mob/living/M, mob/living/user)
. =..()
Expand All @@ -214,10 +273,3 @@
i_kill_you(I, user)
. = ..()


/obj/item/food/pizzaslice/custom
name = "pizza slice"
icon_state = "pizzamargheritaslice"
filling_color = "#FFFFFF"
foodtype = GRAIN | VEGETABLES

2 changes: 1 addition & 1 deletion code/game/objects/items/food/spaghetti.dm
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/item/food/spaghetti
name = "Spaghetti Parent"
desc = "You either spawned this erroneously, or a coder did. Either way, someone messed up."
icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon = 'icons/obj/food/spaghetti.dmi'
icon_state = "ERROR"
food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtypes = GRAIN
Expand Down
4 changes: 1 addition & 3 deletions code/modules/food_and_drinks/food/customizables.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,10 @@
desc = "Noodles. With stuff. Delicious."
ingredients_placement = INGREDIENTS_SCATTER
ingMax = 6
icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon = 'icons/obj/food/spaghetti.dmi'
icon_state = "spaghettiboiled"
foodtype = GRAIN


/obj/item/reagent_containers/food/snacks/customizable/pie
name = "pie"
ingMax = 6
Expand All @@ -193,7 +192,6 @@
icon = 'icons/obj/food/soupsalad.dmi'
icon_state = "bowl"


/obj/item/reagent_containers/food/snacks/customizable/soup
name = "soup"
desc = "A bowl with liquid and... stuff in it."
Expand Down
13 changes: 1 addition & 12 deletions code/modules/food_and_drinks/pizzabox.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,17 +175,6 @@
return
else
to_chat(user, "<span class='notice'>Close [open ? src : newbox] first!</span>")
else if(istype(I, /obj/item/food/pizza) || istype(I, /obj/item/reagent_containers/food/snacks/customizable/pizza))
if(open)
if(pizza)
to_chat(user, "<span class='warning'>[src] already has \a [pizza.name]!</span>")
return
if(!user.transferItemToLoc(I, src))
return
pizza = I
to_chat(user, "<span class='notice'>You put [I] in [src].</span>")
update_icon()
return
else if(istype(I, /obj/item/bombcore/miniature/pizza))
if(open && !bomb)
if(!user.transferItemToLoc(I, src))
Expand Down Expand Up @@ -353,4 +342,4 @@
var/obj/item/pizza_type = pizza_preferences[noms.ckey]
pizza = new pizza_type (src)
var/obj/item/organ/tongue/T = noms.getorganslot(ORGAN_SLOT_TONGUE)
pizza.foodtype = T?.liked_food //it's our favorite!
pizza.foodtypes = T?.liked_food //it's our favorite!
Binary file added icons/obj/food/pizza.dmi
View file
Binary file not shown.
Binary file removed icons/obj/food/pizzaspaghetti.dmi
View file
Binary file not shown.
Binary file added icons/obj/food/spaghetti.dmi
View file
Binary file not shown.

0 comments on commit 851e7a2

Please sign in to comment.