mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-22 08:01:06 +00:00
Fixes hair style choices not checking for gender restrictions (#11068)
This commit is contained in:
@@ -444,6 +444,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
|
||||
var/list/valid_hairstyles = list()
|
||||
for(var/hairstyle in hair_styles_list)
|
||||
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))
|
||||
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
|
||||
return TOPIC_REFRESH_UPDATE_PREVIEW
|
||||
|
||||
|
||||
|
||||
else if(href_list["marking_up"])
|
||||
var/M = href_list["marking_up"]
|
||||
var/start = pref.body_markings.Find(M)
|
||||
|
||||
@@ -209,7 +209,7 @@
|
||||
if(!length(valid_species))
|
||||
valid_species = owner.generate_valid_species(check_whitelist, whitelist, blacklist)
|
||||
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()
|
||||
if(!length(valid_accents))
|
||||
valid_accents = owner.generate_valid_accent()
|
||||
|
||||
6
html/changelogs/alberyk-hairfix.yml
Normal file
6
html/changelogs/alberyk-hairfix.yml
Normal file
@@ -0,0 +1,6 @@
|
||||
author: Alberyk
|
||||
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- bugfix: "Fixed hair style choices not checking for gender restrictions."
|
||||
Reference in New Issue
Block a user