diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm
index 894d22bd..c5357b92 100644
--- a/code/__DEFINES/citadel_defines.dm
+++ b/code/__DEFINES/citadel_defines.dm
@@ -68,11 +68,12 @@
#define BREASTS_SIZE_O 15
#define BREASTS_SIZE_HUGE 16
#define BREASTS_SIZE_MASSIVE 17
+#define BREASTS_SIZE_GIGA 25
#define BREASTS_SIZE_MIN BREASTS_SIZE_A
#define BREASTS_SIZE_DEF BREASTS_SIZE_D
-#define BREASTS_SIZE_MAX BREASTS_SIZE_MASSIVE
+#define BREASTS_SIZE_MAX BREASTS_SIZE_GIGA
#define MILK_RATE 5
#define MILK_RATE_MULT 1
diff --git a/hyperstation/code/obj/pregnancytester.dm b/hyperstation/code/obj/pregnancytester.dm
index 6b751747..974fda3a 100644
--- a/hyperstation/code/obj/pregnancytester.dm
+++ b/hyperstation/code/obj/pregnancytester.dm
@@ -1,6 +1,6 @@
/obj/item/pregnancytest
name = "pregnancy test"
- desc = "a one time use small device, used to determine if someone is pregnant or not."
+ desc = "A one time use small device, used to determine whether someone is pregnant or not."
icon = 'hyperstation/icons/obj/pregnancytest.dmi'
throwforce = 0
icon_state = "ptest"
@@ -27,7 +27,7 @@
icon_state = "negative"
name = "[results] pregnancy test"
status = 1
- to_chat(user, "You use the pregnancy test, the display reads positive!")
+ to_chat(user, "You use the pregnancy test, the display reads negative!")
/obj/item/pregnancytest/proc/test(mob/living/user)
diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm
index f102cc74..8ca1e450 100644
--- a/modular_citadel/code/modules/arousal/organs/breasts.dm
+++ b/modular_citadel/code/modules/arousal/organs/breasts.dm
@@ -9,13 +9,13 @@
size = BREASTS_SIZE_DEF //SHOULD BE A LETTER, starts as a number...???
var/cached_size = null //for enlargement SHOULD BE A NUMBER
var/prev_size //For flavour texts SHOULD BE A LETTER
- //var/breast_sizes = list ("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "huge", "massive", "flat")
- var/breast_values = list ("a" = 1, "b" = 2, "c" = 3, "d" = 4, "e" = 5, "f" = 6, "g" = 7, "h" = 8, "i" = 9, "j" = 10, "k" = 11, "l" = 12, "m" = 13, "n" = 14, "o" = 15, "huge" = 16, "massive" = 17, "flat" = 0) // Note: Do not forget to define new sizes.
+ //var/breast_sizes = list ("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "huge", "massive", "giga", "flat")
+ var/breast_values = list ("a" = 1, "b" = 2, "c" = 3, "d" = 4, "e" = 5, "f" = 6, "g" = 7, "h" = 8, "i" = 9, "j" = 10, "k" = 11, "l" = 12, "m" = 13, "n" = 14, "o" = 15, "huge" = 16, "massive" = 17, "giga" = 25, "flat" = 0) // Note: Do not forget to define new sizes.
var/statuscheck = FALSE
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
+ fluid_max_volume = 10
producing = TRUE
shape = "Pair"
can_masturbate_with = TRUE
@@ -32,7 +32,7 @@
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
+ reagents.total_volume = 0.1
else
fluid_rate = CUM_RATE * cached_size * fluid_mult // fluid rate is scaled by the size of the organ
generate_milk()
@@ -68,7 +68,7 @@
desc = "You see three sets of breasts, running from their chest to their belly."
else
desc = "You see some breasts, they seem to be quite exotic."
- if(cached_size > 18)
+ if(cached_size > 18 && cached_size != 25)
desc = "You see [pick("some serious honkers", "a real set of badonkers", "some dobonhonkeros", "massive dohoonkabhankoloos", "two big old tonhongerekoogers", "a couple of giant bonkhonagahoogs", "a pair of humongous hungolomghnonoloughongous")]. Their volume is way beyond cupsize now, measuring in about [round(cached_size)]cm in diameter."
else if (!isnum(size))
if (size == "flat")
@@ -125,17 +125,20 @@
if(!owner.has_status_effect(/datum/status_effect/chem/breast_enlarger))
owner.apply_status_effect(/datum/status_effect/chem/breast_enlarger)
statuscheck = TRUE
- if(16 to 17) //if Ridiculous
+ if(16 to 18) //if Ridiculous
size = breast_values[round(cached_size)]
if(!owner.has_status_effect(/datum/status_effect/chem/breast_enlarger))
owner.apply_status_effect(/datum/status_effect/chem/breast_enlarger)
statuscheck = TRUE
- if(18 to INFINITY) //if Hyper-Ridiculous
+ if(19 to INFINITY) //if Hyper-Ridiculous
size = cached_size
+ if(!owner.has_status_effect(/datum/status_effect/chem/breast_enlarger))
+ owner.apply_status_effect(/datum/status_effect/chem/breast_enlarger)
+ statuscheck = TRUE
- if(round(cached_size) < 17)//Because byond doesn't count from 0, I have to do this.
+ if(round(cached_size) < 19 && round(cached_size) == 25)//Because byond doesn't count from 0, I have to do this.
if (prev_size == 0)
prev_size = "flat"
if(size == 0)//Bloody byond with it's counting from 1
@@ -151,5 +154,7 @@
var/mob/living/carbon/human/H = owner
H.Force_update_genitals()
prev_size = size
- else if (cached_size >= 18)
- size = "massive"
\ No newline at end of file
+ else if (cached_size >= 18 && cached_size < 25)
+ size = "massive"
+ else if (cached_size >= 25)
+ size = "giga"
\ No newline at end of file
diff --git a/modular_citadel/code/modules/arousal/organs/testicles.dm b/modular_citadel/code/modules/arousal/organs/testicles.dm
index dd983e0e..bf80168e 100644
--- a/modular_citadel/code/modules/arousal/organs/testicles.dm
+++ b/modular_citadel/code/modules/arousal/organs/testicles.dm
@@ -11,7 +11,7 @@
var/sack_size = BALLS_SACK_SIZE_DEF
var/cached_size = 6
fluid_mult = 0.133 // Set to a lower value due to production scaling with size (I.E. 6 inches the "normal" amount)
- fluid_max_volume = 3
+ fluid_max_volume = 6
fluid_id = "semen"
producing = TRUE
can_masturbate_with = FALSE
diff --git a/modular_citadel/code/modules/arousal/organs/womb.dm b/modular_citadel/code/modules/arousal/organs/womb.dm
index c8dbfed0..28d7bb43 100644
--- a/modular_citadel/code/modules/arousal/organs/womb.dm
+++ b/modular_citadel/code/modules/arousal/organs/womb.dm
@@ -20,7 +20,7 @@
else
fluid_rate = CUM_RATE
if(reagents.total_volume >= 5)
- fluid_mult = 0.5
+ fluid_mult = 0.8
else
fluid_mult = 1
generate_femcum()
diff --git a/modular_citadel/code/modules/reagents/reagent container/milking machine.dm b/modular_citadel/code/modules/reagents/reagent container/milking machine.dm
index 057c657e..4aa6520d 100644
--- a/modular_citadel/code/modules/reagents/reagent container/milking machine.dm
+++ b/modular_citadel/code/modules/reagents/reagent container/milking machine.dm
@@ -10,7 +10,7 @@
var/on = FALSE
var/obj/item/reagent_containers/glass/inserted_item = null
- var/transfer_rate = 0.25 // How much we transfer every 2 seconds
+ var/transfer_rate = 1 // How much we transfer every 2 seconds
var/target_organ = "breasts" // What organ we are transfering from
/obj/item/milker/examine(mob/user)
diff --git a/modular_citadel/icons/obj/genitals/breasts_onmob.dmi b/modular_citadel/icons/obj/genitals/breasts_onmob.dmi
index 5fb13a29..e4bcaa1f 100644
Binary files a/modular_citadel/icons/obj/genitals/breasts_onmob.dmi and b/modular_citadel/icons/obj/genitals/breasts_onmob.dmi differ