diff --git a/code/modules/cargo/packs/kvas_crate.dm b/code/modules/cargo/packs/kvas_crate.dm new file mode 100644 index 0000000000000..8cc6a6f1f14fd --- /dev/null +++ b/code/modules/cargo/packs/kvas_crate.dm @@ -0,0 +1,7 @@ +/datum/supply_pack/materials/kvastank + name = "Kvass Barrel Crate" + desc = "Contains a classic kvass barrel" + cost = CARGO_CRATE_VALUE * 1.6 + contains = list(/obj/structure/reagent_dispensers/kvastank) + crate_name = "kvass barrel crate" + crate_type = /obj/structure/closet/crate/large \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/drinks/kvas_recipe.dm b/code/modules/food_and_drinks/recipes/drinks/kvas_recipe.dm new file mode 100644 index 0000000000000..2a51ba946bf82 --- /dev/null +++ b/code/modules/food_and_drinks/recipes/drinks/kvas_recipe.dm @@ -0,0 +1,4 @@ +/datum/chemical_reaction/drink/kvas + results = list(/datum/reagent/consumable/kvas = 3) + required_reagents = list(/datum/reagent/consumable/ethanol/beer = 2, /datum/reagent/consumable/sugar = 1) + required_catalysts = list(/datum/reagent/consumable/enzyme = 5) \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipe_okroshka.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipe_okroshka.dm new file mode 100644 index 0000000000000..34015e39917c3 --- /dev/null +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipe_okroshka.dm @@ -0,0 +1,10 @@ +/datum/crafting_recipe/food/oksroshka + name = "Okroshka" + reqs = list( + /datum/reagent/consumable/kvas = 20, + /obj/item/reagent_containers/cup/bowl = 1, + /obj/item/food/grown/cucumber = 1, + /obj/item/food/meat/rawcutlet = 1, + ) + result = /obj/item/food/soup/okroshka + subcategory = CAT_SOUP \ No newline at end of file diff --git a/code/modules/reagents/chemistry/reagents/kvas_okroshka.dm b/code/modules/reagents/chemistry/reagents/kvas_okroshka.dm new file mode 100644 index 0000000000000..4ec5a9b9513a6 --- /dev/null +++ b/code/modules/reagents/chemistry/reagents/kvas_okroshka.dm @@ -0,0 +1,26 @@ +/datum/reagent/consumable/kvas + name = "Kvass" + description = "Ancient slavic drink" + nutriment_factor = 0 + quality = DRINK_GOOD + taste_description = "sweet" + glass_icon_state = "fernetpuro" + glass_name = "stakan of kvass" + glass_desc = "Very vkusno." + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/kvas/on_mob_life(mob/living/carbon/M, delta_time, times_fired) + if(M.getToxLoss() && DT_PROB(10, delta_time)) + M.adjustToxLoss(-1, 0) + ..() + . = TRUE + +/obj/item/food/soup/okroshka + name = "okroshka" + desc = "Kvas is good. Kvas soup is even better." + icon = 'icons/obj/food/okroshka.dmi' + icon_state = "okroshka" + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/kvas = 5, /datum/reagent/consumable/nutriment/vitamin = 4) + tastes = list("okroshka" = 1) + foodtypes = VEGETABLES | MEAT + venue_value = FOOD_PRICE_NORMAL \ No newline at end of file diff --git a/code/modules/reagents/chemistry/reagents/okroshka.dm b/code/modules/reagents/chemistry/reagents/okroshka.dm new file mode 100644 index 0000000000000..e520fa6f418a1 --- /dev/null +++ b/code/modules/reagents/chemistry/reagents/okroshka.dm @@ -0,0 +1,9 @@ +/obj/item/food/soup/okroshka + name = "okroshka" + desc = "Kvas is good. Kvas soup is even better." + icon = 'icons/obj/food/okroshka.dmi' + icon_state = "okroshka" + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/kvas = 5, /datum/reagent/consumable/nutriment/vitamin = 4) + tastes = list("okroshka" = 1) + foodtypes = VEGETABLES | MEAT + venue_value = FOOD_PRICE_NORMAL \ No newline at end of file diff --git a/code/modules/reagents/kvas_tank.dm b/code/modules/reagents/kvas_tank.dm new file mode 100644 index 0000000000000..e32851a8c41ed --- /dev/null +++ b/code/modules/reagents/kvas_tank.dm @@ -0,0 +1,8 @@ +/obj/structure/reagent_dispensers/kvastank + name = "barrel of kvass" + desc = "A yellow barrel full of kvass. No there is no worms inside." + icon = 'icons/obj/medical/kvas_tank.dmi' + icon_state = "kvas_tank" + reagent_id = /datum/reagent/consumable/kvas + tank_volume = 1000 + openable = TRUE \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/cups/kvas_bottle.dm b/code/modules/reagents/reagent_containers/cups/kvas_bottle.dm new file mode 100644 index 0000000000000..5194e4fda68ca --- /dev/null +++ b/code/modules/reagents/reagent_containers/cups/kvas_bottle.dm @@ -0,0 +1,7 @@ +/obj/item/reagent_containers/cup/kvas + name = "kvass bottle" + desc = "A bottled cheap kvas." + volume = 50 + icon = 'icons/obj/kvas_bottle.dmi' + icon_state = "kvas_bottle" + list_reagents = list(/datum/reagent/consumable/kvas = 50) \ No newline at end of file diff --git a/icons/obj/food/okroshka.dmi b/icons/obj/food/okroshka.dmi new file mode 100644 index 0000000000000..714e08efae83b Binary files /dev/null and b/icons/obj/food/okroshka.dmi differ diff --git a/icons/obj/kvas_bottle.dmi b/icons/obj/kvas_bottle.dmi new file mode 100644 index 0000000000000..6d1a732c85b76 Binary files /dev/null and b/icons/obj/kvas_bottle.dmi differ diff --git a/icons/obj/medical/kvas_tank.dmi b/icons/obj/medical/kvas_tank.dmi new file mode 100644 index 0000000000000..c1f4fe71d45b6 Binary files /dev/null and b/icons/obj/medical/kvas_tank.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 29af7d9b84ca4..0c7e2d42c31a1 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2787,6 +2787,7 @@ #include "code\modules\cargo\markets\market_items\weapons.dm" #include "code\modules\cargo\packs\_packs.dm" #include "code\modules\cargo\packs\costumes_toys.dm" +#include "code\modules\cargo\packs\kvas_crate.dm" #include "code\modules\cargo\packs\emergency.dm" #include "code\modules\cargo\packs\engineering.dm" #include "code\modules\cargo\packs\exploration.dm" @@ -3191,8 +3192,10 @@ #include "code\modules\food_and_drinks\recipes\drinks\drinks_alcoholic.dm" #include "code\modules\food_and_drinks\recipes\drinks\drinks_lizard.dm" #include "code\modules\food_and_drinks\recipes\drinks\drinks_moth.dm" +#include "code\modules\food_and_drinks\recipes\drinks\kvas_recipe.dm" #include "code\modules\food_and_drinks\recipes\drinks\drinks_non-alcoholic.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_bread.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipe_okroshka.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_burger.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_cake.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_drink.dm" @@ -4315,6 +4318,7 @@ #include "code\modules\projectiles\projectile\special\temperature.dm" #include "code\modules\projectiles\projectile\special\wormhole.dm" #include "code\modules\reagents\chem_splash.dm" +#include "code\modules\reagents\kvas_tank.dm" #include "code\modules\reagents\reagent_containers.dm" #include "code\modules\reagents\reagent_dispenser.dm" #include "code\modules\reagents\chemistry\chem_wiki_render.dm" @@ -4335,6 +4339,7 @@ #include "code\modules\reagents\chemistry\machinery\reagentgrinder.dm" #include "code\modules\reagents\chemistry\machinery\smoke_machine.dm" #include "code\modules\reagents\chemistry\reagents\alcohol_reagents.dm" +#include "code\modules\reagents\chemistry\reagents\kvas_okroshka.dm" #include "code\modules\reagents\chemistry\reagents\atmos_gas_reagents.dm" #include "code\modules\reagents\chemistry\reagents\cat2_medicine_reagents.dm" #include "code\modules\reagents\chemistry\reagents\catalyst_reagents.dm" @@ -4376,6 +4381,7 @@ #include "code\modules\reagents\reagent_containers\cups\_glass_datum.dm" #include "code\modules\reagents\reagent_containers\cups\bottle.dm" #include "code\modules\reagents\reagent_containers\cups\drinkingglass.dm" +#include "code\modules\reagents\reagent_containers\cups\kvas_bottle.dm" #include "code\modules\reagents\reagent_containers\cups\drinks.dm" #include "code\modules\reagents\reagent_containers\cups\glassbottle.dm" #include "code\modules\reagents\reagent_containers\cups\soda.dm"