mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-11 18:02:20 +00:00
* New foods, milkshakes, and a bugfix. * changed syrup colors * resolved weird merge conflict * Update code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * made requested changes * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/reagents/Chemistry-Recipes.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/cooking/recipes/cultural/recipes_human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * made requested changes * more corrections * updating again because it didn't take last time --------- Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>