cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for unisex hairstyles.

Browse Source
This commit is contained in:
Segrain
2013-08-25 09:27:05 +03:00
parent 5f8c8d9cce
commit e85ddd3b9a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/__HELPERS/mobs.dm
View File

@@ -4,7 +4,7 @@ proc/random_hair_style(gender, species = "Human")
var/list/valid_hairstyles = list() var/list/valid_hairstyles = list()
for(var/hairstyle in hair_styles_list) for(var/hairstyle in hair_styles_list)
var/datum/sprite_accessory/S = hair_styles_list[hairstyle] var/datum/sprite_accessory/S = hair_styles_list[hairstyle]
if(gender != S.gender) if(gender != S.gender && S.gender != NEUTER)
continue continue
if(!(species in S.species_allowed)) if(!(species in S.species_allowed))
continue continue
@@ -21,7 +21,7 @@ proc/random_facial_hair_style(gender, species = "Human")
var/list/valid_facialhairstyles = list() var/list/valid_facialhairstyles = list()
for(var/facialhairstyle in facial_hair_styles_list) for(var/facialhairstyle in facial_hair_styles_list)
var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle] var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle]
if(gender != S.gender) if(gender != S.gender && S.gender != NEUTER)
continue continue
if(!(species in S.species_allowed)) if(!(species in S.species_allowed))
continue continue

6
code/modules/client/preferences.dm
View File

@@ -822,7 +822,7 @@ datum/preferences
var/list/valid_hairstyles = list() var/list/valid_hairstyles = list()
for(var/hairstyle in hair_styles_list) for(var/hairstyle in hair_styles_list)
var/datum/sprite_accessory/S = hair_styles_list[hairstyle] var/datum/sprite_accessory/S = hair_styles_list[hairstyle]
if(gender != S.gender) if(gender != S.gender && S.gender != NEUTER)
continue continue
if( !(species in S.species_allowed)) if( !(species in S.species_allowed))
continue continue
@@ -838,7 +838,7 @@ datum/preferences
var/list/valid_facialhairstyles = list() var/list/valid_facialhairstyles = list()
for(var/facialhairstyle in facial_hair_styles_list) for(var/facialhairstyle in facial_hair_styles_list)
var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle] var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle]
if(gender != S.gender) if(gender != S.gender && S.gender != NEUTER)
continue continue
if( !(species in S.species_allowed)) if( !(species in S.species_allowed))
continue continue
@@ -921,7 +921,7 @@ datum/preferences
var/list/valid_facialhairstyles = list() var/list/valid_facialhairstyles = list()
for(var/facialhairstyle in facial_hair_styles_list) for(var/facialhairstyle in facial_hair_styles_list)
var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle] var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle]
if(gender != S.gender) if(gender != S.gender && S.gender != NEUTER)
continue continue
if( !(species in S.species_allowed)) if( !(species in S.species_allowed))
continue continue