Merge remote-tracking branch 'citadel/master' into mobility_flags

code/modules/food_and_drinks/food/condiment.dm

@@ -310,7 +310,13 @@
 	originalname = "astrotame"
 	list_reagents = list(/datum/reagent/consumable/astrotame = 5)
 
+//Other Sauce
 /obj/item/reagent_containers/food/condiment/pack/bbqsauce
 	name = "bbq sauce pack"
 	originalname = "bbq sauce"
 	list_reagents = list(/datum/reagent/consumable/bbqsauce = 10)
+
+/obj/item/reagent_containers/food/condiment/pack/soysauce
+	name = "soy sauce pack"
+	originalname = "soy sauce"
+	list_reagents = list(/datum/reagent/consumable/soysauce = 10)

code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm

@@ -69,9 +69,9 @@
 /datum/crafting_recipe/food/birthdaycake
 	name = "Birthday cake"
 	reqs = list(
-		/datum/reagent/consumable/sugar = 10,
+		/datum/reagent/consumable/sugar = 5,
+		/datum/reagent/consumable/caramel =2,
 		/obj/item/candle = 1,
-		/obj/item/reagent_containers/food/snacks/grown/vanillapod = 2,
 		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/store/cake/birthday

code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm

@@ -481,6 +481,8 @@ datum/crafting_recipe/food/donut/meat
 		/obj/item/reagent_containers/food/snacks/grown/oat = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/oatmealcookie
+	subcategory = CAT_PASTRY
+
 
 /datum/crafting_recipe/food/raisincookie
 	name = "Raisin cookie"