From ccfe9c4f7eb1891f987d6e6994f9d057b6fb1f66 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Wed, 17 Jan 2018 17:22:33 -0500 Subject: [PATCH] Tweak to fix two issues Fix mysterious 'fuel blob' icon. There's an unnamed state in effects.dmi that I named but didn't include that in the PR to here before. And there's a better way to do update_transform and here it is. --- .../mob/living/carbon/human/update_icons.dm | 17 +++++++++++++---- icons/effects/effects.dmi | Bin 396490 -> 396498 bytes 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 256350b3810..61241bb9fa6 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -174,7 +174,13 @@ Please contact me on #coderbus IRC. ~Carn x //5: Set appearance once appearance = ma_compiled -/mob/living/carbon/human/update_transform(var/mutable_appearance/ma) +/mob/living/carbon/human/update_transform(var/mutable_appearance/passed_ma) + var/mutable_appearance/ma + if(passed_ma) + ma = passed_ma + else + ma = new(src) + // First, get the correct size. var/desired_scale = icon_scale @@ -191,14 +197,17 @@ Please contact me on #coderbus IRC. ~Carn x M.Scale(desired_scale) M.Translate(1,-6) ma.transform = M - ma.layer = MOB_LAYER // Fix for a byond bug where turf entry order no longer matters + ma.layer = MOB_LAYER -0.01 // Fix for a byond bug where turf entry order no longer matters else var/matrix/M = matrix() M.Scale(desired_scale) M.Translate(0, 16*(desired_scale-1)) ma.transform = M - ma.layer = MOB_LAYER -0.1 // Fix for a byond bug where turf entry order no longer matters - + ma.layer = MOB_LAYER // Fix for a byond bug where turf entry order no longer matters + + if(!passed_ma) + appearance = ma + //Update the layers from the defines above /mob/living/carbon/human/update_icons_layers(var/update_icons = 1) list_layers.Cut() diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index 948a55d9f1e6ec000579b40df42d1e9c3253202d..adcd4fbee2c4c547797e51230d64150bc89bd1ac 100644 GIT binary patch delta 941 zcmV;e15*6TnHbWU7?31?cY0J za_b)Ya_V%Nbld#|l!6OULxPe})_;Ew>#l*uBy1;!x@q=jJGMVNy(d4Pf4#hs-RsNz z1WGe0$d;@Z%lWKhg{jDvB=LM!0V^x>@rO3l0NIi|-B5MZck@|)!IUOjvYyWliq@dX zmORd91#o&MTe6C*XFlUnHe^dy7EZ;07rLS9$N|Co;l#5rYIy{=>iVjhL`jrH$yKdx zwV|r;D#lS9#gP>|yc;IUmg(xMyBXJYM9!qh4zxfVPX-u$J)7M&f z=jKqMZkm>BOLJv^X>O1dyOUfh0HG^t3@A5VdUIs%L$i_M??LT(3!^@TrO|>x92zSn z&dSQT)$ClnH(Y8a#h>3hMEEw9uE!OCkfvgy40pmU`848y%dDwD)yyFEWeFZ6t%HOf z3Z^ALA&5Q_se|m)|G^L#%7ctCB}I^6sQ^UDWfz{rtf9((u-s+_gu=Y!-BHfnC^sZF zQ_wL{3@QP%`Hp_Ul)r@zT((G`TT;2)cd%a}ayGN1X|KfN%V#po_6H)u42gxfN|#vI zqW_3oI_c6%kYV}pJQ9*a6!EneQ!b^*I8`P1foPQyQ<+7)|p6;^Fso+dt1IbP6&LKPC#|O!aiLp3&?gQ-$)Au@hvM~%~r%T4TA1Mta zuw*PSq+F(*5jELV$Kw7O{X+=%XMmt{sdDRTfGp>KoRyWyhQbIz6d?RFZeL06-=|Kr zY(Y0%ngF|96|$nGUJ0ZhEeSvA`sv$02;jYWyTCqMD9c-pWF$^JRI$OS z!_jDY%T0g9!bZb#@fZcXn2`gQ5?PTp!A4x*suhrFn)|OV%S9S};YE$Idfy`D`!vZa zY9W_@;soga8Gku6)Sv+ljYKUX5@C)=`Bg z%Dz`DBkLysG1G>jY-8!)ljpY`*}cBZ{{qYhH*q=|<&cJ};xvIut9L8aMRjXTV zs4BdQQ5c0$XvGfihKaIey1MFa$8{Z%Gbz#oEfB}!0Y+cXD9Si;T9yf@n}TVYasTPu z94gdJ({gQTt}V@fEs|n)l1l|3bVZE;<;F{Hj?8^%Hd6FGsEoHT>eI9|S}=%1W2MAd zSsAyQos0K|OUm= zTLq}{EC8#2<5j;M<4dh2H$$64ZWPOzIU`8Xps_CygO4j>M^9Le$L3l`Pgt_IH)^3% z9mxW^T=tYV^Ig_C6`TodAh~JXIb;X?_#k;PGZrV$eV~0|`d&v*I);JlbnzJXBc*`^ z7LNsnl*_y`q9&c|SkynGe+bk486fCfs@%F7Aj>&_XJuv5p)f)a1qlC)%PPtJ`;=Fp ztEQ}FiB|&YK}*6#T{xO6Z@KBO zRoFOKEg!=PFJ|Pxr9{@E?PMb^aMcP(HO>9kmDMr{zwn|)S)H{=`996Eidx8}I03qI zMqdtp4K-+hLnBd(NI87e*X6fmjAcr