From 84fc69d82575640448245867313743863ccea18d Mon Sep 17 00:00:00 2001 From: Incoming Date: Wed, 30 Dec 2015 20:53:40 -0500 Subject: [PATCH] Removes gender restrictions from socks. --- code/__HELPERS/global_lists.dm | 2 +- code/__HELPERS/mobs.dm | 9 +++----- code/_globalvars/lists/flavor_misc.dm | 2 -- code/modules/client/preferences.dm | 9 +++----- code/modules/client/preferences_savefile.dm | 4 +--- .../mob/new_player/preferences_setup.dm | 2 +- .../mob/new_player/sprite_accessories.dm | 22 ------------------- 7 files changed, 9 insertions(+), 41 deletions(-) diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index c7f57434960..31a40ca978f 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -12,7 +12,7 @@ //undershirt init_sprite_accessory_subtypes(/datum/sprite_accessory/undershirt, undershirt_list, undershirt_m, undershirt_f) //socks - init_sprite_accessory_subtypes(/datum/sprite_accessory/socks, socks_list, socks_m, socks_f) + init_sprite_accessory_subtypes(/datum/sprite_accessory/socks, socks_list) //lizard bodyparts (blizzard intensifies) init_sprite_accessory_subtypes(/datum/sprite_accessory/body_markings, body_markings_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/lizard, tails_list_lizard) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 72ab4f9bdf3..e9816ab8c34 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -28,13 +28,10 @@ if(FEMALE) return pick(undershirt_f) else return pick(undershirt_list) -/proc/random_socks(gender) +/proc/random_socks() if(!socks_list.len) - init_sprite_accessory_subtypes(/datum/sprite_accessory/socks, socks_list, socks_m, socks_f) - switch(gender) - if(MALE) return pick(socks_m) - if(FEMALE) return pick(socks_f) - else return pick(socks_list) + init_sprite_accessory_subtypes(/datum/sprite_accessory/socks, socks_list) + return pick(socks_list) /proc/random_features() if(!tails_list_human.len) diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index df39c500d7f..033d5af6152 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -16,8 +16,6 @@ var/global/list/undershirt_m = list() //stores only undershirt name var/global/list/undershirt_f = list() //stores only undershirt name //Socks var/global/list/socks_list = list() //stores /datum/sprite_accessory/socks indexed by name -var/global/list/socks_m = list() //stores only socks name -var/global/list/socks_f = list() //stores only socks name //Lizard Bits (all datum lists indexed by name) var/global/list/body_markings_list = list() var/global/list/tails_list_lizard = list() diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 6124923d224..b142bc28df4 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -721,7 +721,7 @@ var/list/preferences_datums = list() if("undershirt") undershirt = random_undershirt(gender) if("socks") - socks = random_socks(gender) + socks = random_socks() if("eyes") eye_color = random_eye_color() if("s_tone") @@ -834,10 +834,7 @@ var/list/preferences_datums = list() if("socks") var/new_socks - if(gender == MALE) - new_socks = input(user, "Choose your character's socks:", "Character Preference") as null|anything in socks_m - else - new_socks = input(user, "Choose your character's socks:", "Character Preference") as null|anything in socks_f + new_socks = input(user, "Choose your character's socks:", "Character Preference") as null|anything in socks_list if(new_socks) socks = new_socks @@ -1001,7 +998,7 @@ var/list/preferences_datums = list() gender = MALE underwear = random_underwear(gender) undershirt = random_undershirt(gender) - socks = random_socks(gender) + socks = random_socks() facial_hair_style = random_facial_hair_style(gender) hair_style = random_hair_style(gender) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index b6a823ea3fc..ceea9a220fe 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -323,14 +323,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car facial_hair_style = sanitize_inlist(facial_hair_style, facial_hair_styles_male_list) underwear = sanitize_inlist(underwear, underwear_m) undershirt = sanitize_inlist(undershirt, undershirt_m) - socks = sanitize_inlist(socks, socks_m) else hair_style = sanitize_inlist(hair_style, hair_styles_female_list) facial_hair_style = sanitize_inlist(facial_hair_style, facial_hair_styles_female_list) underwear = sanitize_inlist(underwear, underwear_f) undershirt = sanitize_inlist(undershirt, undershirt_f) - socks = sanitize_inlist(socks, socks_f) - + socks = sanitize_inlist(socks, socks_list) age = sanitize_integer(age, AGE_MIN, AGE_MAX, initial(age)) hair_color = sanitize_hexcolor(hair_color, 3, 0) facial_hair_color = sanitize_hexcolor(facial_hair_color, 3, 0) diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 4e55cef28f9..7f622559c7d 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -7,7 +7,7 @@ gender = pick(MALE,FEMALE) underwear = random_underwear(gender) undershirt = random_undershirt(gender) - socks = random_socks(gender) + socks = random_socks() skin_tone = random_skin_tone() hair_style = random_hair_style(gender) facial_hair_style = random_facial_hair_style(gender) diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 689058e6aea..97fec9be03e 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -993,112 +993,90 @@ /datum/sprite_accessory/socks/nude name = "Nude" icon_state = null - gender = NEUTER /datum/sprite_accessory/socks/white_norm name = "Normal White" icon_state = "white_norm" - gender = NEUTER /datum/sprite_accessory/socks/black_norm name = "Normal Black" icon_state = "black_norm" - gender = NEUTER /datum/sprite_accessory/socks/white_short name = "Short White" icon_state = "white_short" - gender = NEUTER /datum/sprite_accessory/socks/black_short name = "Short Black" icon_state = "black_short" - gender = NEUTER /datum/sprite_accessory/socks/white_knee name = "Knee-high White" icon_state = "white_knee" - gender = NEUTER /datum/sprite_accessory/socks/black_knee name = "Knee-high Black" icon_state = "black_knee" - gender = NEUTER /datum/sprite_accessory/socks/thin_knee name = "Knee-high Thin" icon_state = "thin_knee" - gender = FEMALE /datum/sprite_accessory/socks/striped_knee name = "Knee-high Striped" icon_state = "striped_knee" - gender = NEUTER /datum/sprite_accessory/socks/rainbow_knee name = "Knee-high Rainbow" icon_state = "rainbow_knee" - gender = NEUTER /datum/sprite_accessory/socks/white_thigh name = "Thigh-high White" icon_state = "white_thigh" - gender = NEUTER /datum/sprite_accessory/socks/black_thigh name = "Thigh-high Black" icon_state = "black_thigh" - gender = NEUTER /datum/sprite_accessory/socks/thin_thigh name = "Thigh-high Thin" icon_state = "thin_thigh" - gender = FEMALE /datum/sprite_accessory/socks/striped_thigh name = "Thigh-high Striped" icon_state = "striped_thigh" - gender = NEUTER /datum/sprite_accessory/socks/rainbow_thigh name = "Thigh-high Rainbow" icon_state = "rainbow_thigh" - gender = NEUTER /datum/sprite_accessory/socks/usa_knee name = "Knee-High Freedom Stripes" icon_state = "assblastusa_knee" - gender = NEUTER /datum/sprite_accessory/socks/usa_thigh name = "Thigh-high Freedom Stripes" icon_state = "assblastusa_thigh" - gender = NEUTER /datum/sprite_accessory/socks/uk_knee name = "Knee-High UK Stripes" icon_state = "uk_knee" - gender = NEUTER /datum/sprite_accessory/socks/uk_thigh name = "Thigh-high UK Stripes" icon_state = "uk_thigh" - gender = NEUTER /datum/sprite_accessory/socks/commie_knee name = "Knee-High Commie Stripes" icon_state = "commie_knee" - gender = NEUTER /datum/sprite_accessory/socks/commie_thigh name = "Thigh-high Commie Stripes" icon_state = "commie_thigh" - gender = NEUTER /datum/sprite_accessory/socks/pantyhose name = "Pantyhose" icon_state = "pantyhose" - gender = FEMALE //////////.////////////////// // MutantParts Definitions //