diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm index 867f11a270..91173d9c22 100644 --- a/code/__DEFINES/citadel_defines.dm +++ b/code/__DEFINES/citadel_defines.dm @@ -46,10 +46,10 @@ #define DEF_BALLS_SHAPE "Single" #define BALLS_SIZE_MIN 1 -#define BALLS_SIZE_DEF 2 -#define BALLS_SIZE_MAX 3 +#define BALLS_SIZE_DEF 8 //GS13 - changed from 2 +#define BALLS_SIZE_MAX 40 //GS13 - changed from 3 -#define CUM_RATE 2 // units per 10 seconds +#define CUM_RATE 5 // units per 10 seconds //GS13 - upping the production rate #define CUM_RATE_MULT 1 #define CUM_EFFICIENCY 1 //amount of nutrition required per life() @@ -60,7 +60,7 @@ #define DEF_BREASTS_SHAPE "Pair" -#define MILK_RATE 3 +#define MILK_RATE 5 //GS13 - production rate #define MILK_RATE_MULT 1 #define MILK_EFFICIENCY 1 diff --git a/code/modules/arousal/genitals_sprite_accessories.dm b/code/modules/arousal/genitals_sprite_accessories.dm index 3161c61dbc..b8d0c9e9f9 100644 --- a/code/modules/arousal/genitals_sprite_accessories.dm +++ b/code/modules/arousal/genitals_sprite_accessories.dm @@ -9,7 +9,7 @@ //DICKS,COCKS,PENISES,WHATEVER YOU WANT TO CALL THEM /datum/sprite_accessory/penis - icon = 'icons/obj/genitals/penis_onmob.dmi' + icon = 'GainStation13/icons/obj/genitals/penis_onmob.dmi' //GS13 - Hyperstation cocks name = "penis" //the preview name of the accessory color_src = "cock_color" alt_aroused = TRUE @@ -22,13 +22,13 @@ /datum/sprite_accessory/penis/knotted icon_state = "knotted" name = "Knotted" - taur_icon = 'icons/obj/genitals/taur_penis_onmob.dmi' + taur_icon = 'GainStation13/icons/obj/genitals/taur_penis_onmob.dmi' //GS13 - Hyperstation cocks taur_dimension_x = 64 /datum/sprite_accessory/penis/flared icon_state = "flared" name = "Flared" - taur_icon = 'icons/obj/genitals/taur_penis_onmob.dmi' + taur_icon = 'GainStation13/icons/obj/genitals/taur_penis_onmob.dmi' //GS13 - Hyperstation cocks taur_dimension_x = 64 /datum/sprite_accessory/penis/barbknot @@ -38,7 +38,7 @@ /datum/sprite_accessory/penis/tapered icon_state = "tapered" name = "Tapered" - taur_icon = 'icons/obj/genitals/taur_penis_onmob.dmi' + taur_icon = 'GainStation13/icons/obj/genitals/taur_penis_onmob.dmi' //GS13 - Hyperstation cocks taur_dimension_x = 64 /datum/sprite_accessory/penis/tentacle @@ -55,7 +55,7 @@ //Testicles /datum/sprite_accessory/testicles - icon = 'icons/obj/genitals/testicles_onmob.dmi' + icon = 'GainStation13/icons/obj/genitals/testicles_onmob.dmi' //GS13 - Hyperstation cocks icon_state = "testicle" name = "testicle" //the preview name of the accessory color_src = "balls_color" @@ -70,7 +70,7 @@ //Vaginas /datum/sprite_accessory/vagina - icon = 'icons/obj/genitals/vagina_onmob.dmi' + icon = 'GainStation13/icons/obj/genitals/vagina_onmob.dmi' //GS13 - Hyperstation cocks name = "vagina" color_src = "vag_color" alt_aroused = TRUE @@ -108,7 +108,7 @@ //BREASTS BE HERE /datum/sprite_accessory/breasts - icon = 'icons/obj/genitals/breasts_onmob.dmi' + icon = 'GainStation13/icons/obj/genitals/breasts_onmob.dmi' //GS13 - Hyperstation cocks name = "breasts" color_src = "breasts_color" diff --git a/code/modules/arousal/organs/breasts.dm b/code/modules/arousal/organs/breasts.dm index fb21d944bd..e9974d672d 100644 --- a/code/modules/arousal/organs/breasts.dm +++ b/code/modules/arousal/organs/breasts.dm @@ -1,11 +1,11 @@ #define BREASTS_ICON_MIN_SIZE 1 -#define BREASTS_ICON_MAX_SIZE 6 +#define BREASTS_ICON_MAX_SIZE 30 /obj/item/organ/genital/breasts name = "breasts" desc = "Female milk producing organs." icon_state = "breasts" - icon = 'icons/obj/genitals/breasts.dmi' + icon = 'GainStation13/icons/obj/genitals/breasts.dmi' //GS13 - hyperstation boobers zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_BREASTS size = BREASTS_SIZE_DEF // "c". Refer to the breast_values static list below for the cups associated number values @@ -20,7 +20,7 @@ unarousal_verb = "Your breasts no longer feel sensitive" orgasm_verb = "leaking" fluid_transfer_factor = 0.5 - var/static/list/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, "flat" = 0) + var/static/list/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) var/cached_size //these two vars pertain size modifications and so should be expressed in NUMBERS. var/prev_size //former cached_size value, to allow update_size() to early return should be there no significant changes. diff --git a/code/modules/arousal/organs/penis.dm b/code/modules/arousal/organs/penis.dm index 7e0f31ed43..790a717cad 100644 --- a/code/modules/arousal/organs/penis.dm +++ b/code/modules/arousal/organs/penis.dm @@ -2,11 +2,11 @@ name = "penis" desc = "A male reproductive organ." icon_state = "penis" - icon = 'icons/obj/genitals/penis.dmi' + icon = 'GainStation13/icons/obj/genitals/penis.dmi' zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_PENIS masturbation_verb = "stroke" - can_climax = TRUE + can_climax = TRUE arousal_verb = "You pop a boner" unarousal_verb = "Your boner goes down" genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH|GENITAL_CAN_AROUSE|UPDATE_OWNER_APPEARANCE|GENITAL_UNDIES_HIDDEN|GENITAL_CAN_TAUR @@ -16,7 +16,6 @@ size = 2 //arbitrary value derived from length and diameter for sprites. layer_index = PENIS_LAYER_INDEX var/length = 6 //inches - var/prev_length = 6 //really should be renamed to prev_length var/diameter = 4.38 var/diameter_ratio = COCK_DIAMETER_RATIO_DEF //0.25; check citadel_defines.dm @@ -41,14 +40,18 @@ var/rounded_length = round(length) var/new_size switch(rounded_length) - if(0 to 6) //If modest size + if(0 to 4) //If modest size new_size = 1 - if(7 to 11) //If large + if(5 to 10) //If large new_size = 2 - if(12 to 36) //If massive + if(11 to 18) //If massive new_size = 3 - if(37 to INFINITY) //If comical - new_size = 4 //no new sprites for anything larger yet + if(18 to 26) //If massive + new_size = 3 + if(26 to 34) //If massive + new_size = 4 + if(34 to INFINITY) //If comical + new_size = 5 //no new sprites for anything larger yet if(linked_organ) linked_organ.size = clamp(size + new_size, BALLS_SIZE_MIN, BALLS_SIZE_MAX) diff --git a/config/entries/fetish_content.txt b/config/entries/fetish_content.txt index edc22d1d6d..b233472216 100644 --- a/config/entries/fetish_content.txt +++ b/config/entries/fetish_content.txt @@ -1,4 +1,5 @@ ## Breast cups selectable from the character creation menu. Keep em lowercase. +## GS13 edit - added twice as many breast sizes BREASTS_CUPS_PREFS a BREASTS_CUPS_PREFS b BREASTS_CUPS_PREFS c @@ -7,10 +8,22 @@ BREASTS_CUPS_PREFS e BREASTS_CUPS_PREFS f BREASTS_CUPS_PREFS g BREASTS_CUPS_PREFS h +BREASTS_CUPS_PREFS i +BREASTS_CUPS_PREFS j +BREASTS_CUPS_PREFS k +BREASTS_CUPS_PREFS l +BREASTS_CUPS_PREFS m +BREASTS_CUPS_PREFS n +BREASTS_CUPS_PREFS o +##BREASTS_CUPS_PREFS huge +##BREASTS_CUPS_PREFS massive +##BREASTS_CUPS_PREFS giga +##BREASTS_CUPS_PREFS impossible ## Minimum and maximum limits for penis length from the character creation menu. +## GS13 edit - 36 inches PENIS_MIN_INCHES_PREFS 1 -PENIS_MAX_INCHES_PREFS 24 +PENIS_MAX_INCHES_PREFS 36 ## Minimum and maximum limits for butt size from the character creation menu. If there's bigger butt sizes out there, change the max accordingly. BUTT_MIN_SIZE_PREFS 1