From 91f1455aacf1b6dd3e9c8e95df6d11db2f9e3535 Mon Sep 17 00:00:00 2001
From: jbox1 <40789662+jbox144@users.noreply.github.com>
Date: Sat, 15 Feb 2020 21:35:30 +1100
Subject: [PATCH 1/5] Added new trait define
---
code/__DEFINES/traits.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 01ab0933..2776b2b0 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -145,6 +145,7 @@
#define TRAIT_MUSICIAN "musician"
#define TRAIT_CROCRIN_IMMUNE "crocin_immune"
#define TRAIT_NYMPHO "nymphomania"
+#define TRAIT_FLUID_LEAK "leaky_fluids"
#define TRAIT_MASO "masochism"
#define TRAIT_HIGH_BLOOD "high_blood"
#define TRAIT_PHARMA "hepatic_pharmacokinesis"
@@ -160,7 +161,6 @@
// common trait sources
#define TRAIT_GENERIC "generic"
#define EYE_DAMAGE "eye_damage"
-#define DISEASE_TRAIT "disease"
#define GENETIC_MUTATION "genetic"
#define OBESITY "obesity"
#define MAGIC_TRAIT "magic"
From eb3a39e506e58a283afdd803c24305962569311b Mon Sep 17 00:00:00 2001
From: jbox1 <40789662+jbox144@users.noreply.github.com>
Date: Sat, 15 Feb 2020 21:36:51 +1100
Subject: [PATCH 2/5] Additional Trait "Leaky Fluids"
---
modular_citadel/code/datums/traits/neutral.dm | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/modular_citadel/code/datums/traits/neutral.dm b/modular_citadel/code/datums/traits/neutral.dm
index 197c9b94..6f5eb162 100644
--- a/modular_citadel/code/datums/traits/neutral.dm
+++ b/modular_citadel/code/datums/traits/neutral.dm
@@ -41,3 +41,12 @@
var/active = FALSE
var/power = 0
var/cachedmoveCalc = 1
+
+/datum/quirk/fluid_leak
+ name = "Leaky fluids"
+ desc = "You don't stop making fluids, and you have a habbit of leaking everywhere when you are full"
+ mob_trait = TRAIT_FLUID_LEAK
+ value = 0
+ medical_record_text = "Patient poorly controls their fluids."
+ gain_text = "You feel like your leaking everywhere."
+ lose_text = "You feel like you can control your fluids."
From 660f61fdd416c3c41483dc7946194e19048cc5e9 Mon Sep 17 00:00:00 2001
From: jbox1 <40789662+jbox144@users.noreply.github.com>
Date: Sat, 15 Feb 2020 21:39:40 +1100
Subject: [PATCH 3/5] Addition of leaky fluids bahaviour and code cleanup
---
modular_citadel/code/modules/arousal/organs/breasts.dm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm
index da8a142f..c9383fb1 100644
--- a/modular_citadel/code/modules/arousal/organs/breasts.dm
+++ b/modular_citadel/code/modules/arousal/organs/breasts.dm
@@ -15,6 +15,7 @@
fluid_id = "milk"
var/amount = 2
fluid_mult = 0.25 // Set to a lower value due to production scaling with size (I.E. D cups produce the "normal" amount)
+ fluid_max_volume = 5
producing = TRUE
shape = "Pair"
can_masturbate_with = TRUE
@@ -28,7 +29,7 @@
return
if(!reagents || !owner)
return
- reagents.maximum_volume = fluid_max_volume * cached_size * fluid_mult // fluid amount is also scaled by the size of the organ
+ reagents.maximum_volume = fluid_max_volume * cached_size// fluid amount is also scaled by the size of the organ
if(fluid_id && producing)
if(reagents.total_volume == 0) // Apparently, 0.015 gets rounded down to zero and no reagents are created if we don't start it with 0.1 in the tank.
fluid_rate = 0.1
@@ -43,6 +44,9 @@
if(!sent_full_message)
send_full_message()
sent_full_message = TRUE
+ if(HAS_TRAIT(owner, TRAIT_FLUID_LEAK))
+ reagents.get_master_reagent().reaction_turf(get_turf(owner), 3)
+ reagents.remove_reagent(fluid_id, 3)
return FALSE
sent_full_message = FALSE
reagents.isolate_reagent(fluid_id)
From 5bbcff800c22d009a4b668ad0a99b79dc9c312b5 Mon Sep 17 00:00:00 2001
From: jbox1 <40789662+jbox144@users.noreply.github.com>
Date: Sat, 15 Feb 2020 21:47:49 +1100
Subject: [PATCH 4/5] Desc change
---
modular_citadel/code/datums/traits/neutral.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modular_citadel/code/datums/traits/neutral.dm b/modular_citadel/code/datums/traits/neutral.dm
index 6f5eb162..f064f757 100644
--- a/modular_citadel/code/datums/traits/neutral.dm
+++ b/modular_citadel/code/datums/traits/neutral.dm
@@ -43,8 +43,8 @@
var/cachedmoveCalc = 1
/datum/quirk/fluid_leak
- name = "Leaky fluids"
- desc = "You don't stop making fluids, and you have a habbit of leaking everywhere when you are full"
+ name = "Leaky breasts"
+ desc = "You don't stop making milk, and you have a habit of leaking everywhere when your breasts are full"
mob_trait = TRAIT_FLUID_LEAK
value = 0
medical_record_text = "Patient poorly controls their fluids."
From 88d5e33d581593a25ecec0e4bd1acf86051768f1 Mon Sep 17 00:00:00 2001
From: jbox1 <40789662+jbox144@users.noreply.github.com>
Date: Wed, 19 Feb 2020 13:03:29 +1100
Subject: [PATCH 5/5] b
---
code/__DEFINES/traits.dm | 1 +
1 file changed, 1 insertion(+)
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 2776b2b0..c47c6052 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -161,6 +161,7 @@
// common trait sources
#define TRAIT_GENERIC "generic"
#define EYE_DAMAGE "eye_damage"
+#define DISEASE_TRAIT "disease"
#define GENETIC_MUTATION "genetic"
#define OBESITY "obesity"
#define MAGIC_TRAIT "magic"