diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index e87c6c9c..14e00a1e 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -55,7 +55,7 @@ init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list) GLOB.breasts_size_list = list ("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing. - GLOB.genital_fluids_list = list (/datum/reagent/consumable/milk, /datum/reagent/water, /datum/reagent/consumable/semen, /datum/reagent/consumable/femcum) + GLOB.genital_fluids_list = list ("Milk", "Water", "Semen", "Femcum") GLOB.gentlemans_organ_names = list("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret", "baloney pony", "schlanger") for(var/K in GLOB.breasts_shapes_list) var/datum/sprite_accessory/breasts/value = GLOB.breasts_shapes_list[K] diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 0e0d3e5e..83285599 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -825,7 +825,20 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "    Change
" //dat += "Ball Circumference: [features["balls_size"]] inch(es)" // The menu works but doesn't do anything yet. Need to figure it out. dat += "Testicles showing:[features["balls_shape"]]" - dat += "Produces:[features["balls_fluid"]]" + dat += "Produces:" + switch(features["balls_fluid"]) + if(/datum/reagent/consumable/milk) + dat += "Milk" + if(/datum/reagent/water) + dat += "Water" + if(/datum/reagent/consumable/semen) + dat += "Semen" + if(/datum/reagent/consumable/femcum) + dat += "Femcum" + else + dat += "Nothing?" + //This else is a safeguard for errors, and if it happened, they wouldn't be able to change this pref, + //DO NOT REMOVE IT UNLESS YOU HAVE A GOOD IDEA dat += APPEARANCE_CATEGORY_COLUMN dat += "

Vagina

" dat += "[features["has_vag"] == TRUE ? "Yes" : "No"]" @@ -2137,8 +2150,15 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("balls_fluid") var/new_shape new_shape = input(user, "Balls Fluid", "Character Preference") as null|anything in GLOB.genital_fluids_list - if(new_shape) - features["balls_fluid"] = new_shape + switch(new_shape) + if("Milk") + features["balls_fluid"] = /datum/reagent/consumable/milk + if("Water") + features["balls_fluid"] = /datum/reagent/water + if("Semen") + features["balls_fluid"] = /datum/reagent/consumable/semen + if("Femcum") + features["balls_fluid"] = /datum/reagent/consumable/femcum if("egg_size") var/new_size @@ -2171,8 +2191,15 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("breasts_fluid") var/new_shape new_shape = input(user, "Breast Fluid", "Character Preference") as null|anything in GLOB.genital_fluids_list - if(new_shape) - features["breasts_fluid"] = new_shape + switch(new_shape) + if("Milk") + features["balls_fluid"] = /datum/reagent/consumable/milk + if("Water") + features["balls_fluid"] = /datum/reagent/water + if("Semen") + features["balls_fluid"] = /datum/reagent/consumable/semen + if("Femcum") + features["balls_fluid"] = /datum/reagent/consumable/femcum if("breasts_color") var/new_breasts_color = input(user, "Breast Color:", "Character Preference") as color|null diff --git a/config/whitelist.txt b/config/whitelist.txt index 59270487..51ca28e6 100644 --- a/config/whitelist.txt +++ b/config/whitelist.txt @@ -7,3 +7,4 @@ #Iamgoofball #Rshoe95 #That one penguin who became an admin +SandPoot \ No newline at end of file