diff --git a/code/game/machinery/vending/snacks.dm b/code/game/machinery/vending/snacks.dm index dea1d82b2cf..ae0708f92f9 100644 --- a/code/game/machinery/vending/snacks.dm +++ b/code/game/machinery/vending/snacks.dm @@ -46,7 +46,8 @@ /obj/item/reagent_containers/food/drinks/jyalra = 5, /obj/item/reagent_containers/food/drinks/jyalra/cheese = 5, /obj/item/reagent_containers/food/drinks/jyalra/apple = 5, - /obj/item/reagent_containers/food/drinks/jyalra/cherry = 5 + /obj/item/reagent_containers/food/drinks/jyalra/cherry = 5, + /obj/item/reagent_containers/food/snacks/algaechips = 2 ) contraband = list( /obj/item/reagent_containers/food/snacks/syndicake = 6, @@ -90,6 +91,7 @@ /obj/item/reagent_containers/food/drinks/jyalra/cherry = 1.75, /obj/item/reagent_containers/food/snacks/syndicake = 3.50, /obj/item/reagent_containers/food/snacks/koisbar = 12.00, + /obj/item/reagent_containers/food/snacks/algaechips = 2.50 ) light_color = COLOR_BABY_BLUE manufacturer = "nanotrasen" diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 03372a8ac9c..89020928783 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -450,3 +450,7 @@ /obj/item/trash/mac_fiery name = "empty fiery hot mac and cheeze container" icon_state = "mac_trash_fiery" + +/obj/item/trash/algaechips + name = "It looks like someone left some strands of algae in it." + icon_state = "algaechips" diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 7d7f6d3c00e..dff78dac53e 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -336,6 +336,7 @@ /obj/item/trash/meatsnack = 0.5, /obj/item/trash/maps = 0.5, /obj/item/trash/tuna = 0.5, + /obj/item/trash/algaechips = 0.5, /obj/effect/decal/cleanable/ash = 1.5, /obj/effect/decal/cleanable/dirt = 2, /obj/effect/decal/cleanable/flour = 1, diff --git a/code/modules/cooking/recipes/cultural/recipes_human.dm b/code/modules/cooking/recipes/cultural/recipes_human.dm index baf5092b91b..0e377c0550c 100644 --- a/code/modules/cooking/recipes/cultural/recipes_human.dm +++ b/code/modules/cooking/recipes/cultural/recipes_human.dm @@ -372,6 +372,23 @@ result = /obj/item/reagent_containers/food/snacks/imperial_scallops reagent_mix = RECIPE_REAGENT_REPLACE //Simplify and replace +/singleton/recipe/voidsman_stew + appliance = SKILLET + fruit = list("onion" = 1, "garlic" = 1) + reagents = list(/singleton/reagent/water = 5, /singleton/reagent/spacespice = 2, /singleton/reagent/blackpepper = 1) + items = list( + /obj/item/reagent_containers/food/snacks/fish + ) + result = /obj/item/reagent_containers/food/snacks/voidsman_stew + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify and replace + +/singleton/recipe/carian_strogonoff + appliance = SKILLET + fruit = list("mushroom" = 2, "onion" = 1, "garlic" = 1) + reagents = list(/singleton/reagent/drink/milk/cream = 10) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify and replace + result = /obj/item/reagent_containers/food/snacks/carian_stroganoff + // New Hai Phong /singleton/recipe/chetroinuoc diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_dominia.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_dominia.dm index ef64594a6af..52b11ddb1d6 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_dominia.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_dominia.dm @@ -252,3 +252,14 @@ glass_name = "rapturous sacrament of the threefold goddess" glass_desc = "And Our Lady did come down from the mountain, and She was flanked in radiant and ever-burning cosmic fires. And She spoke with the Lady Caladius for what seemed an eternity, \ and the Lady Caladius did finally emerge. And we happy few were so blessed as to hear her- the Prophetess Giovanna- say, 'Drink today not as warriors, but as immortals.'." + +/singleton/reagent/alcohol/witchspirit + name = "Witch-spirit" + color = "#33EDA3" + description = "The most fashionable new cocktail in Nova Luxembourg." + strength = 45 + taste_description = "herbal and citrus sting" + + glass_icon_state = "witchspirit" + glass_name = "glass of witch-spirit" + glass_desc = "The most fashionable new cocktail in Nova Luxembourg, and the only Witch-spirit the Primaries will put up with." diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 1ecb74d9ed5..9c8778c3273 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -2823,7 +2823,6 @@ required_reagents = list(/singleton/reagent/drink/lemonade = 8, /singleton/reagent/drink/grenadine = 2) result_amount = 10 - /datum/chemical_reaction/drink/kiraspecial name = "Kira Special" id = "kiraspecial" @@ -4514,6 +4513,13 @@ required_reagents = list(/singleton/reagent/alcohol/threefold = 1, /singleton/reagent/alcohol/godhead = 1, /singleton/reagent/water/holywater = 1) result_amount = 3 +/datum/chemical_reaction/drink/witchspirit + name = "witch-spirit" + id = "witchspirit" + result = /singleton/reagent/alcohol/witchspirit + required_reagents = list(/singleton/reagent/alcohol/wine/algae = 1, /singleton/reagent/alcohol/gin = 1, /singleton/reagent/alcohol/limoncello = 1, /singleton/reagent/alcohol/melonliquor = 1) + result_amount = 4 + //boba drinks /datum/chemical_reaction/drink/boba_tea diff --git a/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm b/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm index 6a16ce3febf..7966c192629 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm @@ -625,6 +625,28 @@ reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood/mollusc = 6, /singleton/reagent/nutriment = 2, /singleton/reagent/water = 5, /singleton/reagent/sodiumchloride = 2) reagent_data = list(/singleton/reagent/nutriment/protein/seafood/mollusc = list("pillowy scallops" = 10, "salt" = 5), /singleton/reagent/nutriment = list("butter" = 10)) +/obj/item/reagent_containers/food/snacks/voidsman_stew + name = "voidsman's stew" + desc = "Fried fish balls in a light sauce. This dish predates the Imperial liberation of Sun Reach, being originally known as a 'freebooter stew'. The name was changed by the Viceroy's orders to honor those who died fighting the pirate lords." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "voidsman_stew" + trash = /obj/item/trash/wooden_platter + reagents_to_add = list(/singleton/reagent/nutriment/protein = 8, /singleton/reagent/nutriment = 4, /singleton/reagent/nutriment/triglyceride = 4, /singleton/reagent/spacespice = 2) + reagent_data = list(/singleton/reagent/nutriment = list("hot stew" = 3, "spices" = 1, "vegetables" = 1, "fish" = 2)) + bitesize = 3 + filling_color = "#4D2009" + +/obj/item/reagent_containers/food/snacks/carian_stroganoff + name = "carian stroganoff" + desc = "Meaty mushrooms drenched in a creamy sauce. Caria has a variety of mushroom dishes, but the rich flavours of Carian stroganoff made it popular when brought to Moroz and to the rest of the Spur." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "carian_stroganoff" + trash = /obj/item/trash/wooden_platter + reagents_to_add = list(/singleton/reagent/nutriment/protein = 6, /singleton/reagent/nutriment = 4) + reagent_data = list(/singleton/reagent/nutriment = list("creamy sauce" = 2, "savory spices" = 2), /singleton/reagent/nutriment = list("fried mushrooms" = 4)) + bitesize = 3 + filling_color = "#986E55" + //New Hai Phong /obj/item/reagent_containers/food/snacks/chetroinuoc diff --git a/code/modules/reagents/reagent_containers/food/snacks/processed.dm b/code/modules/reagents/reagent_containers/food/snacks/processed.dm index 87dc9b82f00..100d3372763 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/processed.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/processed.dm @@ -828,6 +828,18 @@ reagent_data = list(/singleton/reagent/nutriment = list("light cocoa" = 2)) bitesize = 1 +//Dominia Snacks?! +//By the Goddess, pass the Algae chips I'm on a killstreak in Reign of Steel + +/obj/item/reagent_containers/food/snacks/algaechips + name = "\improper Soostatom Bites Algae Chips" + desc = "Cripsy batter fried algae chips from Sun Reach. Soostatom Bites, snapping good snacks!" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "algaechips" + trash = /obj/item/trash/algaechips + reagents_to_add = list(/singleton/reagent/nutriment = 3) + reagent_data = list(/singleton/reagent/nutriment = list("salty algae" = 3)) + //Microwave food packages /obj/item/storage/box/fancy/quick_microwave_pizza diff --git a/html/changelogs/Fyni-DomiFoodandDrink.yml b/html/changelogs/Fyni-DomiFoodandDrink.yml new file mode 100644 index 00000000000..2d0a96c6f45 --- /dev/null +++ b/html/changelogs/Fyni-DomiFoodandDrink.yml @@ -0,0 +1,60 @@ +################################ +# 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: Fyni + +# 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: "Adds voidsman stew and carian stroganoff to make-able recipes" + - rscadd: "Adds algae crisps to the Getmore vendor." + - rscadd: "Adds the witchspirit cocktail to the makeable list" \ No newline at end of file diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index ac595771810..f2c163aeeca 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/item/reagent_containers/food/cultural/human.dmi b/icons/obj/item/reagent_containers/food/cultural/human.dmi index 71e5ad76620..924eaededb6 100644 Binary files a/icons/obj/item/reagent_containers/food/cultural/human.dmi and b/icons/obj/item/reagent_containers/food/cultural/human.dmi differ diff --git a/icons/obj/item/reagent_containers/food/processed.dmi b/icons/obj/item/reagent_containers/food/processed.dmi index cd032d3e71a..5c40cd9a044 100644 Binary files a/icons/obj/item/reagent_containers/food/processed.dmi and b/icons/obj/item/reagent_containers/food/processed.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index d3e2c3508ec..5cc86465784 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ