pregnancy test cleanup + condensing climax stat checks

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
+1 -1
View File
@@ -63,7 +63,7 @@
C.do_jitter_animation()
C.adjustArousalLoss(20) //make the target more aroused.
if (C.getArousalLoss() >= 100 && ishuman(C) && C.has_dna())
if (C.can_climax())
C.mob_climax(forced_climax=TRUE) //make them cum if they are over the edge.
return
+18 -23
View File
@@ -8,7 +8,6 @@
var/results = "null"
w_class = WEIGHT_CLASS_TINY
/obj/item/pregnancytest/attack_self(mob/user)
if(QDELETED(src))
return
@@ -16,29 +15,25 @@
return
if(isAI(user))
return
if(user.stat > 0)//unconscious or dead
if(user.stat > CONSCIOUS)//unconscious or dead
return
if(status == 1)
return //Already been used once, pregnancy tests only work once.
test(user)
Test(user)
/obj/item/pregnancytest/proc/force(mob/living/user)
//Force it negative
icon_state = "negative"
name = "[results] pregnancy test"
status = 1
to_chat(user, "<span class='notice'>You use the pregnancy test, the display reads negative!</span>")
/obj/item/pregnancytest/proc/test(mob/living/user)
/obj/item/pregnancytest/proc/Test(mob/living/user)
if(status)
return
var/_result = FALSE
var/obj/item/organ/genital/womb/W = user.getorganslot("womb")
if(!W)
return
if(W.pregnant == 1)
results = "positive"
icon_state = "positive"
name = "[results] pregnancy test"
status = 1
to_chat(user, "<span class='notice'>You use the pregnancy test, the display reads positive!</span>")
else
force(user)
return // no reason to waste the single-use on them
if(W.pregnant)
_result = TRUE
UpdateResult(user, _result)
/obj/item/pregnancytest/proc/UpdateResult(mob/living/user, _result)
var/result_text = _result ? "positive" : "negative"
results = result_text
icon_state = result_text
name = "[results] preganancy test"
status = TRUE
to_chat(user, "<span class='notice'>You use the pregnancy test, the display reads [results]!</span>")
+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.getArousalLoss() >= 100 && ishuman(U) && U.has_dna())
if (U.can_climax())
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.getArousalLoss() >= 100 && ishuman(U) && U.has_dna())
if (U.can_climax())
U.mob_climax(forced_climax=TRUE)
if(prob(50))
U.emote("moan")