mirror of
https://github.com/quotefox/Hyper-Station-13.git
synced 2026-08-31 00:26:18 +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:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user