Lots of genital changes

Penile masturbation is fixed again.
Masturbation cooldown set to 5 seconds once again, as intended.
mob_masturbate is now mob_climax(forced_climax=FALSE). It can be used to
masturbate alone, cum inside someone partially or completely and can be
used to trigger a forced orgasm through all eligible genitals.
Hexacrocin (Aphro PLUS) now increases your minimum arousal over time
when overdosing, up to your maximum arousal level at which point you are
constantly aroused.
When fully aroused, hexacrocin overdose will force an orgasm.
Hexacamhor (ANaphro PLUS) overdose now decreases minimum arousal over
time, down to 0.
Added to_chat feedback to the player when their libido changes
permanently.
Changed old "src <<" messages to use the new to_chat in citadel chems
and citadel arousal, so text should display now.
Changed names of genitals to be capitalized, to avoid the code
automatically calling them "The X".
Masturbation also has more helpful feedback messages when you lack the
correct organs.
The old force_orgasm proc is removed, use mob_climax(forced_climax=TRUE)
instead.
This commit is contained in:
ktccd
2017-08-08 17:41:27 +02:00
parent 41f42aabca
commit 9e71a0bdb1
9 changed files with 155 additions and 51 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/item/organ/genital/breasts
name = "breasts"
name = "Breasts"
desc = "Female milk producing organs."
icon_state = "breasts"
icon = 'code/citadel/icons/breasts.dmi'
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/item/organ/genital/eggsack
name = "egg sack"
name = "Egg sack"
desc = "An egg producing reproductive organ."
icon_state = "egg_sack"
icon = 'code/citadel/icons/ovipositor.dmi'
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/item/organ/genital/ovipositor
name = "ovipositor"
name = "Ovipositor"
desc = "An egg laying reproductive organ."
icon_state = "ovi_knotted_2"
icon = 'code/citadel/icons/ovipositor.dmi'
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/item/organ/genital/penis
name = "penis"
name = "Penis"
desc = "A male reproductive organ."
icon_state = "penis"
icon = 'code/citadel/icons/penis.dmi'
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/item/organ/genital/testicles
name = "testicles"
name = "Testicles"
desc = "A male reproductive organ."
icon_state = "testicles"
icon = 'code/citadel/icons/penis.dmi'
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/item/organ/genital/vagina
name = "vagina"
name = "Vagina"
desc = "A female reproductive organ."
icon = 'code/citadel/icons/vagina.dmi'
icon_state = "vagina"
+2 -2
View File
@@ -1,5 +1,5 @@
/obj/item/organ/genital/womb
name = "womb"
name = "Womb"
desc = "A female reproductive organ."
icon = 'code/citadel/icons/vagina.dmi'
icon_state = "womb"
@@ -10,7 +10,7 @@
fluid_id = "femcum"
producing = TRUE
var/obj/item/organ/genital/vagina/linked_vag
/obj/item/organ/genital/womb/Initialize()
. = ..()
reagents.add_reagent(fluid_id, fluid_max_volume)