cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-08-24 21:26:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleaning up mob_climax_partner

Browse Source
This commit is contained in:
sarcoph
2022-05-05 18:12:53 -08:00
parent 8db6687006
commit 7531da1491
3 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hyperstation/code/modules/arousal/arousalhud.dm
+3 -10
View File
@@ -378,10 +378,10 @@ obj/screen/arousal/proc/kiss()
to_chat(src, "<span class='warning'>You cannot climax without choosing genitals.</span>")
return
src << browse(null, "window=arousal") // close arousal window
mob_climax_partner_spillage(picked_organ, partner, impreg=FALSE)
mob_climax_inside_spillage(picked_organ, partner, impreg=FALSE)
/mob/living/carbon/human/proc/climaxover(mob/living/carbon/human/partner)
/mob/living/carbon/human/proc/climaxover(atom/partner)
var/obj/item/organ/genital/picked_organ
picked_organ = pick_climax_genitals()
if(!picked_organ)
@@ -391,13 +391,6 @@ obj/screen/arousal/proc/kiss()
if(!partner || isnoncarbon(partner))
to_chat(src, "<span class='warning'>You cannot do this alone.</span>")
return
var/obj/item/organ/genital/penis/P = picked_organ
if(P.condom)
to_chat(src, "<span class='warning'>You cannot do this action with a condom on.</span>")
return
if(P.sounding)
to_chat(src, "<span class='warning'>You cannot do this action with a sounding in.</span>")
return
mob_climax_cover(picked_organ, partner)
@@ -435,7 +428,7 @@ obj/screen/arousal/proc/kiss()
to_chat(src, "<span class='warning'>You cannot impregnate someone with a sounding rod in.</span>")
return
src << browse(null, "window=arousal") //alls fine, we can close the window now.
mob_climax_partner_spillage(picked_organ, partner, impreg=TRUE)
mob_climax_inside_spillage(picked_organ, partner, impreg=TRUE)
/mob/living/carbon/human/proc/cumcontainer(mob/living/T)
hyperstation/code/obj/fleshlight.dm
+1 -1
View File
@@ -151,7 +151,7 @@
if(user.can_orgasm())
var/mob/living/carbon/human/O = user
var/impreg_chance = target_genital.name == "vagina" && !P.condom && !P.sounding
if(O.mob_climax_partner(P, target, spillage=FALSE, remote=TRUE) && impreg_chance)
if(O.mob_climax_in_partner(P, target, spillage=FALSE, remote=TRUE) && impreg_chance)
target.impregnate(by=O)
if("Lick")
holder.visible_message("<span class='userlove'>[holder] licks into [src].</span>",\