From 638c2eb81d059e85d46f95cc564bd822069dcde6 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 21 May 2018 17:44:09 -0400 Subject: [PATCH 1/2] Merge pull request #37974 from AutomaticFrenzy/patch/glowshroom-icon Fix glowshrooms missing their icon in the editor --- code/game/objects/effects/glowshroom.dm | 2 +- icons/obj/lighting.dmi | Bin 75976 -> 75974 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index 8dab6e4246..42d0f097d9 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -78,7 +78,7 @@ pixel_x = -32 icon_state = "[base_icon_state][rand(1,3)]" else //if on the floor, glowshroom on-floor sprite - icon_state = "[base_icon_state]f" + icon_state = base_icon_state addtimer(CALLBACK(src, .proc/Spread), delay) diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi index 49006ff1c7d6b01aecb9946c94390b57cabcb395..396d681f22101ba1337a117335a3325923fd913e 100644 GIT binary patch delta 710 zcmV;%0y+K2(FDfP1dt>gw|Z1qbVOxyV{&P5bZKvH004NLotMjQqc9YPkw6uH2XK49 z$d^Q!r=JB)0vU*ZMy!y&^BbQ#x8mvL_v^cOetS)JWSusR*ow!y`(&}#xv#`lJfz8@ zB3)L#dvRWR5?gWOLq<2rBG=Z5t$0ipg_Siqu@&nf^g%V*k{We@@D*e4X>dg5t&^Mhd<{KWyaeamQNAfy+ajhwM=amnFrsD+`>>w;DTtE1sQWXT_~9 z&eERhxhFw31xr_9PM6zIMX%c+=rvxu8(Iz5o zeCRmVHAo>>YpKB!C0lHNo+{bKhv~5{G7fP^8#}S4^yX5!96V#a=YtO9qK8@8I>UV=8<5np82U1>t(@axf!!8+3e$)T*(~X#rkkOb^3HXfBJMhi3*mk%B78a z{zPJp*qFS_m|1ib{dGdc6Sl?mEx=Xo{PF5x7QLQDr%}3=_KR$PS56?D1zUzDKOj*W zTA;W!%^#>^_jwRL5VP6i;vEmd=%_u@AZl3eW+)rhJ5>5p<};K(WsVAal8g&`k_@7X zY+#bmzBaS~aoyy)G`M`ngK!&c%QHOQ@gTg@h6!5C`aB31K~+vmT>aZ1{*z~{swQQB sjQ-bNT4Tf78>^}mDe6|dyg!TQx7Xw^-Ad+uxFCvdgXRLa<^loYCEoL5(*OVf delta 712 zcmV;(0yq7}(FDlR1dt>gxq4JsbVOxyV{&P5bZKvH004NLotMpSqc9YOkw6uH7jS#Q z$To>GPd^Kq1TqjGk60mn_ZZ)QZpG8f@7H(n{Pvpc$U1Eru@#SZ_sL?fb6<(Acu12) zMY^nf|Khy#B(~zlcNyIzi(FeLw&F2a6js*c#8#}w&*Hsn_#W#$FqR^IDmzAIK zE>ck^jr*V{PbgY}1?#f%z?~;WXK3GLv{I&V-ge5boR=kqvn%U3i?^D8IxC!=Q)h*( zF3!@P>e!PYn}VgQ(7+tgl>r))tXl{|#Y#&^KRl9{Y~#to93ok;v@{Do{!@aNmS_`^ zHavA4>l&nxtF_c%iE;!H(M&e7kx;UnQAF60V(o$J_Z;-C9cMF@o1O!k-ffoY-DX_M z|6x|L*(=#%V^zr(o2g2Fw%9;bvJFquV_{_6g*|QT%%Uhf}$dIlhez>2U50>2LxK>2MYmEM1jL z8+QGP#9Fa2d7m;-bP)Y@Ld6rd#|LH3=N6~4JuBH8dBHPy!2xpxwyCy#% zQ5svIxHZimsAms(5IzvI+2i6p55nlMJ<}j+Snnc~4eK2${VDSZ?QF{t9`AV&-f6=Gt!6_Wgo{p9PD@<<+aUa#XRNAb uWq(Zm*)7l#rtExHbR=m7Fi|4o30pcb7rCxIY