From e49070b572d2f1cdd6ca60b99b817394f5f3e34d Mon Sep 17 00:00:00 2001 From: Aryn Date: Sat, 2 Jun 2012 01:43:22 -0600 Subject: [PATCH] Fixed HUD change bug. --- baystation12.dme | 2 +- code/ZAS/Processing.dm | 8 ++++---- .../mob/living/carbon/human/hud_overlays.dm | 14 +++++++++++++- icons/mob/hud.dmi | Bin 2683 -> 3022 bytes 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index d1a917f794e..6ddf22432bc 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1203,9 +1203,9 @@ #include "code\WorkInProgress\virus2\monkeydispensor.dm" #include "code\WorkInProgress\virus2\Prob.dm" #include "code\WorkInProgress\Wrongnumber\weldbackpack.dm" -#include "code\ZAS\Airflow.dm" #include "code\ZAS\Connection.dm" #include "code\ZAS\Creation.dm" +#include "code\ZAS\Debug.dm" #include "code\ZAS\Definition.dm" #include "code\ZAS\FEA_gas_mixture.dm" #include "code\ZAS\FEA_system.dm" diff --git a/code/ZAS/Processing.dm b/code/ZAS/Processing.dm index 48e51767eb1..3282e444f61 100644 --- a/code/ZAS/Processing.dm +++ b/code/ZAS/Processing.dm @@ -51,8 +51,8 @@ zone //Add checks to ensure that we're not sucking air out of an empty room. if(total_space && air.total_moles > 0.1 && air.temperature > TCMB+0.5) //If there is space, air should flow out of the zone. - if(abs(air.pressure) > vsc.airflow_lightest_pressure) - AirflowSpace(src) + //if(abs(air.pressure) > vsc.airflow_lightest_pressure) + // AirflowSpace(src) ShareSpace(air,total_space*(zone_share_percent/100)) //React the air here. @@ -109,8 +109,8 @@ zone for(var/zone/Z in connected_zones) //Ensure we're not doing pointless calculations on equilibrium zones. if(abs(air.total_moles - Z.air.total_moles) > 0.1 || abs(air.temperature - Z.air.temperature) > 0.1) - if(abs(Z.air.pressure - air.pressure) > vsc.airflow_lightest_pressure) - Airflow(src,Z) + //if(abs(Z.air.pressure - air.pressure) > vsc.airflow_lightest_pressure) + // Airflow(src,Z) ShareRatio(air,Z.air,connected_zones[Z]*(zone_share_percent/100)) proc/ShareRatio(datum/gas_mixture/A, datum/gas_mixture/B, ratio) diff --git a/code/modules/mob/living/carbon/human/hud_overlays.dm b/code/modules/mob/living/carbon/human/hud_overlays.dm index 4d09641fcdb..9163a8a6af9 100644 --- a/code/modules/mob/living/carbon/human/hud_overlays.dm +++ b/code/modules/mob/living/carbon/human/hud_overlays.dm @@ -4,4 +4,16 @@ mob/living/carbon/human var/image/sec_img var/image/sec2_img var/image/imp_img - var/image/health_img \ No newline at end of file + var/image/health_img + +mob/New() + . = ..() + antag_img = image('icons/mob/hud.dmi',src) + +mob/living/carbon/human/New() + . = ..() + med_img = image('icons/mob/hud.dmi',src) + sec_img = image('icons/mob/hud.dmi',src) + sec2_img = image('icons/mob/hud.dmi',src) + imp_img = image('icons/mob/hud.dmi',src) + health_img = image('icons/mob/hud.dmi',src) \ No newline at end of file diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index af336e04ee8bb8df410384ac93ca4703c74b92c8..773bb2ca7c506b5cafae032feb5c648c79276e1b 100644 GIT binary patch delta 2752 zcmY+Fc{tQ-8^?cR>@g;5M}|>ID*KWx2H6@yoyIOsNXoutn>jcQoiM$UCCiMxvJEMO z5!sGOW290|PL^SY$TEh}@J{a^=k$KB>vLWAAK&M?zxQ?B&-3g`kICWWAaG$Y002jQ zd|Lnj6hKrx1VV@L@c{rv4*-$?z!3n{bN1K3U|9!Q$qSOby}kDs_w~qnDW7~LJSBq2 zdJJfWrl{2*YJWj?;Z*ltG7dFMq<6 zs^eubb6C!0uL%8wX07EK6H!_7La&UZabY}bbrz)iq(JendxSRwCb4c~#oAvf!e+PL z0mTX`UC=8SIiz>-6opto`Q5s{y}m(G-pmyXe!+s1o*cn<-JKrbpL(n=B7JKdT}gYY zVpUz3pu|1RI_^lxXt(#zYW8Aa8*=T^Y*(`yT|Q)?P_LGL4O!e6X{oK$M8!WQ^*`(% zeW|EW$)S2`%AW3ec-aEgT(0pxS7sS28t3z(QRDrtXq-p?%;NLV$b_R+ELzlBQ^NzN zHbE`ZgMlHXN62rL!?%;g_OUgo=xFiI8;a#h&S>vc@TKN4ZD2s%7662p4mOC32_;`? zyC^9;X`ydEDCCvjbyTkb$EnM1NI2;FQO`CCdz8wS+7(uyy1lvfai65udhk>0r=)(( z!!sl7ylv~GsX+DvQ@yg*i8qm-GOdl}l$U%n>dSL+ta@9`LR4z(GZ%HV>;VB?e6-vt zU3mDLceW##vE1zJ+}!MWS;`+G)lPRPv0Sj!^^~;7Y$&DrPmYt&oR_y{HOg^EKtCYN z?|6%VZ3R%&If8984I6iyM)ZUcTn+I=YC;a|3g3*0O%cTHI@U>><;&L@lO=Ayf?rbr z%V+TgnA#9yd-_`>h-lXd1XA3OHCW=I}GTB1rxGbNg(7uY9Y#Snq{@Zv5=cN zM9_FF0SvQqpNIM9$7lTddE{n({IZ6VktLnu@!+Ia-bL=Z%uh=rcN=ZS-hKy=J7+vR=Eal+(-F--2v52 z>}Is>C%^ucMko_iTXV0t_{geuX!p!+;52)LAK6WQlk}boe_KtHS#Dih1{Doid0S4* zuj|X#jyFtqSwG|UNUgB>4D*BG{%a}}Qd`!9;9%)T3;dcH7b*np*iJZjC7^wbK&{ob3}0Vdmc#;_Nn| z&?GaG#n9WSB|TDk_n9;B(wrp?LwpAklv$4NKoQh_(#wA(zGa zc+x>XhrMNWwRA7?z=0;MlP4)yEzeDnFn0!;v}vKTc9OGc5Y6#i%!u8%x-}>A2kZ7K zia8f)QeIuHYC;%5&)c?raQCfZ8kuPco8= zDLq$r(I+@&9dmo$ir`%Z_S6NP8V4C%8y#&Egt`2dc;iMVLP%dPdV~JT=(Eb}Y2AhJ zy9;cMQzUBC2F5_-OJnBg52uZC_K1@KsrMfWHQrnsQapAtJ9HD4 z(Uaff%g%RGETwcm6E`939zOhKaM0hXq0PXMaH%2gI!%0`?c1DRH?%l;@Z6@jt>1}$ z{wlLDuk3~;i#dT|5JQlx=z^aZ|E09+k3K4Wn@&GH0itg$zB)h%f!0{}b)r$PWpS_y zyWdXEL!+H6{U1Rz7^oVIS-JRd8GID_XRM1SLfWMmB1y+9@=-1Ba<=ov5Fs7o&~p=r z#LW4_xaP>EjK}Vd2z`fI_d!R(&2iT9sF`UWXRvX7dk_Bau)J!iwB3eFl~6_q?@dE~X*(024SUH6yIN+_x@%So3*Lr=Kw&kPrMR_sj@8X9JE{E~CFXR4cy zPRFP+r{y1DC0VOaR&!OD!uF!V|JMxw{zh`41$Fy}cu4b5h-VHZMN+?p#k;bwK6d+R zPj_Yu(O;FC_9XM__T_mFS)L-h%CPb)Mc<{1`u z_)ZBe-7eQOR|#gevJ@zuvtWG(QWxFKzOstni2vcbF86VHMF{4yz}TB`Uhw$e!FUS_ z$k=rE^=7DhE&Qg;$D7oh+Kupqk!H0gw3P}z&gwUVsyQ{1`p-Mr3+yPh47(qACw}bf PkMIs>ooyPeE~ot$c{LRp delta 2394 zcmY+Dc~sI_8^?cWiJA+gDehR>Xl0X@W*Lf*dzzvRTDebYftjUfVnX54xFn@zsTr=g zmPNUaucV-vuZ6il8q+Ab;g%aJF1*ZX-g9Q|IiLId@jdr>?&sWdKd7&(Qq+|IS!n3d8kBebD$(<~=?!-yi~8qrXcfV!?5eW`d#IJH@q z+##G@N74CNhDkz~ruY_|8sQ~tvQ1FyWBKUq!$s5~FYj#3)!KWV>e2OA)P6w^Wc$)5 zRMO-8TI^YbZS>P>!|~Ve5@qXX?$8qv&JTkBOsGjJMec%lp?(dvxr_^zRbVkJhx6ND zw@q*C3Mu_H?+(tHdBM`p?A30RwXhjFU7>fRr1f&~g&M^W@sZr)PPemyv@;&;xN~W* zw!AE@KHW~ian8U_4@}XuJRC1HoVFA*R$ z^{hV1L8IWbhBK~Iv^q*Z^C_TEg*!hY^K7=_|+0s_t*2UbZT_h^$H_5jAy*$7MQ}b*;H)Hp7vOM1R z?eqQIA^FU?^@!vG*N z>2%80D<*G-hs6xpLu3Ms6J%M zIs7+`;toq*dAX<`;_VX)ZxT@z=TF*_3>OrknzcV z17#z1DO`Q~sxF;@xD=B?rCkG5Ys0<~)u#JrObdu8oUh<;_O(oN$MeMxNoBW1CWk(W zH2G2^Q_kSn{Oj2(SxvvwzKk|Mnp?Vl*T?t#BJ)8W({ih$VRPTdNwkk?(t>Fm z0x$FAfG*{}bmNT<=r(45kF9hz<%=yQR#SeSOU@MLle8EnPNJ00%-}$#F%9G7NWhemTbE$lit%>|hYV-)-SIJ5ts2@vVrHLno$d+oauZ>hbP#5 zn~9sL)$If&51MzP`6(ZAmJ*tXCwYJ&|B;@3e&Um=iuCitEGF9lhurK&|Bjhh?r#(4S~Lf&zbx*zn!!M<8^gD3CYxDPySfng-#}}0#IZz%7ArvJTe_Plob$wJO^>vThygbO;+@P32=PEd@g>4ybxOJ#N)Q@$OWf05*^C1AO9Gge;MAf9)}#HPi_piytXPt zB1U3v67N-}j)&OzpR_p+bM9D4hq5mf0e#_YKWbcD6!`J#_E3LnTzrJJ-z;oi>xvE4 z^O+x|Wyf@i~fue1VW5xPTe|}FsGc(-FbTL~G6;8_;`lu#( zwBIX=Yv-FjV~2*AX}jU=FKh-vm=TZ~Im7wB6&lfWeXa86h~)r*LnL5PVDMyS_JdJ2 z^KqKl2?By=OFJ^L07?%-1Y1*`8tIvCtE7Ec0s*UHO%`} zr(EUGeEazQk&tEOWy;ea{JnY4L^$G$eq3sJhMr0Rxi;zil3FSEXrTrpn!U9Z+1Mg3 zxE9x{=RXC@2~=et?6fkf-07~C9C)zGmQQ>7!Bd|)oFJ>C%Dk`Vf^~?F&qY z?<&8G#=5un_iC6R=y55Z&z9LEe2CgR_(fG2o5y%de@>a?%mi;G$`0+c%%~|BoTvU|L1_>8dyLbE+1}Q*2IQTAS`?u1GPVLI$tT-)qbR}7|bVb!2 zk^*XwKKdkxn5a~7;DdBUukCwHFMXKkw?Y2LMw$N6anC9@aE~hX80;c{Kw~b*oVB*c zmv1p}W;*r7v6k-CBh%>-(Kk1?VE?oQ#`%Tl%}fcs66g{ZC8SE|l29pOsu0avFD>&D z3!{Ga%MyHTCXTJH)_aM!n99Xo;`xVses6omR>#Ij$+PP=EnXGkAf0A(h1faX%A;a0 z%;ewG0D!b(ncz{r&4Nw