Merge pull request #855 from CapnMachaddish/wardrobe-detonation

CLOTHESPLOSIONS!
This commit is contained in:
QuoteFox
2021-01-10 11:31:48 +00:00
committed by GitHub
2 changed files with 23 additions and 0 deletions
@@ -37,6 +37,9 @@
dat += "<a href='byond://?src=[REF(src)];container=1'>Fill container</A>"
dat += "(Use a container in your hand to collect your seminal fluid.)<BR>"
dat += "<a href='byond://?src=[REF(src)];clothesplosion=1'>Explode out of clothes</A>"
dat += "(Self-explanatory.)<BR>"
if(user.pulling)
dat += "<a href='byond://?src=[REF(src)];kiss=1'>Kiss [user.pulling]</A>"
dat += "(Kiss a partner, or object.)<BR>"
@@ -127,6 +130,14 @@
to_chat(usr, "<span class='warning'>You aren't aroused enough for that! </span>")
return
if(href_list["clothesplosion"])
if (H.arousalloss >= (H.max_arousal / 100) * 33) //Requires 33% arousal.
H.clothesplosion()
return
else
to_chat(usr, "<span class='warning'>You aren't aroused enough for that! </span>")
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, "<span class='warning'>You cannot climax without choosing genitals.</span>")
return
/mob/living/carbon/human/proc/climaxover(mob/living/T)
var/mob/living/carbon/human/L = T
@@ -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("<span class='boldnotice'>[that_guy] explodes out of their clothes!'</span>")
/mob/living/carbon/human/proc/pick_masturbate_genitals()
var/obj/item/organ/genital/ret_organ
var/list/genitals_list = list()