Fixes default synth tails necessitating potentially harmful mystery delays in mannequin generation.

-Now get_tail_image() can check the owner's syntheticness without having to wait for something else to call it whenever/wherever the fuck it happens.
This commit is contained in:
Verkister
2018-03-23 09:39:35 +02:00
parent c7a6904fce
commit aaff2e64c4
2 changed files with 5 additions and 5 deletions
@@ -195,7 +195,6 @@
/datum/preferences/proc/dress_preview_mob(var/mob/living/carbon/human/mannequin)
copy_to(mannequin, TRUE)
sleep(1) //VOREStation Add - Not sure why this is required. Some race condition about robo manufacturers with tails.
if(!equip_preview_mob)
return
@@ -17,10 +17,11 @@ var/global/list/wing_icon_cache = list()
/mob/living/carbon/human/proc/get_tail_image()
//If you are FBP with tail style and didn't set a custom one
if(synthetic && synthetic.includes_tail && !tail_style)
var/icon/tail_s = new/icon("icon" = synthetic.icon, "icon_state" = "tail")
tail_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD)
return image(tail_s)
if(isSynthetic())
if(synthetic.includes_tail && !tail_style)
var/icon/tail_s = new/icon("icon" = synthetic.icon, "icon_state" = "tail")
tail_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD)
return image(tail_s)
//If you have a custom tail selected
if(tail_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL && !isTaurTail(tail_style)))