diff --git a/GainStation13/code/modules/mob/living/taur_belly.dm b/GainStation13/code/modules/mob/living/taur_belly.dm index 3ad4c92a90..d2eb5afbe0 100644 --- a/GainStation13/code/modules/mob/living/taur_belly.dm +++ b/GainStation13/code/modules/mob/living/taur_belly.dm @@ -13,7 +13,7 @@ genital_flags = UPDATE_OWNER_APPEARANCE|GENITAL_CAN_TAUR masturbation_verb = "massage" var/sent_full_message = TRUE //defaults to 1 since they're full to start - //var/inflatable = FALSE //For inflation connoisseurs not implemented yet + var/inflatable = FALSE var/size_cached = 0 var/prev_size = 0 layer_index = TAUR_BELLY_LAYER_INDEX @@ -71,7 +71,7 @@ max_size = D.features["max_taur_belly_size"] starting_size = D.features["belly_size"] shape = D.features["taur_belly_shape"] - //inflatable = D.features["inflatable_belly"] + inflatable = D.features["taur_inflatable_belly"] toggle_visibility(D.features["taur_belly_visibility"], FALSE) diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm index 42fab39ca4..d8fbff214e 100644 --- a/code/__DEFINES/citadel_defines.dm +++ b/code/__DEFINES/citadel_defines.dm @@ -9,8 +9,8 @@ #define BUTT_LAYER_INDEX 1 #define VAGINA_LAYER_INDEX 2 #define TESTICLES_LAYER_INDEX 3 -#define BELLY_LAYER_INDEX 4 -#define TAUR_BELLY_LAYER_INDEX 5 +#define TAUR_BELLY_LAYER_INDEX 4 +#define BELLY_LAYER_INDEX 5 #define GENITAL_LAYER_INDEX 6 #define PENIS_LAYER_INDEX 7 diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index d72ff09f1a..48034a8f23 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -229,7 +229,7 @@ "taur_belly_size" = TAUR_BELLY_SIZE_DEF, "taur_belly_shape" = TAUR_BELLY_SHAPE_DEF, "hide_taur_belly" = FALSE, - //"inflatable_belly" = FALSE, + "taur_inflatable_belly" = FALSE, "taur_belly_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), "taur_belly_visibility" = GEN_VISIBLE_NO_UNDIES, // GS13 EDIT END diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 00d4f3eeca..0d343e2359 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -134,7 +134,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/eye_type = DEFAULT_EYES_TYPE //Eye type var/split_eye_colors = FALSE var/datum/species/pref_species = new /datum/species/human() //Mutant race - var/list/features = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF", "mcolor3" = "FFFFFF", "tail_lizard" = "Smooth", "tail_human" = "None", "snout" = "Round", "horns" = "None", "horns_color" = "85615a", "ears" = "None", "wings" = "None", "wings_color" = "FFF", "frills" = "None", "deco_wings" = "None", "spines" = "None", "legs" = "Plantigrade", "insect_wings" = "Plain", "insect_fluff" = "None", "insect_markings" = "None", "arachnid_legs" = "Plain", "arachnid_spinneret" = "Plain", "arachnid_mandibles" = "Plain", "mam_body_markings" = list(), "mam_ears" = "None", "mam_snouts" = "None", "mam_tail" = "None", "mam_tail_animated" = "None", "xenodorsal" = "Standard", "xenohead" = "Standard", "xenotail" = "Xenomorph Tail", "taur" = "None", "genitals_use_skintone" = FALSE, "has_cock" = FALSE, "cock_shape" = DEF_COCK_SHAPE, "cock_length" = COCK_SIZE_DEF, "cock_diameter_ratio" = COCK_DIAMETER_RATIO_DEF, "cock_color" = "ffffff", "cock_taur" = FALSE, "has_balls" = FALSE, "balls_color" = "ffffff", "balls_shape" = DEF_BALLS_SHAPE, "balls_size" = BALLS_SIZE_DEF, "balls_cum_rate" = CUM_RATE, "balls_cum_mult" = CUM_RATE_MULT, "balls_efficiency" = CUM_EFFICIENCY, "has_breasts" = FALSE, "breasts_color" = "ffffff", "breasts_size" = BREASTS_SIZE_DEF, "breasts_shape" = DEF_BREASTS_SHAPE, "breasts_fluid" = /datum/reagent/consumable/milk, "breasts_producing" = FALSE, "has_vag" = FALSE, "vag_shape" = DEF_VAGINA_SHAPE, "vag_color" = "ffffff", "has_womb" = FALSE, "has_butt" = FALSE, "butt_color" = "ffffff", "butt_size" = BUTT_SIZE_DEF, "balls_visibility" = GEN_VISIBLE_NO_UNDIES, "breasts_visibility"= GEN_VISIBLE_NO_UNDIES, "cock_visibility" = GEN_VISIBLE_NO_UNDIES, "vag_visibility" = GEN_VISIBLE_NO_UNDIES, "butt_visibility" = GEN_VISIBLE_NO_UNDIES, "ipc_screen" = "Sunburst", "ipc_antenna" = "None", "flavor_text" = "", "silicon_flavor_text" = "", "ooc_notes" = "", "meat_type" = "Mammalian", "body_model" = MALE, "body_size" = RESIZE_DEFAULT_SIZE, "color_scheme" = OLD_CHARACTER_COLORING, "belly_size" = BELLY_SIZE_DEF, "belly_shape" = DEF_BELLY_SHAPE, "inflatable_belly" = FALSE, "belly_visibility" = GEN_VISIBLE_NO_UNDIES, "taur_belly_size" = TAUR_BELLY_SIZE_DEF, "taur_belly_shape" = TAUR_BELLY_SHAPE_DEF, /*"taur_inflatable_belly" = FALSE,*/ "taur_belly_visibility" = GEN_VISIBLE_NO_UNDIES) + var/list/features = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF", "mcolor3" = "FFFFFF", "tail_lizard" = "Smooth", "tail_human" = "None", "snout" = "Round", "horns" = "None", "horns_color" = "85615a", "ears" = "None", "wings" = "None", "wings_color" = "FFF", "frills" = "None", "deco_wings" = "None", "spines" = "None", "legs" = "Plantigrade", "insect_wings" = "Plain", "insect_fluff" = "None", "insect_markings" = "None", "arachnid_legs" = "Plain", "arachnid_spinneret" = "Plain", "arachnid_mandibles" = "Plain", "mam_body_markings" = list(), "mam_ears" = "None", "mam_snouts" = "None", "mam_tail" = "None", "mam_tail_animated" = "None", "xenodorsal" = "Standard", "xenohead" = "Standard", "xenotail" = "Xenomorph Tail", "taur" = "None", "genitals_use_skintone" = FALSE, "has_cock" = FALSE, "cock_shape" = DEF_COCK_SHAPE, "cock_length" = COCK_SIZE_DEF, "cock_diameter_ratio" = COCK_DIAMETER_RATIO_DEF, "cock_color" = "ffffff", "cock_taur" = FALSE, "has_balls" = FALSE, "balls_color" = "ffffff", "balls_shape" = DEF_BALLS_SHAPE, "balls_size" = BALLS_SIZE_DEF, "balls_cum_rate" = CUM_RATE, "balls_cum_mult" = CUM_RATE_MULT, "balls_efficiency" = CUM_EFFICIENCY, "has_breasts" = FALSE, "breasts_color" = "ffffff", "breasts_size" = BREASTS_SIZE_DEF, "breasts_shape" = DEF_BREASTS_SHAPE, "breasts_fluid" = /datum/reagent/consumable/milk, "breasts_producing" = FALSE, "has_vag" = FALSE, "vag_shape" = DEF_VAGINA_SHAPE, "vag_color" = "ffffff", "has_womb" = FALSE, "has_butt" = FALSE, "butt_color" = "ffffff", "butt_size" = BUTT_SIZE_DEF, "balls_visibility" = GEN_VISIBLE_NO_UNDIES, "breasts_visibility"= GEN_VISIBLE_NO_UNDIES, "cock_visibility" = GEN_VISIBLE_NO_UNDIES, "vag_visibility" = GEN_VISIBLE_NO_UNDIES, "butt_visibility" = GEN_VISIBLE_NO_UNDIES, "ipc_screen" = "Sunburst", "ipc_antenna" = "None", "flavor_text" = "", "silicon_flavor_text" = "", "ooc_notes" = "", "meat_type" = "Mammalian", "body_model" = MALE, "body_size" = RESIZE_DEFAULT_SIZE, "color_scheme" = OLD_CHARACTER_COLORING, "belly_size" = BELLY_SIZE_DEF, "belly_shape" = DEF_BELLY_SHAPE, "inflatable_belly" = FALSE, "belly_visibility" = GEN_VISIBLE_NO_UNDIES, "taur_belly_size" = TAUR_BELLY_SIZE_DEF, "taur_belly_shape" = TAUR_BELLY_SHAPE_DEF, "taur_inflatable_belly" = FALSE, "taur_belly_visibility" = GEN_VISIBLE_NO_UNDIES) var/custom_speech_verb = "default" //if your say_mod is to be something other than your races var/custom_tongue = "default" //if your tongue is to be something other than your races @@ -886,10 +886,11 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Max Fat Belly Size: [features["max_taur_belly_size"]]" dat += "Belly Shape: [features["taur_belly_shape"]]" dat += "Belly Visibility:[features["taur_belly_visibility"]]" - //dat += "Inflation (climax with and manual belly size change in arousal menu):[features["inflatable_belly"] == 1 ? "Yes" : "No"]" + dat += "Inflation (climax with and manual belly size change in arousal menu):[features["taur_inflatable_belly"] == 1 ? "Yes" : "No"]" dat += "" dat += "" + //Markings if(MARKINGS_CHAR_TAB) var/iterated_markings = 0 @@ -2560,6 +2561,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) features["tail_human"] = "None" features["tail_lizard"] = "None" features["arachnid_spinneret"] = "None" + else + features["has_taur_belly"] = FALSE if("ears") var/list/snowflake_ears_list = list() @@ -3209,6 +3212,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) //GS13 TAUR BELLY EDIT if("has_taur_belly") features["has_taur_belly"] = !features["has_taur_belly"] + if("taur_inflatable_belly") + features["taur_inflatable_belly"] = !features["taur_inflatable_belly"] if("widescreenpref") widescreenpref = !widescreenpref user.client.view_size.setDefault(getScreenSize(widescreenpref)) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 326dab2f29..5951ea8487 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -908,7 +908,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["feature_taur_belly_shape"] >> features["taur_belly_shape"] S["feature_taur_belly_color"] >> features["taur_belly_color"] S["feature_hide_taur_belly"] >> features["hide_taur_belly"] - //S["feature_inflatable_belly"] >> features["inflatable_belly"] + S["feature_taur_inflatable_belly"] >> features["taur_inflatable_belly"] S["feature_taur_belly_visibility"] >> features["feature_taur_belly_visibility"] // Flavor texts, Made into a standard. @@ -1346,7 +1346,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["feature_taur_belly_shape"], features["taur_belly_shape"]) WRITE_FILE(S["feature_taur_belly_color"], features["taur_belly_color"]) WRITE_FILE(S["feature_hide_taur_belly"], features["hide_taur_belly"]) - //WRITE_FILE(S["feature_inflatable_belly"], features["inflatable_belly"]) + WRITE_FILE(S["feature_taur_inflatable_belly"], features["taur_inflatable_belly"]) //GS13 TAUR BELLY EDIT START END WRITE_FILE(S["feature_ooc_notes"], features["ooc_notes"]) diff --git a/hyperstation/code/modules/arousal/arousalhud.dm b/hyperstation/code/modules/arousal/arousalhud.dm index 43ab8461f1..7cc65e8b64 100644 --- a/hyperstation/code/modules/arousal/arousalhud.dm +++ b/hyperstation/code/modules/arousal/arousalhud.dm @@ -55,6 +55,14 @@ dat += "(Shrink your belly down a size)
" dat += "Increase belly size" dat += "(Bloat your belly up a size)
" + //GS13 EDIT TAUR BELLY + var/obj/item/organ/genital/taur_belly/TBelly = user.getorganslot("taur_belly") + if(TBelly) + if(TBelly.inflatable) + dat += "Decrease taur belly size" + dat += "(Shrink your taur belly down a size)
" + dat += "Increase taur belly size" + dat += "(Bloat your taur belly up a size)
" if(user.pulling) dat += "Climax over [user.pulling]" //you can cum on objects if you really want... @@ -243,6 +251,26 @@ else to_chat(usr, "Your belly is already at the maximum size! ") +//GS13 EDIT TAUR BELLY START + if(href_list["taur_shrink_belly"]) + var/obj/item/organ/genital/taur_belly/X = usr.getorganslot("taur_belly") + if(X.size > 0) + to_chat(usr, "You feel your taur belly diminish.") + X.size -= 1 + H.update_genitals() + else + to_chat(usr, "Your taur belly is already at the minimum size! ") + + if(href_list["taur_inflate_belly"]) + var/obj/item/organ/genital/taur_belly/X = usr.getorganslot("taur_belly") + if(X.size < 11) + to_chat(usr, "You feel your taur belly bloat out..") + X.size += 1 + H.update_genitals() + else + to_chat(usr, "Your taur belly is already at the maximum size! ") +//GS13 EDIT TAUR BELLY END + if(href_list["removeequipmentpenis"]) var/obj/item/organ/genital/penis/O = usr.getorganslot("penis") var/obj/item/I = O.equipment