diff --git a/hyperstation/code/modules/arousal/arousalhud.dm b/hyperstation/code/modules/arousal/arousalhud.dm index b35ac109..68a2a19c 100644 --- a/hyperstation/code/modules/arousal/arousalhud.dm +++ b/hyperstation/code/modules/arousal/arousalhud.dm @@ -37,6 +37,9 @@ dat += "Fill container" dat += "(Use a container in your hand to collect your seminal fluid.)
" + dat += "Explode out of clothes" + dat += "(Self-explanatory.)
" + if(user.pulling) dat += "Kiss [user.pulling]" dat += "(Kiss a partner, or object.)
" @@ -127,6 +130,14 @@ to_chat(usr, "You aren't aroused enough for that! ") return + if(href_list["clothesplosion"]) + if (H.arousalloss >= (H.max_arousal / 100) * 33) //Requires 33% arousal. + H.clothesplosion() + return + else + to_chat(usr, "You aren't aroused enough for that! ") + return + if(href_list["climax"]) if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal. H.climaxalone(FALSE) @@ -313,6 +324,8 @@ obj/screen/arousal/proc/kiss() to_chat(src, "You cannot climax without choosing genitals.") return + + /mob/living/carbon/human/proc/climaxover(mob/living/T) var/mob/living/carbon/human/L = T diff --git a/modular_citadel/code/modules/arousal/arousal.dm b/modular_citadel/code/modules/arousal/arousal.dm index 1334af14..f5406f46 100644 --- a/modular_citadel/code/modules/arousal/arousal.dm +++ b/modular_citadel/code/modules/arousal/arousal.dm @@ -464,6 +464,16 @@ if(G.can_climax) setArousalLoss(min_arousal) +/mob/living/carbon/human/proc/clothesplosion() + var/mob/living/carbon/human/that_guy = src + var/items = that_guy.get_contents() + for(var/obj/item/W in items) + if(W == that_guy.w_uniform || W == that_guy.wear_suit) + that_guy.dropItemToGround(W, TRUE) + playsound(that_guy.loc, 'sound/items/poster_ripped.ogg', 50, 1) + that_guy.visible_message("[that_guy] explodes out of their clothes!'") + + /mob/living/carbon/human/proc/pick_masturbate_genitals() var/obj/item/organ/genital/ret_organ var/list/genitals_list = list()