mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-06-05 22:31:04 +01:00
ChungusGamer666
d85e44c69c
## About The Pull Request Fixes https://github.com/tgstation/tgstation/issues/76422 This was caused by me somehow not using the wrapper there and not noticing it Also fixes hair gradients and facial hair gradients. I am pretty sure they were uhh, being hidden behind the actual hair/facial hair. Oops. Also also fixes spawning yourself as a human as admin and getting random hair colors. That was just a failure to update the icon after updating everything, I think? Additionally, to totally babyproof all of this, ensures that head_flags involved stuff gets applied AFTER species by creating a new preference priority, and uses two separate wrappers to apply gradient style and color. Here's this absolute hellspawn to prove that everything works.     Sorry for being so damn good at breaking this codebase. ## Why It's Good For The Game Bugs are bad they make you mad ## Changelog 🆑 fix: Hair and facial hair gradients work again now fix: Facial hair colors apply properly again fix: Admin spawned characters will get hair color preferences applied properly /🆑
182 lines
6.4 KiB
Plaintext
182 lines
6.4 KiB
Plaintext
/proc/generate_possible_values_for_sprite_accessories_on_head(accessories)
|
|
var/list/values = possible_values_for_sprite_accessory_list(accessories)
|
|
|
|
var/icon/head_icon = icon('icons/mob/species/human/bodyparts_greyscale.dmi', "human_head_m")
|
|
head_icon.Blend(skintone2hex("caucasian1"), ICON_MULTIPLY)
|
|
|
|
for (var/name in values)
|
|
var/datum/sprite_accessory/accessory = accessories[name]
|
|
if (accessory == null || accessory.icon_state == null)
|
|
continue
|
|
|
|
var/icon/final_icon = new(head_icon)
|
|
|
|
var/icon/beard_icon = values[name]
|
|
beard_icon.Blend(COLOR_DARK_BROWN, ICON_MULTIPLY)
|
|
final_icon.Blend(beard_icon, ICON_OVERLAY)
|
|
|
|
final_icon.Crop(10, 19, 22, 31)
|
|
final_icon.Scale(32, 32)
|
|
|
|
values[name] = final_icon
|
|
|
|
return values
|
|
|
|
/datum/preference/color/eye_color
|
|
priority = PREFERENCE_PRIORITY_BODYPARTS
|
|
savefile_key = "eye_color"
|
|
savefile_identifier = PREFERENCE_CHARACTER
|
|
category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
|
|
relevant_head_flag = HEAD_EYECOLOR
|
|
|
|
/datum/preference/color/eye_color/apply_to_human(mob/living/carbon/human/target, value)
|
|
var/hetero = target.eye_color_heterochromatic
|
|
target.eye_color_left = value
|
|
if(!hetero)
|
|
target.eye_color_right = value
|
|
|
|
var/obj/item/organ/internal/eyes/eyes_organ = target.get_organ_by_type(/obj/item/organ/internal/eyes)
|
|
if (!eyes_organ || !istype(eyes_organ))
|
|
return
|
|
|
|
if (!initial(eyes_organ.eye_color_left))
|
|
eyes_organ.eye_color_left = value
|
|
eyes_organ.old_eye_color_left = value
|
|
|
|
if(hetero) // Don't override the snowflakes please
|
|
return
|
|
|
|
if (!initial(eyes_organ.eye_color_right))
|
|
eyes_organ.eye_color_right = value
|
|
eyes_organ.old_eye_color_right = value
|
|
eyes_organ.refresh()
|
|
|
|
/datum/preference/color/eye_color/create_default_value()
|
|
return random_eye_color()
|
|
|
|
/datum/preference/choiced/facial_hairstyle
|
|
priority = PREFERENCE_PRIORITY_BODYPARTS
|
|
savefile_key = "facial_style_name"
|
|
savefile_identifier = PREFERENCE_CHARACTER
|
|
category = PREFERENCE_CATEGORY_FEATURES
|
|
main_feature_name = "Facial hair"
|
|
should_generate_icons = TRUE
|
|
relevant_head_flag = HEAD_FACIAL_HAIR
|
|
|
|
/datum/preference/choiced/facial_hairstyle/init_possible_values()
|
|
return generate_possible_values_for_sprite_accessories_on_head(GLOB.facial_hairstyles_list)
|
|
|
|
/datum/preference/choiced/facial_hairstyle/apply_to_human(mob/living/carbon/human/target, value)
|
|
target.set_facial_hairstyle(value, update = FALSE)
|
|
|
|
/datum/preference/choiced/facial_hairstyle/compile_constant_data()
|
|
var/list/data = ..()
|
|
|
|
data[SUPPLEMENTAL_FEATURE_KEY] = "facial_hair_color"
|
|
|
|
return data
|
|
|
|
/datum/preference/color/facial_hair_color
|
|
priority = PREFERENCE_PRIORITY_BODYPARTS
|
|
savefile_key = "facial_hair_color"
|
|
savefile_identifier = PREFERENCE_CHARACTER
|
|
category = PREFERENCE_CATEGORY_SUPPLEMENTAL_FEATURES
|
|
relevant_head_flag = HEAD_FACIAL_HAIR
|
|
|
|
/datum/preference/color/facial_hair_color/apply_to_human(mob/living/carbon/human/target, value)
|
|
target.set_facial_haircolor(value, update = FALSE)
|
|
|
|
/datum/preference/choiced/facial_hair_gradient
|
|
priority = PREFERENCE_PRIORITY_BODYPARTS
|
|
category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
|
|
savefile_identifier = PREFERENCE_CHARACTER
|
|
savefile_key = "facial_hair_gradient"
|
|
relevant_head_flag = HEAD_FACIAL_HAIR
|
|
|
|
/datum/preference/choiced/facial_hair_gradient/init_possible_values()
|
|
return assoc_to_keys_features(GLOB.facial_hair_gradients_list)
|
|
|
|
/datum/preference/choiced/facial_hair_gradient/apply_to_human(mob/living/carbon/human/target, value)
|
|
target.set_facial_hair_gradient_style(new_style = value, update = FALSE)
|
|
|
|
/datum/preference/choiced/facial_hair_gradient/create_default_value()
|
|
return "None"
|
|
|
|
/datum/preference/color/facial_hair_gradient
|
|
priority = PREFERENCE_PRIORITY_BODYPARTS
|
|
category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
|
|
savefile_identifier = PREFERENCE_CHARACTER
|
|
savefile_key = "facial_hair_gradient_color"
|
|
relevant_head_flag = HEAD_FACIAL_HAIR
|
|
|
|
/datum/preference/color/facial_hair_gradient/apply_to_human(mob/living/carbon/human/target, value)
|
|
target.set_facial_hair_gradient_color(new_color = value, update = FALSE)
|
|
|
|
/datum/preference/color/facial_hair_gradient/is_accessible(datum/preferences/preferences)
|
|
if (!..(preferences))
|
|
return FALSE
|
|
return preferences.read_preference(/datum/preference/choiced/facial_hair_gradient) != "None"
|
|
|
|
/datum/preference/color/hair_color
|
|
priority = PREFERENCE_PRIORITY_BODYPARTS
|
|
savefile_key = "hair_color"
|
|
savefile_identifier = PREFERENCE_CHARACTER
|
|
category = PREFERENCE_CATEGORY_SUPPLEMENTAL_FEATURES
|
|
relevant_head_flag = HEAD_HAIR
|
|
|
|
/datum/preference/color/hair_color/apply_to_human(mob/living/carbon/human/target, value)
|
|
target.set_haircolor(value, update = FALSE)
|
|
|
|
/datum/preference/choiced/hairstyle
|
|
priority = PREFERENCE_PRIORITY_BODYPARTS
|
|
savefile_key = "hairstyle_name"
|
|
savefile_identifier = PREFERENCE_CHARACTER
|
|
category = PREFERENCE_CATEGORY_FEATURES
|
|
main_feature_name = "Hairstyle"
|
|
should_generate_icons = TRUE
|
|
relevant_head_flag = HEAD_HAIR
|
|
|
|
/datum/preference/choiced/hairstyle/init_possible_values()
|
|
return generate_possible_values_for_sprite_accessories_on_head(GLOB.hairstyles_list)
|
|
|
|
/datum/preference/choiced/hairstyle/apply_to_human(mob/living/carbon/human/target, value)
|
|
target.set_hairstyle(value, update = FALSE)
|
|
|
|
/datum/preference/choiced/hairstyle/compile_constant_data()
|
|
var/list/data = ..()
|
|
|
|
data[SUPPLEMENTAL_FEATURE_KEY] = "hair_color"
|
|
|
|
return data
|
|
|
|
/datum/preference/choiced/hair_gradient
|
|
priority = PREFERENCE_PRIORITY_BODYPARTS
|
|
category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
|
|
savefile_identifier = PREFERENCE_CHARACTER
|
|
savefile_key = "hair_gradient"
|
|
relevant_head_flag = HEAD_HAIR
|
|
|
|
/datum/preference/choiced/hair_gradient/init_possible_values()
|
|
return assoc_to_keys_features(GLOB.hair_gradients_list)
|
|
|
|
/datum/preference/choiced/hair_gradient/apply_to_human(mob/living/carbon/human/target, value)
|
|
target.set_hair_gradient_style(new_style = value, update = FALSE)
|
|
|
|
/datum/preference/choiced/hair_gradient/create_default_value()
|
|
return "None"
|
|
|
|
/datum/preference/color/hair_gradient
|
|
priority = PREFERENCE_PRIORITY_BODYPARTS
|
|
category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
|
|
savefile_identifier = PREFERENCE_CHARACTER
|
|
savefile_key = "hair_gradient_color"
|
|
relevant_head_flag = HEAD_HAIR
|
|
|
|
/datum/preference/color/hair_gradient/apply_to_human(mob/living/carbon/human/target, value)
|
|
target.set_hair_gradient_color(new_color = value, update = FALSE)
|
|
|
|
/datum/preference/color/hair_gradient/is_accessible(datum/preferences/preferences)
|
|
if (!..(preferences))
|
|
return FALSE
|
|
return preferences.read_preference(/datum/preference/choiced/hair_gradient) != "None"
|