From 760f956cf7310dfaec0e68c2e55fe1b0a5b8e9b0 Mon Sep 17 00:00:00 2001 From: KasparoVy Date: Sat, 19 Mar 2016 04:27:12 -0400 Subject: [PATCH] Drops some excess brackets. --- code/modules/client/preferences.dm | 28 +++++++++---------- .../mob/living/carbon/human/appearance.dm | 8 +++--- code/modules/mob/living/carbon/human/human.dm | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 650cce78080..8951c4c8bc1 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -356,7 +356,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts dat += "[TextPreview(flavor_text)]...
" dat += "
" - if((species in list("Unathi", "Vulpkanin", "Tajaran", "Machine"))) //Species that have head accessories. + if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species that have head accessories. var/headaccessoryname = "Head Accessory" if(species == "Unathi") headaccessoryname = "Horns" @@ -364,7 +364,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts dat += "Change Color
__
 " dat += "Style: [ha_style]
" - if((species in list("Unathi", "Vulpkanin", "Tajaran", "Machine"))) //Species that have body markings. + if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species that have body markings. dat += "
Body Markings
" dat += "Change Color
__
 " dat += "
Style: [m_style]
" @@ -1090,7 +1090,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts continue if(gender == FEMALE && S.gender == MALE) continue - if( !(species in S.species_allowed)) + if(!(species in S.species_allowed)) continue valid_hairstyles[hairstyle] = hair_styles_list[hairstyle] @@ -1109,7 +1109,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts continue if(gender == FEMALE && S.gender == MALE) continue - if( !(species in S.species_allowed)) + if(!(species in S.species_allowed)) continue valid_facialhairstyles[facialhairstyle] = facial_hair_styles_list[facialhairstyle] @@ -1199,7 +1199,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts for(var/hairstyle in hair_styles_list) var/datum/sprite_accessory/S = hair_styles_list[hairstyle] if(species == "Machine") //Species that can use prosthetic heads. - if((species in S.species_allowed)) + if(species in S.species_allowed) if(!rlimb_data["head"]) valid_hairstyles[hairstyle] = S continue @@ -1208,7 +1208,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts else if(!rlimb_data["head"]) continue - else if(("Human" in S.species_allowed)) + else if("Human" in S.species_allowed) valid_hairstyles[hairstyle] = S continue else @@ -1222,7 +1222,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts h_style = new_h_style if("headaccessory") - if((species in list("Unathi", "Vulpkanin", "Tajaran", "Machine"))) // Species with head accessories + if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) // Species with head accessories var/input = "Choose the colour of your your character's head accessory:" var/new_head_accessory = input(user, input, "Character Preference", rgb(r_headacc, g_headacc, b_headacc)) as color|null if(new_head_accessory) @@ -1231,11 +1231,11 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts b_headacc = hex2num(copytext(new_head_accessory, 6, 8)) if("ha_style") - if((species in list("Unathi", "Vulpkanin", "Tajaran", "Machine"))) // Species with head accessories + if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) // Species with head accessories var/list/valid_head_accessory_styles = list() for(var/head_accessory_style in head_accessory_styles_list) var/datum/sprite_accessory/H = head_accessory_styles_list[head_accessory_style] - if( !(species in H.species_allowed)) + if(!(species in H.species_allowed)) continue valid_head_accessory_styles[head_accessory_style] = head_accessory_styles_list[head_accessory_style] @@ -1245,7 +1245,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts ha_style = new_head_accessory_style if("markings") - if((species in list("Unathi", "Vulpkanin", "Tajaran", "Machine"))) // Species with markings + if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) // Species with markings var/input = "Choose the colour of your your character's markings:" var/new_markings = input(user, input, "Character Preference", rgb(r_markings, g_markings, b_markings)) as color|null if(new_markings) @@ -1254,11 +1254,11 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts b_markings = hex2num(copytext(new_markings, 6, 8)) if("m_style") - if((species in list("Unathi", "Vulpkanin", "Tajaran"))) // Species with markings + if(species in list("Unathi", "Vulpkanin", "Tajaran")) // Species with markings var/list/valid_markings = list() for(var/markingstyle in marking_styles_list) var/datum/sprite_accessory/M = marking_styles_list[markingstyle] - if( !(species in M.species_allowed)) + if(!(species in M.species_allowed)) continue if(species == "Machine") //Species that can use prosthetic heads. @@ -1306,7 +1306,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts if(gender == FEMALE && S.gender == MALE) continue if(species == "Machine") //Species that can use prosthetic heads. - if((species in S.species_allowed)) + if(species in S.species_allowed) if(!rlimb_data["head"]) valid_facialhairstyles[facialhairstyle] = S continue @@ -1315,7 +1315,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts else if(!rlimb_data["head"]) continue - else if(("Human" in S.species_allowed)) + else if("Human" in S.species_allowed) valid_facialhairstyles[facialhairstyle] = S continue else diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm index e691e35ecac..7f32ac11960 100644 --- a/code/modules/mob/living/carbon/human/appearance.dm +++ b/code/modules/mob/living/carbon/human/appearance.dm @@ -184,7 +184,7 @@ if(gender == FEMALE && S.gender == MALE) continue if(species.flags & ALL_RPARTS) //If the user is a species who can have a robotic head... - if((species.name in S.species_allowed)) //If this is a hairstyle native to the user's species... + if(species.name in S.species_allowed) //If this is a hairstyle native to the user's species... if(!user.client.prefs.rlimb_data["head"]) //Check to see if they have the default head. valid_hairstyles += hairstyle //Give them their hairstyles if they do. continue @@ -194,7 +194,7 @@ if(!user.client.prefs.rlimb_data["head"]) //If the hairstyle is not native to the user's species, and they're using the default head, don't let them access it. continue else - if(("Human" in S.species_allowed)) //If the user has a robotic head and the hairstyle can fit humans, let them use it as a wig for their humanoid robot head. + if("Human" in S.species_allowed) //If the user has a robotic head and the hairstyle can fit humans, let them use it as a wig for their humanoid robot head. valid_hairstyles += hairstyle continue else @@ -220,7 +220,7 @@ if(gender == FEMALE && S.gender == MALE) continue if(species.flags & ALL_RPARTS) //If the user is a species who can have a robotic head... - if((species.name in S.species_allowed)) //If this is a facial hair style native to the user's species... + if(species.name in S.species_allowed) //If this is a facial hair style native to the user's species... if(!user.client.prefs.rlimb_data["head"]) //Check to see if they have the default head. valid_facial_hairstyles += facialhairstyle //Give them their facial hair styles if they do. continue @@ -230,7 +230,7 @@ if(!user.client.prefs.rlimb_data["head"]) //If the facial hair style is not native to the user's species, and they're using the default head, don't let them access it. continue else - if(("Human" in S.species_allowed)) //If the user has a robotic head and the facial hair style can fit humans, let them use it as a postiche for their humanoid robot head. + if("Human" in S.species_allowed) //If the user has a robotic head and the facial hair style can fit humans, let them use it as a postiche for their humanoid robot head. valid_facial_hairstyles += facialhairstyle continue else //If the user is not a species who can have robotic heads, use the default handling. diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 9eb01aec4fd..50755c6a68d 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1635,7 +1635,7 @@ b_markings = hex2num(copytext(optic_colour, 6, 8)) update_markings() - else if(!(client.prefs.rlimb_data["head"]))//Means that the character has the default Morpheus head, which has a screen. Time to customize. + else if(!client.prefs.rlimb_data["head"])//Means that the character has the default Morpheus head, which has a screen. Time to customize. var/list/hair = list() for(var/i in hair_styles_list) var/datum/sprite_accessory/hair/tmp_hair = hair_styles_list[i]