From 18520dc1e0b90b678bfee4843ffe5ac128b4b67a Mon Sep 17 00:00:00 2001
From: KasparoVy <unknown-soldier@hotmail.ca>
Date: Thu, 21 Apr 2016 23:00:11 -0400
Subject: [PATCH] Fixes Headlight Sprite and Fixes Hair+Head Accessory
 Animation

Hair and Head Accessories will now no longer animate as fast as they
possibly can and, instead, will follow the timings the spriter defined
in the .dmi file.
---
 .../mob/living/carbon/human/update_icons.dm   |   6 ++++--
 icons/mob/body_accessory.dmi                  | Bin 13074 -> 13110 bytes
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 48f5701a671..6b9632980e6 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -404,7 +404,8 @@ var/global/list/damage_icon_parts = list()
 				var/icon/head_accessory_s = new/icon("icon" = head_accessory_style.icon, "icon_state" = "[head_accessory_style.icon_state]_s")
 				if(head_accessory_style.do_colouration)
 					head_accessory_s.Blend(rgb(r_headacc, g_headacc, b_headacc), ICON_ADD)
-				head_accessory_standing.Blend(head_accessory_s, ICON_OVERLAY)
+				head_accessory_standing = head_accessory_s //head_accessory_standing.Blend(head_accessory_s, ICON_OVERLAY)
+														   //Having it this way preserves animations. Useful for animated antennae.
 		else
 			//warning("Invalid ha_style for [species.name]: [ha_style]")
 
@@ -444,7 +445,8 @@ var/global/list/damage_icon_parts = list()
 				else if(hair_style.do_colouration)
 					hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)
 
-				hair_standing.Blend(hair_s, ICON_OVERLAY)
+				hair_standing = hair_s //hair_standing.Blend(hair_s, ICON_OVERLAY)
+									   //Having it this way preserves animations. Useful for IPC screens.
 		else
 			//warning("Invalid h_style for [species.name]: [h_style]")
 		//hair_standing.Blend(debrained_s, ICON_OVERLAY)//how does i overlay for fish?
diff --git a/icons/mob/body_accessory.dmi b/icons/mob/body_accessory.dmi
index e98c077053b2a061ccee33283b638ce1c9278c8a..6c10bb002e87afce4b113e56fda5a7aa07a7d8a6 100644
GIT binary patch
delta 562
zcmV-20?qxBX0~Rqp&<c)v!Wq@4u8Mx_S^15n{A&z|KabQ|6hB>`STzCUXJaz-G@mS
zf7|n~?e^R5gZV#x`@P|Cc<BG>-yAz%{J&rRr<;GjeED*3oK76Y>#x7QS^WR;OaCtX
zvk%^BtPi=5KZFqe_ka1%i~sEl9}gjf@WlW8e>Oh;w%c#J4{f!5{``mkD1U_TkHg=5
zY%x6a(-8jVV<9~B(`zAw|M1Q`5C6xmx8HUjCSm*`v_JpaZoln5nE%zZf22!b|LlWz
zdY3O>?%la_CtSXKxp(Y*bE^&^gmCQq`J&u@(<lGj#~(rnSAOT?VfcUj58;;|zt?or
z6VZO#eVBytldrb-zqZ?NyKN7XF#aw$(hAV*?CiD^{%|<#g%HB|^XH3q-l_hCTz=lY
z+HXSc<G*$5R`HE*d?PG=@h`)*|KsPv=Rg1X@Wc~OWYd1zeQ109vHfrVr+*bb_YZ$3
zyY}1eL)+t@l>N{AH~+_N|40D{03c<P;Vo>FzbF}hXq^A~{P_=mFZ|8N7Q;h7z4p#K
z5C2wGooce}+1c3&dj$Zb;79@J{P_?6Q3&B5|7`#X;cq^+c>erPLkQtNyz|b(|FO~@
zPEgwbKsUGq1^{HIHyjR+^grIZb*uQsH@*?R{h$6-_}oAIo$&e3e?C0%#1p-0yH|hP
zE`b3KKz@!KfVx5e0)YIu1O}6#FJF^T2qG5w??Mk>--7Ul&;S4c07*qoM6N<$g4gvy
A7XSbN

delta 530
zcmV+t0`2{_W|C&Gp&<cWv!Wq@4u4<!?X`dY{D;4H{(tQi=g)umd)m*h{Sflr|8sA@
z?ftK+_ItzO@X-I$zd3fk_<z6rPdER5`SRu7IGs3(*I$2qv-tnxm;PP&XCJ)NSRZm9
ze+VJ`@Bi|j7ysKAJ|02{;feqG|7?8x+Ha@*^XEVOM<IlN9RB8Gi{YW4hJWxk9}D53
zpI!?g{D*hmdH6qSzuWCcx$ghDx8L^uS9SYGx&-#mK6s~h`SRu7ojZ5J<;$0Q$Idsm
z>JUN*$IhQG%I!CO^3Q$zA%t+{cRn75|JVNze);ixO*gIm322|ZwY~po-~6w_kye0a
zXJ@ya@Q1@;FN6@zpFdx`^Gi<kC*<<;?$v%1av%S#TepgDeB&Eo@r!>MuKgcB7e4>_
z&xa?TctZP`wg2t^^smC_{^9RvKhyTx-v6|3{*T-Kkpd6^K+3!e43oh!Uz30WB7gJH
zQUAyD=Rf?t@HZb@3=jSE+B@$&{99Fas>$|eXJ;$y6#$TeLkFPq=Rf>MA%uVYx8Wm%
zzxmkW`SU*wA%y?%&N~nP$I5#+VeJC|>2nDT0LV^nI2<1Of4X(+R`HE*d?S4OKmDul
zxqtXO;q#yWe0buCCwkR)um1L30uKX#{2VC&b%_830QqqV43oh!Uz30WA{X=D0lcPP
U-!>WzRR91007*qoM6N<$f~Eg0l>h($