diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index f5b62f0eeff..2f71a447b74 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -26,7 +26,8 @@ "blackpepper" = list("peppermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"), "cornoil" = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"), "wasabi" = list("wasabitube", "wasabi bottle", "A pungent paste commonly served in tiny amounts with sushi. Spicy!"), - "sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!")) + "sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"), + "vinegar" = list("vinegar", "vinegar", "Perfect for chips, if you're feeling Space British.")) var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters. /obj/item/reagent_containers/food/condiment/attack_self(mob/user) @@ -218,7 +219,7 @@ volume = 10 amount_per_transfer_from_this = 10 possible_transfer_amounts = null - possible_states = list("ketchup" = list("condi_ketchup", "Ketchup", "You feel more American already."), "capsaicin" = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"), "soysauce" = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring"), "frostoil" = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage"), "sodiumchloride" = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably"), "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!")) + possible_states = list("ketchup" = list("condi_ketchup", "Ketchup", "You feel more American already."), "capsaicin" = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"), "soysauce" = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring"), "frostoil" = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage"), "sodiumchloride" = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably"), "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.")) /obj/item/reagent_containers/food/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly. return diff --git a/code/modules/food_and_drinks/food/foods/ethnic.dm b/code/modules/food_and_drinks/food/foods/ethnic.dm index 4d7faf2c0a3..c3c678bfe6b 100644 --- a/code/modules/food_and_drinks/food/foods/ethnic.dm +++ b/code/modules/food_and_drinks/food/foods/ethnic.dm @@ -150,3 +150,12 @@ trash = /obj/item/stack/rods filling_color = "#FFFEE0" list_reagents = list("nutriment" = 8) + +/obj/item/reagent_containers/food/snacks/picoss_kabob + name = "picoss-kabob" + desc = "A popular Moghes streetfood consisting of vinegar-marinated space carp on a skewer with onion and chillis." + icon_state = "picoss_skewer" + trash = /obj/item/stack/rods + list_reagents = list("protein" = 8, "vitamin" = 4, "vinegar" = 1, "capsaicin" = 1) + filling_color = "#A85340" + tastes = list("fish" = 4, "acid" = 1, "onion" = 1, "heat" = 1) diff --git a/code/modules/food_and_drinks/recipes/recipes_grill.dm b/code/modules/food_and_drinks/recipes/recipes_grill.dm index d303c1919dc..a12287ee890 100644 --- a/code/modules/food_and_drinks/recipes/recipes_grill.dm +++ b/code/modules/food_and_drinks/recipes/recipes_grill.dm @@ -148,6 +148,17 @@ ) result = /obj/item/reagent_containers/food/snacks/tofukabob +/datum/recipe/grill/picoss_kabob + reagents = list("vinegar" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/carpmeat, + /obj/item/reagent_containers/food/snacks/carpmeat, + /obj/item/reagent_containers/food/snacks/grown/onion, + /obj/item/reagent_containers/food/snacks/grown/chili, + /obj/item/stack/rods + ) + result = /obj/item/reagent_containers/food/snacks/picoss_kabob + /datum/recipe/grill/sushi_Tamago reagents = list("sake" = 5) items = list( diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 59981e1e10f..f3d12f81308 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -1015,3 +1015,10 @@ reagent_state = LIQUID color = "#A7EE9F" taste_description = "mint" + +/datum/reagent/consumable/vinegar + name = "Vinegar" + id = "vinegar" + description = "Useful for pickling, or putting on chips." + taste_description = "vinegar" + color = "#ffffff" diff --git a/code/modules/reagents/chemistry/recipes/food_reactions.dm b/code/modules/reagents/chemistry/recipes/food_reactions.dm index 70f0cdbebe4..c04262e826a 100644 --- a/code/modules/reagents/chemistry/recipes/food_reactions.dm +++ b/code/modules/reagents/chemistry/recipes/food_reactions.dm @@ -217,3 +217,10 @@ min_temp = T0C + 480 mix_message = "The mixture emits a horrible smell as you heat up the contents. Luckily, enzymes don't stink." mix_sound = 'sound/goonstation/misc/fuse.ogg' + +/datum/chemical_reaction/vinegar + name = "Vinegar" + id = "vinegar" + result = "vinegar" + required_reagents = list("acetic_acid" = 1, "water" = 9) + result_amount = 10 diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi index 0405ee9e972..e61167bdabd 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 fc7e8a6166d..e0ac931b235 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ