From 7a319904e437abc05c0e77951503f5c075379655 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 27 Aug 2013 22:51:24 +0100 Subject: [PATCH] Reverts gender checks as it was breaking with NEUTER and breaking facial hair. --- code/__HELPERS/mobs.dm | 12 ++++++++---- code/modules/client/preferences.dm | 12 +++++++++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 7d345e1ea28..324cfad6323 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -4,9 +4,11 @@ proc/random_hair_style(gender, species = "Human") var/list/valid_hairstyles = list() for(var/hairstyle in hair_styles_list) var/datum/sprite_accessory/S = hair_styles_list[hairstyle] - if(gender != S.gender && S.gender != NEUTER) + if(gender == MALE && S.gender == FEMALE) continue - if(!(species in S.species_allowed)) + if(gender == FEMALE && S.gender == MALE) + continue + if( !(species in S.species_allowed)) continue valid_hairstyles[hairstyle] = hair_styles_list[hairstyle] @@ -21,9 +23,11 @@ proc/random_facial_hair_style(gender, species = "Human") var/list/valid_facialhairstyles = list() for(var/facialhairstyle in facial_hair_styles_list) var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle] - if(gender != S.gender && S.gender != NEUTER) + if(gender == MALE && S.gender == FEMALE) continue - if(!(species in S.species_allowed)) + if(gender == FEMALE && S.gender == MALE) + continue + if( !(species in S.species_allowed)) continue valid_facialhairstyles[facialhairstyle] = facial_hair_styles_list[facialhairstyle] diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index c15bfb3f8da..cdf4e8e20ff 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -822,7 +822,9 @@ datum/preferences var/list/valid_hairstyles = list() for(var/hairstyle in hair_styles_list) var/datum/sprite_accessory/S = hair_styles_list[hairstyle] - if(gender != S.gender && S.gender != NEUTER) + if(gender == MALE && S.gender == FEMALE) + continue + if(gender == FEMALE && S.gender == MALE) continue if( !(species in S.species_allowed)) continue @@ -838,7 +840,9 @@ datum/preferences var/list/valid_facialhairstyles = list() for(var/facialhairstyle in facial_hair_styles_list) var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle] - if(gender != S.gender && S.gender != NEUTER) + if(gender == MALE && S.gender == FEMALE) + continue + if(gender == FEMALE && S.gender == MALE) continue if( !(species in S.species_allowed)) continue @@ -921,7 +925,9 @@ datum/preferences var/list/valid_facialhairstyles = list() for(var/facialhairstyle in facial_hair_styles_list) var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle] - if(gender != S.gender && S.gender != NEUTER) + if(gender == MALE && S.gender == FEMALE) + continue + if(gender == FEMALE && S.gender == MALE) continue if( !(species in S.species_allowed)) continue