cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

SPECIES NUKING 2023: Head flags 3 & Knuckles: Fixes some growing pains with head flags (#76440)

Browse Source 
## 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.

![image](https://github.com/tgstation/tgstation/assets/82850673/7ed29a68-cb60-4b28-996c-3be0e7331be8)

![image](https://github.com/tgstation/tgstation/assets/82850673/e57128be-0d7c-46ad-90dd-ee25981d0fea)

![image](https://github.com/tgstation/tgstation/assets/82850673/5c3619a8-fe6f-42b3-9fdc-12277d568e8d)

![image](https://github.com/tgstation/tgstation/assets/82850673/fdd13000-2220-47ad-8e02-44bc75a4a907)

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
/🆑
This commit is contained in:
ChungusGamer666
2023-07-01 14:15:25 +02:00
committed by GitHub
parent f25571e8e6
commit d85e44c69c
9 changed files with 117 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/bodyparts/head_hair_and_lips.dm
+65 -23
View File
@@ -59,7 +59,7 @@
else
show_eyeless = FALSE
if(!is_creating)
if(!is_creating || !owner)
return
lip_style = human_head_owner.lip_style
@@ -104,18 +104,18 @@
//Overlay
facial_hair_overlay = image(sprite_accessory.icon, sprite_accessory.icon_state, -HAIR_LAYER, image_dir)
facial_hair_overlay.alpha = facial_hair_alpha
//Gradients
var/facial_hair_gradient_style = LAZYACCESS(gradient_styles, GRADIENT_FACIAL_HAIR_KEY)
if(facial_hair_gradient_style)
var/facial_hair_gradient_color = LAZYACCESS(gradient_colors, GRADIENT_FACIAL_HAIR_KEY)
var/image/facial_hair_gradient_overlay = get_gradient_overlay(sprite_accessory.icon, sprite_accessory.icon_state, HAIR_LAYER, GLOB.facial_hair_gradients_list[facial_hair_gradient_style], facial_hair_gradient_color)
. += facial_hair_gradient_overlay
//Emissive blocker
if(blocks_emissive)
facial_hair_overlay.overlays += emissive_blocker(facial_hair_overlay.icon, facial_hair_overlay.icon_state, location, alpha = facial_hair_alpha)
//Offsets
worn_face_offset?.apply_offset(facial_hair_overlay)
. += facial_hair_overlay
//Gradients
var/facial_hair_gradient_style = LAZYACCESS(gradient_styles, GRADIENT_FACIAL_HAIR_KEY)
if(facial_hair_gradient_style)
var/facial_hair_gradient_color = LAZYACCESS(gradient_colors, GRADIENT_FACIAL_HAIR_KEY)
var/image/facial_hair_gradient_overlay = get_gradient_overlay(sprite_accessory.icon, sprite_accessory.icon_state, -HAIR_LAYER, GLOB.facial_hair_gradients_list[facial_hair_gradient_style], facial_hair_gradient_color)
. += facial_hair_gradient_overlay
var/image/hair_overlay
if(!(show_debrained && (head_flags & HEAD_DEBRAIN)) && !hair_hidden && hairstyle && (head_flags & HEAD_HAIR))
@@ -124,18 +124,18 @@
//Overlay
hair_overlay = image(sprite_accessory.icon, sprite_accessory.icon_state, -HAIR_LAYER, image_dir)
hair_overlay.alpha = hair_alpha
//Gradients
var/hair_gradient_style = LAZYACCESS(gradient_styles, GRADIENT_HAIR_KEY)
if(hair_gradient_style)
var/hair_gradient_color = LAZYACCESS(gradient_colors, GRADIENT_HAIR_KEY)
var/image/hair_gradient_overlay = get_gradient_overlay(sprite_accessory.icon, sprite_accessory.icon_state, HAIR_LAYER, GLOB.hair_gradients_list[hair_gradient_style], hair_gradient_color)
. += hair_gradient_overlay
//Emissive blocker
if(blocks_emissive)
hair_overlay.overlays += emissive_blocker(hair_overlay.icon, hair_overlay.icon_state, location, alpha = hair_alpha)
//Offsets
worn_face_offset?.apply_offset(hair_overlay)
. += hair_overlay
//Gradients
var/hair_gradient_style = LAZYACCESS(gradient_styles, GRADIENT_HAIR_KEY)
if(hair_gradient_style)
var/hair_gradient_color = LAZYACCESS(gradient_colors, GRADIENT_HAIR_KEY)
var/image/hair_gradient_overlay = get_gradient_overlay(sprite_accessory.icon, sprite_accessory.icon_state, -HAIR_LAYER, GLOB.hair_gradients_list[hair_gradient_style], hair_gradient_color)
. += hair_gradient_overlay
if(show_debrained && (head_flags & HEAD_DEBRAIN))
. += get_debrain_overlay(can_rotate = !dropped)
@@ -147,6 +147,9 @@
if(override_hair_color)
SET_OVERLAY_VALUE(facial_hair_overlay, color, override_hair_color)
SET_OVERLAY_VALUE(hair_overlay, color, override_hair_color)
else if(fixed_hair_color)
SET_OVERLAY_VALUE(facial_hair_overlay, color, fixed_hair_color)
SET_OVERLAY_VALUE(hair_overlay, color, fixed_hair_color)
else
SET_OVERLAY_VALUE(facial_hair_overlay, color, facial_hair_color)
SET_OVERLAY_VALUE(hair_overlay, color, hair_color)
@@ -197,7 +200,7 @@
/obj/item/bodypart/head/proc/get_gradient_overlay(file, icon, layer, datum/sprite_accessory/gradient, grad_color)
RETURN_TYPE(/mutable_appearance)
var/mutable_appearance/gradient_overlay = mutable_appearance(layer = -layer)
var/mutable_appearance/gradient_overlay = mutable_appearance(layer = layer)
var/icon/temp = icon(gradient.icon, gradient.icon_state)
var/icon/temp_hair = icon(file, icon)
temp.Blend(temp_hair, ICON_ADD)
@@ -279,22 +282,42 @@
update_body_parts()
/**
* Set the hair gradient style and color of a human.
* Set the hair gradient style of a human.
* Update calls update_body_parts().
**/
/mob/living/proc/set_hair_gradient(new_style, new_color, update = TRUE)
/mob/living/proc/set_hair_gradient_style(new_style, update = TRUE)
return
/mob/living/carbon/human/set_hair_gradient(new_style, new_color, update = TRUE)
/mob/living/carbon/human/set_hair_gradient_style(new_style, update = TRUE)
var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD)
LAZYSETLEN(grad_style, GRADIENTS_LEN)
LAZYSETLEN(grad_color, GRADIENTS_LEN)
grad_style[GRADIENT_HAIR_KEY] = new_style
if(my_head)
LAZYSETLEN(my_head.gradient_styles, GRADIENTS_LEN)
LAZYSETLEN(my_head.gradient_colors, GRADIENTS_LEN)
my_head.gradient_styles[GRADIENT_HAIR_KEY] = new_style
if(update)
update_body_parts()
/**
* Set the hair gradient color of a human.
* Update calls update_body_parts().
**/
/mob/living/proc/set_hair_gradient_color(new_color, update = TRUE)
return
/mob/living/carbon/human/set_hair_gradient_color(new_color, update = TRUE)
var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD)
LAZYSETLEN(grad_style, GRADIENTS_LEN)
LAZYSETLEN(grad_color, GRADIENTS_LEN)
grad_color[GRADIENT_HAIR_KEY] = new_color
if(my_head)
LAZYSETLEN(my_head.gradient_styles, GRADIENTS_LEN)
my_head.gradient_styles[GRADIENT_HAIR_KEY] = new_style
LAZYSETLEN(my_head.gradient_colors, GRADIENTS_LEN)
my_head.gradient_colors[GRADIENT_HAIR_KEY] = new_color
@@ -332,29 +355,48 @@
// so no head? tough luck
my_head?.override_hair_color = hex_string
else
hair_color = hex_string
facial_hair_color = hex_string
my_head?.facial_hair_color = hex_string
if(update)
update_body_parts()
/**
* Set the facial hair gradient style and color of a human.
* Set the facial hair gradient style of a human.
* Update calls update_body_parts().
**/
/mob/living/proc/set_facial_hair_gradient(new_style, new_color, update = TRUE)
/mob/living/proc/set_facial_hair_gradient_style(new_style, update = TRUE)
return
/mob/living/carbon/human/set_facial_hair_gradient(new_style, new_color, update = TRUE)
/mob/living/carbon/human/set_facial_hair_gradient_style(new_style, update = TRUE)
var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD)
LAZYSETLEN(grad_style, GRADIENTS_LEN)
LAZYSETLEN(grad_color, GRADIENTS_LEN)
grad_style[GRADIENT_FACIAL_HAIR_KEY] = new_style
if(my_head)
LAZYSETLEN(my_head.gradient_styles, GRADIENTS_LEN)
LAZYSETLEN(my_head.gradient_colors, GRADIENTS_LEN)
my_head.gradient_styles[GRADIENT_FACIAL_HAIR_KEY] = new_style
if(update)
update_body_parts()
/**
* Set the facial hair gradient color of a human.
* Update calls update_body_parts().
**/
/mob/living/proc/set_facial_hair_gradient_color(new_color, update = TRUE)
return
/mob/living/carbon/human/set_facial_hair_gradient_color(new_color, update = TRUE)
var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD)
LAZYSETLEN(grad_style, GRADIENTS_LEN)
LAZYSETLEN(grad_color, GRADIENTS_LEN)
grad_color[GRADIENT_FACIAL_HAIR_KEY] = new_color
if(my_head)
LAZYSETLEN(my_head.gradient_styles, GRADIENTS_LEN)
my_head.gradient_styles[GRADIENT_FACIAL_HAIR_KEY] = new_style
LAZYSETLEN(my_head.gradient_colors, GRADIENTS_LEN)
my_head.gradient_colors[GRADIENT_FACIAL_HAIR_KEY] = new_color