diff --git a/hyperstation/code/modules/arousal/arousalhud.dm b/hyperstation/code/modules/arousal/arousalhud.dm index faafdb4c..307f50cd 100644 --- a/hyperstation/code/modules/arousal/arousalhud.dm +++ b/hyperstation/code/modules/arousal/arousalhud.dm @@ -308,8 +308,6 @@ obj/screen/arousal/proc/kiss() src.visible_message("[src] is about to kiss [L]!", \ "You're attempting to kiss [L]!", \ "You're attempting to kiss with something!") - if(!do_mob(src, L, 2 SECONDS)) //I think two seconds is enough time to pull away if its unwanted. - return SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "kissed", /datum/mood_event/kiss) //how cute, affection is nice. //Well done you kissed it/them! src.visible_message("[src] kisses [L]!", \ diff --git a/modular_citadel/code/modules/arousal/arousal.dm b/modular_citadel/code/modules/arousal/arousal.dm index a9a5ca23..3f3f2c8e 100644 --- a/modular_citadel/code/modules/arousal/arousal.dm +++ b/modular_citadel/code/modules/arousal/arousal.dm @@ -461,9 +461,10 @@ if(do_after(src, mb_time, target = src) && in_range(src, container)) fluid_source.trans_to(container, total_fluids) src.visible_message("[src] uses [p_their()] [G.name] to fill [container]!", \ - "You used your [G.name] to fill [container].", \ + "You used your [G.name] and fill [container] with a total of [total_fluids]u's.", \ "You have relieved some pressure.") SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm) + container.add_cum_overlay() //your aim is bad... if(G.can_climax) setArousalLoss(min_arousal)