cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-08-27 22:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

move forced_climax to its own proc

Browse Source
This commit is contained in:
sarcoph
2022-05-05 01:48:08 -08:00
parent e1a6c16dd0
commit 6bfd8b666a
9 changed files with 49 additions and 52 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
@@ -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)
code/modules/mob/living/carbon/life.dm
+1 -1
View File
@@ -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