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

Merge pull request #10094 from Verkister/patch-46

Browse Source 
Readds wing hiding toggles lost in retabbening
This commit is contained in:
Novacat
2021-04-07 17:15:00 -04:00
committed by Chompstation Bot
parent 1b9c7ace1a
commit 2241c1b1a3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1120,13 +1120,13 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
return return
//If you are FBP with wing style and didn't set a custom one //If you are FBP with wing style and didn't set a custom one
if(synthetic && synthetic.includes_wing && !wing_style) if(synthetic && synthetic.includes_wing && !wing_style && !wings_hidden) //VOREStation Edit
var/icon/wing_s = new/icon("icon" = synthetic.icon, "icon_state" = "wing") //I dunno. If synths have some custom wing? var/icon/wing_s = new/icon("icon" = synthetic.icon, "icon_state" = "wing") //I dunno. If synths have some custom wing?
wing_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD) wing_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD)
return image(wing_s) return image(wing_s)
//If you have custom wings selected //If you have custom wings selected
if(wing_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL)) if(wing_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL) && !wings_hidden) //VOREStation Edit
var/icon/wing_s = new/icon("icon" = wing_style.icon, "icon_state" = flapping && wing_style.ani_state ? wing_style.ani_state : wing_style.icon_state) var/icon/wing_s = new/icon("icon" = wing_style.icon, "icon_state" = flapping && wing_style.ani_state ? wing_style.ani_state : wing_style.icon_state)
if(wing_style.do_colouration) if(wing_style.do_colouration)
wing_s.Blend(rgb(src.r_wing, src.g_wing, src.b_wing), wing_style.color_blend_mode) wing_s.Blend(rgb(src.r_wing, src.g_wing, src.b_wing), wing_style.color_blend_mode)