Skip to content

Commit

Permalink
Feat: add kvas and related dishes (#36)
Browse files Browse the repository at this point in the history
- Добавляет квас как реагент. (Пиво 1 часть. Сахар 2 части. Энзим 5
юнитов, как катализатор).
Квас повышает настроение и медленно выводит токсины.

- Добавляет бочку кваса на 1000 юнитов, в карго, в раздел канистр.

![2222](https://user-images.githubusercontent.com/104280915/204438336-658c2250-b882-4ad8-b70c-117f5bf25d8c.png)
- Добавляет окрошку в категорию супов, как овощное и мясное блюдо. (20
юнитов кваса. 1 огурец. 1 сырая котлета).

![2323232](https://user-images.githubusercontent.com/104280915/204438283-cb621484-60e0-4fa1-8549-828b9fbab3f3.png)
- Добавляет мемную пластиковую бутылку с квасом, для щитспавнов.

![22131231](https://user-images.githubusercontent.com/104280915/204438357-1b7a2872-83d7-4b9a-9b53-f7a5bdeaa4d2.png)

Co-authored-by: Bizzonium <[email protected]>
Co-authored-by: BeebBeebBoob <[email protected]>
Co-authored-by: Vallat <[email protected]>
Co-authored-by: Magic101lvl <[email protected]>
Co-authored-by: VastKilleroOm <[email protected]>
Co-authored-by: Krashly <[email protected]>
Co-authored-by: Holoo <[email protected]>
  • Loading branch information
8 people committed Dec 28, 2022
1 parent b86fb0f commit 2766694
Show file tree
Hide file tree
Showing 11 changed files with 77 additions and 0 deletions.
7 changes: 7 additions & 0 deletions code/modules/cargo/packs/kvas_crate.dm
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions code/modules/food_and_drinks/recipes/drinks/kvas_recipe.dm
Original file line number Diff line number Diff line change
@@ -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)
10 changes: 10 additions & 0 deletions code/modules/food_and_drinks/recipes/tablecraft/recipe_okroshka.dm
Original file line number Diff line number Diff line change
@@ -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
26 changes: 26 additions & 0 deletions code/modules/reagents/chemistry/reagents/kvas_okroshka.dm
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions code/modules/reagents/chemistry/reagents/okroshka.dm
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions code/modules/reagents/kvas_tank.dm
Original file line number Diff line number Diff line change
@@ -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
7 changes: 7 additions & 0 deletions code/modules/reagents/reagent_containers/cups/kvas_bottle.dm
Original file line number Diff line number Diff line change
@@ -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)
Binary file added icons/obj/food/okroshka.dmi
Binary file not shown.
Binary file added icons/obj/kvas_bottle.dmi
Binary file not shown.
Binary file added icons/obj/medical/kvas_tank.dmi
Binary file not shown.
6 changes: 6 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 2766694

Please sign in to comment.