mirror of
https://github.com/quotefox/Hyper-Station-13.git
synced 2026-08-27 06:36:19 +01:00
move forced_climax to its own proc
This commit is contained in:
@@ -1648,7 +1648,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
|
||||
if (target.canbearoused)
|
||||
target.adjustArousalLoss(5)
|
||||
if (target.can_orgasm() && HAS_TRAIT(target, TRAIT_MASO))
|
||||
target.mob_climax(forced_climax=TRUE)
|
||||
target.mob_climax_forced()
|
||||
if (!HAS_TRAIT(target, TRAIT_NYMPHO))
|
||||
stop_wagging_tail(target)
|
||||
|
||||
@@ -2006,7 +2006,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
|
||||
if(HAS_TRAIT(H, TRAIT_MASO))
|
||||
H.adjustArousalLoss(damage * brutemod * H.physiology.brute_mod)
|
||||
if (H.can_orgasm())
|
||||
H.mob_climax(forced_climax=TRUE)
|
||||
H.mob_climax_forced()
|
||||
|
||||
else//no bodypart, we deal damage with a more general method.
|
||||
H.adjustBruteLoss(damage * hit_percent * brutemod * H.physiology.brute_mod)
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
if(HAS_TRAIT(B, TRAIT_CHOKE_SLUT))
|
||||
B.adjustArousalLoss(7)
|
||||
if (B.can_orgasm())
|
||||
B.mob_climax(forced_climax=TRUE)
|
||||
B.mob_climax_forced()
|
||||
else
|
||||
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "suffocation", /datum/mood_event/suffocation)
|
||||
else
|
||||
|
||||
@@ -289,7 +289,7 @@
|
||||
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_orgasm())
|
||||
user.mob_climax(forced_climax=TRUE)
|
||||
user.mob_climax_forced()
|
||||
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>")
|
||||
var/A = new /obj/item/reagent_containers/chalice/lust
|
||||
|
||||
@@ -581,7 +581,7 @@
|
||||
for(var/V in listeners)
|
||||
var/mob/living/carbon/human/H = V
|
||||
if(H.canbearoused && H.has_dna() && HAS_TRAIT(H, TRAIT_NYMPHO)) // probably a redundant check but for good measure
|
||||
H.mob_climax(forced_climax=TRUE)
|
||||
H.mob_climax_forced()
|
||||
*/
|
||||
else if((findtext(message, family_friendly_words)))
|
||||
cooldown = COOLDOWN_MEME
|
||||
@@ -1123,7 +1123,7 @@
|
||||
if(E.phase > 1)
|
||||
if(HAS_TRAIT(H, TRAIT_NYMPHO) && H.canbearoused && E.lewd) // probably a redundant check but for good measure
|
||||
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "<span class='love'>Your [E.enthrallGender] pushes you over the limit, overwhelming your body with pleasure.</b></span>"), 5)
|
||||
H.mob_climax(forced_climax=TRUE)
|
||||
H.mob_climax_forced()
|
||||
H.SetStun(20)
|
||||
H.setArousalLoss(H.min_arousal)
|
||||
E.resistanceTally = 0 //makes resistance 0, but resets arousal, resistance buildup is faster unaroused (massively so).
|
||||
|
||||
Reference in New Issue
Block a user