cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-14 17:45:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes hair/ears/horns clipping on taller height settings [NOVA PORT] (#5762)

Browse Source 
## About The Pull Request
**PORT OF https://github.com/NovaSector/NovaSector/pull/7002**

Does as the title suggests. Also fixes
https://github.com/Bubberstation/Bubberstation/issues/3139.
## Why It's Good For The Game
Fixes a bug.
## Proof Of Testing
See below.
<details>
<summary>Screenshots/Videos</summary>

https://github.com/user-attachments/assets/33ee4f1a-bf41-499e-b915-bb1ee80cafa8

</details>

## Changelog
🆑 Happyowl93
fix: Fixed ears/hair/horns clipping when using the tall/taller/tallest
height settings.
/🆑
This commit is contained in:
Alexis
2026-06-09 09:48:59 -04:00
committed by nevimer
parent 82b4f9f9ac
commit d65ca7ddcc
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/mobs.dm
+2
View File
@@ -905,6 +905,8 @@ GLOBAL_LIST_INIT(layers_to_offset, list(
"[HAIR_LAYER]" = UPPER_BODY,
// Doesn't do much
"[EYES_LAYER]" = UPPER_BODY,
"[BENEATH_HAIR_LAYER]" = UPPER_BODY,
"[OUTER_HAIR_LAYER]" = UPPER_BODY, // BUBBER EDIT - ADDITION
// Long belts (sabre sheathe) will get cut off by filter
"[BELT_LAYER]" = LOWER_BODY,
// Everything below looks fine with or without a filter, so we can skip it and just offset
code/modules/mob/living/carbon/human/human_update_icons.dm
+14 -1
View File
@@ -1147,7 +1147,20 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E
if(isnull(offset_type))
if(islist(raw_applied))
for(var/image/applied_appearance in raw_applied)
apply_height_filters(applied_appearance)
/*
BUBBER EDIT - ADDITION - CHANGE
ORIGINAL: apply_height_filters(applied_appearance)
*/
var/sub_offset_type = GLOB.layers_to_offset[num2text(-applied_appearance.layer)]
if(isnull(sub_offset_type))
if(findtext(applied_appearance.icon_state, "horns_", 3, 9) || findtext(applied_appearance.icon_state, "ears_", 3, 8))
sub_offset_type = UPPER_BODY
if(sub_offset_type)
applied_appearance.pixel_z = initial(applied_appearance.pixel_z)
apply_height_offsets(applied_appearance, sub_offset_type)
else
apply_height_filters(applied_appearance)
// BUBBER EDIT - ADDITION - END
else if(isimage(raw_applied))
apply_height_filters(raw_applied)
else