cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1231 from CHOMPStationBot/upstream-merge-9639

Browse Source 
[MIRROR] Fixes nontaur clipping
This commit is contained in:
Razgriz
2021-02-03 09:56:24 -07:00
committed by GitHub
parent de48720951 ea752d0708
commit e15b227727
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/mob/living/carbon/human/update_icons.dm
View File

@@ -288,7 +288,8 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
icon_key += "_t" //VOREStation Edit. icon_key += "_t" //VOREStation Edit.
if(istype(tail_style, /datum/sprite_accessory/tail/taur)) if(istype(tail_style, /datum/sprite_accessory/tail/taur))
icon_key += tail_style.clip_mask_state if(tail_style.clip_mask) //VOREStation Edit.
icon_key += tail_style.clip_mask_state
icon_key = "[icon_key][husk ? 1 : 0][fat ? 1 : 0][hulk ? 1 : 0][skeleton ? 1 : 0]" icon_key = "[icon_key][husk ? 1 : 0][fat ? 1 : 0][hulk ? 1 : 0][skeleton ? 1 : 0]"
var/icon/base_icon var/icon/base_icon
@@ -302,14 +303,15 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
var/icon/Cutter = null var/icon/Cutter = null
if(istype(tail_style, /datum/sprite_accessory/tail/taur)) // Tail icon 'cookie cutters' are filled in where icons are preserved. We need to invert that. if(istype(tail_style, /datum/sprite_accessory/tail/taur)) // Tail icon 'cookie cutters' are filled in where icons are preserved. We need to invert that.
Cutter = new(icon = tail_style.icon, icon_state = tail_style.clip_mask) if(tail_style.clip_mask) //VOREStation Edit.
Cutter = new(icon = tail_style.icon, icon_state = tail_style.clip_mask_state)
Cutter.Blend("#000000", ICON_MULTIPLY) // Make it all black. Cutter.Blend("#000000", ICON_MULTIPLY) // Make it all black.
Cutter.SwapColor("#00000000", "#FFFFFFFF") // Everywhere empty, make white. Cutter.SwapColor("#00000000", "#FFFFFFFF") // Everywhere empty, make white.
Cutter.SwapColor("#000000FF", "#00000000") // Everywhere black, make empty. Cutter.SwapColor("#000000FF", "#00000000") // Everywhere black, make empty.
Cutter.Blend("#000000", ICON_MULTIPLY) // Black again. Cutter.Blend("#000000", ICON_MULTIPLY) // Black again.
for(var/obj/item/organ/external/part in organs) for(var/obj/item/organ/external/part in organs)
if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) //VOREStation Edit allowing tails to prevent bodyparts rendering, granting more spriter freedom for taur/digitigrade stuff. if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) //VOREStation Edit allowing tails to prevent bodyparts rendering, granting more spriter freedom for taur/digitigrade stuff.