From 50e4b1a024baed9390ac6c69d1bac682c8394234 Mon Sep 17 00:00:00 2001
From: xxalpha <xxnoob@live.com>
Date: Tue, 17 Mar 2015 20:46:12 +0000
Subject: [PATCH 1/2] Fixes jetpack trail animation.

Fixes jetpack trail animation 2.
---
 .../effects/effect_system/effects_other.dm    |   2 +-
 icons/effects/effects.dmi                     | Bin 285951 -> 285953 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/objects/effects/effect_system/effects_other.dm b/code/game/objects/effects/effect_system/effects_other.dm
index 11271644ee1..4e58261b04b 100644
--- a/code/game/objects/effects/effect_system/effects_other.dm
+++ b/code/game/objects/effects/effect_system/effects_other.dm
@@ -32,7 +32,7 @@
 				var/obj/effect/effect/ion_trails/I = new /obj/effect/effect/ion_trails(src.oldposition)
 				I.dir = src.holder.dir
 				flick("ion_fade", I)
-				I.icon_state = "ion_trails"
+				I.icon_state = ""
 				spawn( 20 )
 					if(I)
 						I.delete()
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 14a4b7f8fef97de4e851a1c70dd16aafa0891a0c..d2bad4aa9dce457c0001b2c5e41f5a8e135c925c 100644
GIT binary patch
delta 802
zcmV+-1Ks@pxe<Z75s)MS50NDzf1GT)2QI5rt4iDMY0t>O#8@#lvQ23A*Y6?K#vvXc
zZG|EfW#-M-oAEfe<j2#`=U1|Md5-sBtk8;NWOcuYqh3_5CK;h=9MvFr?T%lpV-840
zZfwiU&fdgPC5$B*S;f)Tum&v2$U_`eAlZRrWSMwR97(NPl98o{Qwxxle{GrBNkH(v
z1@SzLM(-f3x;m-SgeEkhC$*-tj+tswF-_7WO}yCQ%?ZUjVe6Cb<G5}ha-mheWfkH$
z9XNij=L{1P$(CmVnzj;_6>>T|7fFStZ98c_&84ULh?F>7WNrYIt(kLR!g%Y8l!cS#
zBc-2%Dr5(vKFuqm2ZJ~?e?}!Kc<sV!el6ZwsjblJ_pc2id|ArS6AD0SR}01GI}w)r
zKH@;gtgFE^!Xf<f1h<+svxM#{VYS>Nh*LwPnPsQ>0z=@KoMlWHt!4>w1E9Fn{rn>4
zEi+D({$xN#*yQl;nUrA^I$(Yr8R&(o2223!KBHd=Gu=X4sXL_4e?6&E7d;e9M9!Zq
z>-8DM)Au(WR{MyEOa|&9F4qgJYtbK)kj{GH708KlcNhsNAd2{U7E`IU$|W-#rh$Fw
z>#*re>A614wLWdvwxR+9oc~dsg=)I(IJYxF<*Zq(!0>|tg!hB)r3npp4oE1S5v6bk
z#AG^{1MjRKyn={Wf3~lMWJ)6waAXNN9nZCv813lLm5)CIg9wAh_N|`nv1S@uAbPgP
z!h5_>OM>c%v*;Foro6h|Wm_^Og~Cq$@cB8O^y5KvrzO&g_>Cmg7Du!XtU0GMJ|DwC
zcuU6)S%ex$U`W3op%A)Umm}u#YaL6^bMzl!zCQy5TWV8!e|IqC79<6)T|N{>CTj(1
zdYLF{EvFY(RtkgwXB1E01M@m$YxG}Gxoz|g@{+Z-n_;ejO60Yc`s2g0tc_NBi!+xF
zKoFWa=0uqn47)vg@h|QllE7yOHu=ZEBu*ij+Ku?M9Ef7Hx+PDq8?t$Mj{gC{Yp3Up
g*!|}K03ZNKgFgd@KLY`WKLY}XKLZ1|KLZ57S=jh~MF0Q*

delta 802
zcmV+-1Ks?Ax)J}m5s)MS4Ur`xe@M371D92*Ri$nBv}a`S1gsbv*(Nmm>-Ugq;}8!x
zZG|EfW#-M-oAEfe<j2#`=U1|Md5-s>4Of!nWOcuYqk%Kqkep;`95uk}#vZ>IOD&L`
z+?bB)ow<o4#<d|iS;f&-(-sWL$wM455cEKDvP_&Oj)YPj$;r~eX*dXGe>$pn0ua1!
zUOWe*RXgyju1>01k|kM^oz&XiSgP5qVw$8$nmDn;o8_|ZxoJ+ikJGxI$hnfmmNLZg
zY=m*HXEo&l$(CaR+KzEUOEI6Fi=;x^b-gf-=F-u8L`v*0a;*WRX{fcJ{dnt(l=+k9
zBBh^$Dn$>IK82Ohfk7Oaf1;A$bz}W%ZY|zAp$u2@_pc2id|680;|oA4+i+QjJK>l7
zKH-4RtZhKI+#>vP1h<N|K|*(o8zuG#;@l8vgY2|lU<fP~LB_aNGDxu20J0Wp2rpvM
zQEhqUP6lLz%?|H@3gJh&7-ErzflD@G0vP)lea7{C3vGq!kv?~%e=1cDP%aTUce1S4
zXB1E0-`Tj@M?_>YWDeqTy}-H_{UPz`tQSs!EU$KliI6;^h_7ccRZ7W1P+h}3uq%BX
zb`~fd>O-jYdAp|L3^dgBAK4pV^KDnxCJ<Bv&0-0<K1e`#KkD8r$^4xI0xGL{#q9wx
znU3bbJL^X;FCv!he`_JBRLBIJSVB(6bE5=CyKL;r$Dffwgh5mL)<E}IGfgcJ1Knfc
zJzl6KUUkG-bc;VzUS039si+iOVkf`<{G3ku@gTZW0%=A3M&fIWBiaYnoYNU!Okp6r
z&87}ngc?X-NWUMU5V~BKBWjCl9ZS!1^dBMIpAmwol&+jRe;9HL61;9~F&0K9D+4*d
zOq7ih^NTC3I6{Ckil^^^IUTaq>MzK`v}y-MMLW|6m}`OYqESM9d{|bER#I(o=4K-h
zgl3jnUKJ(9ZjVm<i~EPf^BIH9{xL9%Qwl0~6Fx0Rq8P1i$<ynGY+jz@f0C)E<VnD&
gRR91W07*nagF^#{LjwVaLjwYbLjwc1Ljwf9S?g?kK>z>%


From 4e84fac6affb79a2d0cea85715f28044860011a7 Mon Sep 17 00:00:00 2001
From: xxalpha <xxnoob@live.com>
Date: Wed, 18 Mar 2015 19:49:28 +0000
Subject: [PATCH 2/2] Changelog.

---
 html/changelogs/xxalpha-jetpacktrail.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 html/changelogs/xxalpha-jetpacktrail.yml

diff --git a/html/changelogs/xxalpha-jetpacktrail.yml b/html/changelogs/xxalpha-jetpacktrail.yml
new file mode 100644
index 00000000000..afbf3cd9f1a
--- /dev/null
+++ b/html/changelogs/xxalpha-jetpacktrail.yml
@@ -0,0 +1,7 @@
+author: xxalpha
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed jetpack trail animation."
+