From 2ec9596d387bd933db394002c4895c6001becedf Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 29 Jul 2021 04:21:44 -0500 Subject: [PATCH] Fix gas meters to display properly (#60433) --- code/datums/greyscale/json_configs/meter.json | 5 ++--- .../atmospherics/machinery/other/meter.dm | 8 ++------ icons/obj/atmospherics/pipes/meter.dmi | Bin 1445 -> 1704 bytes 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/code/datums/greyscale/json_configs/meter.json b/code/datums/greyscale/json_configs/meter.json index 3acd68b6f72..73cfb739959 100644 --- a/code/datums/greyscale/json_configs/meter.json +++ b/code/datums/greyscale/json_configs/meter.json @@ -2,9 +2,8 @@ "meter": [ { "type": "icon_state", - "icon_state": "pressure0", - "blend_mode": "overlay", - "color_ids": [ 1 ] + "icon_state": "pressure_off", + "blend_mode": "overlay" }, { "type": "icon_state", diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index 3e3995dee6b..c91f2feca42 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -2,7 +2,7 @@ name = "gas flow meter" desc = "It measures something." icon = 'icons/obj/atmospherics/pipes/meter.dmi' - icon_state = "meter_base" + icon_state = "meter" layer = HIGH_PIPE_LAYER power_channel = AREA_USAGE_ENVIRON use_power = IDLE_POWER_USE @@ -61,15 +61,11 @@ /obj/machinery/meter/process_atmos() if(!(target?.flags_1 & INITIALIZED_1)) - icon_state = "meter0" - greyscale_colors = COLOR_GRAY - set_greyscale(colors=greyscale_colors) + icon_state = "meter" return FALSE if(machine_stat & (BROKEN|NOPOWER)) icon_state = "meter" - greyscale_colors = COLOR_GRAY - set_greyscale(colors=greyscale_colors) return FALSE use_power(5) diff --git a/icons/obj/atmospherics/pipes/meter.dmi b/icons/obj/atmospherics/pipes/meter.dmi index 2816d22f43907fd3b40b97db2b6cc3d4cfa0b54c..2aed35e065f493a571c76be1a218d9eca42e0d0a 100644 GIT binary patch literal 1704 zcmbW2e=yW(9LK+3tF>XXr5~=9RVNeIpy{$=SwAl>$tgeD6hiW=)nyiowcJkX+@#BP zIZKOfQ7XiSv{uTGgq4-W-dcpERf{jHWtY=**B_0Uo4Y@r=kuA*e4cr~=XpM_d9HYR z971Yt*8~6n>E`O}wHk+3R|5jRy6;FO3RZ)ZeB3YAIrL)ikKr+~;l%R*5TARa$3ZL2 zLa%uSlAD~K+Fp=YDl`kCr7vop`HPcAO4kw{fRUs#4kZ=$ZQSK$sMD#3QCght&yV9IFUbd= z4KK*Vn0G<%o0^(9in0K%rC8~4H+kbYRIC&CJ{1$m0atjH67%W>tS@`Hm&kB876z0F zr0F~4Nd9E(l2j^>Nx0o|L#yOB${kK2N*zx^6MH?_4SQU=(T>An?8ckY?CP~r^L*Sfz= z|60!PHE*}6g8JLB_=DVPbc`Ld*c{x@YhoX!JIcFcfybuUF@2X-#FJ5%cjkFqY*o@L zcz8VCoJF5dpjhfh50SOedu+w%wWL27{C_s z!$+yVhyg3AYI0H{tbZXEHd9>8eVylz*AFO@uCdb(sYP%I9t(d&(>XwnId$l4CR;;|;NnEZG zam2n--{$(7ni|z&6da9u{8hVzI+IBq&rGaGB2@eHksrps?mAJIX+O>g2>n>%zl6Y` zJ-Ipvho2PssKrl&{2yQcVCKmN>gp})70@E?I$qkE~PcZ zmq7EetLhH*Nbn0d*OHzyN(Ms?9LcJu{ZI-14e=L!#ODk4{MZz>WEE*Ih){BvYP*lo zLE!Qt*ktNA1;(Jfb#iiYFhxE)I}4W42n3CI5=p)!Af7b4xzbasPZ@pFlDRM_mlE+} zg{tE<&d1#H75zY0}WqYkX3`}w?`z@40E)F>Y(4b<&7&U%b}Q9mE926yDZIzgvF?O zt?k9oOY+P}6Q^3_zs`(iiqkDRgsTgUSMSrkB{=A=HU;8eS@=^7)}}$F@ze!I6Es_1 RS^atdHy01*2abVhe*q%`2BH7} literal 1445 zcmeAS@N?(olHy`uVBq!ia0vp^4}kap2OE%-ZOp$8q#jm=P@u; z%$a(5BiA7Vfny&nE4vo2Q_A(byUC-wWW{;~UE5s8wJIwg-L{U9(YaKY;`zY;#9syO zTdBYQIAl(I-EMKe%zV?9xT8_Fx2;T4I(x%(#?;j^3Kcp|7|s=~X7sc}kcUtO!* zG$o_7=xM0k@BFIrN44)&=EbTVXUX8bV02+!V;S?7+c(!T%J4i$U|?sqkT`IVfse<+ z;K6|gW@a$M;BV6^{)M}L*2n8!TQ$x5r;_){qAhOMeOB{7H2EpuSIz%$e&Ek^hP?~k zObCj4@{4!v)5N%%Q_~F@7+C5(T^vIy=DfXY=%<`6(eO|)s#EW;m!?u7lV8JXlbtLf zCM7$a-#K(W@LuA{s{Vk*LsRK3uhPUelMO~UGagH_#l5MNZ`<84M26xE9Z0n&RfmUo+#1R-|t@k z@%HW87w0p3Zz^p#Y{290?jBwL=I-6QFRYopjkOLWO0;!%ck9aq{rmL#{CT-W|NdUz zuD{bizO=OT>(RpxH*el-UOgjw-_PQ6^WWMh{`>Rzd;0bR|7YtSc)#!e!<%ojt!!-m z{0TF-|L1F!?dd;r?=*b>{(b&^u4msr>+9=Z{yBTQej@WM`^yxqSKZXS4q&vEPmnPTLw~DZhZew(Z46W zJL1+auhV+71?Y*}-~TW1zMLN?y?=+#pJ%2&&&J>TvpoOb=g*(N%xJRQ_g|g$N1WgC zl{&Tmo<4nQz~fwHci7-dJ>Sij9`7HP%=%Tbr0Cye=LK2+gg-C7JaO7S#$1Na&u8tQ zEPa8^pg#VY|GkE%{{O2!&&dB5BXf>PaeYhU1O`PF2M$gFC#DwCnU?YwYCa$SIeA?V z@6xlIe|D`-IdA#j^*J-&VWacQqksLeYN-9R=<-A@@A>~rtS%dHBwWAQAbf-2Oscy1 z0^S4rW{51{W%xWpBtdrW&u8yX*F0x-I-#AYK)!px-nfv%IB(7xIkWuxvwm{V-~a1n z;^(sPXS8z|NZWrJAcf+zCK%ScBC(EHZbt@?@G@<_oeXh+roXD6(3x+%{$O9{r*=9 z^Q`%&&$F+2ZvXdhKQKWa;xJqA^S|wWyZQMaKZj3#cDupg&>iUumjw*&E#J9s0xt)l zNYnjy^v3F|tM+m0%m6Be