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:
sarcoph
2022-05-04 14:43:22 -08:00
parent 227a298150
commit e91606bc60
9 changed files with 19 additions and 19 deletions
@@ -1647,7 +1647,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
)
if (target.canbearoused)
target.adjustArousalLoss(5)
if (target.can_climax() && HAS_TRAIT(target, TRAIT_MASO))
if (target.can_orgasm() && HAS_TRAIT(target, TRAIT_MASO))
target.mob_climax(forced_climax=TRUE)
if (!HAS_TRAIT(target, TRAIT_NYMPHO))
stop_wagging_tail(target)
@@ -2005,7 +2005,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_damage_overlays()
if(HAS_TRAIT(H, TRAIT_MASO))
H.adjustArousalLoss(damage * brutemod * H.physiology.brute_mod)
if (H.can_climax())
if (H.can_orgasm())
H.mob_climax(forced_climax=TRUE)
else//no bodypart, we deal damage with a more general method.
+1 -1
View File
@@ -77,7 +77,7 @@
var/mob/living/carbon/human/B = src
if(HAS_TRAIT(B, TRAIT_CHOKE_SLUT))
B.adjustArousalLoss(7)
if (B.can_climax())
if (B.can_orgasm())
B.mob_climax(forced_climax=TRUE)
else
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "suffocation", /datum/mood_event/suffocation)
@@ -288,7 +288,7 @@
if(user.getArousalLoss() < 100)
to_chat(user, "<i>You hear a voice in your head... <b>\"You are not horny enough to receive my blessing, dear~\"</i></b>")
return
if(user.can_climax())
if(user.can_orgasm())
user.mob_climax(forced_climax=TRUE)
to_chat(user, "<i>You hear a voice in your head... <b>\"You are worth of my blessing dear~\"</i></b>")
to_chat(user, "<span class='userdanger'>You feel overpowering pleasure surge through your entire body.</span>")
+3 -3
View File
@@ -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)
+6 -6
View File
@@ -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
+2 -2
View File
@@ -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")
@@ -217,8 +217,8 @@
if(M.canbearoused)
ui_interact(usr)
/mob/living/proc/can_climax(_arousal = 100)
return src.getArousalLoss() >= _arousal && ishuman(src) && src.has_dna()
/mob/living/proc/can_orgasm(arousal = 100)
return src.getArousalLoss() >= arousal && ishuman(src) && src.has_dna()
/mob/living/proc/mob_climax()//This is just so I can test this shit without being forced to add actual content to get rid of arousal. Will be a very basic proc for a while.
set name = "Masturbate"
@@ -25,7 +25,7 @@
if(ismob(M) && M.canbearoused && arousal_gain != 0)
var/orgasm = FALSE
if(arousal_gain > 0)
if(M.can_climax())
if(M.can_orgasm())
var/mob/living/carbon/human/H = M
var/orgasm_message = pick("A sharp pulse of electricity pushes you to orgasm!", "You feel a jolt of electricity force you into orgasm!")
H.visible_message("<span class='warning'>\The [assembly] electrodes shock [H]!</span>", "<span class='warning'>[orgasm_message]</span>")
@@ -197,7 +197,7 @@
/datum/reagent/drug/aphrodisiacplus/overdose_process(mob/living/M)
if(M && M.canbearoused && !(M.client?.prefs.cit_toggles & NO_APHRO) && prob(33))
if(prob(5) && M.can_climax())
if(prob(5) && M.can_orgasm())
if(prob(5)) //Less spam
to_chat(M, "<span class='love'>Your libido is going haywire!</span>")
if(M.min_arousal < 50)