diff --git a/code/game/machinery/vendors/departmental_vendors.dm b/code/game/machinery/vendors/departmental_vendors.dm
index 0043e71876c..30a055df375 100644
--- a/code/game/machinery/vendors/departmental_vendors.dm
+++ b/code/game/machinery/vendors/departmental_vendors.dm
@@ -184,12 +184,17 @@
icon_lightmask = "seeds"
icon_panel = "thin_vendor"
category = VENDOR_TYPE_DEPARTMENTAL
- products = list(/obj/item/seeds/aloe = 3,
+ products = list(
+ /obj/item/seeds/agave = 3,
+ /obj/item/seeds/aloe = 3,
/obj/item/seeds/ambrosia = 3,
+ /obj/item/seeds/annona = 3,
/obj/item/seeds/apple = 3,
+ /obj/item/seeds/avocado = 3,
/obj/item/seeds/bamboo = 3,
/obj/item/seeds/banana = 3,
/obj/item/seeds/berry = 3,
+ /obj/item/seeds/bell_pepper = 3,
/obj/item/seeds/cabbage = 3,
/obj/item/seeds/carrot = 3,
/obj/item/seeds/cassava = 3,
@@ -197,6 +202,7 @@
/obj/item/seeds/chanter = 3,
/obj/item/seeds/chili = 3,
/obj/item/seeds/cocoapod = 3,
+ /obj/item/seeds/coconut = 3,
/obj/item/seeds/coffee = 3,
/obj/item/seeds/comfrey = 3,
/obj/item/seeds/corn = 3,
@@ -208,20 +214,27 @@
/obj/item/seeds/grape = 3,
/obj/item/seeds/grass = 3,
/obj/item/seeds/harebell = 3,
+ /obj/item/seeds/kiwi = 3,
/obj/item/seeds/lemon = 3,
/obj/item/seeds/lettuce = 3,
/obj/item/seeds/lime = 3,
+ /obj/item/seeds/mango = 3,
+ /obj/item/seeds/mate = 3,
/obj/item/seeds/mint = 3,
+ /obj/item/seeds/nispero = 3,
/obj/item/seeds/olive = 3,
/obj/item/seeds/onion = 3,
/obj/item/seeds/orange = 3,
+ /obj/item/seeds/peach = 3,
/obj/item/seeds/peanuts = 3,
/obj/item/seeds/pineapple = 3,
/obj/item/seeds/plum = 3,
/obj/item/seeds/poppy = 3,
/obj/item/seeds/potato = 3,
+ /obj/item/seeds/prickly_pear = 3,
/obj/item/seeds/pumpkin = 3,
/obj/item/seeds/replicapod = 3,
+ /obj/item/seeds/ricinus = 3,
/obj/item/seeds/wheat/rice = 3,
/obj/item/seeds/soya = 3,
/obj/item/seeds/sugarcane = 3,
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index 49754f5b861..5b808e6becd 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -208,3 +208,18 @@
/obj/item/trash/spentcasing/bullet/lasershot
desc = "A spent IK-series single-use lasershot cell. It smells of burnt plastic with a metallic-chemical undertone."
icon_state = "lasercasing"
+
+// Trash from Hispania!
+
+/obj/item/trash/empty_jar
+ name = "Empty Jar"
+ icon_state = "jar"
+
+/obj/item/trash/empty_plasticcup
+ name = "Empty Plastic Cup"
+ icon_state = "cup"
+
+/obj/item/trash/barcardine
+ name = "barcardine bar wrapper"
+ desc = "An empty wrapper from a barcardine bar. You notice the inside has several medical labels. You're not sure if you care or not about that."
+ icon_state = "barcardine_trash"
diff --git a/code/modules/cooking/recipes/cutting_board_recipes.dm b/code/modules/cooking/recipes/cutting_board_recipes.dm
index c9b11691388..dd3a605635a 100644
--- a/code/modules/cooking/recipes/cutting_board_recipes.dm
+++ b/code/modules/cooking/recipes/cutting_board_recipes.dm
@@ -185,7 +185,7 @@
catalog_category = COOKBOOK_CATEGORY_BURGS
steps = list(
PCWJ_ADD_ITEM(/obj/item/food/bun),
- PCWJ_ADD_ITEM(/obj/item/robot_parts/head),
+ new /datum/cooking/recipe_step/add_item/robot_head(),
)
/datum/cooking/recipe/hotdog
@@ -618,7 +618,7 @@
product_type = /obj/item/food/jelliedtoast/cherry
catalog_category = COOKBOOK_CATEGORY_BURGS
steps = list(
- PCWJ_ADD_ITEM(/obj/item/food/sliced/bread),
+ PCWJ_ADD_ITEM(/obj/item/food/toast),
PCWJ_ADD_REAGENT("cherryjelly", 5),
)
@@ -627,7 +627,7 @@
product_type = /obj/item/food/jelliedtoast/slime
catalog_category = COOKBOOK_CATEGORY_BURGS
steps = list(
- PCWJ_ADD_ITEM(/obj/item/food/sliced/bread),
+ PCWJ_ADD_ITEM(/obj/item/food/toast),
PCWJ_ADD_REAGENT("slimejelly", 5),
)
@@ -682,3 +682,57 @@
PCWJ_ADD_ITEM(/obj/item/food/bun),
PCWJ_ADD_REAGENT("nothing", 10),
)
+
+// ----------- Board recipes imported from Hispania!
+
+/datum/cooking/recipe/butter_dog
+ container_type = /obj/item/reagent_containers/cooking/board
+ product_type = /obj/item/food/hotdog/butter
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/bun),
+ PCWJ_ADD_REAGENT("butter", 30),
+ )
+
+// Buttertoast //
+/datum/cooking/recipe/butter_toast
+ container_type = /obj/item/reagent_containers/cooking/board
+ product_type = /obj/item/food/butter_toast
+ catalog_category = COOKBOOK_CATEGORY_BREAD
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/toast),
+ PCWJ_ADD_REAGENT("butter", 5),
+ )
+
+/datum/cooking/recipe/avocadosandwich
+ container_type = /obj/item/reagent_containers/cooking/board
+ product_type = /obj/item/food/avocadosandwich
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/toast),
+ PCWJ_ADD_ITEM(/obj/item/food/sliced/avocado),
+ PCWJ_ADD_ITEM(/obj/item/food/sliced/avocado),
+ PCWJ_ADD_REAGENT("mayonnaise", 10),
+ PCWJ_ADD_ITEM(/obj/item/food/toast),
+ )
+
+/datum/cooking/recipe/baconrolled
+ container_type = /obj/item/reagent_containers/cooking/board
+ product_type = /obj/item/food/baconrolled
+ catalog_category = COOKBOOK_CATEGORY_SIDES
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/sliced/avocado),
+ PCWJ_ADD_ITEM(/obj/item/food/bacon),
+ )
+
+/datum/cooking/recipe/salmoncreamtoast
+ container_type = /obj/item/reagent_containers/cooking/board
+ product_type = /obj/item/food/salmoncreamtoast
+ catalog_category = COOKBOOK_CATEGORY_SEAFOOD
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/baguette),
+ PCWJ_ADD_ITEM(/obj/item/food/smokedsalmon),
+ PCWJ_ADD_REAGENT("cream_cheese", 10),
+ )
+
+// ----------- END of recipe imports from Hispania!
diff --git a/code/modules/cooking/recipes/grill_recipes.dm b/code/modules/cooking/recipes/grill_recipes.dm
index c70213a807d..e9d7a8b6bc3 100644
--- a/code/modules/cooking/recipes/grill_recipes.dm
+++ b/code/modules/cooking/recipes/grill_recipes.dm
@@ -384,3 +384,299 @@
PCWJ_USE_GRILL(J_MED, 10 SECONDS),
)
+// ----------- Grill recipes imported from Hispania!
+
+//HISPANIA GRILL RECIPES
+/datum/cooking/recipe/arepa
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/dough/corn),
+ PCWJ_ADD_REAGENT("sodiumchloride", 5),
+ PCWJ_USE_GRILL(J_MED, 10 SECONDS),
+ )
+
+/datum/cooking/recipe/arepa_cheese
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa/cheese
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/arepa),
+ PCWJ_ADD_ITEM(/obj/item/food/sliced/cheesewedge),
+ PCWJ_USE_GRILL(J_MED, 10 SECONDS),
+ )
+
+/datum/cooking/recipe/arepa_ham
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa/ham
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/arepa),
+ PCWJ_ADD_ITEM(/obj/item/food/rawcutlet),
+ PCWJ_USE_GRILL(J_MED, 15 SECONDS),
+ )
+
+/datum/cooking/recipe/arepa_ham_cheese
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa/ham_cheese
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/arepa),
+ PCWJ_ADD_ITEM(/obj/item/food/sliced/cheesewedge),
+ PCWJ_ADD_ITEM(/obj/item/food/rawcutlet),
+ PCWJ_USE_GRILL(J_MED, 15 SECONDS),
+ )
+
+/datum/cooking/recipe/arepa_plasma
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa/plasma
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/arepa),
+ PCWJ_ADD_REAGENT("plasma_dust", 10),
+ PCWJ_USE_GRILL(J_LO, 10 SECONDS),
+ )
+
+/datum/cooking/recipe/ghost_arepa
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa/ghost
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/arepa),
+ PCWJ_ADD_ITEM(/obj/item/food/ectoplasm),
+ PCWJ_ADD_REAGENT("enzyme", 5),
+ PCWJ_ADD_REAGENT("milk", 5),
+ PCWJ_USE_GRILL(J_MED, 10 SECONDS),
+ )
+
+/datum/cooking/recipe/xeno_arepa
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa/xeno
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/arepa),
+ PCWJ_ADD_ITEM(/obj/item/food/monstermeat/xenomeat),
+ PCWJ_ADD_REAGENT("sugar", 5),
+ PCWJ_ADD_REAGENT("enzyme", 5),
+ PCWJ_USE_GRILL(J_MED, 15 SECONDS),
+ )
+
+/datum/cooking/recipe/spider_arepa
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa/spider
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/arepa),
+ PCWJ_ADD_ITEM(/obj/item/food/monstermeat/spiderleg),
+ PCWJ_ADD_ITEM(/obj/item/food/monstermeat/spiderleg),
+ PCWJ_ADD_ITEM(/obj/item/food/monstermeat/spiderleg),
+ PCWJ_ADD_ITEM(/obj/item/food/monstermeat/spiderleg),
+ PCWJ_ADD_REAGENT("sodiumchloride", 5),
+ PCWJ_ADD_REAGENT("charcoal", 1),
+ PCWJ_USE_GRILL(J_MED, 15 SECONDS),
+ )
+
+/datum/cooking/recipe/arepa_life
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa/life
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/arepa),
+ PCWJ_ADD_REAGENT("lazarus_reagent", 5),
+ PCWJ_ADD_REAGENT("holywater", 1),
+ PCWJ_USE_GRILL(J_LO, 10 SECONDS),
+ )
+
+/datum/cooking/recipe/arepa_slime
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa/slime
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/arepa),
+ PCWJ_ADD_ITEM(/obj/item/slime_extract),
+ PCWJ_ADD_REAGENT("water", 10),
+ PCWJ_USE_GRILL(J_MED, 10 SECONDS),
+ )
+
+/datum/cooking/recipe/sweet_arepa
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa/sweet
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/arepa),
+ PCWJ_ADD_REAGENT("sugar", 10),
+ PCWJ_USE_GRILL(J_MED, 10 SECONDS),
+ )
+
+/datum/cooking/recipe/arepa_cheesier
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa/cheesier
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/arepa),
+ PCWJ_ADD_ITEM(/obj/item/food/sliceable/cheesewheel),
+ PCWJ_USE_GRILL(J_MED, 15 SECONDS),
+ )
+
+/datum/cooking/recipe/fruit_arepa
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa/fruit
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/arepa),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/banana),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/tomato),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/apple),
+ PCWJ_USE_GRILL(J_MED, 10 SECONDS),
+ )
+
+/datum/cooking/recipe/arepa_salmon
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa/salmon
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/arepa),
+ PCWJ_ADD_ITEM(/obj/item/food/salmonmeat),
+ PCWJ_USE_GRILL(J_MED, 15 SECONDS),
+ )
+
+/datum/cooking/recipe_step/add_item/robot_head
+
+/datum/cooking/recipe_step/add_item/robot_head/check_conditions_met(obj/added_item, datum/cooking/recipe_tracker/tracker)
+ if(!istype(added_item, /obj/item/robot_parts/head))
+ return PCWJ_CHECK_INVALID
+ return PCWJ_CHECK_VALID
+
+/datum/cooking/recipe_step/add_item/robot_head/get_pda_formatted_desc()
+ return "Add a robot head."
+
+/datum/cooking/recipe/arepa_industrial
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa/industrial
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/arepa),
+ new /datum/cooking/recipe_step/add_item/robot_head(),
+ PCWJ_USE_GRILL(J_HI, 15 SECONDS),
+ )
+
+/datum/cooking/recipe/arepa_infernal
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa/infernal
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/arepa),
+ PCWJ_ADD_REAGENT("capsaicin", 10),
+ PCWJ_ADD_REAGENT("napalm", 1),
+ PCWJ_USE_GRILL(J_MED, 15 SECONDS),
+ )
+
+/datum/cooking/recipe/arepa_ice
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa/ice
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/arepa),
+ PCWJ_ADD_REAGENT("frostoil", 10),
+ PCWJ_ADD_REAGENT("water", 10),
+ PCWJ_USE_GRILL(J_LO, 10 SECONDS),
+ )
+
+/datum/cooking/recipe/arepa_plumphelmet
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa/plumphelmet
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/arepa),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/mushroom/plumphelmet),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/mushroom/plumphelmet),
+ PCWJ_ADD_REAGENT("enzyme", 5),
+ PCWJ_USE_GRILL(J_MED, 15 SECONDS),
+ )
+
+/datum/cooking/recipe/arepa_magma
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/arepa/magma
+ catalog_category = COOKBOOK_CATEGORY_BURGS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/arepa),
+ PCWJ_ADD_REAGENT("capsaicin", 10),
+ PCWJ_ADD_REAGENT("blood", 10),
+ PCWJ_ADD_REAGENT("plasma_dust", 10),
+ PCWJ_USE_GRILL(J_HI, 20 SECONDS),
+ )
+
+// Toast //
+/datum/cooking/recipe/toast
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/toast
+ catalog_category = COOKBOOK_CATEGORY_BREAD
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/sliced/bread),
+ PCWJ_USE_GRILL(J_HI, 10 SECONDS),
+ )
+
+// CHULETA //
+/datum/cooking/recipe/syntisteak_cactus
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/syntisteak_cactus
+ catalog_category = COOKBOOK_CATEGORY_MEAT
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/meat/syntiflesh, exact = TRUE),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/prickly_pear),
+ PCWJ_ADD_REAGENT("sodiumchloride", 1),
+ PCWJ_ADD_REAGENT("blackpepper", 1),
+ PCWJ_USE_GRILL(J_MED, 15 SECONDS),
+ )
+
+/datum/cooking/recipe/meatsteak_cactus
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/meatsteak_cactus
+ catalog_category = COOKBOOK_CATEGORY_MEAT
+ steps = list(
+ PCWJ_ADD_MEATHUNK(exact = TRUE),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/prickly_pear),
+ PCWJ_ADD_REAGENT("sodiumchloride", 1),
+ PCWJ_ADD_REAGENT("blackpepper", 1),
+ PCWJ_USE_GRILL(J_MED, 15 SECONDS),
+ )
+
+// SALMON STUFF //
+/datum/cooking/recipe/smokedsalmon
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/smokedsalmon
+ catalog_category = COOKBOOK_CATEGORY_SEAFOOD
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/salmonmeat),
+ PCWJ_ADD_REAGENT("sodiumchloride", 1),
+ PCWJ_ADD_REAGENT("blackpepper", 1),
+ PCWJ_ADD_REAGENT("water", 5),
+ PCWJ_USE_GRILL(J_HI, 15 SECONDS),
+ )
+
+/datum/cooking/recipe/avocadosalmon
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/avocadosalmon
+ catalog_category = COOKBOOK_CATEGORY_SEAFOOD
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/salmonmeat),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/avocado),
+ PCWJ_ADD_REAGENT("sodiumchloride", 1),
+ PCWJ_ADD_REAGENT("blackpepper", 1),
+ PCWJ_USE_GRILL(J_HI, 15 SECONDS),
+ )
+
+/datum/cooking/recipe/citrussalmon
+ container_type = /obj/item/reagent_containers/cooking/grill_grate
+ product_type = /obj/item/food/citrussalmon
+ catalog_category = COOKBOOK_CATEGORY_SEAFOOD
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/salmonmeat),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/citrus/lemon),
+ PCWJ_ADD_REAGENT("sodiumchloride", 1),
+ PCWJ_ADD_REAGENT("blackpepper", 1),
+ PCWJ_USE_GRILL(J_HI, 15 SECONDS),
+ )
+
+// ----------- END of recipe imports from Hispania!
diff --git a/code/modules/cooking/recipes/oven_recipes.dm b/code/modules/cooking/recipes/oven_recipes.dm
index 6317fe76817..31bf0a96eef 100644
--- a/code/modules/cooking/recipes/oven_recipes.dm
+++ b/code/modules/cooking/recipes/oven_recipes.dm
@@ -387,8 +387,7 @@
steps = list(
PCWJ_ADD_ITEM(/obj/item/food/dough),
PCWJ_ADD_ITEM(/obj/item/food/dough),
- PCWJ_ADD_ITEM(/obj/item/food/sliced/cheesewedge),
- PCWJ_ADD_ITEM(/obj/item/food/sliced/cheesewedge),
+ PCWJ_ADD_REAGENT("cream_cheese", 20),
PCWJ_USE_OVEN(J_MED, 10 SECONDS),
)
@@ -1199,3 +1198,115 @@
PCWJ_ADD_ITEM(/obj/item/food/tapiocadough),
PCWJ_USE_OVEN(J_MED, 15 SECONDS),
)
+
+// ----------- Oven recipes imported from Hispania!
+
+/// empanadas by Soulster
+/datum/cooking/recipe/oven/empanada
+ container_type = /obj/item/reagent_containers/cooking/oven
+ product_type = /obj/item/food/empanada
+ catalog_category = COOKBOOK_CATEGORY_MEAT
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/sliced/dough),
+ PCWJ_ADD_ITEM(/obj/item/food/cutlet),
+ PCWJ_USE_OVEN(J_MED, 10 SECONDS),
+ )
+
+/// Honey Pie by Nothing (Thanks Ume)
+/datum/cooking/recipe/oven/honeypie
+ container_type = /obj/item/reagent_containers/cooking/oven
+ product_type = /obj/item/food/honey_pie
+ catalog_category = COOKBOOK_CATEGORY_DESSERTS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/sliceable/flatdough),
+ PCWJ_ADD_REAGENT("honey", 5),
+ PCWJ_USE_OVEN(J_MED, 15 SECONDS),
+ )
+
+/// HoneyBread(For Luka <3 )
+/datum/cooking/recipe/oven/honeybread
+ container_type = /obj/item/reagent_containers/cooking/oven
+ product_type = /obj/item/food/sliceable/honeybread
+ catalog_category = COOKBOOK_CATEGORY_BREAD
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/dough),
+ PCWJ_ADD_ITEM(/obj/item/food/dough),
+ PCWJ_ADD_ITEM(/obj/item/food/dough),
+ PCWJ_ADD_REAGENT("honey", 15),
+ PCWJ_USE_OVEN(J_MED, 15 SECONDS),
+ )
+
+// Peachmeat
+/datum/cooking/recipe/oven/peachmeat
+ container_type = /obj/item/reagent_containers/cooking/oven
+ product_type = /obj/item/food/peach_meat
+ catalog_category = COOKBOOK_CATEGORY_MEAT
+ steps = list(
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/peach),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/peach),
+ PCWJ_ADD_MEATHUNK(),
+ PCWJ_ADD_REAGENT("guacamole", 10),
+ PCWJ_ADD_REAGENT("sodiumchloride", 1),
+ PCWJ_ADD_REAGENT("blackpepper", 1),
+ PCWJ_USE_OVEN(J_MED, 10 SECONDS),
+ )
+
+// Stuffed mushroom
+/datum/cooking/recipe/oven/stuffed_mushrooms
+ container_type = /obj/item/reagent_containers/cooking/oven
+ product_type = /obj/item/food/stuffed_mushrooms
+ catalog_category = COOKBOOK_CATEGORY_SIDES
+ steps = list(
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/mushroom/chanterelle),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/mushroom/chanterelle),
+ PCWJ_ADD_ITEM(/obj/item/food/sliced/cheesewedge),
+ PCWJ_ADD_ITEM(/obj/item/food/sliced/cheesewedge),
+ PCWJ_ADD_ITEM(/obj/item/food/bacon),
+ PCWJ_ADD_ITEM(/obj/item/food/bacon),
+ PCWJ_USE_OVEN(J_MED, 10 SECONDS),
+ )
+
+/datum/cooking/recipe/oven/cheeseannonacake
+ container_type = /obj/item/reagent_containers/cooking/oven
+ product_type = /obj/item/food/sliceable/cheeseannonacake
+ catalog_category = COOKBOOK_CATEGORY_DESSERTS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/dough),
+ PCWJ_ADD_ITEM(/obj/item/food/dough),
+ PCWJ_ADD_ITEM(/obj/item/food/dough),
+ PCWJ_ADD_ITEM(/obj/item/food/sliced/cheesewedge),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/annona),
+ PCWJ_ADD_REAGENT("milk", 5),
+ PCWJ_ADD_REAGENT("sugar", 15),
+ PCWJ_USE_OVEN(J_MED, 15 SECONDS),
+ )
+
+// Filet Mignon
+/datum/cooking/recipe/oven/filetmignon
+ container_type = /obj/item/reagent_containers/cooking/oven
+ product_type = /obj/item/food/filetmignon
+ catalog_category = COOKBOOK_CATEGORY_MEAT
+ steps = list(
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/mushroom/chanterelle),
+ PCWJ_ADD_MEATHUNK(),
+ PCWJ_ADD_REAGENT("sodiumchloride", 1),
+ PCWJ_ADD_REAGENT("blackpepper", 1),
+ PCWJ_ADD_REAGENT("wine", 5),
+ PCWJ_USE_OVEN(J_MED, 10 SECONDS)
+ )
+
+// Cuy
+/datum/cooking/recipe/oven/cuy
+ container_type = /obj/item/reagent_containers/cooking/oven
+ product_type = /obj/item/food/cuy
+ catalog_category = COOKBOOK_CATEGORY_MEAT
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/sliced/avocado),
+ PCWJ_ADD_ITEM(/obj/item/food/rawmouse),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/potato),
+ PCWJ_ADD_REAGENT("sodiumchloride", 1),
+ PCWJ_ADD_REAGENT("blackpepper", 1),
+ PCWJ_USE_OVEN(J_MED, 10 SECONDS),
+ )
+
+// ----------- END of recipe imports from Hispania!
diff --git a/code/modules/cooking/recipes/prep_bowl_recipes.dm b/code/modules/cooking/recipes/prep_bowl_recipes.dm
index 335ed6e0f7c..26422b2c957 100644
--- a/code/modules/cooking/recipes/prep_bowl_recipes.dm
+++ b/code/modules/cooking/recipes/prep_bowl_recipes.dm
@@ -168,3 +168,47 @@
PCWJ_ADD_PRODUCE(/obj/item/food/grown/potato),
)
+// ----------- Bowl recipes imported from Hispania!
+
+// ENSALADASS CALENTITAS
+/datum/cooking/recipe/ensaladacactus
+ container_type = /obj/item/reagent_containers/cooking/bowl
+ product_type = /obj/item/food/ensaladacactus
+ catalog_category = COOKBOOK_CATEGORY_SALADS
+ steps = list(
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/cabbage),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/tomato),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/prickly_pear),
+ PCWJ_ADD_REAGENT("sodiumchloride", 1),
+ PCWJ_ADD_REAGENT("blackpepper", 1),
+ )
+
+/datum/cooking/recipe/garlic_snack
+ container_type = /obj/item/reagent_containers/cooking/bowl
+ product_type = /obj/item/food/garlic_snack
+ catalog_category = COOKBOOK_CATEGORY_SIDES
+ steps = list(
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/garlic),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/garlic),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/garlic),
+ PCWJ_ADD_REAGENT("guacamole", 10),
+ PCWJ_ADD_REAGENT("sodiumchloride", 2),
+ PCWJ_ADD_REAGENT("blackpepper", 1),
+ PCWJ_ADD_ITEM(/obj/item/food/baguette),
+ )
+
+/datum/cooking/recipe/guacamole
+ container_type = /obj/item/reagent_containers/cooking/bowl
+ product_type = /obj/item/reagent_containers/condiment/guacamole
+ catalog_category = COOKBOOK_CATEGORY_SIDES
+ steps = list(
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/avocado),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/avocado),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/tomato),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/onion),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/garlic),
+ PCWJ_ADD_REAGENT("sodiumchloride", 1),
+ PCWJ_ADD_REAGENT("blackpepper", 1),
+ )
+
+// ----------- END of recipe imports from Hispania!
diff --git a/code/modules/cooking/recipes/stove_recipes.dm b/code/modules/cooking/recipes/stove_recipes.dm
index 25fba8ca679..478f6bd9e2b 100644
--- a/code/modules/cooking/recipes/stove_recipes.dm
+++ b/code/modules/cooking/recipes/stove_recipes.dm
@@ -889,7 +889,7 @@
)
/datum/cooking/recipe/tapioca_pudding
- container_type =/obj/item/reagent_containers/cooking/pot
+ container_type = /obj/item/reagent_containers/cooking/pot
product_type = /obj/item/food/tapioca_pudding
catalog_category = COOKBOOK_CATEGORY_DESSERTS
steps = list(
@@ -898,3 +898,198 @@
PCWJ_ADD_REAGENT("sugar", 5),
PCWJ_USE_STOVE(J_MED, 20 SECONDS),
)
+
+// ----------- Stove recipes imported from Hispania!
+
+/datum/cooking/recipe/pancake_mermelada
+ container_type = /obj/item/reagent_containers/cooking/pan
+ product_type = /obj/item/food/pancake/mermelada_pancake
+ catalog_category = COOKBOOK_CATEGORY_BREAKFASTS
+ steps = list(
+ PCWJ_ADD_ITEM(/obj/item/food/cookiedough),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/nispero),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/citrus),
+ PCWJ_USE_STOVE(J_MED, 10 SECONDS),
+ )
+
+/// By Hexi
+/datum/cooking/recipe/macacosoup
+ container_type = /obj/item/reagent_containers/cooking/pot
+ product_type = /obj/item/food/soup/macacosoup
+ catalog_category = COOKBOOK_CATEGORY_SOUPS
+ steps = list(
+ PCWJ_ADD_REAGENT("water", 10),
+ PCWJ_ADD_REAGENT("sodiumchloride", 1),
+ PCWJ_ADD_REAGENT("blackpepper", 1),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/banana),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/potato),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/carrot),
+ PCWJ_ADD_ITEM(/obj/item/food/monkeycube),
+ PCWJ_USE_STOVE(J_MED, 20 SECONDS),
+ )
+
+/datum/cooking/recipe/furamingosoup
+ container_type = /obj/item/reagent_containers/cooking/pot
+ product_type = /obj/item/food/soup/furamingosoup
+ catalog_category = COOKBOOK_CATEGORY_SOUPS
+ steps = list(
+ PCWJ_ADD_REAGENT("water", 10),
+ PCWJ_ADD_REAGENT("sugar", 5),
+ PCWJ_ADD_REAGENT("milk", 5),
+ PCWJ_ADD_ITEM(/obj/item/food/shrimp),
+ PCWJ_USE_STOVE(J_MED, 15 SECONDS),
+ )
+
+// CaribeanParadise
+/datum/cooking/recipe/caribean_paradise
+ container_type = /obj/item/reagent_containers/cooking/pot
+ product_type = /obj/item/food/caribean_paradise
+ catalog_category = COOKBOOK_CATEGORY_SOUPS
+ steps = list(
+ PCWJ_ADD_REAGENT("coconutwater", 35),
+ PCWJ_ADD_REAGENT("mangojuice", 15),
+ PCWJ_ADD_REAGENT("blackpepper", 5),
+ PCWJ_ADD_REAGENT("sodiumchloride", 5),
+ PCWJ_ADD_REAGENT("limejuice", 5),
+ PCWJ_USE_STOVE(J_MED, 15 SECONDS),
+ )
+
+// Garlic Soup
+/datum/cooking/recipe/garlic_soup
+ container_type = /obj/item/reagent_containers/cooking/pot
+ product_type = /obj/item/food/soup/garlic
+ catalog_category = COOKBOOK_CATEGORY_SOUPS
+ steps = list(
+ PCWJ_ADD_REAGENT("water", 5),
+ PCWJ_ADD_REAGENT("sodiumchloride", 1),
+ PCWJ_ADD_REAGENT("blackpepper", 1),
+ PCWJ_ADD_ITEM(/obj/item/food/sliceable/bread),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/garlic),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/garlic),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/garlic),
+ PCWJ_ADD_ITEM(/obj/item/food/egg),
+ PCWJ_ADD_ITEM(/obj/item/food/sausage),
+ PCWJ_USE_STOVE(J_MED, 20 SECONDS),
+ )
+
+/datum/cooking/recipe/mushrooms_curry
+ container_type = /obj/item/reagent_containers/cooking/pot
+ product_type = /obj/item/food/mushrooms_curry
+ catalog_category = COOKBOOK_CATEGORY_VEGE
+ steps = list(
+ PCWJ_ADD_REAGENT("milk", 5),
+ PCWJ_ADD_REAGENT("sodiumchloride", 1),
+ PCWJ_ADD_REAGENT("blackpepper", 1),
+ PCWJ_ADD_ITEM(/obj/item/food/boiledrice),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/mushroom/chanterelle),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/garlic),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/onion),
+ PCWJ_USE_STOVE(J_MED, 20 SECONDS),
+ )
+
+/datum/cooking/recipe/elfs_poison
+ container_type = /obj/item/reagent_containers/cooking/pot
+ product_type = /obj/item/food/soup/elfs_poison
+ catalog_category = COOKBOOK_CATEGORY_SOUPS
+ steps = list(
+ PCWJ_ADD_REAGENT("water", 10),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/mushroom/chanterelle),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/mushroom/chanterelle),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/garlic),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/onion),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/mushroom/amanita),
+ PCWJ_USE_STOVE(J_LO, 20 SECONDS),
+ )
+
+// SALMON CONSOME
+/datum/cooking/recipe/salmonconsome
+ container_type = /obj/item/reagent_containers/cooking/pot
+ product_type = /obj/item/food/soup/fishconsome
+ catalog_category = COOKBOOK_CATEGORY_SOUPS
+ steps = list(
+ PCWJ_ADD_REAGENT("water", 5),
+ PCWJ_ADD_REAGENT("sodiumchloride", 1),
+ PCWJ_ADD_REAGENT("blackpepper", 1),
+ PCWJ_ADD_ITEM(/obj/item/food/salmonmeat),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/garlic),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/potato),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/onion),
+ PCWJ_USE_STOVE(J_MED, 20 SECONDS),
+ )
+
+// SALMON CURRY
+/datum/cooking/recipe/salmoncurry
+ container_type = /obj/item/reagent_containers/cooking/pot
+ product_type = /obj/item/food/salmoncurry
+ catalog_category = COOKBOOK_CATEGORY_SEAFOOD
+ steps = list(
+ PCWJ_ADD_REAGENT("milk", 5),
+ PCWJ_ADD_REAGENT("sodiumchloride", 1),
+ PCWJ_ADD_REAGENT("blackpepper", 1),
+ PCWJ_ADD_ITEM(/obj/item/food/salmonmeat),
+ PCWJ_ADD_ITEM(/obj/item/food/boiledrice),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/garlic),
+ PCWJ_USE_STOVE(J_MED, 20 SECONDS),
+ )
+
+// FUNNY HAHAHA
+/datum/cooking/recipe/gigapuddi
+ container_type = /obj/item/reagent_containers/cooking/pot
+ product_type = /obj/item/food/gigapuddi
+ catalog_category = COOKBOOK_CATEGORY_DESSERTS
+ steps = list(
+ PCWJ_ADD_REAGENT("milk", 5),
+ PCWJ_ADD_ITEM(/obj/item/food/egg),
+ PCWJ_ADD_ITEM(/obj/item/food/egg),
+ PCWJ_ADD_ITEM(/obj/item/food/chocolatebar),
+ PCWJ_USE_STOVE(J_LO, 5 SECONDS),
+ )
+
+/datum/cooking/recipe/gigapuddi/happypuddi
+ product_type = /obj/item/food/gigapuddi/happy
+ steps = list(
+ PCWJ_ADD_REAGENT("milk", 5),
+ PCWJ_ADD_REAGENT("sugar", 10),
+ PCWJ_ADD_ITEM(/obj/item/food/egg),
+ PCWJ_ADD_ITEM(/obj/item/food/egg),
+ PCWJ_ADD_ITEM(/obj/item/food/chocolatebar),
+ PCWJ_USE_STOVE(J_LO, 5 SECONDS),
+ )
+
+/datum/cooking/recipe/gigapuddi/angrypuddi
+ product_type = /obj/item/food/gigapuddi/anger
+ steps = list(
+ PCWJ_ADD_REAGENT("milk", 5),
+ PCWJ_ADD_REAGENT("sodiumchloride", 10),
+ PCWJ_ADD_ITEM(/obj/item/food/egg),
+ PCWJ_ADD_ITEM(/obj/item/food/egg),
+ PCWJ_ADD_ITEM(/obj/item/food/chocolatebar),
+ PCWJ_USE_STOVE(J_LO, 5 SECONDS),
+ )
+
+// HISPANIA CANDIES
+/datum/cooking/recipe/nisperocandy
+ container_type = /obj/item/reagent_containers/cooking/pot
+ product_type = /obj/item/food/candy/nispero
+ catalog_category = COOKBOOK_CATEGORY_CANDY
+ steps = list(
+ PCWJ_ADD_REAGENT("sugar", 10),
+ PCWJ_ADD_REAGENT("cornoil", 5),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/nispero),
+ PCWJ_ADD_PRODUCE(/obj/item/food/grown/citrus/lemon),
+ PCWJ_USE_STOVE(J_HI, 15 SECONDS),
+ )
+
+/datum/cooking/recipe/mousse_avocado
+ container_type = /obj/item/reagent_containers/cooking/pot
+ product_type = /obj/item/food/mousse_avocado
+ catalog_category = COOKBOOK_CATEGORY_CANDY
+ steps = list(
+ PCWJ_ADD_REAGENT("sugar", 5),
+ PCWJ_ADD_REAGENT("milk", 5),
+ PCWJ_ADD_REAGENT("cocoa", 5),
+ PCWJ_ADD_ITEM(/obj/item/food/sliced/avocado),
+ PCWJ_USE_STOVE(J_HI, 10 SECONDS),
+ )
+
+// ---------- END of recipe imports from Hispania!
diff --git a/code/modules/cooking/recipes/sushi_mat_recipes.dm b/code/modules/cooking/recipes/sushi_mat_recipes.dm
index 5d911dbc063..520911683a7 100644
--- a/code/modules/cooking/recipes/sushi_mat_recipes.dm
+++ b/code/modules/cooking/recipes/sushi_mat_recipes.dm
@@ -69,10 +69,10 @@
catalog_category = COOKBOOK_CATEGORY_SUSHI
steps = list(
PCWJ_ADD_ITEM(/obj/item/food/boiledrice),
- PCWJ_ADD_ITEM(/obj/item/food/salmonsteak),
- PCWJ_ADD_ITEM(/obj/item/food/salmonsteak),
- PCWJ_ADD_ITEM(/obj/item/food/salmonsteak),
- PCWJ_ADD_ITEM(/obj/item/food/salmonsteak),
+ PCWJ_ADD_ITEM(/obj/item/food/smokedsalmon),
+ PCWJ_ADD_ITEM(/obj/item/food/smokedsalmon),
+ PCWJ_ADD_ITEM(/obj/item/food/smokedsalmon),
+ PCWJ_ADD_ITEM(/obj/item/food/smokedsalmon),
PCWJ_ADD_ITEM(/obj/item/stack/seaweed),
)
@@ -132,7 +132,7 @@
catalog_category = COOKBOOK_CATEGORY_SUSHI
steps = list(
PCWJ_ADD_ITEM(/obj/item/food/boiledrice),
- PCWJ_ADD_ITEM(/obj/item/food/salmonsteak),
+ PCWJ_ADD_ITEM(/obj/item/food/smokedsalmon),
PCWJ_ADD_ITEM(/obj/item/stack/seaweed),
)
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index a92c41d7138..7ae99a18b06 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -4,7 +4,7 @@
// leave empty containers when used up and can be filled/re-filled with other items. Formatting for first section is identical
// to mixed-drinks code. If you want an object that starts pre-loaded, you need to make it in addition to the other code.
-//Food items that aren't eaten normally and leave an empty container behind.
+// Food items that aren't eaten normally and leave an empty container behind.
/obj/item/reagent_containers/condiment
name = "condiment container"
desc = "Just your average condiment container."
@@ -13,7 +13,7 @@
container_type = OPENCONTAINER
possible_transfer_amounts = list(1, 5, 10, 15, 20, 25, 30, 50)
volume = 50
- //Possible_states has the reagent id as key and a list of, in order, the icon_state, the name and the desc as values. Used in the on_reagent_change() to change names, descs and sprites.
+ // Possible_states has the reagent id as key and a list of, in order, the icon_state, the name and the desc as values. Used in the on_reagent_change() to change names, descs and sprites.
var/list/possible_states = list(
"bbqsauce" = list("bbqsauce", "BBQ sauce bottle", "Sweet, smoky, savory, and gets everywhere. Perfect for grilling."),
"ketchup" = list("ketchup", "ketchup bottle", "You feel more American already."),
@@ -35,7 +35,10 @@
"honey" = list("honey", "honey jar", "A sweet substance produced by bees."),
"sugar" = list("sugar", "sugar sack", "Tasty spacey sugar!"),
"flour" = list("flour", "flour sack", "A big bag of flour. Good for baking!"),
- "rice" = list("rice", "rice sack", "A big bag of rice. Good for cooking!"))
+ "rice" = list("rice", "rice sack", "A big bag of rice. Good for cooking!"),
+ "butter" = list("butter", "butter tub", "Delicious milk fat."),
+ "cream_cheese" = list("cream_cheese", "cream cheese tub", "Thick liquid cheese."),
+ "guacamole" = list("guacamole", "guacamole tub", "Creamy, tangy, avocado paste."))
var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters.
/obj/item/reagent_containers/condiment/mob_act(mob/target, mob/living/user)
@@ -297,7 +300,30 @@
list_reagents = list("ketchup" = 50)
possible_states = list()
-//Food packs. To easily apply deadly toxi... delicious sauces to your food!
+// Butter adapted from Hispania!
+/obj/item/reagent_containers/condiment/butter
+ name = "butter"
+ desc = "Delicious milk fat."
+ icon_state = "butter"
+ list_reagents = list("butter" = 50)
+ possible_states = list()
+
+// Cream cheese adapted from Hispania!
+/obj/item/reagent_containers/condiment/cream_cheese
+ name = "cream cheese"
+ desc = "Thick liquid cheese."
+ icon_state = "cream_cheese"
+ list_reagents = list("cream_cheese" = 50)
+ possible_states = list()
+
+/obj/item/reagent_containers/condiment/guacamole
+ name = "guacamole"
+ desc = "Creamy, tangy avocado paste."
+ icon_state = "guacamole"
+ list_reagents = list("guacamole" = 50)
+ possible_states = list()
+
+// Food packs. To easily apply deadly toxi- delicious sauces to your food!
/obj/item/reagent_containers/condiment/pack
name = "condiment pack"
@@ -315,7 +341,8 @@
"blackpepper" = list("condi_pepper", "Pepper Mill", "Often used to flavor food or make people sneeze."),
"cornoil" = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn."),
"sugar" = list("condi_sugar", "Sugar", "Tasty spacey sugar!"),
- "vinegar" =list("condi_mixed", "vinegar", "Perfect for chips, if you're feeling Space British."))
+ "vinegar" = list("condi_mixed", "vinegar", "Perfect for chips, if you're feeling Space British."),
+ "discount_sauce" = list("discount_sauce", "Discount Dan's Special Sauce", "Discount Dan brings you his very own special blend of delicious ingredients in one discount sauce!"))
/obj/item/reagent_containers/condiment/pack/interact_with_atom(atom/target, mob/living/user, list/modifiers)
//You can tear the bag open above food to put the condiments on it, obviously.
@@ -362,3 +389,10 @@
name = "hotsauce pack"
originalname = "hotsauce"
list_reagents = list("capsaicin" = 10)
+
+// Discount sauce from Hispania!
+/obj/item/reagent_containers/condiment/pack/discount_sauce
+ name = "Discount Dan's Special Sauce"
+ desc = "Discount Dan brings you his very own special blend of delicious ingredients in one discount sauce!"
+ list_reagents = list("discount_sauce" = 10)
+ icon_state = "discount_sauce"
diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm
index 282886d3582..3eb1a1cb071 100644
--- a/code/modules/food_and_drinks/food/foods/baked_goods.dm
+++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm
@@ -1353,3 +1353,33 @@
tastes = list("tapioca" = 0.5, "flat" = 0.25, "bread" = 0.25)
goal_difficulty = FOOD_GOAL_HARD
+//////////////////////
+// Hispania! //
+//////////////////////
+
+/obj/item/food/honey_pie
+ name = "honey pie"
+ desc = "A honey pie!"
+ icon_state = "honey_pie"
+ trash = /obj/item/trash/plate
+ filling_color = "#FBFFB8"
+ bitesize = 3
+ list_reagents = list("nutriment" = 10, "vitamin" = 5)
+
+// further adapted to fit our existing pancake profiles -- alfalfascout
+/obj/item/food/pancake/mermelada_pancake
+ name = "fluffy mermelada pancake"
+ desc = "A fluffy pancake. The softer, superior relative of the waffle. This time with a top of a jelly made of nispero and citrus."
+ icon_state = "mermelada_pancake"
+ list_reagents = list("nutriment" = 4, "vitamin" = 1, "sugar" = 6)
+ tastes = list("soft dough" = 10, "sweet jelly" = 10)
+
+//Stuffed mushrooms//
+/obj/item/food/stuffed_mushrooms
+ name = "Stuffed Mushrooms"
+ desc = "Two mushrooms stuffed with bacon and cheese, delicious!"
+ icon_state = "stuffed_mushrooms"
+ list_reagents = list("nutriment" = 3, "vitamin" = 2)
+ tastes = list("bacon" = 1,"cheesy" = 1,"earthy" = 1)
+
+// ----------- END of imports from Hispania!
diff --git a/code/modules/food_and_drinks/food/foods/bread.dm b/code/modules/food_and_drinks/food/foods/bread.dm
index c86c745f410..1e04086d06f 100644
--- a/code/modules/food_and_drinks/food/foods/bread.dm
+++ b/code/modules/food_and_drinks/food/foods/bread.dm
@@ -281,3 +281,38 @@
filling_color = "#E6DEB5"
list_reagents = list("nutriment" = 8, "vitamin" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
+
+////////////////////////
+// Hispania! //
+////////////////////////
+
+// HoneyBread //
+/obj/item/food/sliceable/honeybread
+ name = "honey bread"
+ desc = "Just a Honey Bread."
+ icon_state = "honeybread"
+ slice_path = /obj/item/food/sliced/honeybread
+ slices_num = 5
+ filling_color = "#EFD8A7"
+ list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5)
+ tastes = list("bread" = 10, "honey" = 10)
+
+/obj/item/food/sliced/honeybread
+ name = "honey bread slice"
+ desc = "A slice of a honeybread."
+ icon_state = "honeybreadslice"
+ trash = /obj/item/trash/plate
+ filling_color = "#EFD8A7"
+
+// ButterToast //
+/obj/item/food/butter_toast
+ name = "buttered toast"
+ desc = "Butter lightly spread over a piece of toast."
+ icon = 'icons/obj/food/burgerbread.dmi'
+ icon_state = "butter_toast"
+ filling_color = "#D2691E"
+ list_reagents = list("nutriment" = 4, "vitamin" = 1)
+ tastes = list("butter" = 1,"toast" = 1)
+ bitesize = 5
+
+// ----------- END of imports from Hispania!
diff --git a/code/modules/food_and_drinks/food/foods/candy.dm b/code/modules/food_and_drinks/food/foods/candy.dm
index 029a0b48fda..90b0d4bf2e8 100644
--- a/code/modules/food_and_drinks/food/foods/candy.dm
+++ b/code/modules/food_and_drinks/food/foods/candy.dm
@@ -609,3 +609,76 @@
icon_state = "toolerone"
filling_color = "#7D5F46"
goal_difficulty = FOOD_GOAL_NORMAL
+
+// ***********************************************************
+// Candy from Hispania!
+// ***********************************************************
+
+/obj/item/food/candy/nispero
+ name = "Nispero Candy"
+ desc = "A jar full of sticky nispero candies."
+ icon_state = "nisperocandy"
+ bitesize = 0.8
+ trash = /obj/item/trash/empty_jar
+ list_reagents = list("nutriment" = 1, "sugar" = 4)
+ filling_color = "#A0522D"
+ tastes = list("sweet citric" = 1)
+
+/obj/item/food/candy/mre_cracker
+ name = "enriched cracker"
+ desc = "It's a salted cracker, the surface looks saturated with oil."
+ icon_state = "mre_cracker"
+ list_reagents = list("nutriment" = 0.25, "teporone" = 1, "weak_omnizine" = 1)
+ tastes = list("salty" = 1, "oily" = 1)
+
+/obj/item/food/candy/choco_mre
+ name = "morale bar"
+ desc = "Some brand of non-melting military chocolate with a lot of stimulants. It has a label that says \"WARNING DO NOT EAT MORE THAN ONE\"."
+ icon_state = "mre_candy"
+ var/initial_state
+ list_reagents = list("sugar" = 4, "coffee" = 8, "nicotine" = 20, "epinephrine" = 12, "nutriment" = 0.25)
+ var/open = FALSE
+ antable = FALSE
+ tastes = list("chocolate" = 1, "chemical" = 1, "coffee" = 1)
+ bitesize = 25
+
+/obj/item/food/candy/choco_mre/Initialize(mapload)
+ . = ..()
+ initial_state = icon_state
+
+/obj/item/food/candy/choco_mre/activate_self(mob/user)
+ if(..())
+ return ITEM_INTERACT_COMPLETE
+
+ if(!open)
+ open = TRUE
+ antable = TRUE
+ to_chat(user, "You tear \the [src] open.")
+ playsound(src, 'sound/items/poster_ripped.ogg', 50, 1)
+ icon_state = "[initial_state]open"
+ return ITEM_INTERACT_COMPLETE
+
+/obj/item/food/candy/choco_mre/attack(mob/M, mob/user, def_zone)
+ if(!open && (M == user))
+ open = TRUE
+ antable = TRUE
+ to_chat(user,("You viciously rip \the [src] open with your teeth, swallowing some plastic in the process, you animal."))
+ playsound(src, 'sound/items/poster_ripped.ogg', 50, 1)
+ icon_state = "[initial_state]open"
+ return
+ if(!open)
+ to_chat(usr, "Open \the [src] first!")
+ return
+ else
+ ..()
+
+/obj/item/food/candy/choco_mre/barcardine
+ name = "barcardine bars"
+ desc = "A bar of chocolate, it smells like the medical bay. \"Chocolate always helps the pain go away.\""
+ icon_state = "barcardine"
+ trash = /obj/item/trash/barcardine
+ list_reagents = list("sugar" = 5, "epinephrine" = 3, "nutriment" = 1, "hydrocodone" = 2)
+ tastes = list("chocolate" = 1)
+ bitesize = 3
+
+// ----------- END of imports from Hispania!
diff --git a/code/modules/food_and_drinks/food/foods/desserts.dm b/code/modules/food_and_drinks/food/foods/desserts.dm
index fdf83015d83..721c0dfcbe7 100644
--- a/code/modules/food_and_drinks/food/foods/desserts.dm
+++ b/code/modules/food_and_drinks/food/foods/desserts.dm
@@ -70,9 +70,20 @@
tastes = list("vanilla" = 2, "chewiness" = 1)
goal_difficulty = FOOD_GOAL_HARD
-//////////////////////
-// Mug Cakes from Hispania! //
-//////////////////////
+////////////////////////
+// Hispania! //
+////////////////////////
+
+/obj/item/food/mousse_avocado
+ name = "Avocado Chocolate Mousse"
+ desc = "A mousse made of avocado and cacao."
+ icon_state = "mousse_avocado"
+ bitesize = 1
+ trash = /obj/item/trash/empty_plasticcup
+ list_reagents = list("nutriment" = 1, "chocolate" = 4, "cream" = 3)
+ filling_color = "#462B00"
+ tastes = list("quality chocolate" = 1)
+
/obj/item/food/mugcake
name = "mugcake"
desc = "A delicious and spongy little cake inside a coffee mug."
@@ -156,5 +167,4 @@
icon_state = "honey_mugcake"
list_reagents = list("nutriment" = 6)
-
// ---------- END of imports from Hispania!
diff --git a/code/modules/food_and_drinks/food/foods/ethnic.dm b/code/modules/food_and_drinks/food/foods/ethnic.dm
index 410412e8faa..d4dd9f2f3c3 100644
--- a/code/modules/food_and_drinks/food/foods/ethnic.dm
+++ b/code/modules/food_and_drinks/food/foods/ethnic.dm
@@ -208,3 +208,270 @@
/obj/item/food/picoss_kebab/bone
icon_state = "picoss_skewer_bone"
trash = /obj/item/stack/bone_rods
+
+////////////////////////
+// Hispania! //
+////////////////////////
+
+/obj/item/food/sliceable/cheeseannonacake
+ name = "cheese annona cake"
+ desc = "DANGEROUSLY sugary cheesy."
+ icon_state = "cheeseannonacake"
+ slice_path = /obj/item/food/sliced/cheeseannonacake
+ slices_num = 5
+ filling_color = "#FAF7AF"
+ bitesize = 3
+ list_reagents = list("nutriment" = 20, "vitamin" = 5)
+ tastes = list("cake" = 4, "sugary cream cheese" = 3)
+
+/obj/item/food/sliced/cheeseannonacake
+ name = "cheese annona cake slice"
+ desc = "Slice of pure cheestisfaction."
+ icon_state = "cheeseannonacake_slice"
+ trash = /obj/item/trash/plate
+ filling_color = "#FAF7AF"
+ tastes = list("cake" = 4, "sugary cream cheese" = 3)
+
+///empanadas by Soulster
+/obj/item/food/empanada
+ name = "empanada"
+ desc = "A meaty goodness"
+ icon_state = "empanada"
+ bitesize = 3
+ list_reagents = list("nutriment" = 3, "vitamin" = 2)
+
+///VIVA VENEZUELA CARAJO -EvoS
+/obj/item/food/arepa
+ name = "arepa"
+ desc = "Venezuelan flavor."
+ icon_state = "arepa"
+ bitesize = 4
+ list_reagents = list("nutriment" = 5, "vitamin" = 2)
+
+/obj/item/food/arepa/cheese
+ name = "cheese arepa"
+ desc = "Venezuelan flavor just with cheese."
+ icon_state = "arepa_cheese"
+ list_reagents = list("nutriment" = 5, "vitamin" = 5)
+
+/obj/item/food/arepa/ham
+ name = "ham arepa"
+ desc = "Venezuelan flavor just with ham."
+ icon_state = "ham_arepa"
+ list_reagents = list("nutriment" = 6, "vitamin" = 5)
+
+/obj/item/food/arepa/ham_cheese
+ name = "ham and cheese arepa"
+ desc = "Venezuelan flavor but with ham and cheese."
+ icon_state = "arepa_ham_cheese"
+ bitesize = 6
+ list_reagents = list("nutriment" = 8, "vitamin" = 6)
+
+/obj/item/food/arepa/plasma
+ name = "plasma arepa"
+ desc = "Venezuelan flavor taken to another level."
+ icon_state = "arepa_plasma"
+ bitesize = 6
+ list_reagents = list("nutriment" = 10, "vitamin" = 9)
+
+/obj/item/food/arepa/ghost
+ name = "ghost arepa"
+ desc = "deliciously spooky BOOOOOOOOO"
+ icon_state = "arepa_ghost"
+ bitesize = 3
+ list_reagents = list("nutriment" = 4, "vitamin" = 7, "ectoplasm" = 5)
+
+/obj/item/food/arepa/xeno
+ name = "xeno arepa"
+ desc = "Viscous, lumpy and smells horrible, but has everything a healthy body needs, even if you feel like throwing up."
+ icon_state = "xeno_arepa"
+ bitesize = 5
+ list_reagents = list("nutriment" = 5, "vitamin" = 4)
+
+/obj/item/food/arepa/spider
+ name = "spider arepa"
+ desc = "I think it's still moving... Ok, I swear it moved."
+ icon_state = "spider_arepa"
+ bitesize = 7
+ list_reagents = list("nutriment" = 7, "vitamin" = 6, "toxin" = 2, "charcoal" = 2)
+
+/obj/item/food/arepa/life
+ name = "holy arepa"
+ desc = "created by a mage in his moms house."
+ icon_state = "arepa_life"
+ bitesize = 3
+ list_reagents = list("nutriment" = 0, "vitamin" = 0, "strange_reagent" = 5)
+
+/obj/item/food/arepa/slime
+ name = "slime arepa"
+ desc = "A smooth arepa."
+ icon_state = "arepa_slime"
+ list_reagents = list("nutriment" = 5, "vitamin" = 5, "slimejelly" = 5)
+
+/obj/item/food/arepa/sweet
+ name = "sweet arepa"
+ desc = "A sweet and delicious arepa."
+ icon_state = "sweet_arepa"
+ bitesize = 5
+ list_reagents = list("nutriment" = 3, "vitamin" = 5, "slimejelly" = 10, "sugar" = 10)
+
+/obj/item/food/arepa/cheesier
+ name = "cheese arepa"
+ desc = "A lot of cheese with delicious arepa."
+ icon_state = "cheese_arepa"
+ bitesize = 10
+ list_reagents = list("nutriment" = 10, "vitamin" = 4)
+
+/obj/item/food/arepa/fruit
+ name = "fruit arepa"
+ desc = "A tropical arepa."
+ icon_state = "fruit_arepa"
+ bitesize = 5
+ list_reagents = list("nutriment" = 5, "vitamin" = 8, "banana" = 10)
+
+/obj/item/food/arepa/salmon
+ name = "arepa with salmon"
+ desc = "It's supposed to be tuna."
+ icon_state = "arepa_salmon"
+ bitesize = 5
+ list_reagents = list("nutriment" = 5, "vitamin" = 8)
+
+/obj/item/food/arepa/industrial
+ name = "industrial arepa"
+ desc = "Beep Boop VENEZUELA RISE UP Beep."
+ icon_state = "arepa_industrial"
+ bitesize = 7
+ list_reagents = list("nutriment" = 2, "vitamin" = 2, "oil" = 10, "iron" = 10, "synthanol" = 5)
+
+/obj/item/food/arepa/infernal
+ name = "arepa inferno"
+ desc = "You feel your nose burn with the smell of it."
+ icon_state = "arepa_infernal"
+ bitesize = 5
+ list_reagents = list("nutriment" = 3, "vitamin" = 3, "capsaicin" = 10, "condensedcapsaicin" = 7)
+
+/obj/item/food/arepa/ice
+ name = "iced arepa"
+ desc = "A solid ice cube with an arepa in it."
+ icon_state = "arepa_ice"
+ bitesize = 5
+ list_reagents = list("nutriment" = 3, "vitamin" = 3, "frostoil" = 25)
+
+/obj/item/food/arepa/plumphelmet
+ name = "dwarf arepa"
+ desc = "Armok itself created this arepa."
+ icon_state = "arepa_plumphelmet"
+ bitesize = 5
+ list_reagents = list("nutriment" = 9, "vitamin" = 5)
+
+/obj/item/food/arepa/magma
+ name = "magma arepa"
+ desc = "Arepa taken from lavaland itself."
+ icon_state = "arepa_magma"
+ bitesize = 6
+ list_reagents = list("nutriment" = 6, "vitamin" = 6, "capsaicin" = 20, "condensedcapsaicin" = 20) //666,el diablo
+
+// Cuy//
+/obj/item/food/cuy
+ name = "Cuy"
+ desc = "Wood grilled guinea pig served with potatoes and avocado slices"
+ icon_state = "cuy"
+ bitesize = 5
+ list_reagents = list("nutriment" = 2, "vitamin" = 1)
+ tastes = list("salty" = 1, "mousey" = 1)
+
+/obj/item/food/ensaladacactus
+ name = "Salad of Pickly Pear"
+ desc = "An salad everyday keeps you away from a doctor."
+ icon_state = "cactus_salad"
+ filling_color = "#89F834"
+ bitesize = 1
+ trash = /obj/item/trash/empty_plasticcup
+ list_reagents = list("nutriment" = 3, "vitamin" = 8)
+ tastes = list("prickly pear" = 4, "cabbage and tomato" = 3)
+
+/obj/item/food/gigapuddi
+ name = "Giga Puddi"
+ desc = "A large crème caramel."
+ icon_state = "gigapuddi"
+ trash = /obj/item/trash/plate
+ list_reagents = list("nutriment" = 2, "vitamin" = 2)
+ tastes = list("japanese" = 4, "milk" = 3)
+ bitesize = 50
+
+/obj/item/food/gigapuddi/happy
+ desc = "A large crème caramel, made with extra love."
+ icon_state = "happypuddi"
+ list_reagents = list("nutriment" = 2, "vitamin" = 1, "milk" = 1, "love" = 1)
+ tastes = list("japanese" = 4, "milk" = 3, "love" = 2)
+
+/obj/item/food/gigapuddi/anger
+ desc = "A large crème caramel, made with extra hate."
+ icon_state = "angerpuddi"
+ list_reagents = list("nutriment" = 2, "vitamin" = 1, "milk" = 1, "hate" = 1)
+ tastes = list("japanese" = 4, "milk" = 3, "hate" = 2)
+
+/obj/item/food/caribean_paradise
+ name = "Caribean Paradise"
+ icon_state = "caribean_paradise"
+ bitesize = 3
+ desc = "Half coconut stuffed with mango"
+ trash = /obj/item/food/sliced/coconut
+ filling_color = "#E37F0E"
+ list_reagents = list("nutriment" = 3, "sugar" = 2, "vitamin" = 4)
+ tastes = list("mango" = 1)
+
+/obj/item/food/mushrooms_curry
+ name = "Mushroom Curry"
+ icon_state = "mushrooms_curry"
+ bitesize = 5
+ desc = "A slight twist to the traditional recipe, rare but delicious"
+ list_reagents = list("nutriment" = 5, "vitamin" = 4)
+
+/obj/item/food/garlic_snack
+ name = "Garlic Dip Dish"
+ icon_state = "garlic_snack"
+ bitesize = 5
+ desc = "A fresh garlic-avocado mix"
+ filling_color = "#E6EBD1"
+ list_reagents = list("nutriment" = 4, "vitamin" = 4)
+
+/obj/item/food/avocadosandwich
+ name = "Avocado Sandwich"
+ desc = "Made of avocado and lots of mayonnaise."
+ icon_state = "avocado_sandwich"
+ filling_color = "#fff98f"
+ list_reagents = list("nutriment" = 6, "vitamin" = 6, "mayonnaise" = 5)
+ tastes = list("bread" = 1, "avocado" = 2)
+
+/obj/item/food/salmoncreamtoast
+ name = "Salmon Cream Cheese Toast"
+ desc = "Bite size toast with salmon and thick cream cheese"
+ icon_state = "scc_toast"
+ filling_color = "#ff8c69"
+ bitesize = 3
+ list_reagents = list("nutriment" = 6, "vitamin" = 6, "cream_cheese" = 5)
+ tastes = list("bread" = 1, "avocado" = 2)
+
+/obj/item/food/soup/macacosoup
+ name = "Macaco Soup"
+ desc = "Uma delicia"
+ icon_state = "macacosoup"
+ list_reagents = list("nutriment" = 7, "vitamin" = 2)
+
+/obj/item/food/soup/furamingosoup
+ name = "Furamingo Soup"
+ desc = "Black, white, pink or blue"
+ icon_state = "furamingosoup"
+ list_reagents = list("nutriment" = 7, "vitamin" = 2)
+
+/obj/item/food/salmoncurry
+ name = "Salmon Curry"
+ desc = "it uses a combination of spices and herbs to create a tasty meal"
+ icon_state = "carpcurry"
+ trash = /obj/item/trash/snack_bowl
+ bitesize = 4
+ list_reagents = list("nutriment" = 3, "vitamin" = 2, "blackpepper" = 1, "capsaicin" = 1)
+ tastes = list("spicy" = 1, "salmon" = 1, "milk" = 1)
+
+// ---------- END of imports from Hispania!
diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm
index d5f3cd6eb3d..ab64e4025ca 100644
--- a/code/modules/food_and_drinks/food/foods/ingredients.dm
+++ b/code/modules/food_and_drinks/food/foods/ingredients.dm
@@ -188,6 +188,11 @@
list_reagents = list("nutriment" = 6)
tastes = list("dough" = 1)
+/obj/item/food/dough/corn
+ name = "maize dough"
+ desc = "Perfect for making arepas, usable in place of wheat dough."
+ color = "#FFEE99"
+
// Dough + rolling pin = flat dough
/obj/item/food/dough/item_interaction(mob/living/user, obj/item/used, list/modifiers)
if(!istype(used, /obj/item/kitchen/rollingpin))
diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm
index f9285b4329b..68602d3b3fa 100644
--- a/code/modules/food_and_drinks/food/foods/meat.dm
+++ b/code/modules/food_and_drinks/food/foods/meat.dm
@@ -696,3 +696,69 @@
filling_color = "#FF1C1C"
bitesize = 3
goal_difficulty = FOOD_GOAL_NORMAL
+
+////////////////////////
+// Hispania! //
+////////////////////////
+
+/obj/item/food/rawmouse
+ name = "raw mouse"
+ desc = "A raw mouse, what did you expect? Disgusting!"
+ icon_state = "raw_mouse"
+ filling_color = "#FF1C1C"
+ list_reagents = list("protein" = 3)
+ tastes = list("nasty" = 1)
+
+/obj/item/food/peach_meat
+ name = "Steak in Peach Sauce"
+ desc = "A good steak dipped in peach sauce with an avocado base."
+ icon_state = "peach_meat"
+ trash = /obj/item/trash/plate
+ bitesize = 3
+ list_reagents = list("nutriment" = 5, "protein" = 1, "vitamin" = 1)
+ tastes = list("sweet" = 1, "beefy" = 1)
+
+/obj/item/food/baconrolled
+ name = "Avocado Bacon Rolls"
+ desc = "Rolls of bacon filled up with avocado!"
+ icon_state = "bacon_roll"
+ list_reagents = list("protein" = 1, "nutriment" = 2)
+ tastes = list("meat with vegetables" = 1)
+
+/obj/item/food/meatsteak_cactus
+ name = "cactus steak"
+ desc = "A piece of hot spicy meat. With some prickly pear cactus on top."
+ icon_state = "meatstake_cactus"
+ trash = /obj/item/trash/plate
+ filling_color = "#7A3D11"
+ bitesize = 3
+ list_reagents = list("nutriment" = 5, "vitamin" = 1)
+ tastes = list("meat" = 1, "cactus" = 1)
+
+/obj/item/food/syntisteak_cactus
+ name = "cactus synthisteak"
+ desc = "A synthetic slab of flesh. With some prickly pear cactus on top."
+ icon_state = "meatstake_cactus"
+ trash = /obj/item/trash/plate
+ filling_color = "#7A3D11"
+ bitesize = 3
+ list_reagents = list("nutriment" = 5, "vitamin" = 1)
+ tastes = list("meat" = 1, "cactus" = 1)
+
+/obj/item/food/filetmignon
+ name = "Filet Mignon"
+ desc = "Sirloin wrapped in bacon served with mushroom sauce"
+ icon_state = "filetmignon"
+ bitesize = 3
+ list_reagents = list("nutriment" = 5, "vitamin" = 1, "protein" = 1)
+ tastes = list("winey" = 1, "beefy" = 1)
+
+/obj/item/food/hotdog/butter
+ name = "butter dog"
+ desc = "Made of butter instead of real dogs."
+ icon_state = "butter_dog"
+ filling_color = "#fff98f"
+ list_reagents = list("nutriment" = 6, "vitamin" = 6, "butter" = 5)
+ tastes = list("bread" = 1)
+
+// ---------- END of imports from Hispania!
diff --git a/code/modules/food_and_drinks/food/foods/seafood.dm b/code/modules/food_and_drinks/food/foods/seafood.dm
index 7522a5f3256..677baa637dc 100644
--- a/code/modules/food_and_drinks/food/foods/seafood.dm
+++ b/code/modules/food_and_drinks/food/foods/seafood.dm
@@ -387,3 +387,39 @@
list_reagents = list("protein" = 5)
tastes = list("fish" = 2, "high society" = 1)
materials = list(MAT_METAL = 100)
+
+////////////////////////
+// Hispania! //
+////////////////////////
+
+/obj/item/food/smokedsalmon
+ name = "smoked salmon steak"
+ desc = "A fillet of freshly-grilled and smoked salmon meat."
+ icon_state = "smokedsalmon"
+ trash = /obj/item/trash/plate
+ filling_color = "#7A3D11"
+ bitesize = 4
+ list_reagents = list("nutriment" = 5, "vitamin" = 1, "sodiumchloride" = 1)
+ tastes = list("smoked salmon" = 1)
+
+/obj/item/food/avocadosalmon
+ name = "avocado salmon"
+ desc = "A fillet of freshly-grilled of salmon meat with avocado."
+ icon_state = "salmonavocado"
+ trash = /obj/item/trash/plate
+ filling_color = "#7A3D11"
+ bitesize = 4
+ list_reagents = list("nutriment" = 3, "vitamin" = 3, "sodiumchloride" = 1, "protein" = 1)
+ tastes = list("meat with vegetables" = 1)
+
+/obj/item/food/citrussalmon
+ name = "grilled citrus salmon"
+ desc = "A fillet of freshly-grilled of salmon meat with some citrus fruits."
+ icon_state = "citrussalmon"
+ trash = /obj/item/trash/plate
+ filling_color = "#7A3D11"
+ bitesize = 4
+ list_reagents = list("nutriment" = 3, "vitamin" = 3, "orangejuice" = 2, "lemonjuice" = 2)
+ tastes = list("salmon" = 1, "citrus" = 1)
+
+// ---------- END of imports from Hispania!
diff --git a/code/modules/food_and_drinks/food/foods/soups.dm b/code/modules/food_and_drinks/food/foods/soups.dm
index 821884b7f57..1d2a8791335 100644
--- a/code/modules/food_and_drinks/food/foods/soups.dm
+++ b/code/modules/food_and_drinks/food/foods/soups.dm
@@ -319,7 +319,6 @@
tastes = list("tomato" = 1, "mint" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
-
/obj/item/food/soup/clownchili
name = "chili con carnival"
desc = "A delicious stew of meat, chiles, and salty, salty clown tears."
@@ -328,3 +327,31 @@
list_reagents = list("nutriment" = 5, "tomatojuice" = 2, "protein" = 2)
tastes = list("tomato" = 1, "chili" = 1, "meat" = 1, "sad clowns" = 4)
goal_difficulty = FOOD_GOAL_EXCESSIVE
+
+////////////////////////
+// Hispania! //
+////////////////////////
+
+/obj/item/food/soup/garlic
+ name = "Garlic Soup"
+ desc = "A garlic soup with an egg on top."
+ icon_state = "garlic_soup"
+ bitesize = 4
+ list_reagents = list("nutriment" = 6, "vitamin" = 3)
+
+/obj/item/food/soup/elfs_poison
+ name = "Elf's poison"
+ icon_state = "elfs_poison"
+ bitesize = 4
+ desc = "Ugh it looks nasty..."
+ list_reagents = list("nutriment" = 6, "amanitin" = 6, "psilocybin" = 3)
+
+/obj/item/food/soup/fishconsome
+ name = "Fish Consome"
+ desc = "A warm consome with tasty fish meat."
+ icon_state = "carpconsomme"
+ bitesize = 4
+ list_reagents = list("nutriment" = 3, "vitamin" = 2, "blackpepper" = 1)
+ tastes = list("mexico" = 1, "salmon" = 1, "potato" = 1)
+
+// ---------- END of imports from Hispania!
diff --git a/code/modules/hydroponics/grown/agave.dm b/code/modules/hydroponics/grown/agave.dm
new file mode 100644
index 00000000000..d30cf9cdede
--- /dev/null
+++ b/code/modules/hydroponics/grown/agave.dm
@@ -0,0 +1,25 @@
+// From Hispania!
+//Semilla
+/obj/item/seeds/agave
+ name = "pack of agave"
+ desc = "These seeds grow into agave, used to create tequila."
+ icon_state = "agave-seed"
+ species = "agave"
+ plantname = "Agave Bush"
+ product = /obj/item/food/grown/agave
+ lifespan = 30
+ endurance = 40
+ yield = 5
+ potency = 30
+ maturation = 5
+ growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
+
+//Fruta
+/obj/item/food/grown/agave
+ seed = /obj/item/seeds/agave
+ name = "agave"
+ desc = "Used to create tequila."
+ icon_state = "agave"
+ wine_power = 0.5
+ tastes = list("bland" = 1)
+ distill_reagent = "tequila"
diff --git a/code/modules/hydroponics/grown/annona.dm b/code/modules/hydroponics/grown/annona.dm
new file mode 100644
index 00000000000..54894849a9f
--- /dev/null
+++ b/code/modules/hydroponics/grown/annona.dm
@@ -0,0 +1,44 @@
+// From Hispania!
+//Semillas
+/obj/item/seeds/annona
+ name = "pack of annona seeds"
+ desc = "These seeds grow intoan annona plant."
+ icon_state = "annona-seeds"
+ species = "annona"
+ plantname = "Annona Tree"
+ product = /obj/item/food/grown/annona
+ maturation = 8
+ potency = 50
+ yield = 5
+ potency = 40
+ maturation = 4
+ growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
+ genes = list(/datum/plant_gene/trait/repeated_harvest)
+ mutatelist = list(/obj/item/seeds/annona/annona_reticulata)
+ reagents_add = list("vitamin" = 0.08, "plantmatter" = 0.2)
+
+/obj/item/seeds/annona/annona_reticulata
+ name = "pack of annona reticulata"
+ desc = "These seeds grow into an annona reticulata plant, the edgy sister of the annona."
+ icon_state = "annonareticulata-seeds"
+ species = "annonar"
+ plantname = "Annona Reticulata Tree"
+ product = /obj/item/food/grown/annona/reticulata
+ mutatelist = list()
+ reagents_add = list("mutagen" = 0.05)
+ rarity = 40
+
+//Fruta
+/obj/item/food/grown/annona
+ seed = /obj/item/seeds/annona
+ name = "annona"
+ desc = "Annona species are taprooted, evergreen or semideciduous, tropical trees or shrubs."
+ icon_state = "annona"
+ tastes = list("sugary" = 1)
+
+/obj/item/food/grown/annona/reticulata
+ seed = /obj/item/seeds/annona/annona_reticulata
+ name = "annona reticulata"
+ desc = "The edgy sister of the annona."
+ icon_state = "annonareticulata"
+ tastes = list("sugary" = 1, "edgy" = 1)
diff --git a/code/modules/hydroponics/grown/avocado.dm b/code/modules/hydroponics/grown/avocado.dm
new file mode 100644
index 00000000000..e721abbf592
--- /dev/null
+++ b/code/modules/hydroponics/grown/avocado.dm
@@ -0,0 +1,102 @@
+// From Hispania!
+/obj/item/seeds/avocado
+ name = "pack of avocado seeds"
+ desc = "These seeds grow into avocado trees. Watery."
+ icon_state = "seed-avocado"
+ species = "avocado"
+ plantname = "Avocado Tree"
+ product = /obj/item/food/grown/avocado
+ lifespan = 50
+ endurance = 35
+ production = 5
+ potency = 30
+ growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
+ icon_grow = "avocado-grow"
+ icon_dead = "avocado-dead"
+ mutatelist = list(/obj/item/seeds/avocado/aircado, /obj/item/seeds/avocado/firecado, /obj/item/seeds/avocado/earthcado)
+ genes = list(/datum/plant_gene/trait/repeated_harvest)
+ reagents_add = list("water" = 0.05, "vitamin" = 0.05, "plantmatter" = 0.1)
+
+/obj/item/food/grown/avocado
+ seed = /obj/item/seeds/avocado
+ name = "avocado"
+ desc = "An unusually fatty fruit containing a single large seed."
+ icon_state = "avocado"
+ slice_path = /obj/item/food/sliced/avocado
+ slices_num = 2
+
+/obj/item/food/sliced/avocado
+ name = "avocado slice"
+ desc = "A slice of green goodness."
+ icon = 'icons/obj/hydroponics/harvest.dmi'
+ icon_state = "avocado_cut"
+ list_reagents = list("vitamin" = 1)
+
+/obj/item/seeds/avocado/aircado
+ name = "pack of aircado seeds"
+ desc = "These seeds grow into aircado trees. Airy."
+ icon_state = "seed-aircado"
+ species = "aircado"
+ plantname = "Aircado Tree"
+ product = /obj/item/food/grown/avocado/aircado
+ mutatelist = list(/obj/item/seeds/avocado, /obj/item/seeds/avocado/firecado, /obj/item/seeds/avocado/earthcado)
+ reagents_add = list("oxygen" = 0.05)
+ rarity = 20
+
+/obj/item/seeds/avocado/firecado
+ name = "pack of firecado seeds"
+ desc = "These seeds grow into firecado trees. Fiery."
+ icon_state = "seed-firecado"
+ species = "firecado"
+ plantname = "Firecado Tree"
+ product = /obj/item/food/grown/avocado/firecado
+ mutatelist = list(/obj/item/seeds/avocado, /obj/item/seeds/avocado/aircado, /obj/item/seeds/avocado/earthcado)
+ reagents_add = list("oil" = 0.05, "plantmatter" = 0.1)
+ rarity = 20
+
+/obj/item/seeds/avocado/earthcado
+ name = "pack of earthcado seeds"
+ desc = "These seeds grow into earthcado trees. Earthy."
+ icon_state = "seed-earthcado"
+ species = "earthcado"
+ plantname = "Earthcado Tree"
+ product = /obj/item/food/grown/avocado/earthcado
+ mutatelist = list(/obj/item/seeds/avocado, /obj/item/seeds/avocado/firecado, /obj/item/seeds/avocado/aircado)
+ reagents_add = list("carbon" = 0.05, "plantmatter" = 0.1)
+ rarity = 20
+
+/obj/item/food/grown/avocado/aircado
+ seed = /obj/item/seeds/avocado/aircado
+ name = "aircado"
+ desc = "An unusually airy fruit containing a single large seed."
+ icon_state = "aircado"
+ slice_path = /obj/item/food/sliced/avocado/aircado
+
+/obj/item/food/grown/avocado/firecado
+ seed = /obj/item/seeds/avocado/firecado
+ name = "firecado"
+ desc = "An unusually fiery fruit containing a single large seed."
+ icon_state = "firecado"
+ slice_path = /obj/item/food/sliced/avocado/firecado
+
+/obj/item/food/grown/avocado/earthcado
+ seed = /obj/item/seeds/avocado/earthcado
+ name = "earthcado"
+ desc = "An unusually earthy fruit containing a single large seed."
+ icon_state = "earthcado"
+ slice_path = /obj/item/food/sliced/avocado/earthcado
+
+/obj/item/food/sliced/avocado/aircado
+ name = "aircado slice"
+ desc = "A slice of white goodness."
+ icon_state = "aircado_cut"
+
+/obj/item/food/sliced/avocado/firecado
+ name = "firecado slice"
+ desc = "A slice of red goodness."
+ icon_state = "firecado_cut"
+
+/obj/item/food/sliced/avocado/earthcado
+ name = "earthcado slice"
+ desc = "A slice of brown goodness."
+ icon_state = "earthcado_cut"
diff --git a/code/modules/hydroponics/grown/cactus.dm b/code/modules/hydroponics/grown/cactus.dm
new file mode 100644
index 00000000000..4c1f6682c4e
--- /dev/null
+++ b/code/modules/hydroponics/grown/cactus.dm
@@ -0,0 +1,66 @@
+// From Hispania!
+//Semillas
+/obj/item/seeds/prickly_pear
+ name = "pack of prickly pear cactus"
+ desc = "These seeds will grow into a prickly pear cactus, its fruit can be eaten."
+ icon_state = "pricklypearlcactus-seed"
+ species = "prickly"
+ plantname = "Prickly Cactus"
+ product = /obj/item/food/grown/prickly_pear
+ lifespan = 60
+ endurance = 25
+ yield = 6
+ potency = 35
+ maturation = 4
+ growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
+ genes = list(/datum/plant_gene/trait/repeated_harvest)
+ mutatelist = list(/obj/item/seeds/prickly_pear/san_pedro)
+ reagents_add = list("nutriment" = 0.08)
+
+/obj/item/seeds/prickly_pear/san_pedro
+ name = "pack of san pedro cactus"
+ desc = "These seeds will grow into a San Pedro cactus."
+ icon_state = "sanpedrocactus-seed"
+ species = "pedro"
+ plantname = "San Pedro Cactus"
+ product = /obj/item/food/grown/prickly_pear/san_pedro
+ mutatelist = list(/obj/item/seeds/prickly_pear/san_pedro/peyote)
+ reagents_add = list("nutriment" = 0.06, "sugar" = 0.02, "lsd" = 0.02)
+
+/obj/item/seeds/prickly_pear/san_pedro/peyote
+ name = "pack of peyote"
+ desc = "These seeds grow into a useless decorative peyote cactus."
+ icon_state = "peyote-seed"
+ species = "peyote"
+ plantname = "Peyote Cactus"
+ product = /obj/item/food/grown/prickly_pear/san_pedro/peyote
+ mutatelist = list()
+ reagents_add = list("lsd" = 1)
+
+//Fruta
+/obj/item/food/grown/prickly_pear
+ seed = /obj/item/seeds/prickly_pear
+ name = "prickly pear"
+ desc = "The red fruit or pear of this cactus are also known as tuna."
+ icon_state = "pricklypearlcactus"
+ tastes = list("sweet" = 1, "bland" = 1)
+
+/obj/item/food/grown/prickly_pear/san_pedro
+ seed = /obj/item/seeds/prickly_pear/san_pedro
+ name = "san pedro cactus"
+ desc = "A cactus from the Earth Andes mountains. Medicinal, ornamental, symbolic of life for the indigenous people."
+ icon_state = "sanpedrocactus"
+ force = 7
+ throwforce = 7
+ w_class = WEIGHT_CLASS_NORMAL
+ throw_speed = 4
+ throw_range = 5
+ attack_verb = list("hit", "sliced")
+ tastes = list("weird" = 1, "watery" = 1)
+
+/obj/item/food/grown/prickly_pear/san_pedro/peyote
+ seed = /obj/item/seeds/prickly_pear/san_pedro/peyote
+ name = "peyote"
+ desc = "Now I can see the future, the past and all that is true."
+ icon_state = "peyote"
+ tastes = list("fun" = 1)
diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm
index 78fca01338a..9afa46c99d8 100644
--- a/code/modules/hydroponics/grown/citrus.dm
+++ b/code/modules/hydroponics/grown/citrus.dm
@@ -1,7 +1,7 @@
// Citrus - base type
/obj/item/food/grown/citrus
seed = /obj/item/seeds/lime
- name = "citrus"
+ name = "citrus fruit"
desc = ABSTRACT_TYPE_DESC
icon_state = "lime"
bitesize_mod = 2
diff --git a/code/modules/hydroponics/grown/coconut.dm b/code/modules/hydroponics/grown/coconut.dm
new file mode 100644
index 00000000000..cf7f75b94af
--- /dev/null
+++ b/code/modules/hydroponics/grown/coconut.dm
@@ -0,0 +1,129 @@
+// From Hispania!
+//These are the seeds
+/obj/item/seeds/coconut
+ name = "pack of coconut seeds"
+ desc = "These seeds grow into coconut palms."
+ icon_state = "coconut-seeds"
+ species = "coco"
+ plantname = "Coconut Palm"
+ product = /obj/item/food/grown/coconut
+ lifespan = 55
+ endurance = 35
+ yield = 5
+ growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
+ genes = list(/datum/plant_gene/trait/repeated_harvest)
+ mutatelist = list(/obj/item/seeds/coconut/bombonut)
+ reagents_add = list("coconutwater" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1, "sugar" = 0.01)
+
+//When it grows
+/obj/item/food/grown/coconut
+ seed = /obj/item/seeds/coconut
+ name = "coconut"
+ desc = "A seed? A nut? A fruit?"
+ icon_state = "coconut-bet"
+ force = 5
+ throwforce = 5
+ w_class = WEIGHT_CLASS_NORMAL
+ throw_range = 3
+ attack_verb = list("hit", "bludgeoned", "whacked")
+ slice_path = /obj/item/food/sliced/coconut
+ slices_num = 2
+
+// We need the food class for the slicing mechanics but I'm sorry, you can't just eat a coconut by biting into it
+/obj/item/food/grown/coconut/interact_with_atom(atom/target, mob/living/user, list/modifiers)
+ if(user.a_intent == INTENT_HARM && force)
+ return NONE
+
+ user.changeNext_move(CLICK_CD_MELEE)
+ if(iscarbon(target))
+ to_chat(user, SPAN_NOTICE("[src] is too hard to bite into!"))
+ return ITEM_INTERACT_COMPLETE
+
+ return NONE
+
+//Here's the drink
+/obj/item/food/sliced/coconut
+ name = "coconut half"
+ desc = "Full of juice"
+ icon = 'icons/obj/hydroponics/harvest.dmi'
+ icon_state = "coconut-slice"
+ filling_color = "#FF4500"
+ list_reagents = list("coconutwater" = 1)
+
+//BOMBONUT HERE//
+
+/obj/item/seeds/coconut/bombonut
+ name = "pack of bombonut seeds"
+ desc = "These seeds grow bombonuts, the explosively refreshing cousin of the coconut"
+ icon_state = "bombonut-seeds"
+ species = "bombo"
+ plantname = "Bombonout Palm"
+ mutatelist = list()
+ product = /obj/item/grown/bombonut
+ lifespan = 35
+ potency = 30
+ genes = list(/datum/plant_gene/trait/repeated_harvest)
+ reagents_add = list("plantmatter" = 0.1, "sorium" = 0.7)
+
+/obj/item/grown/bombonut
+ seed = /obj/item/seeds/coconut/bombonut
+ name = "bombonut"
+ desc = "The explosive variety of coconuts."
+ icon_state = "bombonut"
+ seed = /obj/item/seeds/coconut/bombonut
+
+/obj/item/grown/bombonut/activate_self(mob/living/user)
+ if(..())
+ return ITEM_INTERACT_COMPLETE
+
+ var/area/A = get_area(user)
+ user.visible_message(
+ SPAN_WARNING("[user] primes the [src]!"),
+ SPAN_USERDANGER("You prime the [src]!")
+ )
+ var/message = "[ADMIN_LOOKUPFLW(user)] primed a bombonut for detonation at [A] [ADMIN_COORDJMP(user)]"
+ investigate_log("[key_name(user)] primed a bombonut for detonation at [A] [COORD(user)].", INVESTIGATE_BOMB)
+ message_admins(message)
+ log_game("[key_name(user)] primed a bombonut for detonation at [A] [COORD(user)].")
+ if(iscarbon(user))
+ var/mob/living/carbon/C = user
+ C.throw_mode_on()
+ playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/grown/bombonut, prime)), rand(1 SECONDS, 6 SECONDS))
+ return ITEM_INTERACT_COMPLETE
+
+
+/obj/item/grown/bombonut/burn()
+ prime()
+ ..()
+
+/obj/item/grown/bombonut/proc/update_mob()
+ if(ismob(loc))
+ var/mob/M = loc
+ M.drop_item_to_ground(src)
+
+/obj/item/grown/bombonut/ex_act(severity)
+ qdel(src) // Ensuring that it's deleted by its own explosion.
+
+/obj/item/grown/bombonut/proc/prime()
+ switch(seed.potency) //Bombonaut are alot like IEDs, lots of flame, very little bang.
+ if(0 to 30)
+ update_mob()
+ explosion(loc,-1,-1,2, flame_range = 1)
+ qdel(src)
+ if(31 to 50)
+ update_mob()
+ explosion(loc,-1,-1,2, flame_range = 2)
+ qdel(src)
+ if(51 to 70)
+ update_mob()
+ explosion(loc,-1,-1,2, flame_range = 3)
+ qdel(src)
+ if(71 to 90)
+ update_mob()
+ explosion(loc,-1,-1,2, flame_range = 4)
+ qdel(src)
+ else
+ update_mob()
+ explosion(loc,-1,-1,2, flame_range = 5)
+ qdel(src)
diff --git a/code/modules/hydroponics/grown/kiwi.dm b/code/modules/hydroponics/grown/kiwi.dm
new file mode 100644
index 00000000000..c8eb3ddaabd
--- /dev/null
+++ b/code/modules/hydroponics/grown/kiwi.dm
@@ -0,0 +1,27 @@
+//Semillas
+/obj/item/seeds/kiwi
+ name = "pack of kiwi seeds"
+ desc = "These seeds grow into kiwi bushes"
+ icon_state = "kiwi-seeds"
+ species = "kiwi"
+ plantname = "Kiwi Tree"
+ product = /obj/item/food/grown/kiwi
+ lifespan = 20
+ production = 5
+ yield = 2
+ weed_chance = 15
+ maturation = 4
+ potency = 30
+ genes = list(/datum/plant_gene/trait/repeated_harvest)
+ // mutatelist = list(/obj/item/seeds/kiwi/actual_kiwi) do later, converting simple animal to basic mob
+ growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
+ reagents_add = list("sugar" = 0.12)
+
+//Frutas
+
+/obj/item/food/grown/kiwi
+ seed = /obj/item/seeds/kiwi
+ name = "kiwi"
+ desc = "Is a fruit of ovoid shape, of variable size and covered with a brown fuzzy thin skin"
+ icon_state = "kiwi"
+ tastes = list("sour" = 1, "sweet" = 1)
diff --git a/code/modules/hydroponics/grown/mango.dm b/code/modules/hydroponics/grown/mango.dm
new file mode 100644
index 00000000000..b857d19aa21
--- /dev/null
+++ b/code/modules/hydroponics/grown/mango.dm
@@ -0,0 +1,26 @@
+// From Hispania!
+//These are the seeds
+/obj/item/seeds/mango
+ name = "pack of mango"
+ desc = "These seeds grow into a miniature mango tree."
+ icon_state = "mango-seed"
+ species = "mango"
+ plantname = "Mango Tree"
+ product = /obj/item/food/grown/mango
+ lifespan = 20
+ maturation = 5
+ production = 3
+ yield = 2
+ potency = 30
+ weed_chance = 15
+ maturation = 7
+ growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
+ genes = list(/datum/plant_gene/trait/repeated_harvest)
+ reagents_add = list("sugar" = 0.12)
+
+/obj/item/food/grown/mango
+ seed = /obj/item/seeds/mango
+ name = "mango"
+ desc = "It has an ovoid shape, non-edible rind and variable colour, from of pale yellow to dark red."
+ icon_state = "mango"
+ tastes = list("sweet" = 1, "juicy"=1)
diff --git a/code/modules/hydroponics/grown/mate.dm b/code/modules/hydroponics/grown/mate.dm
new file mode 100644
index 00000000000..75932b9edb9
--- /dev/null
+++ b/code/modules/hydroponics/grown/mate.dm
@@ -0,0 +1,23 @@
+// From Hispania!
+//These are the seeds
+/obj/item/seeds/mate
+ name = "pack of mate"
+ desc = "These seeds will grow into a mate plant, famous for its bitter herbal tea."
+ icon_state = "mate-seed"
+ species = "mate"
+ plantname = "Mate Bush"
+ product = /obj/item/food/grown/mate
+ lifespan = 55
+ endurance = 35
+ yield = 5
+ potency = 30
+ maturation = 4
+ growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
+ reagents_add = list("mate" = 0.2,)
+
+/obj/item/food/grown/mate
+ seed = /obj/item/seeds/mate
+ name = "mate"
+ desc = "It has a very earthy smell."
+ icon_state = "mate"
+ tastes = list("bitterness" = 1 , "earthiness" = 1)
diff --git a/code/modules/hydroponics/grown/nispero.dm b/code/modules/hydroponics/grown/nispero.dm
new file mode 100644
index 00000000000..17620dc651d
--- /dev/null
+++ b/code/modules/hydroponics/grown/nispero.dm
@@ -0,0 +1,24 @@
+// From Hispania!
+//These are the seeds
+/obj/item/seeds/nispero
+ name = "pack of nispero"
+ desc = "These seeds will grow into a small n�spero tree, a small sour-sweet fruit that can also be used to make an alcoholic beverage"
+ icon_state = "nispero-seed"
+ species = "nispero"
+ plantname = "Nispero Tree"
+ product = /obj/item/food/grown/nispero
+ lifespan = 20
+ endurance = 25
+ yield = 9
+ potency = 25
+ maturation = 5
+ growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
+ genes = list(/datum/plant_gene/trait/repeated_harvest)
+ reagents_add = list("vitamin" = 0.06)
+
+/obj/item/food/grown/nispero
+ seed = /obj/item/seeds/nispero
+ name = "nispero"
+ desc = "A small sour-sweet fruit that can also be used to make an alcoholic beverage"
+ icon_state = "nispero"
+ tastes = list("sour" = 1, "sweet" = 1)
diff --git a/code/modules/hydroponics/grown/peach.dm b/code/modules/hydroponics/grown/peach.dm
new file mode 100644
index 00000000000..a6d69752e24
--- /dev/null
+++ b/code/modules/hydroponics/grown/peach.dm
@@ -0,0 +1,25 @@
+// From Hispania!
+//Semilla
+/obj/item/seeds/peach
+ name = "pack of peach"
+ desc = "These seeds grow into thicc juicy bouncy peaches."
+ icon_state = "peach-seed"
+ species = "peach"
+ plantname = "Peach Tree"
+ product = /obj/item/food/grown/peach
+ lifespan = 20
+ endurance = 25
+ yield = 9
+ potency = 45
+ maturation = 4
+ weed_chance = 45
+ growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
+ reagents_add = list("vitamin" = 0.06)
+
+//Fruta
+/obj/item/food/grown/peach
+ seed = /obj/item/seeds/peach
+ name = "peach"
+ desc = "The peach is a round, coloured, juicy fruit, typically eaten in summer."
+ icon_state = "peach"
+ tastes = list("deliciously sweet" = 1)
diff --git a/code/modules/hydroponics/grown/pepper.dm b/code/modules/hydroponics/grown/pepper.dm
new file mode 100644
index 00000000000..87eb509af99
--- /dev/null
+++ b/code/modules/hydroponics/grown/pepper.dm
@@ -0,0 +1,24 @@
+// From Hispania!
+//Semilla
+/obj/item/seeds/bell_pepper
+ name = "pack of bell pepper"
+ desc = "These seeds grow into bell peppers."
+ icon_state = "bellpepper-seeds"
+ species = "bellp"
+ plantname = "Bell Pepper Tree"
+ product = /obj/item/food/grown/bell_pepper
+ endurance = 20
+ yield = 4
+ potency = 3
+ maturation = 3
+ weed_chance = 35
+ growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
+ reagents_add = list("nutriment" = 0.14, "sugar" = 0.12)
+
+//Fruta
+/obj/item/food/grown/bell_pepper
+ seed = /obj/item/seeds/bell_pepper
+ name = "bell pepper"
+ desc = "The bell pepper is the fruit of plants in the Grossum cultivar group of the species Capsicum annuum."
+ icon_state = "bellpepper"
+ tastes = list("fruity" = 1)
diff --git a/code/modules/hydroponics/grown/ricinus.dm b/code/modules/hydroponics/grown/ricinus.dm
new file mode 100644
index 00000000000..aa14aa0fcf5
--- /dev/null
+++ b/code/modules/hydroponics/grown/ricinus.dm
@@ -0,0 +1,25 @@
+// From Hispania!
+//Semilla
+/obj/item/seeds/ricinus
+ name = "pack of ricinus seeds"
+ desc = "These seeds will grow into a castor oil plant, used for extracting castor oil... And nothing else."
+ icon_state = "ricinus-seeds"
+ species = "ricinus"
+ plantname = "Ricinus Bush"
+ product = /obj/item/food/grown/ricinus
+ lifespan = 30
+ endurance = 25
+ yield = 5
+ potency = 37
+ maturation = 4
+ growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
+ genes = list(/datum/plant_gene/trait/repeated_harvest)
+ reagents_add = list("sugar" = 0.12)
+
+//Fruta
+/obj/item/food/grown/ricinus
+ seed = /obj/item/seeds/ricinus
+ name = "ricinus"
+ desc = "Ricinus communis, the castor bean or castor oil plant, is a species of perennial flowering plant"
+ icon_state = "ricinus"
+ tastes = list("beans" = 1)
diff --git a/code/modules/mob/living/basic/friendly/mouse.dm b/code/modules/mob/living/basic/friendly/mouse.dm
index 88cdf41c63c..d2dd4189d2e 100644
--- a/code/modules/mob/living/basic/friendly/mouse.dm
+++ b/code/modules/mob/living/basic/friendly/mouse.dm
@@ -12,7 +12,7 @@
see_in_dark = 6
maxHealth = 5
health = 5
- butcher_results = list(/obj/item/food/meat = 1)
+ butcher_results = list(/obj/item/food/rawmouse = 1)
response_help_continuous = "pets"
response_help_simple = "pet"
response_disarm_continuous = "gently pushes aside"
diff --git a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
index 532560a5619..d20d73d83e9 100644
--- a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
@@ -1391,3 +1391,122 @@
else
M.reagents.remove_reagent(R.id, 2)
return ..()
+
+// ----------- drinks from Hispania!
+
+/datum/reagent/consumable/drink/agavejuice
+ name = "Agave Juice"
+ id = "agave"
+ description = "Principal reagent to make tequila."
+ color = "#C9B25D"
+ drink_icon = "agave_juice"
+ drink_name = "Glass of Agave Juice"
+ drink_desc = "Principal reagent to make tequila, are you sure about this?"
+ taste_description = "bland"
+ metabolization_rate = 0.15 * REAGENTS_METABOLISM
+
+/datum/reagent/consumable/drink/annonajuice
+ name = "Annona Juice"
+ id = "annonajuice"
+ description = "Magic juice with a lovely taste."
+ color = "#C1AA8D"
+ drink_icon = "annona_juice"
+ drink_name = "Glass of Annona Juice"
+ drink_desc = "Magic juice with a lovely taste."
+ taste_description = "sugar"
+ metabolization_rate = 0.15 * REAGENTS_METABOLISM
+
+/datum/reagent/consumable/drink/kiwijuice
+ name = "Kiwi Juice"
+ id = "kiwijuice"
+ description = "For some reason, kinda tastes like feathers."
+ color = "#C5CA4C"
+ drink_icon = "kiwi_juice"
+ drink_name = "Glass of Kiwi Juice"
+ drink_desc = "For some reason, kinda tastes like feathers."
+ taste_description = "sour sweet"
+ metabolization_rate = 0.15 * REAGENTS_METABOLISM
+
+/datum/reagent/consumable/drink/mangojuice
+ name = "Mango Juice"
+ id = "mangojuice"
+ description = "Sweet and pulpy."
+ color = "#FF9903"
+ drink_icon = "glass_sunnyorange"
+ drink_name = "Glass of Mango Juice"
+ drink_desc = "Sweet and pulpy."
+ taste_description = "pulp"
+ metabolization_rate = 0.15 * REAGENTS_METABOLISM
+
+/datum/reagent/consumable/drink/tea/mate
+ name = "Mate"
+ id = "mate"
+ description = "A robustly bitter, earthy tea."
+ color = "#948870"
+ drink_icon = "mate"
+ drink_name = "Glass of Mate"
+ drink_desc = "A robustly bitter, earthy tea."
+ taste_description = "bitterness"
+ metabolization_rate = 0.15 * REAGENTS_METABOLISM
+
+/datum/reagent/consumable/drink/nisperojuice
+ name = "Nispero Juice"
+ id = "nisperojuice"
+ description = "Some of the weirdest juice you've seen in your life."
+ color = "#9B723C"
+ drink_icon = "nispero_juice"
+ drink_name = "Glass of Nispero Juice"
+ drink_desc = "Some of the weirdest juice you've seen in your life."
+ taste_description = "sour sweet"
+ metabolization_rate = 0.15 * REAGENTS_METABOLISM
+
+/datum/reagent/consumable/drink/peachjuice
+ name = "Peach Juice"
+ id = "peachjuice"
+ description = "Colorful, juicy fruit."
+ color = "#FFB5B6"
+ drink_name = "Glass of Peach Juice"
+ drink_desc = "Colorful, juicy fruit."
+ taste_description = "deliciously sweet"
+ metabolization_rate = 0.15 * REAGENTS_METABOLISM
+
+/datum/reagent/consumable/drink/castor
+ name = "Castor Oil"
+ id = "castor_oil"
+ description = "Smells like beans."
+ color = "#9D8F62"
+ drink_icon = "castor_oil"
+ drink_name = "Glass of Castor Oil"
+ drink_desc = "Smells like beans."
+ taste_description = "beans"
+ metabolization_rate = 0.15 * REAGENTS_METABOLISM
+
+/datum/reagent/consumable/drink/castor/on_mob_life(mob/living/carbon/M)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustBruteLoss(-2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
+
+/datum/reagent/consumable/drink/coconutwater
+ name = "Coconut Water"
+ id = "coconutwater"
+ description = "Diaphanous water with coconut bits floating inside."
+ color = "#C1AA8D"
+ drink_icon = "glass_white"
+ drink_name = "Glass of Coconut Water"
+ drink_desc = "Diaphanous water with coconut bits floating inside."
+ taste_description = "mildly sweet"
+ metabolization_rate = 0.15 * REAGENTS_METABOLISM
+
+/datum/reagent/consumable/drink/cactusjuice
+ name = "Prickly Pear Cactus Juice"
+ id = "cactusjuice"
+ description = "The lower tier of the avocado."
+ color = "#5BB615"
+ drink_icon = "cactus_juice"
+ drink_name = "Glass of Prickly Pear Cactus Juice"
+ drink_desc = "Wait what, cactus?"
+ taste_description = "bland water"
+ metabolization_rate = 0.15 * REAGENTS_METABOLISM
+
+// ----------- END of imports from Hispania!
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index cc9696833e0..1e0ddefb5e3 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -1047,3 +1047,52 @@
description = "Small, hard balls of dried tapioca powder."
color = "#DFDFDF" // rgb: 223, 223, 223
taste_description = "dry starchy pearls"
+
+// ----------- Reagents imported from Hispania!
+
+/datum/reagent/consumable/butter
+ name = "butter"
+ id = "butter"
+ description = "Delicious milk fat."
+ reagent_state = LIQUID
+ color = "#fff98f" // rgb: 255, 249, 143
+ nutriment_factor = 5 * REAGENTS_METABOLISM
+ taste_description = "butter"
+
+/datum/reagent/consumable/guacamole
+ name = "guacamole"
+ id = "guacamole"
+ description = "greenish pasta with a good fruit flavor"
+ reagent_state = LIQUID
+ color = "#32CD32"
+ nutriment_factor = 5 * REAGENTS_METABOLISM
+ taste_description = "avocado"
+
+/datum/reagent/consumable/discount_sauce
+ name = "discount sauce"
+ id = "discount_sauce"
+ description = "Nice and tasty sauce mixed with multiple kinds of stuff!"
+ reagent_state = LIQUID
+ color = "#f4fffab3" // rgb: 255, 254, 244
+ nutriment_factor = 5 * REAGENTS_METABOLISM
+ taste_description = "sweet iron"
+
+/datum/reagent/consumable/discount_sauce/on_mob_life(mob/living/M)
+ if(prob(25))
+ M.reagents.add_reagent("cholesterol", rand(1,3))
+ if(prob(20))
+ M.reagents.add_reagent("porktonium", 5)
+ if(prob(30))
+ M.reagents.add_reagent("omnizine", 5)
+ return ..()
+
+/datum/reagent/consumable/cream_cheese
+ name = "cream cheese"
+ id = "cream_cheese"
+ description = "Cheese but liquid"
+ reagent_state = LIQUID
+ color = "#f7f7f5"
+ nutriment_factor = 5 * REAGENTS_METABOLISM
+ taste_description = "sour"
+
+// ----------- END of recipe imports from Hispania!
diff --git a/code/modules/reagents/chemistry/recipes/food_reactions.dm b/code/modules/reagents/chemistry/recipes/food_reactions.dm
index 4ba62a51dff..b5112a054e5 100644
--- a/code/modules/reagents/chemistry/recipes/food_reactions.dm
+++ b/code/modules/reagents/chemistry/recipes/food_reactions.dm
@@ -271,3 +271,38 @@
var/location = get_turf(holder.my_atom)
for(var/i in 1 to created_volume)
new /obj/item/food/tapiocadough(location)
+
+// Corn dough for arepas and the like
+/datum/chemical_reaction/corndough
+ name = "Maize Dough"
+ id = "corndough"
+ result = null
+ required_reagents = list("water" = 10, "corn_starch" = 10)
+ result_amount = 1
+ mix_message = "The ingredients form a dough."
+
+/datum/chemical_reaction/corndough/on_reaction(datum/reagents/holder, created_volume)
+ var/location = get_turf(holder.my_atom)
+ for(var/i in 1 to created_volume)
+ new /obj/item/food/dough/corn(location)
+
+// ----------- Reagent recipes imported from Hispania!
+
+/datum/chemical_reaction/butter
+ name = "Butter"
+ id = "butter"
+ result = "butter"
+ required_reagents = list("cream" = 20, "sodiumchloride" = 1)
+ result_amount = 20
+ mix_message = "The butter whips into shape."
+
+/datum/chemical_reaction/cream_cheese
+ name = "Cream Cheese"
+ id = "cream_cheese"
+ result = "cream_cheese"
+ required_reagents = list("cream" = 15, "milk" = 15, "sodiumchloride" = 1)
+ required_catalysts = list("enzyme" = 5)
+ result_amount = 20
+ mix_message = "The cream combines into a smooth cheese."
+
+// ----------- END of recipe imports from Hispania!
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index bdcfb8f7ab7..36111dbc196 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/food/breakfast.dmi b/icons/obj/food/breakfast.dmi
index ae5aff5037e..00b91251b55 100644
Binary files a/icons/obj/food/breakfast.dmi and b/icons/obj/food/breakfast.dmi differ
diff --git a/icons/obj/food/burgerbread.dmi b/icons/obj/food/burgerbread.dmi
index a3a8675daaf..3c234ee246a 100644
Binary files a/icons/obj/food/burgerbread.dmi and b/icons/obj/food/burgerbread.dmi differ
diff --git a/icons/obj/food/candy.dmi b/icons/obj/food/candy.dmi
index 53cc0b59f4c..3b87df9b9d6 100644
Binary files a/icons/obj/food/candy.dmi and b/icons/obj/food/candy.dmi differ
diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi
index e70a01a9df8..4233c74b1bf 100644
Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index 5634b124bf4..fea1c7d3957 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi
index 5a16fcbaee2..d70536a7f6f 100644
Binary files a/icons/obj/food/soupsalad.dmi and b/icons/obj/food/soupsalad.dmi differ
diff --git a/icons/obj/hydroponics/growing_flowers.dmi b/icons/obj/hydroponics/growing_flowers.dmi
index 0d7ef56651a..30d1309f5c9 100644
Binary files a/icons/obj/hydroponics/growing_flowers.dmi and b/icons/obj/hydroponics/growing_flowers.dmi differ
diff --git a/icons/obj/hydroponics/growing_fruits.dmi b/icons/obj/hydroponics/growing_fruits.dmi
index f01bec11fce..d707a407395 100644
Binary files a/icons/obj/hydroponics/growing_fruits.dmi and b/icons/obj/hydroponics/growing_fruits.dmi differ
diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi
index bf82eaff6b1..ce84a8b7bf1 100644
Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ
diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi
index bf0ab047d89..b7e107a0ca2 100644
Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ
diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi
index 9a97393312f..23973f39e47 100644
Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ
diff --git a/paradise.dme b/paradise.dme
index c8d7929f5b7..a69e093519d 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -2407,17 +2407,22 @@
#include "code\modules\hydroponics\beekeeping\beekeeper_suit.dm"
#include "code\modules\hydroponics\beekeeping\honey_frame.dm"
#include "code\modules\hydroponics\beekeeping\honeycomb.dm"
+#include "code\modules\hydroponics\grown\agave.dm"
#include "code\modules\hydroponics\grown\ambrosia.dm"
+#include "code\modules\hydroponics\grown\annona.dm"
#include "code\modules\hydroponics\grown\apple.dm"
+#include "code\modules\hydroponics\grown\avocado.dm"
#include "code\modules\hydroponics\grown\banana.dm"
#include "code\modules\hydroponics\grown\beans.dm"
#include "code\modules\hydroponics\grown\berries.dm"
+#include "code\modules\hydroponics\grown\cactus.dm"
#include "code\modules\hydroponics\grown\cannabis.dm"
#include "code\modules\hydroponics\grown\cassava.dm"
#include "code\modules\hydroponics\grown\cereals.dm"
#include "code\modules\hydroponics\grown\chili.dm"
#include "code\modules\hydroponics\grown\citrus.dm"
#include "code\modules\hydroponics\grown\cocoa_vanilla.dm"
+#include "code\modules\hydroponics\grown\coconut.dm"
#include "code\modules\hydroponics\grown\corn.dm"
#include "code\modules\hydroponics\grown\cotton.dm"
#include "code\modules\hydroponics\grown\eggplant.dm"
@@ -2425,21 +2430,28 @@
#include "code\modules\hydroponics\grown\garlic.dm"
#include "code\modules\hydroponics\grown\grass_carpet.dm"
#include "code\modules\hydroponics\grown\herbals.dm"
+#include "code\modules\hydroponics\grown\kiwi.dm"
#include "code\modules\hydroponics\grown\kudzu.dm"
+#include "code\modules\hydroponics\grown\mango.dm"
+#include "code\modules\hydroponics\grown\mate.dm"
#include "code\modules\hydroponics\grown\melon.dm"
#include "code\modules\hydroponics\grown\misc_seeds.dm"
#include "code\modules\hydroponics\grown\mushrooms.dm"
#include "code\modules\hydroponics\grown\nettle.dm"
+#include "code\modules\hydroponics\grown\nispero.dm"
#include "code\modules\hydroponics\grown\nymph.dm"
#include "code\modules\hydroponics\grown\olive.dm"
#include "code\modules\hydroponics\grown\onion.dm"
+#include "code\modules\hydroponics\grown\peach.dm"
#include "code\modules\hydroponics\grown\peanut.dm"
+#include "code\modules\hydroponics\grown\pepper.dm"
#include "code\modules\hydroponics\grown\pineapple.dm"
#include "code\modules\hydroponics\grown\plum.dm"
#include "code\modules\hydroponics\grown\potato.dm"
#include "code\modules\hydroponics\grown\pumpkin.dm"
#include "code\modules\hydroponics\grown\random_seeds.dm"
#include "code\modules\hydroponics\grown\replicapod.dm"
+#include "code\modules\hydroponics\grown\ricinus.dm"
#include "code\modules\hydroponics\grown\root.dm"
#include "code\modules\hydroponics\grown\tea_coffee.dm"
#include "code\modules\hydroponics\grown\tobacco.dm"