bald expansion and added shave bodyflag (#19117)

This commit is contained in:
Henri215
2022-09-25 13:44:27 -03:00
committed by GitHub
parent efca09e5a0
commit 98f4520a43
11 changed files with 18 additions and 10 deletions
@@ -328,14 +328,14 @@
active_character.b_type = new_b_type
if("hair")
if(active_character.species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Vulpkanin", "Vox")) //Species that have hair. (No HAS_HAIR flag)
if(!(S.bodyflags & BALD))
var/input = "Choose your character's hair colour:"
var/new_hair = input(user, input, "Character Preference", active_character.h_colour) as color|null
if(new_hair)
active_character.h_colour = new_hair
if("secondary_hair")
if(active_character.species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Vulpkanin", "Vox"))
if(!(S.bodyflags & BALD))
var/datum/sprite_accessory/hair_style = GLOB.hair_styles_public_list[active_character.h_style]
if(hair_style.secondary_theme && !hair_style.no_sec_colour)
var/new_hair = input(user, "Choose your character's secondary hair colour:", "Character Preference", active_character.h_sec_colour) as color|null
@@ -558,13 +558,13 @@
active_character.body_accessory = (new_body_accessory == "None") ? null : new_body_accessory
if("facial")
if(active_character.species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Vulpkanin", "Vox")) //Species that have facial hair. (No HAS_HAIR_FACIAL flag)
if(!(S.bodyflags & SHAVED))
var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference", active_character.f_colour) as color|null
if(new_facial)
active_character.f_colour = new_facial
if("secondary_facial")
if(active_character.species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Vulpkanin", "Vox"))
if(!(S.bodyflags & SHAVED))
var/datum/sprite_accessory/facial_hair_style = GLOB.facial_hair_styles_list[active_character.f_style]
if(facial_hair_style.secondary_theme && !facial_hair_style.no_sec_colour)
var/new_facial = input(user, "Choose your character's secondary facial-hair colour:", "Character Preference", active_character.f_sec_colour) as color|null