From 17b49ab0220c8a34789f958d4e4a7800e181adc5 Mon Sep 17 00:00:00 2001
From: QuoteFox <49098813+quotefox@users.noreply.github.com>
Date: Sun, 25 Apr 2021 12:41:15 +0100
Subject: [PATCH] Arousal menu update, Impreg chance
---
code/modules/mob/dead/new_player/new_player.dm | 2 +-
code/modules/mob/living/living_defines.dm | 2 +-
hyperstation/code/modules/arousal/arousalhud.dm | 13 +++++++++++--
.../code/modules/arousal/organs/genitals.dm | 2 +-
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 59347e77..d7a8ee3a 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -597,7 +597,7 @@
if (H.custom_body_size) //Do they have it set?
H.resize(H.custom_body_size * 0.01)
if (H.breedable == TRUE)
- H.impregchance = 30
+ H.impregchance = 33
. = H
new_character = .
if(transfer_after)
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 83cff340..8c606186 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -58,7 +58,7 @@
//H13 custom body size and impregnation
var/custom_body_size = 100
var/breedable = 0
- var/impregchance = 0
+ var/impregchance = 33
//h13 noncon settings
var/Noncon = 0
var/ERP = 0
diff --git a/hyperstation/code/modules/arousal/arousalhud.dm b/hyperstation/code/modules/arousal/arousalhud.dm
index 307f50cd..c5f4cbdd 100644
--- a/hyperstation/code/modules/arousal/arousalhud.dm
+++ b/hyperstation/code/modules/arousal/arousalhud.dm
@@ -32,10 +32,14 @@
if(user.pulling)
dat += "Kiss [user.pulling]"
dat += "(Kiss a partner, or object.)
"
+ else
+ dat += "Kiss"
+ dat += "(Requires a partner)
"
+
+ if(user.pulling)
dat += "Climax over [user.pulling]" //you can cum on objects if you really want...
dat += "(Orgasm over a person or object.)
"
-
if(isliving(user.pulling))
if(iscarbon(user.pulling))
dat += "Climax with [user.pulling]"
@@ -43,8 +47,13 @@
var/mob/living/carbon/human/H = user.pulling
if(H.breedable && P && H)
- dat += "Impregnate [user.pulling]"
+ dat += "Impregnate [U.pulling] ([clamp(U.impregchance,0,100)]%)"
dat += "(Climax inside another person, knocking them up.)
"
+ else
+ dat += "Climax over"
+ dat += "(Requires a partner)
"
+ dat += "Climax with"
+ dat += "(Requires a partner)
"
//old code needs to be cleaned
if(P)
diff --git a/modular_citadel/code/modules/arousal/organs/genitals.dm b/modular_citadel/code/modules/arousal/organs/genitals.dm
index af313a3d..44b8498d 100644
--- a/modular_citadel/code/modules/arousal/organs/genitals.dm
+++ b/modular_citadel/code/modules/arousal/organs/genitals.dm
@@ -303,7 +303,7 @@
/mob/living/carbon/human/proc/make_breedable()
//Hyperstation, This makes the character able to use the impreg features of the game
breedable = 1
- impregchance = 30 //30% is a good base chance
+ impregchance = 33 //33% is a good base chance
/datum/species/proc/genitals_layertext(layer)
switch(layer)