diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm index 0f2e94db..ed18bf2a 100644 --- a/code/__DEFINES/citadel_defines.dm +++ b/code/__DEFINES/citadel_defines.dm @@ -69,6 +69,7 @@ #define BREASTS_SIZE_HUGE 16 #define BREASTS_SIZE_MASSIVE 17 #define BREASTS_SIZE_GIGA 25 +#define BREASTS_SIZE_IMPOSSIBLE 30 //Bodysize Limits #define MIN_BODYSIZE 50 @@ -76,7 +77,7 @@ #define BREASTS_SIZE_MIN BREASTS_SIZE_A #define BREASTS_SIZE_DEF BREASTS_SIZE_D -#define BREASTS_SIZE_MAX BREASTS_SIZE_GIGA +#define BREASTS_SIZE_MAX BREASTS_SIZE_IMPOSSIBLE #define MILK_RATE 5 #define MILK_RATE_MULT 1 diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 599a590a..592ef0b8 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -94,7 +94,7 @@ o.add_movespeed_modifier(BREAST_MOVEMENT_SPEED, TRUE, 100, NONE, override = TRUE, multiplicative_slowdown = moveCalc) sizeMoveMod(moveCalc) */ - if((B.cached_size) < 16) + if((B.cached_size) < 40) switch(round(B.cached_size)) if(9) if (B.breast_values[B.prev_size] != B.breast_values[B.size]) diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm index 8ca1e450..de4d0d70 100644 --- a/modular_citadel/code/modules/arousal/organs/breasts.dm +++ b/modular_citadel/code/modules/arousal/organs/breasts.dm @@ -9,8 +9,8 @@ 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", "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/breast_sizes = list ("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "huge", "massive", "giga", "impossible", "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, "impossible" = 30, "flat" = 0) // Note: Do not forget to define new sizes. var/statuscheck = FALSE fluid_id = "milk" var/amount = 2 @@ -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 && cached_size != 25) + if(cached_size > 18 && cached_size != 25 && cached_size != 30) 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") @@ -138,7 +138,7 @@ statuscheck = TRUE - if(round(cached_size) < 19 && round(cached_size) == 25)//Because byond doesn't count from 0, I have to do this. + if(round(cached_size) < 19 && round(cached_size) == 25 && round(cached_size) == 30)//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 @@ -156,5 +156,7 @@ prev_size = size else if (cached_size >= 18 && cached_size < 25) size = "massive" - else if (cached_size >= 25) - size = "giga" \ No newline at end of file + else if (cached_size >= 25 && cached_size < 30) + size = "giga" + else if (cached_size >= 30) + size = "impossible" \ No newline at end of file diff --git a/modular_citadel/icons/obj/genitals/breasts_onmob.dmi b/modular_citadel/icons/obj/genitals/breasts_onmob.dmi index fc18e642..cd542b54 100644 Binary files a/modular_citadel/icons/obj/genitals/breasts_onmob.dmi and b/modular_citadel/icons/obj/genitals/breasts_onmob.dmi differ