mirror of
https://github.com/quotefox/Hyper-Station-13.git
synced 2026-08-23 12:46:17 +01:00
can_climax() -> can_orgasm()
makes the separation between body climax and genital climax clearer, as genitals have a can_climax variable
This commit is contained in:
@@ -63,7 +63,7 @@
|
||||
|
||||
C.do_jitter_animation()
|
||||
C.adjustArousalLoss(20) //make the target more aroused.
|
||||
if (C.can_climax())
|
||||
if (C.can_orgasm())
|
||||
C.mob_climax(forced_climax=TRUE) //make them cum if they are over the edge.
|
||||
|
||||
return
|
||||
@@ -155,10 +155,10 @@
|
||||
target.adjustArousalLoss(20)
|
||||
target.do_jitter_animation() //make your partner shake too!
|
||||
// Why not have a probability to cum when someone's getting nailed with max arousal?~
|
||||
if (target.can_climax() && prob(5))
|
||||
if (target.can_orgasm() && prob(5))
|
||||
// if vagina is not exposed, the climax will not cause a spill
|
||||
target.mob_climax_outside(target_genital, target_genital.is_exposed())
|
||||
if (holder.can_climax())
|
||||
if (holder.can_orgasm())
|
||||
var/mob/living/carbon/human/O = holder
|
||||
var/impreg_chance = target_genital.name == "vagina" && !P.condom && !P.sounding
|
||||
O.mob_climax_partner(P, target, FALSE, impreg_chance, FALSE, TRUE)
|
||||
|
||||
@@ -22,17 +22,17 @@
|
||||
/obj/item/pregnancytest/proc/Test(mob/living/user)
|
||||
if(status)
|
||||
return
|
||||
var/_result = FALSE
|
||||
var/_results = FALSE
|
||||
var/obj/item/organ/genital/womb/W = user.getorganslot("womb")
|
||||
if(!W)
|
||||
return // no reason to waste the single-use on them
|
||||
if(W.pregnant)
|
||||
_result = TRUE
|
||||
UpdateResult(user, _result)
|
||||
_results = TRUE
|
||||
UpdateResult(user, _results)
|
||||
|
||||
/obj/item/pregnancytest/proc/UpdateResult(mob/living/user, _result)
|
||||
var/result_text = _result ? "positive" : "negative"
|
||||
results = result_text
|
||||
/obj/item/pregnancytest/proc/UpdateResult(mob/living/user, results)
|
||||
var/result_text = results ? "positive" : "negative"
|
||||
src.results = result_text
|
||||
icon_state = result_text
|
||||
name = "[results] preganancy test"
|
||||
status = TRUE
|
||||
|
||||
@@ -132,13 +132,13 @@ Code:
|
||||
if(2) //med, can make you cum
|
||||
to_chat(U, "<span class='love'>You feel intense pleasure surge through your [G.name]</span>")
|
||||
U.do_jitter_animation()
|
||||
if (U.can_climax())
|
||||
if (U.can_orgasm())
|
||||
U.mob_climax(forced_climax=TRUE)
|
||||
if(3) //high, makes you stun
|
||||
to_chat(U, "<span class='userdanger'>You feel overpowering pleasure surge through your [G.name]</span>")
|
||||
U.Jitter(3)
|
||||
U.Stun(30)
|
||||
if (U.can_climax())
|
||||
if (U.can_orgasm())
|
||||
U.mob_climax(forced_climax=TRUE)
|
||||
if(prob(50))
|
||||
U.emote("moan")
|
||||
|
||||
Reference in New Issue
Block a user