|
|
|
@@ -124,7 +124,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", "body_markings" = list(), "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_producing" = FALSE, "has_vag" = FALSE, "vag_shape" = DEF_VAGINA_SHAPE, "vag_color" = "ffffff", "has_womb" = FALSE, "balls_visibility" = GEN_VISIBLE_NO_UNDIES, "breasts_visibility"= GEN_VISIBLE_NO_UNDIES, "cock_visibility" = GEN_VISIBLE_NO_UNDIES, "vag_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)
|
|
|
|
|
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_producing" = FALSE, "has_vag" = FALSE, "vag_shape" = DEF_VAGINA_SHAPE, "vag_color" = "ffffff", "has_womb" = FALSE, "balls_visibility" = GEN_VISIBLE_NO_UNDIES, "breasts_visibility"= GEN_VISIBLE_NO_UNDIES, "cock_visibility" = GEN_VISIBLE_NO_UNDIES, "vag_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)
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
@@ -517,9 +517,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
|
|
|
|
// rp marking selection
|
|
|
|
|
// assume you can only have mam markings or regular markings or none, never both
|
|
|
|
|
var/marking_type
|
|
|
|
|
if(parent.can_have_part("body_markings"))
|
|
|
|
|
marking_type = "body_markings"
|
|
|
|
|
else if(parent.can_have_part("mam_body_markings"))
|
|
|
|
|
if(parent.can_have_part("mam_body_markings"))
|
|
|
|
|
marking_type = "mam_body_markings"
|
|
|
|
|
if(marking_type)
|
|
|
|
|
dat += APPEARANCE_CATEGORY_COLUMN
|
|
|
|
@@ -535,7 +533,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
|
|
|
|
var/actual_name = GLOB.bodypart_names[num2text(marking_list[1])] // get the actual name from the bitflag representing the part the marking is applied to
|
|
|
|
|
var/color_marking_dat = ""
|
|
|
|
|
var/number_colors = 1
|
|
|
|
|
var/datum/sprite_accessory/S = (marking_type == "mam_body_markings") ? GLOB.mam_body_markings_list[marking_list[2]] : GLOB.body_markings_list[marking_list[2]]
|
|
|
|
|
var/datum/sprite_accessory/S = GLOB.mam_body_markings_list[marking_list[2]]
|
|
|
|
|
if(S && S.matrixed_sections && S.matrixed_sections != MATRIX_NONE)
|
|
|
|
|
// if it has nothing initialize it to white
|
|
|
|
|
if(length(marking_list) == 2)
|
|
|
|
@@ -555,7 +553,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
|
|
|
|
dat += "</table>"
|
|
|
|
|
|
|
|
|
|
for(var/mutant_part in GLOB.all_mutant_parts)
|
|
|
|
|
if(mutant_part == "body_markings" || mutant_part == "mam_body_markings")
|
|
|
|
|
if(mutant_part == "mam_body_markings")
|
|
|
|
|
continue
|
|
|
|
|
if(parent.can_have_part(mutant_part))
|
|
|
|
|
if(!mutant_category)
|
|
|
|
@@ -1766,8 +1764,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
|
|
|
|
pref_species = new newtype()
|
|
|
|
|
//let's ensure that no weird shit happens on species swapping.
|
|
|
|
|
custom_species = null
|
|
|
|
|
if(!parent.can_have_part("body_markings"))
|
|
|
|
|
features["body_markings"] = list()
|
|
|
|
|
if(!parent.can_have_part("mam_body_markings"))
|
|
|
|
|
features["mam_body_markings"] = list()
|
|
|
|
|
if(parent.can_have_part("mam_body_markings"))
|
|
|
|
@@ -2145,7 +2141,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
|
|
|
|
features["xenodorsal"] = new_dors
|
|
|
|
|
|
|
|
|
|
//every single primary/secondary/tertiary colouring done at once
|
|
|
|
|
if("xenodorsal_primary","xenodorsal_secondary","xenodorsal_tertiary","xhead_primary","xhead_secondary","xhead_tertiary","tail_primary","tail_secondary","tail_tertiary","insect_markings_primary","insect_markings_secondary","insect_markings_tertiary","body_markings_primary","body_markings_secondary","body_markings_tertiary","insect_fluff_primary","insect_fluff_secondary","insect_fluff_tertiary","ears_primary","ears_secondary","ears_tertiary","frills_primary","frills_secondary","frills_tertiary","ipc_antenna_primary","ipc_antenna_secondary","ipc_antenna_tertiary","taur_primary","taur_secondary","taur_tertiary","snout_primary","snout_secondary","snout_tertiary","spines_primary","spines_secondary","spines_tertiary", "mam_body_markings_primary", "mam_body_markings_secondary", "mam_body_markings_tertiary")
|
|
|
|
|
if("xenodorsal_primary","xenodorsal_secondary","xenodorsal_tertiary","xhead_primary","xhead_secondary","xhead_tertiary","tail_primary","tail_secondary","tail_tertiary","insect_markings_primary","insect_markings_secondary","insect_markings_tertiary","insect_fluff_primary","insect_fluff_secondary","insect_fluff_tertiary","ears_primary","ears_secondary","ears_tertiary","frills_primary","frills_secondary","frills_tertiary","ipc_antenna_primary","ipc_antenna_secondary","ipc_antenna_tertiary","taur_primary","taur_secondary","taur_tertiary","snout_primary","snout_secondary","snout_tertiary","spines_primary","spines_secondary","spines_tertiary", "mam_body_markings_primary", "mam_body_markings_secondary", "mam_body_markings_tertiary")
|
|
|
|
|
var/the_feature = features[href_list["preference"]]
|
|
|
|
|
if(!the_feature)
|
|
|
|
|
features[href_list["preference"]] = "FFFFFF"
|
|
|
|
@@ -2442,7 +2438,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
|
|
|
|
if(selected_limb)
|
|
|
|
|
var/limb_value = text2num(GLOB.bodypart_values[selected_limb])
|
|
|
|
|
var/list/marking_list = GLOB.mam_body_markings_list
|
|
|
|
|
if(marking_type == "body_markings") marking_list = GLOB.body_markings_list
|
|
|
|
|
var/list/snowflake_markings_list = list()
|
|
|
|
|
for(var/path in marking_list)
|
|
|
|
|
var/datum/sprite_accessory/S = marking_list[path]
|
|
|
|
|
Timothy Teakettle