diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index ca9dab3f070..38fab55effa 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -538,7 +538,6 @@ /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/storage/box/fancy/food/sliced_bread = 1, /obj/item/reagent_containers/food/condiment/cocoa = 1, /obj/item/reagent_containers/food/condiment/cream_cheese = 1 diff --git a/code/game/objects/random/produce.dm b/code/game/objects/random/produce.dm index fc58c0ee428..a792d8789b4 100644 --- a/code/game/objects/random/produce.dm +++ b/code/game/objects/random/produce.dm @@ -60,7 +60,8 @@ "pumpkin" = 0.1, "onion" = 0.5, "garlic" = 0.5, - "bellpepper" = 0.25 + "bellpepper" = 0.25, + "cucumber" = 0.25 ) /obj/random_produce/box/adhomai @@ -68,7 +69,7 @@ "nfrihi" = 1, "dirtberries" = 1, "earthenroot" = 1, - "sugar tree" = 1, + "sugartree" = 1, "shand" = 1, "mtear" = 1 ) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm b/code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm index 6f24e921eed..e574aade3a4 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm @@ -57,6 +57,10 @@ new /obj/item/reagent_containers/food/drinks/carton/soymilk(src) new /obj/item/reagent_containers/food/drinks/carton/cream(src) new /obj/item/reagent_containers/food/condiment/soysauce(src) + new /obj/random/kitchen_staples(src) + for(var/i = 0 to 4) + new /obj/random/condiment(src) + new /obj/item/reagent_containers/food/snacks/spreads/butter(src) /obj/structure/closet/secure_closet/refrigerator/station/alt name = "refrigerator" diff --git a/code/modules/cooking/recipes/cultural/recipes_tajara.dm b/code/modules/cooking/recipes/cultural/recipes_tajara.dm index df12fc98bd1..3cbd304a179 100644 --- a/code/modules/cooking/recipes/cultural/recipes_tajara.dm +++ b/code/modules/cooking/recipes/cultural/recipes_tajara.dm @@ -150,6 +150,16 @@ result = /obj/item/reagent_containers/food/snacks/adhomian_porridge reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product +/singleton/recipe/zharkir + appliance = POT | SAUCEPAN + fruit = list("mtear" = 1, "earthenroot" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/dip/sarmikhir + ) + finished_temperature = T0C + 200 + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/soup/zharkir + // Tajaran cakes /singleton/recipe/conecake appliance = OVEN diff --git a/code/modules/cooking/recipes/recipes_breads.dm b/code/modules/cooking/recipes/recipes_breads.dm index cb987e72b1d..1eecb305c89 100644 --- a/code/modules/cooking/recipes/recipes_breads.dm +++ b/code/modules/cooking/recipes/recipes_breads.dm @@ -462,6 +462,13 @@ ) result = /obj/item/reagent_containers/food/snacks/blt +/singleton/recipe/cucumber_sandwich + fruit = list("cucumber" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice + ) + result = /obj/item/reagent_containers/food/snacks/cucumber_sandwich //pita (these are all under bread for icon reasons) /singleton/recipe/pita diff --git a/code/modules/cooking/recipes/recipes_fryer.dm b/code/modules/cooking/recipes/recipes_fryer.dm index b37f01ed7ba..fccbdd8dc8a 100644 --- a/code/modules/cooking/recipes/recipes_fryer.dm +++ b/code/modules/cooking/recipes/recipes_fryer.dm @@ -102,6 +102,13 @@ reagent_mix = RECIPE_REAGENT_REPLACE //So we don't end up with a ton of potato juice result = /obj/item/reagent_containers/food/snacks/fries_olympia +/singleton/recipe/fried_pickles + appliance = FRYER + items = list( + /obj/item/reagent_containers/food/snacks/sliced_pickle + ) + result = /obj/item/reagent_containers/food/snacks/fried_pickles + //Fishy Recipes //================== /singleton/recipe/fishandchips diff --git a/code/modules/cooking/recipes/recipes_ingredients.dm b/code/modules/cooking/recipes/recipes_ingredients.dm index 2a033b67ae3..e2012795387 100644 --- a/code/modules/cooking/recipes/recipes_ingredients.dm +++ b/code/modules/cooking/recipes/recipes_ingredients.dm @@ -25,3 +25,10 @@ reagents = list(/singleton/reagent/nutriment/coating/batter = 5) result = /obj/item/reagent_containers/food/snacks/plaincrepe reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/pickle + appliance = MIX + fruit = list("cucumber" = 1) + reagents = list(/singleton/reagent/enzyme = 5) + result = /obj/item/reagent_containers/food/snacks/pickle + reagent_mix = RECIPE_REAGENT_REPLACE diff --git a/code/modules/cooking/recipes/recipes_mix.dm b/code/modules/cooking/recipes/recipes_mix.dm index 6b67859194c..13240419a40 100644 --- a/code/modules/cooking/recipes/recipes_mix.dm +++ b/code/modules/cooking/recipes/recipes_mix.dm @@ -125,3 +125,8 @@ result = /obj/item/reagent_containers/food/snacks/salad/jungle_salad reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product +/singleton/recipe/tossed_salad + fruit = list("cabbage" = 1, "tomato" = 1, "cucumber" = 1) + reagents = list(/singleton/reagent/sodiumchloride = 1) + result = /obj/item/reagent_containers/food/snacks/salad/tossed_salad + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product diff --git a/code/modules/cooking/recipes/recipes_soup.dm b/code/modules/cooking/recipes/recipes_soup.dm index e8d0427d66a..c0195df9b02 100644 --- a/code/modules/cooking/recipes/recipes_soup.dm +++ b/code/modules/cooking/recipes/recipes_soup.dm @@ -104,13 +104,13 @@ /singleton/recipe/gazpacho appliance = MIX reagents = list(/singleton/reagent/water = 10, /singleton/reagent/sodiumchloride = 1, /singleton/reagent/blackpepper = 1) - fruit = list("tomato" = 1, "bellpepper" = 1) //if cucumbers are added to the game please add them to this recipe + fruit = list("tomato" = 1, "bellpepper" = 1, "cucumber" = 1) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/soup/gazpacho /singleton/recipe/pumpkin_soup appliance = SAUCEPAN | POT | MICROWAVE - fruit = list("pumpkin" = 1) //if cucumbers are added to the game please add them to this recipe + fruit = list("pumpkin" = 1) reagents = list(/singleton/reagent/water = 5, /singleton/reagent/drink/milk/cream = 5) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/soup/pumpkin diff --git a/code/modules/cooking/trays.dm b/code/modules/cooking/trays.dm index 46442bd70d6..cbfb6914e01 100644 --- a/code/modules/cooking/trays.dm +++ b/code/modules/cooking/trays.dm @@ -9,6 +9,8 @@ name = "tray" icon = 'icons/obj/kitchen.dmi' icon_state = "tray" + item_state = "tray" + contained_sprite = TRUE desc = "A metal tray to lay food on." throwforce = 12.0 force = 15 diff --git a/code/modules/hydroponics/seed_datums/adhomai.dm b/code/modules/hydroponics/seed_datums/adhomai.dm index 6d6b09f7344..4b2dd4ad0b1 100644 --- a/code/modules/hydroponics/seed_datums/adhomai.dm +++ b/code/modules/hydroponics/seed_datums/adhomai.dm @@ -138,7 +138,7 @@ seed_type = "nfrihi" /datum/seed/sugartree - name = "sugar tree" + name = "sugartree" seed_name = "sugar tree" display_name = "sugar trees" product_desc = "The fruit of the Sugar Tree, native to Adhomai. It is sweet and commonly used in candies." @@ -154,13 +154,13 @@ SET_SEED_TRAIT(src, TRAIT_MATURATION, 9) SET_SEED_TRAIT(src, TRAIT_PRODUCTION, 5) SET_SEED_TRAIT(src, TRAIT_YIELD, 2) - SET_SEED_TRAIT(src, TRAIT_PRODUCT_ICON, "nmshaan") + SET_SEED_TRAIT(src, TRAIT_PRODUCT_ICON, "sugartree") SET_SEED_TRAIT(src, TRAIT_PRODUCT_COLOUR, "#fffdf7") SET_SEED_TRAIT(src, TRAIT_PLANT_COLOUR, "#31331c") - SET_SEED_TRAIT(src, TRAIT_PLANT_ICON, "nmshaan") + SET_SEED_TRAIT(src, TRAIT_PLANT_ICON, "sugartree") SET_SEED_TRAIT(src, TRAIT_IDEAL_HEAT, IDEAL_HEAT_ADHOMAI) SET_SEED_TRAIT(src, TRAIT_WATER_CONSUMPTION, 4) SET_SEED_TRAIT(src, TRAIT_IDEAL_LIGHT, IDEAL_LIGHT_DIM) /obj/item/seeds/sugartree - seed_type = "sugar tree" + seed_type = "sugartree" diff --git a/code/modules/hydroponics/seed_datums/vegetables.dm b/code/modules/hydroponics/seed_datums/vegetables.dm index bf06e48dd63..778bf483329 100644 --- a/code/modules/hydroponics/seed_datums/vegetables.dm +++ b/code/modules/hydroponics/seed_datums/vegetables.dm @@ -280,3 +280,31 @@ /obj/item/seeds/cabbageseed seed_type = "cabbage" +/////////////// +// Cucumber // +/////////////// + +/datum/seed/cucumber + name = "cucumber" + seed_name = "cucumber" + display_name = "cucumber plant" + chems = list(/singleton/reagent/nutriment = list(1,10), /singleton/reagent/water = list(3,10)) + kitchen_tag = "cucumber" + +/datum/seed/cucumber/setup_traits() + ..() + SET_SEED_TRAIT(src, TRAIT_HARVEST_REPEAT, 1) + SET_SEED_TRAIT(src, TRAIT_MATURATION, 8) + SET_SEED_TRAIT(src, TRAIT_PRODUCTION, 6) + SET_SEED_TRAIT(src, TRAIT_YIELD, 3) + SET_SEED_TRAIT(src, TRAIT_POTENCY, 10) + SET_SEED_TRAIT(src, TRAIT_PRODUCT_ICON, "cucumber") + SET_SEED_TRAIT(src, TRAIT_PRODUCT_COLOUR, "#2c9b44") + SET_SEED_TRAIT(src, TRAIT_PLANT_COLOUR, "#3d803b") + SET_SEED_TRAIT(src, TRAIT_PLANT_ICON, "vine") + SET_SEED_TRAIT(src, TRAIT_WATER_CONSUMPTION, 6) + SET_SEED_TRAIT(src, TRAIT_NUTRIENT_CONSUMPTION, 0.25) + +/obj/item/seeds/cucumberseed + seed_type = "cucumber" +x diff --git a/code/modules/reagents/reagent_containers/food/snacks/breads.dm b/code/modules/reagents/reagent_containers/food/snacks/breads.dm index 7deb1ee5b52..e5470665f91 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/breads.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/breads.dm @@ -627,6 +627,15 @@ reagent_data = list(/singleton/reagent/nutriment = list("bread" = 4)) bitesize = 2 +/obj/item/reagent_containers/food/snacks/cucumber_sandwich + name = "cucumber sandwich" + desc = "Slices of cucumber between two buttered pieces of white bread witht he crust cut off. A light and delightful little finger food to have alongside your tea." + icon = 'icons/obj/item/reagent_containers/food/bread.dmi' + icon_state = "cucumbersandwich" + filling_color = "#97df68" + reagents_to_add = list(/singleton/reagent/nutriment = 5) + reagent_data = list(/singleton/reagent/nutriment = list("bread" = 4, "cucumber" = 4, "some kind of spread" = 2)) + bitesize = 2 //pita (these are all kept under 'bread' for icon and code simplification reasons. Plus, this way people don't have to chase these down all over the various categories they would otherwise belong in.) /obj/item/reagent_containers/food/snacks/pita 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 67492b59321..27574938fd7 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/tajara.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/tajara.dm @@ -190,6 +190,31 @@ reagent_data = list(/singleton/reagent/nutriment = list("oatmeal" = 3)) bitesize = 2 +/obj/item/reagent_containers/food/snacks/soup/zharkir + name = "zharkir" + item_state = "zharkir" + desc = "A thick, hot, creamy dish, not unlike a chowder (and known as 'adhomian chowder' in some cultures). It is made with sarmikhir, earthenroot and various adhomian herbs, balancing sweet and savory, and served in a traditional dish - a tall bowl with grooves on the side just big enough for tajaran hands to hold it up to their mouths and warm themselves on a cold Adhomian evening." + icon = 'icons/obj/item/reagent_containers/food/cultural/tajara.dmi' + icon_state = "zharkir" + is_liquid = TRUE + contained_sprite = TRUE + trash = /obj/item/trash/snack_bowl + center_of_mass = list("x"=15, "y"=9) + reagents_to_add = list(/singleton/reagent/drink/milk/adhomai = 5, /singleton/reagent/nutriment = 8) + reagent_data = list(/singleton/reagent/nutriment = list("sweet potato chowder" = 3)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/soup/zharkir/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_zharkir = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_zharkir) + if(0 to 80) + icon_state = "zharkir_half" + if(81 to INFINITY) + icon_state = "zharkir" + // Tajaran ingredients /obj/item/mollusc/clam/rasval name = "ras'val clam" diff --git a/code/modules/reagents/reagent_containers/food/snacks/fryer.dm b/code/modules/reagents/reagent_containers/food/snacks/fryer.dm index 7a5fdd84b86..e6edc008679 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/fryer.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/fryer.dm @@ -445,3 +445,15 @@ bitesize = 3 reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/nutriment/triglyceride/oil = 1.2, /singleton/reagent/capsaicin = 2) reagent_data = list(/singleton/reagent/nutriment = list("crispy potato" = 5), /singleton/reagent/capsaicin = list("paprika" = 5)) + +/obj/item/reagent_containers/food/snacks/fried_pickles + name = "fried pickles" + gender = PLURAL + desc = "Add some crunching to your munching." + icon = 'icons/obj/item/reagent_containers/food/fryer.dmi' + icon_state = "fried_pickles" + filling_color = "#cfda70" + bitesize = 1 + trash = /obj/item/trash/bowl_small + reagents_to_add = list(/singleton/reagent/nutriment = 1) + reagent_data = list(/singleton/reagent/nutriment = list("crunch" = 5)) diff --git a/code/modules/reagents/reagent_containers/food/snacks/ingredients.dm b/code/modules/reagents/reagent_containers/food/snacks/ingredients.dm index 4ed8c33c56a..b88fed99543 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/ingredients.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/ingredients.dm @@ -273,3 +273,22 @@ center_of_mass = list("x"=16, "y"=16) reagents_to_add = list(/singleton/reagent/nutriment = 1) filling_color = "#caa178" + +/obj/item/reagent_containers/food/snacks/pickle + name = "pickle" + desc = "This thing is a pretty big dill." + icon = 'icons/obj/item/reagent_containers/food/ingredients.dmi' + icon_state = "pickle" + filling_color = "#6f861c" + reagents_to_add = list(/singleton/reagent/nutriment = 3) + reagent_data = list(/singleton/reagent/nutriment = list("pickle" = 4)) + bitesize = 1 + slice_path = /obj/item/reagent_containers/food/snacks/sliced_pickle + slices_num = 1 + +/obj/item/reagent_containers/food/snacks/sliced_pickle + name = "bowl of sliced pickles" + desc = "A little green side dish, or just something to mindlessly snack on." + icon = 'icons/obj/item/reagent_containers/food/ingredients.dmi' + icon_state = "pickle_sliced" + trash = /obj/item/trash/bowl_small diff --git a/code/modules/reagents/reagent_containers/food/snacks/mix.dm b/code/modules/reagents/reagent_containers/food/snacks/mix.dm index efc4beb7839..42cab2cee97 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/mix.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/mix.dm @@ -178,3 +178,15 @@ reagents_to_add = list(/singleton/reagent/nutriment = 8) reagent_data = list(/singleton/reagent/nutriment = list("salad" = 2, "tomato" = 2, "bulgur" = 2, "greens" = 2)) bitesize = 3 + +/obj/item/reagent_containers/food/snacks/salad/tossed_salad + name = "tossed salad" + desc = "Got some veggies? Got some dressing? Toss them all in here, call it a salad. Bam, done." + icon = 'icons/obj/item/reagent_containers/food/mix.dmi' + icon_state = "tossedsalad" + trash = /obj/item/trash/snack_bowl + filling_color = "#4a9953" + center_of_mass = list("x"=17, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 7, /singleton/reagent/drink/tomatojuice = 2) + reagent_data = list(/singleton/reagent/nutriment = list("lettuce" = 3, "tomato" = 3, "cucumber" = 2, "vinigrette" = 2)) + bitesize = 2 diff --git a/html/changelogs/tomixcomics-pr.yml b/html/changelogs/tomixcomics-pr.yml new file mode 100644 index 00000000000..7daa373f097 --- /dev/null +++ b/html/changelogs/tomixcomics-pr.yml @@ -0,0 +1,62 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added cucumbers." + - rscadd: "Re-added randomly chosen items spawning in the fridges at shift start like they did before the scarcity arc." + - rscadd: "Added a few cucumber dishes and one Adhomian cuisine dish." + - rscadd: "Made it so it's visible when your character is holding a kitchen tray." + - bugfix: "Fixed sugar tree fruit not showing up." diff --git a/icons/obj/hydroponics_products.dmi b/icons/obj/hydroponics_products.dmi index 51996ea4248..730e45007c7 100644 Binary files a/icons/obj/hydroponics_products.dmi and b/icons/obj/hydroponics_products.dmi differ diff --git a/icons/obj/item/reagent_containers/food/bread.dmi b/icons/obj/item/reagent_containers/food/bread.dmi index 291e32c1816..b92f9ee8028 100644 Binary files a/icons/obj/item/reagent_containers/food/bread.dmi and b/icons/obj/item/reagent_containers/food/bread.dmi differ diff --git a/icons/obj/item/reagent_containers/food/cultural/tajara.dmi b/icons/obj/item/reagent_containers/food/cultural/tajara.dmi index 584f5e2ea81..356aca941de 100644 Binary files a/icons/obj/item/reagent_containers/food/cultural/tajara.dmi and b/icons/obj/item/reagent_containers/food/cultural/tajara.dmi differ diff --git a/icons/obj/item/reagent_containers/food/fryer.dmi b/icons/obj/item/reagent_containers/food/fryer.dmi index 1ed798c697f..4a25c3ba776 100644 Binary files a/icons/obj/item/reagent_containers/food/fryer.dmi and b/icons/obj/item/reagent_containers/food/fryer.dmi differ diff --git a/icons/obj/item/reagent_containers/food/ingredients.dmi b/icons/obj/item/reagent_containers/food/ingredients.dmi index a0510c9bbc6..2c8ad49f471 100644 Binary files a/icons/obj/item/reagent_containers/food/ingredients.dmi and b/icons/obj/item/reagent_containers/food/ingredients.dmi differ diff --git a/icons/obj/item/reagent_containers/food/mix.dmi b/icons/obj/item/reagent_containers/food/mix.dmi index 63528c87e8e..7644ca00557 100644 Binary files a/icons/obj/item/reagent_containers/food/mix.dmi and b/icons/obj/item/reagent_containers/food/mix.dmi differ diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index 3608b034fb5..5efdf6223cb 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ diff --git a/icons/obj/seeds.dmi b/icons/obj/seeds.dmi index 2a83a5c7dd6..719a881d674 100644 Binary files a/icons/obj/seeds.dmi and b/icons/obj/seeds.dmi differ