Merge branch 'master' into new_drinks

ss220club · Jan 11, 2024 · c1a5c56 · c1a5c56
2 parents 7f1be27 + 2073ba4
commit c1a5c56
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/icons/_nanomaps/Cyberiad220_nanomap_z1.png b/icons/_nanomaps/Cyberiad220_nanomap_z1.png
diff --git a/modular_ss220/food/code/food.dm b/modular_ss220/food/code/food.dm
@@ -364,7 +364,7 @@
 	tastes = list("тесто" = 2, "собачатина" = 3)
 
 /datum/recipe/oven/vuplix
-	reagents = list("blackpepper" = 1, "sodiumchloride" = 1, "herbsmix" = 1, "tsauce" = 1, "cream" = 5)
+	reagents = list("blackpepper" = 1, "sodiumchloride" = 1, "herbsmix" = 1, "tomato_sauce" = 1, "cream" = 5)
 	items = list(
 		/obj/item/reagent_containers/food/snacks/dough,
 		/obj/item/reagent_containers/food/snacks/meat,
@@ -373,15 +373,15 @@
 
 // Cheese Vulpixes
 /obj/item/reagent_containers/food/snacks/vulpix/cheese
-	name = "сырные вульпыксы"
+	name = "сырные вульпиксы"
 	desc = "Аппетитно выглядящие мясные шарики в тесте с начинкой из сыра... Главное - не думать о том, из кого они сделаны!"
 	icon = 'modular_ss220/food/icons/food.dmi'
 	icon_state = "vulpix_cheese"
 	list_reagents = list("nutriment" = 4, "vitamin" = 2, "protein" = 4)
 	tastes = list("тесто" = 2, "собачатина" = 3, "сыр" = 2)
 
 /datum/recipe/oven/vulpixcheese
-	reagents = list("blackpepper" = 1, "sodiumchloride" = 1, "herbsmix" = 1, "csauce" = 1, "cream" = 5)
+	reagents = list("blackpepper" = 1, "sodiumchloride" = 1, "herbsmix" = 1, "cheesesauce" = 1, "cream" = 5)
 	items = list(
 		/obj/item/reagent_containers/food/snacks/dough,
 		/obj/item/reagent_containers/food/snacks/meat,
@@ -399,7 +399,7 @@
 	tastes = list("тесто" = 2, "собачатина" = 3, "бекон" = 2, "грибы" = 2)
 
 /datum/recipe/oven/vulpixbacon
-	reagents = list("blackpepper" = 1, "sodiumchloride" = 1, "herbsmix" = 1, "msauce" = 1, "cream" = 5)
+	reagents = list("blackpepper" = 1, "sodiumchloride" = 1, "herbsmix" = 1, "mushroomsauce" = 1, "cream" = 5)
 	items = list(
 		/obj/item/reagent_containers/food/snacks/dough,
 		/obj/item/reagent_containers/food/snacks/meat,
@@ -418,7 +418,7 @@
 	tastes = list("тесто" = 2, "собачатина" = 3, "чилли" = 2)
 
 /datum/recipe/oven/vulpixchilli
-	reagents = list("blackpepper" = 1, "sodiumchloride" = 1, "herbsmix" = 1, "dsauce" = 1, "cream" = 5)
+	reagents = list("blackpepper" = 1, "sodiumchloride" = 1, "herbsmix" = 1, "diablosauce" = 1, "cream" = 5)
 	items = list(
 		/obj/item/reagent_containers/food/snacks/dough,
 		/obj/item/reagent_containers/food/snacks/meat,