cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 08:01:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes hair style choices not checking for gender restrictions (#11068)

Browse Source
This commit is contained in:
Alberyk
2021-01-28 14:41:58 -03:00
committed by GitHub
parent 27158091a1
commit 15c1dc743e
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/client/preference_setup/general/03_body.dm
View File

@@ -444,6 +444,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
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(pref.gender == MALE && S.gender == FEMALE)
continue
if(pref.gender == FEMALE && S.gender == MALE)
continue
if(!(mob_species.type in S.species_allowed)) if(!(mob_species.type in S.species_allowed))
continue continue
@@ -555,7 +559,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.body_markings[new_marking] = "#000000" //New markings start black pref.body_markings[new_marking] = "#000000" //New markings start black
return TOPIC_REFRESH_UPDATE_PREVIEW return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["marking_up"]) else if(href_list["marking_up"])
var/M = href_list["marking_up"] var/M = href_list["marking_up"]
var/start = pref.body_markings.Find(M) var/start = pref.body_markings.Find(M)

2
code/modules/nano/modules/human_appearance.dm
View File

@@ -209,7 +209,7 @@
if(!length(valid_species)) if(!length(valid_species))
valid_species = owner.generate_valid_species(check_whitelist, whitelist, blacklist) valid_species = owner.generate_valid_species(check_whitelist, whitelist, blacklist)
if(!length(valid_hairstyles) || !length(valid_facial_hairstyles)) if(!length(valid_hairstyles) || !length(valid_facial_hairstyles))
valid_hairstyles = owner.generate_valid_hairstyles(check_gender = 0) valid_hairstyles = owner.generate_valid_hairstyles(check_gender = 1)
valid_facial_hairstyles = owner.generate_valid_facial_hairstyles() valid_facial_hairstyles = owner.generate_valid_facial_hairstyles()
if(!length(valid_accents)) if(!length(valid_accents))
valid_accents = owner.generate_valid_accent() valid_accents = owner.generate_valid_accent()

6
html/changelogs/alberyk-hairfix.yml Normal file
View File

@@ -0,0 +1,6 @@
author: Alberyk
delete-after: True
changes:
- bugfix: "Fixed hair style choices not checking for gender restrictions."