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

[MIRROR] Fixes nontaur clipping
This commit is contained in:
Razgriz
2021-02-03 09:56:24 -07:00
committed by GitHub

View File

@@ -288,6 +288,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
icon_key += "_t" //VOREStation Edit.
if(istype(tail_style, /datum/sprite_accessory/tail/taur))
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]"
@@ -302,7 +303,8 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
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.
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.