module kvass

code/modules/reagents/reagent_containers/cups/soda.dm

@@ -75,7 +75,7 @@
 
 		//MASSMETA EDIT ADDITION BEGIN (kvass)
 		if(icon_state == "kvass")
-			crushed_can.icon = 'massmeta/icons/items/janitor.dmi'
+			crushed_can.icon = 'massmeta/features/kvass/icons/janitor.dmi'
 		//MASSMETA EDIT ADDITION END
 
 		qdel(src)
@@ -92,7 +92,7 @@
 
 		//MASSMETA EDIT ADDITION BEGIN (kvass)
 		if(icon_state == "kvass")
-			crushed_can.icon = 'massmeta/icons/items/janitor.dmi'
+			crushed_can.icon = 'massmeta/features/kvass/icons/janitor.dmi'
 		//MASSMETA EDIT ADDITION END
 
 		var/atom/throw_target = get_edge_target_turf(crushed_can, pick(GLOB.alldirs))
@@ -155,7 +155,7 @@
 
 	//MASSMETA EDIT ADDITION BEGIN (kvass)
 	if(icon_state == "kvass")
-		crushed_can.icon = 'massmeta/icons/items/janitor.dmi'
+		crushed_can.icon = 'massmeta/features/kvass/icons/janitor.dmi'
 	//MASSMETA EDIT ADDITION END
 
 	moveToNullspace()

massmeta/features/kvass/code/drink_containers.dm

@@ -0,0 +1,20 @@
+// reagent containers for kvass
+
+// code/modules/reagents/reagent_containers/cups/soda.dm
+/obj/item/reagent_containers/cup/soda_cans/kvass
+	name = "Kvass"
+	desc = "Kvaaaaaaaass."
+	icon = 'massmeta/features/kvass/icons/soda.dmi'
+	icon_state = "kvass"
+	list_reagents = list(/datum/reagent/consumable/kvass = 30)
+	drink_type = GRAIN
+
+// TODO: нужно будет потом добавить иконки "в руках"
+
+// code/modules/reagents/chemistry/reagents/drinks/glass_styles/sodas.dm
+/datum/glass_style/drinking_glass/kvass
+	required_drink_type = /datum/reagent/consumable/kvass
+	name = "glass of Kvass"
+	desc = "A glass of Kvaaaaaaass."
+	icon = 'massmeta/features/kvass/icons/drinks.dmi'
+	icon_state = "kvass"

massmeta/features/kvass/code/drink_reagents.dm → massmeta/features/kvass/code/kvass_reagent.dm

@@ -1,11 +1,14 @@
+// Kvass reagent itself
+
+// code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
 /datum/reagent/consumable/kvass
 	name = "Kvass"
 	description = "Kvaaaaaaass."
 	color = "#351300" // rgb: 53, 19, 0
 	quality = DRINK_VERYGOOD
 	overdose_threshold = 50
 	taste_description = "mmmmm kvass"
-	ph = 6 // а точно ли 6?
+	ph = 4
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	default_container = /obj/item/reagent_containers/cup/soda_cans/kvass
 
@@ -17,13 +20,13 @@
 	need_mob_update = affected_mob.adjustToxLoss(-0.5, updating_health = FALSE, required_biotype = affected_biotype)
 	need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, -0.5 * REM * seconds_per_tick, required_organ_flag = ORGAN_ORGANIC)
 	for(var/datum/reagent/toxin/R in affected_mob.reagents.reagent_list)
-		affected_mob.reagents.remove_reagent(R.type, 2.5 * REM * seconds_per_tick) // а не имба?
+		affected_mob.reagents.remove_reagent(R.type, 1.5 * REM * seconds_per_tick)
 	if(need_mob_update)
 		return UPDATE_MOB_HEALTH
 
 /datum/reagent/consumable/kvass/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
 	. = ..()
 	affected_mob.set_jitter_if_lower(5 SECONDS * REM * seconds_per_tick)
 	if(SPT_PROB(7.5, seconds_per_tick))
-		var/list/phrase = world.file2list("massmeta/features/kvass/string/kvass.txt")
+		var/list/phrase = world.file2list("strings/massmeta/kvass.txt")
 		affected_mob.say(pick(phrase), forced = /datum/reagent/consumable/kvass)

massmeta/features/kvass/code/kvass_tank.dm

@@ -0,0 +1,27 @@
+// A kvass Tank, full of fresh and healthy kvass
+// You can buy and also sell it!
+
+// code/modules/reagents/reagent_dispenser.dm
+/obj/structure/reagent_dispensers/kvasstank
+	name = "kvass tank"
+	desc = "Yellow barrel full of divine liquid."
+	icon = 'massmeta/features/kvass/icons/chemical_tanks.dmi'
+	icon_state = "kvass"
+	reagent_id = /datum/reagent/consumable/kvass
+	openable = TRUE
+	climbable = TRUE
+
+// code/modules/cargo/packs/materials.dm
+/datum/supply_pack/materials/kvasstank
+	name = "Kvass Tank Crate"
+	desc = "Contains a yellow barrel full of kvass."
+	cost = CARGO_CRATE_VALUE * 2
+	contains = list(/obj/structure/reagent_dispensers/kvasstank)
+	crate_name = "kvass tank crate"
+	crate_type = /obj/structure/closet/crate/large/soviet
+
+// code/modules/cargo/exports/large_objects.dm
+/datum/export/large/reagent_dispenser/kvass
+	unit_name = "kvasstank"
+	export_types = list(/obj/structure/reagent_dispensers/kvasstank)
+	contents_cost = CARGO_CRATE_VALUE

massmeta/features/kvass/includes.dm

@@ -1,6 +1,3 @@
-#include "code\drink_reagents.dm"
-#include "code\large_objects.dm"
-#include "code\materials.dm"
-#include "code\reagent_dispenser.dm"
-#include "code\soda.dm"
-#include "code\sodas.dm"
+#include "code\drink_containers.dm"
+#include "code\kvass_reagent.dm"
+#include "code\kvass_tank.dm"

massmeta/features/kvass/readme.md

@@ -4,6 +4,9 @@
 
 Добавляет Квасс, мммм квасс!
 
+Используется модуль soviet_crate.
+
+Фразы при овердозе лежат в: "strings/massmeta/kvass.txt"
 
 ### TG Proc/File Changes: