diff --git a/modular_sand/code/datums/interactions/interaction_datums/lewd/kiss.dm b/modular_sand/code/datums/interactions/interaction_datums/lewd/kiss.dm index 5a40fe983c..bcdc93126b 100644 --- a/modular_sand/code/datums/interactions/interaction_datums/lewd/kiss.dm +++ b/modular_sand/code/datums/interactions/interaction_datums/lewd/kiss.dm @@ -18,4 +18,4 @@ user.visible_message(span_lewd("\The [user] gives an intense, lingering kiss to \the [partner].")) else user.visible_message(span_lewd("\The [user] kisses \the [partner] deeply.")) - playlewdinteractionsound(pick(GLOB.lewd_kiss_sounds), 70, 0, 0) + playlewdinteractionsound(user.loc, pick(GLOB.lewd_kiss_sounds), 90, 0, 0) diff --git a/modular_sand/code/datums/interactions/lewd_definitions.dm b/modular_sand/code/datums/interactions/lewd_definitions.dm index 19b29160e7..e8096bd580 100644 --- a/modular_sand/code/datums/interactions/lewd_definitions.dm +++ b/modular_sand/code/datums/interactions/lewd_definitions.dm @@ -268,14 +268,6 @@ return TRUE /mob/living/proc/moan() - // If using the multiplier option, do a basic percentage chance. - if (use_moaning_multiplier) - if (!(prob(arousal_moaning/100))) - return - else - if(!(prob(get_lust() / get_lust_tolerance() * 65))) - return - if(is_muzzled()) audible_message(span_lewd("[src] [pick("mimes a pleasured moan","moans in silence")].")) else @@ -756,10 +748,18 @@ add_lust(amount) var/lust = get_lust() var/lust_tolerance = get_lust_tolerance() + + var/moaned = FALSE + if (use_moaning_multiplier) + if(prob(arousal_moaning)) + moan() + moaned = TRUE + if(lust >= lust_tolerance) if(prob(10)) to_chat(src, "You struggle to not orgasm!") - moan() + if (!moaned) + moan() return FALSE if(lust >= (lust_tolerance * 3)) if(cum(partner, orifice)) diff --git a/tgui/packages/tgui/interfaces/MobInteraction/InfoSection.tsx b/tgui/packages/tgui/interfaces/MobInteraction/InfoSection.tsx index 4db5c1bb5b..2b3ecdfdcf 100644 --- a/tgui/packages/tgui/interfaces/MobInteraction/InfoSection.tsx +++ b/tgui/packages/tgui/interfaces/MobInteraction/InfoSection.tsx @@ -1,5 +1,5 @@ import { useBackend } from '../../backend'; -import { BlockQuote, Icon, ProgressBar, Section, Stack, Slider } from '../../components'; +import { BlockQuote, Icon, ProgressBar, Section, Stack, Slider, Tooltip } from '../../components'; type HeaderInfo = { isTargetSelf: boolean;