update content

modular_sand/code/datums/interactions/interaction_datums/lewd/self/breasts.dm

@@ -8,34 +8,73 @@
 	write_log_user = "groped own breasts"
 	write_log_target = null
 
+	additional_details = list(
+		list(
+			"info" = "You can fill a container if you hold it in your hand or pull it",
+			"icon" = "flask",
+			"color" = "transparent"
+			)
+	)
+
 /datum/interaction/lewd/titgrope_self/display_interaction(mob/living/user)
 	var/message
 	var/t_His = user.p_their()
 
-	if(user.a_intent == INTENT_HARM)
-		message = "[pick("aggressively gropes [t_His] breast.",
-					"grabs [t_His] breasts.",
-					"tightly squeezes [t_His] breasts.",
-					"slaps at [t_His] breasts.",
-					"gropes [t_His] breasts roughly.")]"
+	var/obj/item/reagent_containers/liquid_container
+
+	var/obj/item/cached_item = user.get_active_held_item()
+	if(istype(cached_item, /obj/item/reagent_containers))
+		liquid_container = cached_item
 	else
-		message = "[pick("gently gropes [t_His] breast.",
-					"softly squeezes [t_His] breasts.",
-					"grips [t_His] breasts.",
-					"runs a few fingers over [t_His] breast.",
-					"delicately teases [t_His] nipple.",
-					"traces a touch across [t_His] breast.")]"
+		cached_item = user.pulling
+		if(istype(cached_item, /obj/item/reagent_containers))
+			liquid_container = cached_item
+
+	if(user.a_intent == INTENT_HARM)
+		message = pick("aggressively gropes [t_His] breast",
+					"grabs [t_His] breasts",
+					"tightly squeezes [t_His] breasts",
+					"slaps at [t_His] breasts",
+					"gropes [t_His] breasts roughly")
+	else
+		message = pick("gently gropes [t_His] breast",
+					"softly squeezes [t_His] breasts",
+					"grips [t_His] breasts",
+					"runs a few fingers over [t_His] breast",
+					"delicately teases [t_His] nipple",
+					"traces a touch across [t_His] breast")
+
 	if(prob(5 + user.get_lust()))
-		user.visible_message("<span class='lewd'><b>\The [user]</b> [pick("shivers in arousal.",
+		user.visible_message(span_lewd("<b>\The [user]</b> [pick(
+				"shivers in arousal.",
 				"moans quietly.",
 				"breathes out a soft moan.",
 				"gasps.",
 				"shudders softly.",
-				"trembles as [t_His] hands run across bare skin.")]</span>")
-	user.visible_message(message = span_lewd("<b>\The [user]</b> [message]"), ignored_mobs = user.get_unconsenting())
-	playlewdinteractionsound(get_turf(user), 'modular_sand/sound/interactions/squelch1.ogg', 50, 1, -1)
-	user.handle_post_sex(NORMAL_LUST, CUM_TARGET_HAND, user)
+				"trembles as [t_His] hands run across bare skin.")]"))
 
+	if(liquid_container)
+		message += " over \the [liquid_container]"
+
+		var/obj/item/organ/genital/breasts/milkers = user.getorganslot(ORGAN_SLOT_BREASTS)
+		var/milktype = milkers?.fluid_id
+
+		if(milkers && milktype)
+			var/modifier
+			switch(milkers.size)
+				if("c", "d", "e")
+					modifier = 2
+				if("f", "g", "h")
+					modifier = 3
+				else
+					if(milkers.size in milkers.breast_values)
+						modifier = clamp(milkers.breast_values[milkers.size] - 5, 0, INFINITY)
+					else
+						modifier = 1
+			liquid_container.reagents.add_reagent(milktype, rand(1,3 * modifier))
+
+	user.visible_message(message = span_lewd("<b>\The [user]</b> [message]."), ignored_mobs = user.get_unconsenting())
+	playlewdinteractionsound(get_turf(user), 'modular_sand/sound/interactions/squelch1.ogg', 50, 1, -1)
 
 /datum/interaction/lewd/self_nipsuck
 	description = "Suck your own nips."

modular_sand/code/datums/interactions/interaction_datums/lewd/self/finger.dm

@@ -12,9 +12,10 @@
 	var/t_His = user.p_their()
 	var/t_Him = user.p_them()
 
-	user.visible_message("<span class='lewd'><b>\The [user]</b> [pick("fingers [t_Him]self.",
+	user.visible_message(span_lewd("<b>\The [user]</b> [pick(
+		"fingers [t_Him]self.",
 		"fingers [t_His] asshole.",
-		"fingers [t_Him]self hard.")]</span>", ignored_mobs = user.get_unconsenting())
+		"fingers [t_Him]self hard.")]"), ignored_mobs = user.get_unconsenting())
 	playlewdinteractionsound(get_turf(user), 'modular_sand/sound/interactions/champ_fingering.ogg', 50, 1, -1)
 	user.handle_post_sex(NORMAL_LUST, CUM_TARGET_HAND, user)
 
@@ -28,12 +29,38 @@
 	write_log_user = "fingered own pussy"
 	write_log_target = null
 
+	additional_details = list(
+		list(
+			"info" = "You can fill a container if you hold it in your hand or pull it",
+			"icon" = "flask",
+			"color" = "transparent"
+			)
+	)
+
 /datum/interaction/lewd/finger_self/display_interaction(mob/living/user)
 	var/t_His = user.p_their()
 
-	user.visible_message("<span class='lewd'><b>\The [user]</b> [pick("fingers [t_His] pussy deep.",
-		"fingers [t_His] pussy.",
-		"plays with [t_His] pussy.",
-		"fingers [t_His] own pussy hard.")]</span>", ignored_mobs = user.get_unconsenting())
+	var/obj/item/reagent_containers/liquid_container
+
+	var/obj/item/cached_item = user.get_active_held_item()
+	if(istype(cached_item, /obj/item/reagent_containers))
+		liquid_container = cached_item
+	else
+		cached_item = user.pulling
+		if(istype(cached_item, /obj/item/reagent_containers))
+			liquid_container = cached_item
+
+	var/message = pick(
+		"fingers [t_His] pussy deep",
+		"fingers [t_His] pussy",
+		"plays with [t_His] pussy",
+		"fingers [t_His] own pussy hard")
+	if(!user.is_fucking(user, CUM_TARGET_HAND, user.getorganslot(ORGAN_SLOT_VAGINA)))
+		user.set_is_fucking(user, CUM_TARGET_HAND, user.getorganslot(ORGAN_SLOT_VAGINA))
+
+	if(liquid_container)
+		message += " over \the [liquid_container]"
+
+	user.visible_message(span_lewd("<b>\The [user]</b> [message]."), ignored_mobs = user.get_unconsenting())
 	playlewdinteractionsound(get_turf(user), 'modular_sand/sound/interactions/champ_fingering.ogg', 50, 1, -1)
-	user.handle_post_sex(NORMAL_LUST, CUM_TARGET_HAND, user)
+	user.handle_post_sex(NORMAL_LUST, CUM_TARGET_HAND, liquid_container ? liquid_container : user)

modular_sand/code/datums/interactions/interaction_datums/lewd/self/jack.dm

@@ -8,24 +8,44 @@
 	write_log_user = "jerked off"
 	write_log_target = null
 
+	additional_details = list(
+		list(
+			"info" = "You can fill a container if you hold it in your hand or pull it",
+			"icon" = "flask",
+			"color" = "transparent"
+			)
+	)
+
 /datum/interaction/lewd/jack/display_interaction(mob/living/user)
 	var/message
 	var/t_His = user.p_their()
 	var/t_Him = user.p_them()
 
-	if(user.is_fucking(user, CUM_TARGET_HAND))
-		message = "[pick("jerks [t_Him]self off.",
-			"works [t_His] shaft.",
-			"strokes [t_His] penis.",
-			"wanks [t_His] cock hard.")]"
+	var/obj/item/reagent_containers/liquid_container
+
+	var/obj/item/cached_item = user.get_active_held_item()
+	if(istype(cached_item, /obj/item/reagent_containers))
+		liquid_container = cached_item
 	else
-		message = "[pick("wraps [t_His] hand around [t_His] cock.",
-			"starts to stroke [t_His] cock.",
-			"starts playing with [t_His] cock.")]"
+		cached_item = user.pulling
+		if(istype(cached_item, /obj/item/reagent_containers))
+			liquid_container = cached_item
+
+	if(user.is_fucking(user, CUM_TARGET_HAND, user.getorganslot(ORGAN_SLOT_PENIS)))
+		message = "[pick("jerks [t_Him]self off",
+			"works [t_His] shaft",
+			"strokes [t_His] penis",
+			"wanks [t_His] cock hard")]"
+	else
+		message = "[pick("wraps [t_His] hand around [t_His] cock",
+			"starts to stroke [t_His] cock",
+			"starts playing with [t_His] cock")]"
 		user.set_is_fucking(user, CUM_TARGET_HAND, user.getorganslot(ORGAN_SLOT_PENIS))
+	if(liquid_container)
+		message += " over \the [liquid_container]"
 
 	playlewdinteractionsound(get_turf(user), pick('modular_sand/sound/interactions/bang1.ogg',
 						'modular_sand/sound/interactions/bang2.ogg',
 						'modular_sand/sound/interactions/bang3.ogg'), 70, 1, -1)
-	user.visible_message(message = span_lewd("<b>\The [user]</b> [message]"), ignored_mobs = user.get_unconsenting())
-	user.handle_post_sex(NORMAL_LUST, CUM_TARGET_HAND, user)
+	user.visible_message(message = span_lewd("<b>\The [user]</b> [message]."), ignored_mobs = user.get_unconsenting())
+	user.handle_post_sex(NORMAL_LUST, CUM_TARGET_HAND, liquid_container ? liquid_container : user)