cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-07-18 19:22:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

pregnancy test cleanup + condensing climax stat checks

Browse Source
This commit is contained in:
sarcoph
2022-05-04 12:40:29 -08:00
parent d9c1c0248a
commit d84debe29e
8 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species.dm
+2 -2
View File
@@ -1647,7 +1647,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
)
if (target.canbearoused)
target.adjustArousalLoss(5)
if (target.getArousalLoss() >= 100 && ishuman(target) && HAS_TRAIT(target, TRAIT_MASO) && target.has_dna())
if (target.can_climax() && 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.getArousalLoss() >= 100 && ishuman(H) && H.has_dna())
if (H.can_climax())
H.mob_climax(forced_climax=TRUE)
else//no bodypart, we deal damage with a more general method.
code/modules/mob/living/carbon/life.dm
+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.getArousalLoss() >= 100 && ishuman(B) && B.has_dna())
if (B.can_climax())
B.mob_climax(forced_climax=TRUE)
else
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "suffocation", /datum/mood_event/suffocation)
code/modules/ruins/objects_and_mobs/sin_ruins.dm
+2 -2
View File
@@ -282,13 +282,13 @@
. = ..()
if(.)
return
if(chalice_taken == 1)
if(chalice_taken)
to_chat(user, "<i>You hear a voice in your head... <b>\"My chalice has already been taken, dear. I cannot give you another...\"</i></b>")
return
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 (ishuman(user) && user.has_dna())
if (user.can_climax(0))
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>")