cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-11 23:23:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

hair (#17143)

Browse Source
This commit is contained in:
Selis
2025-02-14 17:12:08 +01:00
committed by GitHub
parent 05b3e7cfa4
commit 9bf5b930f6
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/03_body.dm
+4 -4
View File
@@ -549,7 +549,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.set_biological_gender(mob_species.genders[1])
pref.custom_species = null
//grab one of the valid hair styles for the newly chosen species
var/list/valid_hairstyles = pref.get_valid_hairstyles()
var/list/valid_hairstyles = pref.get_valid_hairstyles(user)
if(valid_hairstyles.len)
if(!(pref.h_style in valid_hairstyles))
@@ -601,7 +601,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["hair_style"])
var/list/valid_hairstyles = pref.get_valid_hairstyles()
var/list/valid_hairstyles = pref.get_valid_hairstyles(user)
var/new_h_style = tgui_input_list(user, "Choose your character's hair style:", "Character Preference", valid_hairstyles, pref.h_style)
if(new_h_style && CanUseTopic(user))
@@ -618,7 +618,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
else if(href_list["hair_style_left"])
var/H = href_list["hair_style_left"]
var/list/valid_hairstyles = pref.get_valid_hairstyles()
var/list/valid_hairstyles = pref.get_valid_hairstyles(user)
var/start = valid_hairstyles.Find(H)
if(start != 1) //If we're not the beginning of the list, become the previous element.
@@ -629,7 +629,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
else if(href_list["hair_style_right"])
var/H = href_list["hair_style_right"]
var/list/valid_hairstyles = pref.get_valid_hairstyles()
var/list/valid_hairstyles = pref.get_valid_hairstyles(user)
var/start = valid_hairstyles.Find(H)
if(start != valid_hairstyles.len) //If we're not the end of the list, become the next element.
code/modules/client/preference_setup/preference_setup.dm
+1 -1
View File
@@ -232,7 +232,7 @@
if(!pref_mob || !pref_mob.client)
return 1
. = OnTopic(href, href_list, usr)
. = OnTopic(href, href_list, pref_mob)
if(!pref_mob || !pref_mob.client) // Just in case we disappeared during OnTopic
return 1
code/modules/mob/new_player/preferences_setup.dm
+1 -1
View File
@@ -310,7 +310,7 @@
var/datum/sprite_accessory/S = hair_styles_list[hairstyle]
if(!(species in S.species_allowed) && (!custom_base || !(custom_base in S.species_allowed))) //VOREStation Edit - Custom species base species allowance
continue
if((!S.ckeys_allowed) || (user?.ckey in S.ckeys_allowed)) //VOREStation Edit, allows ckey locked hairstyles.
if((!S.ckeys_allowed) || (user.ckey in S.ckeys_allowed)) //VOREStation Edit, allows ckey locked hairstyles.
valid_hairstyles[S.name] = hairstyle //VOREStation Edit, allows ckey locked hairstyles.
//valid_hairstyles[hairstyle] = hair_styles_list[hairstyle] //VOREStation Edit. Replaced by above.