From fddefa054e62be2e33563299d2598b3fb33c042e Mon Sep 17 00:00:00 2001 From: tomixcomics Date: Sun, 17 Mar 2024 23:55:12 +0200 Subject: [PATCH] Decrease food waste (Kitchens spawn with a few extra ingredients) (#18648) * first commit woo * added changelog * Update aurorastation.dme * Update code/game/objects/random/misc.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Signed-off-by: tomixcomics * Update code/modules/reagents/reagent_containers/food/condiment.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Signed-off-by: tomixcomics * Update code/game/objects/random/misc.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Signed-off-by: tomixcomics * Update code/modules/reagents/reagent_containers/food/condiment.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Signed-off-by: tomixcomics --------- Signed-off-by: tomixcomics Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> --- code/game/machinery/vending_types.dm | 1 + code/game/objects/random/misc.dm | 49 ++++++ .../crates_lockers/closets/secure/freezer.dm | 6 + .../modules/cooking/recipes/recipes_breads.dm | 1 + .../Chemistry-Reagents-Food-Drinks.dm | 32 ++-- code/modules/reagents/Chemistry-Recipes.dm | 96 ++++++------ .../reagent_containers/food/condiment.dm | 140 ++++++++++++++++++ .../reagent_containers/food/drinks.dm | 1 - .../reagent_containers/food/snacks/breads.dm | 12 +- .../food/snacks/cultural/tajara.dm | 4 +- .../reagent_containers/food/snacks/mix.dm | 2 +- .../food/snacks/pastries.dm | 22 +-- .../reagent_containers/glass/bottle.dm | 8 +- html/changelogs/TOMIXCOMICS-PR.yml | 46 ++++++ 14 files changed, 333 insertions(+), 87 deletions(-) create mode 100644 html/changelogs/TOMIXCOMICS-PR.yml diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index d8eacc65c04..2e0339ef1f0 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -125,6 +125,7 @@ /obj/item/reagent_containers/food/drinks/carton/cranberryjuice = 4, /obj/item/reagent_containers/food/drinks/carton/fatshouters = 2, /obj/item/reagent_containers/food/drinks/carton/mutthir = 2, + /obj/item/reagent_containers/food/drinks/boba = 2, /obj/item/reagent_containers/food/drinks/flask/barflask = 2, /obj/item/reagent_containers/food/drinks/flask/vacuumflask = 2, /obj/item/reagent_containers/food/drinks/ice = 9, diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 2399d2271b1..170ce732ffb 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -476,3 +476,52 @@ if(P in unwanted || ((P in rare) && prob(50))) P = null . = new P(loc) + +/obj/random/syrup + name = "random syrup" + desc = "Contains random bottles of flavored syrup." + problist = list( + /obj/item/reagent_containers/food/condiment/syrup_chocolate = 2, + /obj/item/reagent_containers/food/condiment/syrup_strawberry = 1, + /obj/item/reagent_containers/food/condiment/syrup_berry = 0.5, + /obj/item/reagent_containers/food/condiment/syrup_raspberry = 0.3, + /obj/item/reagent_containers/food/condiment/syrup_blueberry = 0.3, + /obj/item/reagent_containers/food/condiment/syrup_blue_raspberry = 0.3, + /obj/item/reagent_containers/food/condiment/syrup_ylphaberry = 0.3, + /obj/item/reagent_containers/food/condiment/syrup_caramel = 0.5, + /obj/item/reagent_containers/food/condiment/syrup_pumpkin = 0.3, + /obj/item/reagent_containers/food/condiment/syrup_vanilla = 0.5, + /obj/item/reagent_containers/food/condiment/syrup_dirtberry = 0.3 + ) + +/obj/random/condiment + name = "random condiments and sauces" + desc = "Contains random condiments for use in the kitchen." + spawn_nothing_percentage = 10 + problist = list( + /obj/item/reagent_containers/food/condiment/ketchup = 2, + /obj/item/reagent_containers/food/condiment/mayonnaise = 1.8, + /obj/item/reagent_containers/food/condiment/hot_sauce = 1.5, + /obj/random/syrup = 1.5, + /obj/item/reagent_containers/food/condiment/honey = 1, + /obj/item/reagent_containers/food/condiment/soysauce = 1, + /obj/item/reagent_containers/food/condiment/garlicsauce = 1, + /obj/item/reagent_containers/food/condiment/barbecue = 1, + /obj/item/reagent_containers/food/condiment/ntella = 1, + /obj/item/reagent_containers/food/condiment/peanut_butter = 1, + /obj/item/reagent_containers/food/condiment/cherry_jelly = 1, + /obj/item/reagent_containers/food/condiment/grape_jelly = 0.5 + ) + +/obj/random/kitchen_staples + name = "random kitchen staples" + desc = "Contains random ingredients that are handy in the kitchen" + spawn_nothing_percentage = 20 + problist = list( + /obj/item/reagent_containers/food/condiment/gelatin = 1, + /obj/item/reagent_containers/food/condiment/batter = 1, + /obj/item/reagent_containers/food/condiment/syrup_simple = 1, + /obj/item/reagent_containers/food/condiment/vanilla = 1, + /obj/item/reagent_containers/food/condiment/rice = 1, + /obj/item/reagent_containers/food/condiment/cocoa = 1 + ) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index dee9c85f3c4..70767bbc845 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -55,6 +55,12 @@ new /obj/item/reagent_containers/food/drinks/carton/soymilk(src) for(var/i = 0, i < 2, i++) new /obj/item/storage/box/fancy/egg_box(src) + for(var/i = 0, i < 1, i++) + new /obj/item/reagent_containers/food/snacks/spreads/butter(src) + for(var/i = 0, i < 4, i++) + new /obj/random/condiment(src) + for(var/i = 0, i < 2, i++) + new /obj/random/kitchen_staples(src) /obj/structure/closet/secure_closet/freezer/kitchen name = "kitchen cabinet" diff --git a/code/modules/cooking/recipes/recipes_breads.dm b/code/modules/cooking/recipes/recipes_breads.dm index 2f83bdc9115..bab9cbbfe6a 100644 --- a/code/modules/cooking/recipes/recipes_breads.dm +++ b/code/modules/cooking/recipes/recipes_breads.dm @@ -412,6 +412,7 @@ ) fruit = list("eggplant" = 1) result = /obj/item/reagent_containers/food/snacks/pita/sabich + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product /singleton/recipe/tunapita items = list( diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 1ae9fe174b1..312212ad5e6 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -5818,7 +5818,7 @@ condiment_icon_state = "pumpkinspice" condiment_center_of_mass = list("x"=16, "y"=8) -/singleton/reagent/drink/syrup_chocolate +/singleton/reagent/condiment/syrup_chocolate name = "Chocolate Syrup" description = "Thick chocolate syrup used to flavor drinks." taste_description = "chocolate" @@ -5830,7 +5830,7 @@ taste_mult = 5 condiment_center_of_mass = list("x"=16, "y"=8) -/singleton/reagent/drink/syrup_caramel +/singleton/reagent/condiment/syrup_caramel name = "Caramel Syrup" description = "Thick caramel syrup used to flavor drinks." taste_description = "caramel" @@ -5842,7 +5842,7 @@ taste_mult = 5 condiment_center_of_mass = list("x"=16, "y"=8) -/singleton/reagent/drink/syrup_vanilla +/singleton/reagent/condiment/syrup_vanilla name = "Vanilla Syrup" description = "Thick vanilla syrup used to flavor drinks." taste_description = "vanilla" @@ -5854,7 +5854,7 @@ taste_mult = 5 condiment_center_of_mass = list("x"=16, "y"=8) -/singleton/reagent/drink/syrup_pumpkin +/singleton/reagent/condiment/syrup_pumpkin name = "Pumpkin Spice Syrup" description = "Thick spiced pumpkin syrup used to flavor drinks." taste_description = "spiced pumpkin" @@ -5867,7 +5867,7 @@ condiment_center_of_mass = list("x"=16, "y"=8) //berry -/singleton/reagent/drink/syrup_berry +/singleton/reagent/condiment/syrup_berry name = "Berry Syrup" description = "Thick berry syrup used to flavor drinks." taste_description = "berry" @@ -5880,7 +5880,7 @@ condiment_center_of_mass = list("x"=16, "y"=8) //strawberry -/singleton/reagent/drink/syrup_strawberry +/singleton/reagent/condiment/syrup_strawberry name = "Strawberry Syrup" description = "Thick strawberry syrup used to flavor drinks." taste_description = "strawberry" @@ -5893,7 +5893,7 @@ condiment_center_of_mass = list("x"=16, "y"=8) //blueberry -/singleton/reagent/drink/syrup_blueberry +/singleton/reagent/condiment/syrup_blueberry name = "Blueberry Syrup" description = "Thick blueberry syrup used to flavor drinks." taste_description = "blueberry" @@ -5906,7 +5906,7 @@ condiment_center_of_mass = list("x"=16, "y"=8) //rasp -/singleton/reagent/drink/syrup_raspberry +/singleton/reagent/condiment/syrup_raspberry name = "Raspberry Syrup" description = "Thick raspberry syrup used to flavor drinks." taste_description = "raspberry" @@ -5919,7 +5919,7 @@ condiment_center_of_mass = list("x"=16, "y"=8) //black rasp -/singleton/reagent/drink/syrup_blackraspberry +/singleton/reagent/condiment/syrup_blackraspberry name = "Black Raspberry Syrup" description = "Thick black raspberry syrup used to flavor drinks." taste_description = "black raspberry" @@ -5930,7 +5930,7 @@ condiment_center_of_mass = list("x"=16, "y"=8) //blue rasp -/singleton/reagent/drink/syrup_blueraspberry +/singleton/reagent/condiment/syrup_blueraspberry name = "Blue Raspberry Syrup" description = "Thick blue raspberry syrup used to flavor drinks." taste_description = "blue raspberry" @@ -5943,7 +5943,7 @@ condiment_center_of_mass = list("x"=16, "y"=8) //glow -/singleton/reagent/drink/syrup_glowberry +/singleton/reagent/condiment/syrup_glowberry name = "Glowberry Syrup" description = "Thick glowberry syrup used to flavor drinks." taste_description = "glowberry" @@ -5953,7 +5953,7 @@ taste_mult = 5 //poison -/singleton/reagent/drink/syrup_poisonberry +/singleton/reagent/condiment/syrup_poisonberry name = "Poison Berry Syrup" description = "Thick poison berry syrup used to flavor drinks." taste_description = "something sweet" @@ -5963,7 +5963,7 @@ taste_mult = 5 //death -/singleton/reagent/drink/syrup_deathberry +/singleton/reagent/condiment/syrup_deathberry name = "Death Berry Syrup" description = "Thick death berry syrup used to flavor drinks." taste_description = "something sweet" @@ -5973,7 +5973,7 @@ taste_mult = 5 //ylpha -/singleton/reagent/drink/syrup_ylphaberry +/singleton/reagent/condiment/syrup_ylphaberry name = "Ylpha Berry Syrup" description = "Thick ylpha berry syrup used to flavor drinks." taste_description = "ylpha berry" @@ -5986,7 +5986,7 @@ condiment_center_of_mass = list("x"=16, "y"=8) //dirt -/singleton/reagent/drink/syrup_dirtberry +/singleton/reagent/condiment/syrup_dirtberry name = "Dirt Berry Syrup" description = "Thick dirt berry syrup used to flavor drinks." taste_description = "dirt berry" @@ -5998,7 +5998,7 @@ condiment_icon_state = "syrup_dirtberry" condiment_center_of_mass = list("x"=16, "y"=8) -/singleton/reagent/drink/syrup_simple +/singleton/reagent/condiment/syrup_simple name = "Simple Syrup" description = "Thick, unflavored syrup used as a base for drinks or flavorings." taste_description = "molasses" diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index b3dc6856154..f13392b8187 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -2614,35 +2614,35 @@ name = "Pumpkin Spice Frappe" id = "psfrappe" result = /singleton/reagent/drink/coffee/icecoffee/psfrappe - required_reagents = list(/singleton/reagent/drink/coffee/icecoffee = 4, /singleton/reagent/drink/syrup_pumpkin = 1) + required_reagents = list(/singleton/reagent/drink/coffee/icecoffee = 4, /singleton/reagent/condiment/syrup_pumpkin = 1) result_amount = 5 /datum/chemical_reaction/drink/pslatte name = "Pumpkin Spice Latte" id = "pslatte" result = /singleton/reagent/drink/coffee/latte/pumpkinspice - required_reagents = list(/singleton/reagent/drink/coffee/latte = 4, /singleton/reagent/drink/syrup_pumpkin = 1) + required_reagents = list(/singleton/reagent/drink/coffee/latte = 4, /singleton/reagent/condiment/syrup_pumpkin = 1) result_amount = 5 /datum/chemical_reaction/drink/caramel_latte name = "Caramel latte" id = "caramellatte" result = /singleton/reagent/drink/coffee/latte/caramel - required_reagents = list(/singleton/reagent/drink/coffee/latte = 4, /singleton/reagent/drink/syrup_caramel = 1) + required_reagents = list(/singleton/reagent/drink/coffee/latte = 4, /singleton/reagent/condiment/syrup_caramel = 1) result_amount = 5 /datum/chemical_reaction/drink/mocha_latte name = "Mocha latte" id = "mochalatte" result = /singleton/reagent/drink/coffee/latte/mocha - required_reagents = list(/singleton/reagent/drink/coffee/latte = 4, /singleton/reagent/drink/syrup_chocolate = 1) + required_reagents = list(/singleton/reagent/drink/coffee/latte = 4, /singleton/reagent/condiment/syrup_chocolate = 1) result_amount = 5 /datum/chemical_reaction/drink/vanilla_latte name = "Vanilla latte" id = "vanillalatte" result = /singleton/reagent/drink/coffee/latte/vanilla - required_reagents = list(/singleton/reagent/drink/coffee/latte = 4, /singleton/reagent/drink/syrup_vanilla = 1) + required_reagents = list(/singleton/reagent/drink/coffee/latte = 4, /singleton/reagent/condiment/syrup_vanilla = 1) result_amount = 5 /datum/chemical_reaction/drink/acidspit @@ -3066,63 +3066,63 @@ name = "Caramel Milkshake" id = "shake_caramel" result = /singleton/reagent/drink/shake_caramel - required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_caramel = 1) + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/condiment/syrup_caramel = 1) result_amount = 6 /datum/chemical_reaction/drink/strawberryshake name = "Strawberry Milkshake" id = "shake_strawberry" result = /singleton/reagent/drink/shake_strawberry - required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_strawberry = 1) + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/condiment/syrup_strawberry = 1) result_amount = 6 /datum/chemical_reaction/drink/dirtberryshake name = "Dirtberry Milkshake" id = "shake_dirtberry" result = /singleton/reagent/drink/shake_dirtberry - required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_dirtberry = 1) + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/condiment/syrup_dirtberry = 1) result_amount = 6 /datum/chemical_reaction/drink/blueberry_shake name = "Blueberry Milkshake" id = "shake_blueberry" result = /singleton/reagent/drink/shake_blueberry - required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_blueberry = 1) + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/condiment/syrup_blueberry = 1) result_amount = 6 /datum/chemical_reaction/drink/chocolate_shake name = "Chocolate Milkshake" id = "shake_chocolate" result = /singleton/reagent/drink/shake_chocolate - required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_chocolate = 1) + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/condiment/syrup_chocolate = 1) result_amount = 6 /datum/chemical_reaction/drink/blue_raspberry_shake name = "Blue Raspberry Milkshake" id = "shake_blue_raspberry" result = /singleton/reagent/drink/shake_blue_raspberry - required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_blueraspberry = 1) + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/condiment/syrup_blueraspberry = 1) result_amount = 6 /datum/chemical_reaction/drink/raspberry_shake name = "Raspberry Milkshake" id = "shake_raspberry" result = /singleton/reagent/drink/shake_raspberry - required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_raspberry = 1) + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/condiment/syrup_raspberry = 1) result_amount = 6 /datum/chemical_reaction/drink/ylpha_shake name = "Ylpha Berry Milkshake" id = "shake_ylpha" result = /singleton/reagent/drink/shake_ylpha - required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_ylphaberry = 1) + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/condiment/syrup_ylphaberry = 1) result_amount = 6 /datum/chemical_reaction/drink/berry_shake name = "Berry Milkshake" id = "shake_berry" result = /singleton/reagent/drink/shake_berry - required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_berry = 1) + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/condiment/syrup_berry = 1) result_amount = 6 /datum/chemical_reaction/drink/choco_mint_shake @@ -3178,7 +3178,7 @@ name = "Harvest Moon" id = "harvest_moon" result = /singleton/reagent/alcohol/harvest_moon - required_reagents = list(/singleton/reagent/alcohol/applejack = 1, /singleton/reagent/drink/syrup_pumpkin = 0.5, /singleton/reagent/drink/sodawater = 1) + required_reagents = list(/singleton/reagent/alcohol/applejack = 1, /singleton/reagent/condiment/syrup_pumpkin = 0.5, /singleton/reagent/drink/sodawater = 1) result_amount = 3 /datum/chemical_reaction/drink/new_horizons @@ -3991,7 +3991,7 @@ name = "Caramel Sauce" id = "caramelsauce" result = /singleton/reagent/drink/caramel - required_reagents = list(/singleton/reagent/nutriment/caramel = 2, /singleton/reagent/drink/milk/cream = 1, /singleton/reagent/drink/syrup_simple = 2) + required_reagents = list(/singleton/reagent/nutriment/caramel = 2, /singleton/reagent/drink/milk/cream = 1, /singleton/reagent/condiment/syrup_simple = 2) result_amount = 5 mix_message = "The solution thickens into a glossy, brown sauce." required_temperature_max = T0C + 82 // You don't want the syrup to crystallise/caramelise; that'd just make more caramel... @@ -3999,7 +3999,7 @@ /datum/chemical_reaction/simplesyrup name = "Simple Syrup" id = "simplesyrup" - result = /singleton/reagent/drink/syrup_simple + result = /singleton/reagent/condiment/syrup_simple required_reagents = list(/singleton/reagent/sugar = 2, /singleton/reagent/water = 2) // simple syrup, the sugar dissolves and doesn't change the volume too much result_amount = 2 required_temperature_min = T0C + 30 @@ -4009,32 +4009,32 @@ /datum/chemical_reaction/vanillasyrup name = "Vanilla Syrup" id = "vanillasyrup" - result = /singleton/reagent/drink/syrup_vanilla - required_reagents = list(/singleton/reagent/nutriment/vanilla = 2, /singleton/reagent/drink/syrup_simple = 3) + result = /singleton/reagent/condiment/syrup_vanilla + required_reagents = list(/singleton/reagent/nutriment/vanilla = 2, /singleton/reagent/condiment/syrup_simple = 3) result_amount = 5 mix_message = "The solution takes on a pale yellow hue and the aroma of vanilla." /datum/chemical_reaction/caramelsyrup name = "Caramel Syrup" id = "caramelsyrup" - result = /singleton/reagent/drink/syrup_caramel - required_reagents = list(/singleton/reagent/nutriment/caramel = 2, /singleton/reagent/drink/syrup_simple = 3) + result = /singleton/reagent/condiment/syrup_caramel + required_reagents = list(/singleton/reagent/nutriment/caramel = 2, /singleton/reagent/condiment/syrup_simple = 3) result_amount = 5 mix_message = "The solution takes on a light brown hue and the aroma of caramel." /datum/chemical_reaction/chocosyrup name = "Chocolate Syrup" id = "chocolatesyrup" - result = /singleton/reagent/drink/syrup_chocolate - required_reagents = list(/singleton/reagent/nutriment/coco = 2, /singleton/reagent/drink/syrup_simple = 3) + result = /singleton/reagent/condiment/syrup_chocolate + required_reagents = list(/singleton/reagent/nutriment/coco = 2, /singleton/reagent/condiment/syrup_simple = 3) result_amount = 5 mix_message = "The solution takes on a brown hue and the aroma of chocolate." /datum/chemical_reaction/pumpkinsyrup name = "Pumpkin Spice Syrup" id = "pumpkinsyrup" - result = /singleton/reagent/drink/syrup_pumpkin - required_reagents = list(/singleton/reagent/spacespice/pumpkinspice = 2, /singleton/reagent/drink/syrup_simple = 3) + result = /singleton/reagent/condiment/syrup_pumpkin + required_reagents = list(/singleton/reagent/spacespice/pumpkinspice = 2, /singleton/reagent/condiment/syrup_simple = 3) result_amount = 5 mix_message = "The solution takes on an orange hue and the aroma of pumpkin spice." @@ -4042,85 +4042,85 @@ name = "Mint Syrup" id = "mintsyrup" result = /singleton/reagent/drink/mintsyrup - required_reagents = list(/singleton/reagent/nutriment/mint = 2, /singleton/reagent/drink/syrup_simple = 3) + required_reagents = list(/singleton/reagent/nutriment/mint = 2, /singleton/reagent/condiment/syrup_simple = 3) result_amount = 5 // /datum/chemical_reaction/berrysyrup name = "Berry Syrup" id = "berrysyrup" - result = /singleton/reagent/drink/syrup_berry - required_reagents = list(/singleton/reagent/drink/berryjuice = 2, /singleton/reagent/drink/syrup_simple = 3) + result = /singleton/reagent/condiment/syrup_berry + required_reagents = list(/singleton/reagent/drink/berryjuice = 2, /singleton/reagent/condiment/syrup_simple = 3) result_amount = 5 /datum/chemical_reaction/strawberrysyrup name = "Strawberry Syrup" id = "strawberrysyrup" - result = /singleton/reagent/drink/syrup_strawberry - required_reagents = list(/singleton/reagent/drink/strawberryjuice = 2, /singleton/reagent/drink/syrup_simple = 3) + result = /singleton/reagent/condiment/syrup_strawberry + required_reagents = list(/singleton/reagent/drink/strawberryjuice = 2, /singleton/reagent/condiment/syrup_simple = 3) result_amount = 5 /datum/chemical_reaction/blueberrysyrup name = "Blueberry Syrup" id = "blueberrysyrup" - result = /singleton/reagent/drink/syrup_blueberry - required_reagents = list(/singleton/reagent/drink/blueberryjuice = 2, /singleton/reagent/drink/syrup_simple = 3) + result = /singleton/reagent/condiment/syrup_blueberry + required_reagents = list(/singleton/reagent/drink/blueberryjuice = 2, /singleton/reagent/condiment/syrup_simple = 3) result_amount = 5 /datum/chemical_reaction/raspberrysyrup name = "Raspberry Syrup" id = "raspberrysyrup" - result = /singleton/reagent/drink/syrup_raspberry - required_reagents = list(/singleton/reagent/drink/raspberryjuice = 2, /singleton/reagent/drink/syrup_simple = 3) + result = /singleton/reagent/condiment/syrup_raspberry + required_reagents = list(/singleton/reagent/drink/raspberryjuice = 2, /singleton/reagent/condiment/syrup_simple = 3) result_amount = 5 /datum/chemical_reaction/blueraspberrysyrup name = "Blue Raspberry Syrup" id = "blueraspberrysyrup" - result = /singleton/reagent/drink/syrup_blueraspberry - required_reagents = list(/singleton/reagent/drink/blueraspberryjuice = 2, /singleton/reagent/drink/syrup_simple = 3) + result = /singleton/reagent/condiment/syrup_blueraspberry + required_reagents = list(/singleton/reagent/drink/blueraspberryjuice = 2, /singleton/reagent/condiment/syrup_simple = 3) result_amount = 5 /datum/chemical_reaction/blackraspberrysyrup name = "Black Raspberry Syrup" id = "blackraspberrysyrup" - result = /singleton/reagent/drink/syrup_blackraspberry - required_reagents = list(/singleton/reagent/drink/blackraspberryjuice = 2, /singleton/reagent/drink/syrup_simple = 3) + result = /singleton/reagent/condiment/syrup_blackraspberry + required_reagents = list(/singleton/reagent/drink/blackraspberryjuice = 2, /singleton/reagent/condiment/syrup_simple = 3) result_amount = 5 /datum/chemical_reaction/poisonberrysyrup name = "Poison Berry Syrup" id = "poisonberrysyrup" - result = /singleton/reagent/drink/syrup_poisonberry - required_reagents = list(/singleton/reagent/toxin/poisonberryjuice = 2, /singleton/reagent/drink/syrup_simple = 3) + result = /singleton/reagent/condiment/syrup_poisonberry + required_reagents = list(/singleton/reagent/toxin/poisonberryjuice = 2, /singleton/reagent/condiment/syrup_simple = 3) result_amount = 5 /datum/chemical_reaction/deathberrysyrup name = "Death Berry Syrup" id = "deathberrysyrup" - result = /singleton/reagent/drink/syrup_deathberry - required_reagents = list(/singleton/reagent/toxin/deathberryjuice = 2, /singleton/reagent/drink/syrup_simple = 3) + result = /singleton/reagent/condiment/syrup_deathberry + required_reagents = list(/singleton/reagent/toxin/deathberryjuice = 2, /singleton/reagent/condiment/syrup_simple = 3) result_amount = 5 /datum/chemical_reaction/glowberrysyrup name = "Glowberry Syrup" id = "glowberrysyrup" - result = /singleton/reagent/drink/syrup_glowberry - required_reagents = list(/singleton/reagent/drink/glowberryjuice = 2, /singleton/reagent/drink/syrup_simple = 3) + result = /singleton/reagent/condiment/syrup_glowberry + required_reagents = list(/singleton/reagent/drink/glowberryjuice = 2, /singleton/reagent/condiment/syrup_simple = 3) result_amount = 5 /datum/chemical_reaction/ylphaberrysyrup name = "Ylpha Berry Syrup" id = "ylphaberrysyrup" - result = /singleton/reagent/drink/syrup_ylphaberry - required_reagents = list(/singleton/reagent/drink/ylphaberryjuice = 2, /singleton/reagent/drink/syrup_simple = 3) + result = /singleton/reagent/condiment/syrup_ylphaberry + required_reagents = list(/singleton/reagent/drink/ylphaberryjuice = 2, /singleton/reagent/condiment/syrup_simple = 3) result_amount = 5 /datum/chemical_reaction/dirtberrysyrup name = "Dirt Berry Syrup" id = "dirtberrysyrup" - result = /singleton/reagent/drink/syrup_dirtberry - required_reagents = list(/singleton/reagent/drink/dirtberryjuice = 2, /singleton/reagent/drink/syrup_simple = 3) + result = /singleton/reagent/condiment/syrup_dirtberry + required_reagents = list(/singleton/reagent/drink/dirtberryjuice = 2, /singleton/reagent/condiment/syrup_simple = 3) result_amount = 5 // diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index 64df61298e9..ee016a7cd94 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -113,11 +113,13 @@ /obj/item/reagent_containers/food/condiment/barbecue icon_state = "barbecue" fixed_state = TRUE + name = "barbecue sauce" reagents_to_add = list(/singleton/reagent/nutriment/barbecue = 20) /obj/item/reagent_containers/food/condiment/garlicsauce icon_state = "garlic_sauce" fixed_state = TRUE + name = "garlic sauce" reagents_to_add = list(/singleton/reagent/nutriment/garlicsauce = 50) /obj/item/reagent_containers/food/condiment/pacid @@ -148,6 +150,144 @@ name = "mayonnaise" reagents_to_add = list(/singleton/reagent/nutriment/mayonnaise = 50) +/obj/item/reagent_containers/food/condiment/ntella + icon_state = "NTellajar" + fixed_state = TRUE + name = "NTella jar" + reagents_to_add = list(/singleton/reagent/nutriment/choconutspread = 50) + +/obj/item/reagent_containers/food/condiment/peanut_butter + icon_state = "pbjar" + fixed_state = TRUE + name = "peanut butter jar" + reagents_to_add = list(/singleton/reagent/nutriment/peanutbutter = 50) + +/obj/item/reagent_containers/food/condiment/cherry_jelly + icon_state = "jellyjar" + fixed_state = TRUE + name = "cherry jelly jar" + reagents_to_add = list(/singleton/reagent/nutriment/cherryjelly = 50) + +/obj/item/reagent_containers/food/condiment/hot_sauce + icon_state = "hotsauce" + name = "hot sauce" + fixed_state = TRUE + reagents_to_add = list(/singleton/reagent/capsaicin = 50) + +/obj/item/reagent_containers/food/condiment/grape_jelly + icon_state = "grapejelly" + fixed_state = TRUE + name = "grape jelly jar" + reagents_to_add = list(/singleton/reagent/nutriment/grapejelly = 50) + +/obj/item/reagent_containers/food/condiment/syrup_simple + icon_state = "syrup_simple" + fixed_state = TRUE + name = "simple syrup" + reagents_to_add = list(/singleton/reagent/condiment/syrup_simple = 50) + +/obj/item/reagent_containers/food/condiment/syrup_chocolate + icon_state = "syrup_chocolate" + fixed_state = TRUE + name = "chocolate syrup" + reagents_to_add = list(/singleton/reagent/condiment/syrup_chocolate = 50) + +/obj/item/reagent_containers/food/condiment/syrup_strawberry + icon_state = "syrup_strawberry" + fixed_state = TRUE + name = "strawberry syrup" + reagents_to_add = list(/singleton/reagent/condiment/syrup_strawberry = 50) + +/obj/item/reagent_containers/food/condiment/syrup_strawberry + icon_state = "syrup_strawberry" + fixed_state = TRUE + name = "strawberry syrup" + reagents_to_add = list(/singleton/reagent/condiment/syrup_strawberry = 50) + +/obj/item/reagent_containers/food/condiment/syrup_berry + icon_state = "syrup_berry" + fixed_state = TRUE + name = "berry syrup" + reagents_to_add = list(/singleton/reagent/condiment/syrup_berry = 50) + +/obj/item/reagent_containers/food/condiment/syrup_raspberry + icon_state = "syrup_raspberry" + fixed_state = TRUE + name = "raspberry syrup" + reagents_to_add = list(/singleton/reagent/condiment/syrup_raspberry = 50) + +/obj/item/reagent_containers/food/condiment/syrup_blueberry + icon_state = "syrup_blueberry" + fixed_state = TRUE + name = "blueberry syrup" + reagents_to_add = list(/singleton/reagent/condiment/syrup_blueberry = 50) + +/obj/item/reagent_containers/food/condiment/syrup_blue_raspberry + icon_state = "syrup_blue_raspberry" + fixed_state = TRUE + name = "blue raspberry syrup" + reagents_to_add = list(/singleton/reagent/condiment/syrup_blueberry = 50) + +/obj/item/reagent_containers/food/condiment/syrup_ylphaberry + icon_state = "syrup_ylpha" + fixed_state = TRUE + name = "ylpha berry syrup" + reagents_to_add = list(/singleton/reagent/condiment/syrup_ylphaberry = 50) + +/obj/item/reagent_containers/food/condiment/syrup_caramel + icon_state = "syrup_caramel" + fixed_state = TRUE + name = "caramel syrup" + reagents_to_add = list(/singleton/reagent/condiment/syrup_caramel = 50) + +/obj/item/reagent_containers/food/condiment/syrup_pumpkin + icon_state = "syrup_pumpkin" + fixed_state = TRUE + name = "pumpkin syrup" + reagents_to_add = list(/singleton/reagent/condiment/syrup_pumpkin = 50) + +/obj/item/reagent_containers/food/condiment/syrup_vanilla + icon_state = "syrup_vanilla" + fixed_state = TRUE + name = "vanilla syrup" + reagents_to_add = list(/singleton/reagent/condiment/syrup_vanilla = 50) + +/obj/item/reagent_containers/food/condiment/syrup_dirtberry + icon_state = "syrup_dirtberry" + fixed_state = TRUE + name = "dirtberry syrup" + reagents_to_add = list(/singleton/reagent/condiment/syrup_dirtberry = 50) + +/obj/item/reagent_containers/food/condiment/gelatin + icon_state = "gello" + fixed_state = TRUE + name = "gelatin" + reagents_to_add = list(/singleton/reagent/nutriment/gelatin = 50) + +/obj/item/reagent_containers/food/condiment/batter + icon_state = "batter" + fixed_state = TRUE + name = "batter mix" + reagents_to_add = list(/singleton/reagent/nutriment/coating/batter = 50) + +/obj/item/reagent_containers/food/condiment/vanilla + icon_state = "vanilla" + fixed_state = TRUE + name = "vanilla extract" + reagents_to_add = list(/singleton/reagent/nutriment/vanilla = 50) + +/obj/item/reagent_containers/food/condiment/rice //everyone's favorite condiment, rice. (there wasn't really a better place for this, code-wise) + icon_state = "rice" + fixed_state = TRUE + name = "rice" + reagents_to_add = list(/singleton/reagent/nutriment/rice = 50) + +/obj/item/reagent_containers/food/condiment/cocoa //not exactly a condiment, but not exactly NOT a condiment, right? + icon_state = "cocoapowder" + fixed_state = TRUE + name = "cocoa powder" + reagents_to_add = list(/singleton/reagent/nutriment/coco = 50) + //MRE condiments and drinks. /obj/item/reagent_containers/food/condiment/small/packet diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index e29545d67ca..809dc39bdf4 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -482,7 +482,6 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e name = "boba pearls" desc = "Tapioca balls, so you can eat your drinks! Yum yum!" // the yum yum is sarcastic these things feel like chewing on rubber. icon_state = "boba" - trash = /obj/item/trash/ramen drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' center_of_mass = list("x"=16, "y"=11) diff --git a/code/modules/reagents/reagent_containers/food/snacks/breads.dm b/code/modules/reagents/reagent_containers/food/snacks/breads.dm index bdf2c0ad273..6d4e3a3fcc3 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/breads.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/breads.dm @@ -583,7 +583,8 @@ name = "sabich" desc = "The 'c' is silent. This Israeli dish is fried eggplants and egg in a Pita, with Hummus, Tahini, Salad, or other sides." icon_state = "sabich" - reagents_to_add = list(/singleton/reagent/nutriment = 2) + reagents_to_add = list(/singleton/reagent/nutriment = 10) + bitesize = 2 reagent_data = list(/singleton/reagent/nutriment = list("eggplant" = 5, "eggs" = 4, "pita bread" = 2)) /obj/item/reagent_containers/food/snacks/pita/falafel @@ -591,7 +592,8 @@ desc = "Falafel balls in a fluffy pita with some hummus, chips, and/or salad - popular, beloved, cheap street food. Originates in the middle east, also common in Elyra." icon_state = "falafel" filling_color = "#443011" - reagents_to_add = list(/singleton/reagent/nutriment = 2) + reagents_to_add = list(/singleton/reagent/nutriment = 10) + bitesize = 2 reagent_data = list(/singleton/reagent/nutriment = list("fried chickpeas" = 3, "hummus" = 2, "pita bread" = 2)) /obj/item/reagent_containers/food/snacks/pita/tuna @@ -599,13 +601,15 @@ desc = "It's kind of like a tuna sandwich except... Not." icon_state = "tunapita" filling_color = "#e7dac9" - reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/nutriment/protein/seafood = 3) + reagents_to_add = list(/singleton/reagent/nutriment = 5, /singleton/reagent/nutriment/protein/seafood = 3) reagent_data = list(/singleton/reagent/nutriment = list("mayonnaise" = 3,"pita bread" = 2), /singleton/reagent/nutriment/protein/seafood = list("tuna" = 5)) + bitesize = 2 /obj/item/reagent_containers/food/snacks/pita/chocolate name = "chocolate pita" desc = "Fluffy dough filled with a creamy chocolate spread, what's not to love? This is the sort of meal kids of Middle Eastern or Elyran heritage might occasionaly take to school with them." icon_state = "chocolatepita" filling_color = "#311909" - reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/nutriment/choconutspread = 4) + reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/nutriment/choconutspread = 4) reagent_data = list(/singleton/reagent/nutriment = list("chocolate" = 8, "pita bread" = 5, "childhood" = 3)) + bitesize = 2 diff --git a/code/modules/reagents/reagent_containers/food/snacks/cultural/tajara.dm b/code/modules/reagents/reagent_containers/food/snacks/cultural/tajara.dm index cd00e650785..f2353996f86 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/tajara.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/tajara.dm @@ -418,8 +418,8 @@ icon = 'icons/obj/item/reagent_containers/food/cultural/tajara.dmi' icon_state = "roast_dirtberries" bitesize = 2 - reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/drink/syrup_caramel = 4) - reagent_data = list(/singleton/reagent/nutriment = list("warm crunchy nuts" = 2, "cinnamon" = 2), /singleton/reagent/drink/syrup_caramel = list("caramel" = 5)) + reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/condiment/syrup_caramel = 4) + reagent_data = list(/singleton/reagent/nutriment = list("warm crunchy nuts" = 2, "cinnamon" = 2), /singleton/reagent/condiment/syrup_caramel = list("caramel" = 5)) desc_extended = "A traditional snack consisting of oven-roasted dirtberries covered in a mixture of spice and caramel. These crunchy fruits are usually sold at outdoor festivals and events and are enjoyed for their warming effect and pleasant taste." filling_color = "#BD8939" diff --git a/code/modules/reagents/reagent_containers/food/snacks/mix.dm b/code/modules/reagents/reagent_containers/food/snacks/mix.dm index 912e556c742..efc4beb7839 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/mix.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/mix.dm @@ -171,7 +171,7 @@ name = "spring salad" desc = "A simple salad of carrots, lettuce and peas drizzled in oil with a pinch of salt." icon = 'icons/obj/item/reagent_containers/food/mix.dmi' - icon_state = "tabboulehsalad" + icon_state = "springsalad" trash = /obj/item/trash/snack_bowl filling_color = "#5a9c62" center_of_mass = list("x"=17, "y"=11) diff --git a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm index 9f9d66b07c5..c9254a01fb9 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm @@ -40,37 +40,37 @@ ///makes pancakes change their look and name, flavor and description when you add syrup to them instead of having to have them each be an entirely separate food item that has to be made by the cook. This also means ingredient contents carry over if you turn one type of pancake into another. /obj/item/reagent_containers/food/snacks/pancakes/on_reagent_change() - if(reagents.has_reagent(/singleton/reagent/drink/syrup_chocolate)) + if(reagents.has_reagent(/singleton/reagent/condiment/syrup_chocolate)) name = "chocolate pancakes" desc = "Delicious pancakes covered in chocolate syrup." icon_state = "pancakes_chocolate" - if(reagents.has_reagent(/singleton/reagent/drink/syrup_berry)) + if(reagents.has_reagent(/singleton/reagent/condiment/syrup_berry)) name = "berry pancakes" desc = "Delicious pancakes covered in berry syrup." icon_state = "pancakes_berry" - if(reagents.has_reagent(/singleton/reagent/drink/syrup_strawberry)) + if(reagents.has_reagent(/singleton/reagent/condiment/syrup_strawberry)) name = "strawberry pancakes" desc = "Delicious pancakes covered in strawberry syrup." icon_state = "pancakes_strawberry" - if(reagents.has_reagent(/singleton/reagent/drink/syrup_caramel)) + if(reagents.has_reagent(/singleton/reagent/condiment/syrup_caramel)) name = "caramel pancakes" desc = "Delicious pancakes covered in caramel syrup." icon_state = "pancakes_caramel" - if(reagents.has_reagent(/singleton/reagent/drink/syrup_vanilla)) + if(reagents.has_reagent(/singleton/reagent/condiment/syrup_vanilla)) name = "vanilla pancakes" desc = "Delicious pancakes covered in vanilla syrup." icon_state = "pancakes_vanilla" - if(reagents.has_reagent(/singleton/reagent/drink/syrup_pumpkin)) + if(reagents.has_reagent(/singleton/reagent/condiment/syrup_pumpkin)) name = "pumpkin spice pancakes" desc = "A delicious autumn breakfast." icon_state = "pancakes_pumpkin" - if(reagents.has_reagent(/singleton/reagent/drink/syrup_ylphaberry)) + if(reagents.has_reagent(/singleton/reagent/condiment/syrup_ylphaberry)) name = "ylpha berry pancakes" desc = "Overwhelmingly sweet with a side of tangy, a delicious way to wake up!" icon_state = "pancakes_ylpha" @@ -80,22 +80,22 @@ desc = "Why? Who hurt you?" icon_state = "pancakes_ruined" - if(reagents.has_reagent(/singleton/reagent/drink/syrup_blueberry)) + if(reagents.has_reagent(/singleton/reagent/condiment/syrup_blueberry)) name = "blueberry pancakes" desc = "They're a little... TOO neon blue, aren't they? Doesn't look right... Oh well, they're full of sugar so who cares!" icon_state = "pancakes_blueberry" - if(reagents.has_reagent(/singleton/reagent/drink/syrup_raspberry)) + if(reagents.has_reagent(/singleton/reagent/condiment/syrup_raspberry)) name = "raspberry pancakes" desc = "Your inner 12-year-old-girl-having-a-birthday party is squealing with overwhelming glee the longer you look at this." icon_state = "pancakes_raspberry" - if(reagents.has_reagent(/singleton/reagent/drink/syrup_blueraspberry)) + if(reagents.has_reagent(/singleton/reagent/condiment/syrup_blueraspberry)) name = "blue raspberry pancakes" desc = "Delicious pancakes covered in blue raspberry syrup." icon_state = "pancakes_blue_raspberry" - if(reagents.has_reagent(/singleton/reagent/drink/syrup_dirtberry)) + if(reagents.has_reagent(/singleton/reagent/condiment/syrup_dirtberry)) name = "nifnif pancakes" desc = "Dirtberry pancakes with little bits of roasted nifnif for extra crunch! It may not be traditional adhomian cuisine but it sure is popular there now anyway!" icon_state = "pancakes_nifnif" diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm index 6d4b7838264..1e42e9259fa 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle.dm @@ -245,19 +245,19 @@ /obj/item/reagent_containers/glass/bottle/syrup/chocolate name = "chocolate syrup dispenser" - reagents_to_add = list(/singleton/reagent/drink/syrup_chocolate = 50) + reagents_to_add = list(/singleton/reagent/condiment/syrup_chocolate = 50) /obj/item/reagent_containers/glass/bottle/syrup/pumpkin name = "pumpkin spice syrup dispenser" - reagents_to_add = list(/singleton/reagent/drink/syrup_pumpkin = 50) + reagents_to_add = list(/singleton/reagent/condiment/syrup_pumpkin = 50) /obj/item/reagent_containers/glass/bottle/syrup/vanilla name = "vanilla syrup dispenser" - reagents_to_add = list(/singleton/reagent/drink/syrup_vanilla = 50) + reagents_to_add = list(/singleton/reagent/condiment/syrup_vanilla = 50) /obj/item/reagent_containers/glass/bottle/syrup/caramel name = "caramel syrup dispenser" - reagents_to_add = list(/singleton/reagent/drink/syrup_caramel = 50) + reagents_to_add = list(/singleton/reagent/condiment/syrup_caramel = 50) /obj/item/reagent_containers/glass/bottle/triglyceride name = "triglyceride bottle" diff --git a/html/changelogs/TOMIXCOMICS-PR.yml b/html/changelogs/TOMIXCOMICS-PR.yml new file mode 100644 index 00000000000..e3f4b3a15ee --- /dev/null +++ b/html/changelogs/TOMIXCOMICS-PR.yml @@ -0,0 +1,46 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Tomixcomics + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Made kitchen fridges spawn with about 5-6 semi-randomized key items in them, such as sauces, spreads, and a few kitchen staples" + - tweak: "Changed the code for pita-based foods to have things it was missing (such as bite size or reagent replace functions) that were making them take forever to eat. Edited the food contents back to what they were before the recent Sabich patch that was brought in to fix the issue." + - tweak: "Added boba pearls to Booze-o-mat machines." + - bugfix: "Corrected sprite for spring salad." + - backend: "Created obj listings for a bunch of condiment bottles and other reagents so that they can be spawned in as objects." + - backend: "Changed flavored syrups from 'drinks' subtype to 'condiments' subtype."