New Fluid Trait

code/__DEFINES/traits.dm

@@ -290,7 +290,11 @@
 //used because it's more reliable than checking for the component
 #define TRAIT_DULLAHAN "dullahan"
 
-#define TRAIT_AKIMBO	"akimbo"
+#define TRAIT_AKIMBO		"akimbo" // BLUEMOON ADDITION
+#define TRAIT_FLUID 		"fluid" // BLUEMOON ADDITION
+#define TRAIT_FLUID_TITS	"fluid_tits" // BLUEMOON ADDITION
+#define TRAIT_FLUID_WOMB	"fluid_womb" // BLUEMOON ADDITION
+#define TRAIT_FLUID_PENIS	"fluid_penis" // BLUEMOON ADDITION
 
 
 // mobility flag traits

code/datums/components/mood.dm

@@ -172,6 +172,8 @@
 	HandleNutrition(owner)
 	HandleThirst(owner)
 
+	HandleFluid(owner) // BLUEMOON ADDITION
+
 /datum/component/mood/proc/setSanity(amount, minimum=SANITY_INSANE, maximum=SANITY_NEUTRAL)//I'm sure bunging this in here will have no negative repercussions.
 	var/mob/living/master = parent
 

code/modules/arousal/arousal.dm

@@ -91,6 +91,7 @@
 	if(condomning)
 		to_chat(src, "<span class='userlove'>Ты чувствуешь, как презерватив наполняется изнутри твоей спермой!</span>")
 		R.trans_to(condomning, R.total_volume)
+		sender.fluid_volume = 0
 	else
 		if(spill && R.total_volume > 0)
 			var/turf/location = get_turf(target)
@@ -99,12 +100,14 @@
 			if(istype(sender, /obj/item/organ/genital/penis))
 				if(S)
 					if(R.trans_to(S, R.total_volume))
+						sender.fluid_volume = 0
 						S.blood_DNA |= get_blood_dna_list()
 						S.update_icon()
 						return
 				else
 					var/obj/effect/decal/cleanable/semendrip/drip = (locate(/obj/effect/decal/cleanable/semendrip) in location) || new(location)
 					if(R.trans_to(drip, R.total_volume))
+						sender.fluid_volume = 0
 						drip.blood_DNA |= get_blood_dna_list()
 						drip.update_icon()
 						if(drip.reagents.total_volume >= 10)
@@ -117,12 +120,14 @@
 			if(istype(sender, /obj/item/organ/genital/vagina))
 				if(F)
 					if(R.trans_to(F, R.total_volume))
+						sender.fluid_volume = 0
 						F.blood_DNA |= get_blood_dna_list()
 						F.update_icon()
 						return
 				else
 					F = new(location)
 					if(R.trans_to(F, R.total_volume))
+						sender.fluid_volume = 0
 						F.blood_DNA |= get_blood_dna_list()
 						F.update_icon()
 						return
@@ -139,6 +144,7 @@
 					if(copy.total_volume > 0)
 						cummed_on.apply_status_effect(STATUS_EFFECT_DRIPPING_CUM, copy, get_blood_dna_list(), receiver)
 			R.trans_to(target, amount_to_transfer, log = TRUE)
+			sender.fluid_volume = 0
 		//
 	sender.last_orgasmed = world.time
 	R.clear_reagents()

code/modules/arousal/genitals.dm

@@ -12,7 +12,7 @@
 	var/fluid_transfer_factor = 0 //How much would a partner get in them if they climax using this?
 	var/size = 2 //can vary between num or text, just used in icon_state strings
 	var/datum/reagent/fluid_id = null
-	var/fluid_max_volume = 50
+	var/fluid_max_volume = 100 // BLUEMOON EDIT || 50 to 100
 	var/fluid_efficiency = 1
 	var/fluid_rate = CUM_RATE
 	var/fluid_mult = 1

code/modules/mob/living/carbon/human/examine.dm

@@ -523,6 +523,17 @@
 	if (!isnull(trait_exam))
 		msg += trait_exam
 
+	if(HAS_TRAIT(user, TRAIT_FLUID))
+		if(HAS_TRAIT(user, TRAIT_FLUID_TITS))
+			if(breasts_protechka_examine != null)
+				. += breasts_protechka_examine
+		if(HAS_TRAIT(user, TRAIT_FLUID_PENIS))
+			if(penis_protechka_examine != null)
+				. += penis_protechka_examine
+		if(HAS_TRAIT(user, TRAIT_FLUID_WOMB))
+			if(womb_protechka_examine != null)
+				. += womb_protechka_examine
+
 	var/scar_severity = 0
 	for(var/i in all_scars)
 		var/datum/scar/S = i

modular_bluemoon/SmiLeY/code/serverside/pronouns_ru.dm

@@ -42,6 +42,8 @@
 /datum/proc/ru_aya_oy(temp_gender)
 	. = "ой"
 
+/datum/proc/ru_oy_im(temp_gender)
+	. = "ым"
 
 //like clients, which do have gender.
 /client/ru_who(capitalized, temp_gender)
@@ -128,6 +130,18 @@
 	if(capitalized)
 		. = capitalize(.)
 
+/atom/ru_oy_im(capitalized, temp_gender) // Я чувствую себя свободн(ым/ой)
+	if(!temp_gender)
+		temp_gender = gender
+	. = "ым"
+	switch(temp_gender)
+		if(FEMALE)
+			. = "ой"
+		if(MALE)
+			. = "ым"
+	if(capitalized)
+		. = capitalize(.)
+
 //mobs(and atoms but atoms don't really matter write your own proc overrides) also have gender!
 /atom/ru_who(capitalized, temp_gender)
 	if(!temp_gender)

modular_bluemoon/krashly/code/modules/sexfluids_limits/_limits.dm

@@ -0,0 +1,12 @@
+#define MAX_FLUID 300
+#define OCHEN_BLIZKO_FLUID 280
+#define BLIZKO_TO_MAX_FLUID 200
+#define SREDNE_FLUID 150
+#define MIN_FLUID 0
+
+#define MIN_FLUID_SPAWN 100
+#define MAX_FLUID_SPAWN 200
+
+#define NETU 1
+#define CHUTKA 2
+#define OVERDOHUYA 3

modular_bluemoon/krashly/code/modules/sexfluids_limits/effects.dm

@@ -0,0 +1,101 @@
+/obj/effect/decal/cleanable/fluidrip
+	name = "fluid"
+	density = 0
+	layer = ABOVE_NORMAL_TURF_LAYER
+	icon = 'modular_bluemoon/krashly/code/modules/sexfluids_limits/icons/drips.dmi'
+	icon_state = "drip1"
+	random_icon_states = list("drip1", "drip2", "drip3", "drip4", "drip5")
+
+/obj/effect/decal/cleanable/fluidrip/replace_decal(obj/effect/decal/cleanable/fluidrip/C)
+	. = ..()
+	if(!. || QDELETED(src))
+		return FALSE
+	var/obj/effect/decal/cleanable/fluid/S = (locate(/obj/effect/decal/cleanable/fluid) in C.loc)
+	if(S) // Merge ourselves into this puddle.
+		reagents.trans_to(S, reagents.total_volume)
+		S.transfer_blood_dna(blood_DNA)
+		update_icon()
+		return TRUE
+	reagents.trans_to(C, reagents.total_volume)
+	C.transfer_blood_dna(blood_DNA)
+	if(C.reagents.total_volume >= 10) // Turn the drip into a puddle.
+		S = new(C.loc)
+		C.reagents.trans_to(S, C.reagents.total_volume)
+		C.transfer_blood_dna(S.blood_DNA)
+		S.update_icon()
+		qdel(C)
+	update_icon()
+
+/obj/effect/decal/cleanable/fluidrip/update_icon()
+	. = ..()
+	add_atom_colour(mix_color_from_reagents(reagents.reagent_list), FIXED_COLOUR_PRIORITY)
+
+///
+
+/obj/effect/decal/cleanable/fluid
+	name = "fluid"
+	desc = null
+	gender = PLURAL
+	density = 0
+	layer = ABOVE_NORMAL_TURF_LAYER
+	icon = 'modular_bluemoon/krashly/code/modules/sexfluids_limits/icons/drips.dmi'
+	icon_state = "pool"
+
+/obj/effect/decal/cleanable/fluid/Initialize(mapload)
+	. = ..()
+	dir = GLOB.cardinals
+	if(mapload)
+		reagents.add_reagent(/datum/reagent/consumable/fluid, 10)
+		add_blood_DNA(list("Non-human DNA" = "A+"))
+	update_icon()
+
+/obj/effect/decal/cleanable/fluid/replace_decal(obj/effect/decal/cleanable/fluid/S)
+	if(reagents.total_volume > 0)
+		reagents.trans_to(S.reagents, reagents.total_volume)
+	if(blood_DNA)
+		S.blood_DNA |= blood_DNA
+		S.update_icon()
+	return ..()
+
+/obj/effect/decal/cleanable/fluid/update_icon()
+	. = ..()
+	if(QDELETED(src) || !reagents)
+		return
+	add_atom_colour(mix_color_from_reagents(reagents.reagent_list), FIXED_COLOUR_PRIORITY)
+
+///
+
+/datum/reagent/consumable/fluid
+	name = "Fluid"
+	description = "Fluid from some animal. Useless for anything but insemination, really."
+	taste_description = "something salty"
+	taste_mult = 2 //Not very overpowering flavor
+	data = list("donor"=null,"viruses"=null,"donor_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null)
+	reagent_state = LIQUID
+	color = "#FFFFFF" // rgb: 255, 255, 255
+	can_synth = FALSE
+	// you know i wouldn't
+	// boiling_point = T0C + 100
+	nutriment_factor = 0.5 * REAGENTS_METABOLISM
+	var/decal_path = /obj/effect/decal/cleanable/fluid
+
+/datum/reagent/consumable/fluid/reaction_turf(turf/location, reac_volume)
+	..()
+	if(!istype(location))
+		return
+
+	var/obj/effect/decal/cleanable/fluid/S = locate(/obj/effect/decal/cleanable/fluid) in location
+	if(S)
+		if(S.reagents.add_reagent(type, volume, data))
+			S.update_icon()
+			return
+
+	var/obj/effect/decal/cleanable/fluidrip/drip = (locate(/obj/effect/decal/cleanable/fluidrip) in location) || new(location)
+	if(drip.reagents.add_reagent(type, volume, data))
+		drip.update_icon()
+		if(drip.reagents.total_volume >= 10)
+			S = new(location)
+			drip.reagents.trans_to(S, drip.reagents.total_volume)
+			S.update_icon()
+			qdel(drip)
+		return