From edebf946d8c59bb82e912ff51a627222c81b09ce Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Mon, 17 Aug 2015 10:16:39 +0200 Subject: [PATCH] Harm icon state consistency. All icon states relating to the I_HARM intent now all use the same naming convention. --- code/_onclick/hud/monkey.dm | 10 +++++----- code/_onclick/hud/robot.dm | 2 +- code/setup.dm | 2 +- icons/mob/screen1_Midnight.dmi | Bin 141941 -> 141939 bytes icons/mob/screen1_Orange.dmi | Bin 140369 -> 140367 bytes icons/mob/screen1_White.dmi | Bin 128151 -> 128149 bytes icons/mob/screen1_old.dmi | Bin 114081 -> 114079 bytes 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/_onclick/hud/monkey.dm b/code/_onclick/hud/monkey.dm index 7314e8692d..a7564246ac 100644 --- a/code/_onclick/hud/monkey.dm +++ b/code/_onclick/hud/monkey.dm @@ -10,7 +10,7 @@ using.name = "act_intent" using.set_dir(SOUTHWEST) using.icon = ui_style - using.icon_state = (mymob.a_intent == I_HURT ? I_HURT : mymob.a_intent) + using.icon_state = mymob.a_intent using.screen_loc = ui_acti using.layer = 20 src.adding += using @@ -23,7 +23,7 @@ ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1) ico.DrawBox(rgb(255,255,255,1),1,ico.Height()/2,ico.Width()/2,ico.Height()) using = new /obj/screen( src ) - using.name = "help" + using.name = I_HELP using.icon = ico using.screen_loc = ui_acti using.layer = 21 @@ -34,7 +34,7 @@ ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1) ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,ico.Height()/2,ico.Width(),ico.Height()) using = new /obj/screen( src ) - using.name = "disarm" + using.name = I_DISARM using.icon = ico using.screen_loc = ui_acti using.layer = 21 @@ -45,7 +45,7 @@ ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1) ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,1,ico.Width(),ico.Height()/2) using = new /obj/screen( src ) - using.name = "grab" + using.name = I_GRAB using.icon = ico using.screen_loc = ui_acti using.layer = 21 @@ -56,7 +56,7 @@ ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1) ico.DrawBox(rgb(255,255,255,1),1,1,ico.Width()/2,ico.Height()/2) using = new /obj/screen( src ) - using.name = "harm" + using.name = I_HURT using.icon = ico using.screen_loc = ui_acti using.layer = 21 diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index e5e05aa718..7441ac5609 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -57,7 +57,7 @@ var/obj/screen/robot_inventory using.name = "act_intent" using.set_dir(SOUTHWEST) using.icon = 'icons/mob/screen1_robot.dmi' - using.icon_state = (mymob.a_intent == I_HURT ? I_HURT : mymob.a_intent) + using.icon_state = mymob.a_intent using.screen_loc = ui_acti using.layer = 20 src.adding += using diff --git a/code/setup.dm b/code/setup.dm index 07a53f51f1..635214c490 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -852,7 +852,7 @@ var/list/be_special_flags = list( #define I_HELP "help" #define I_DISARM "disarm" #define I_GRAB "grab" -#define I_HURT "hurt" +#define I_HURT "harm" /* These are used Bump() code for living mobs, in the mob_bump_flag, mob_swap_flags, and mob_push_flags vars to determine whom can bump/swap with whom. diff --git a/icons/mob/screen1_Midnight.dmi b/icons/mob/screen1_Midnight.dmi index 1952b1ea199dfe64c793a6722f6c4dac0d995437..7316c3dcac153efd08f03f391e5f4679a5c9ca95 100644 GIT binary patch delta 789 zcmV+w1M2+s)Clv`2#_Ry-+EM7bVOxyV{&P5bZKvH004NLrI*2S;xG(`&&gAG+vA2^ z5}@scOQ)Tk9@XN0DuZyBL!={rVf+Q<#}E@6^QPM3^$UXFNfj(C2KzThY? z2inds1hef7Lo8*5rH7ycvQVtO+mvp(970k7x`UQoYZdx7QwTB!u}zmF^Q5^F(h4DMc2@l zCTJtld$&1H&E5+v-wRt-q=|=(w(65iT3Sq(Mus{{B{$Y^}Vc#WR3`3LPgFG6cpkL3$ce8f)+~ zTD2FZ^M1#Fh^=Ovz{|w~6qlpx`vCr=Ne|jCov$L(N00o$NB3#)d##Nb!bW;ke*(&i ztcZz3&r;;vlMj~8+u71%gOYxo7k4b~hMshl^y>*NrOJ1!RV3w#+s|S;=sRgsMOGC3 zHf5a-vH5iT&5bX()O(p3(^tjVIAL71X4KI}nzgonE4ny3YdM_l&}-Dr(z0C!x+ zbY>h;I(3gIotCYK5IW9d`;BDG??-gttN(2se}{n^Xp3O6lnl)}psbd7V40oqK(iX; zn-?6r|D1&~0DUxsrZv&WXr5k+$Cn53@cfki2R^JJ|CK-iJOBV707*naRCt{1y?K}$ T)tN4XAOnXW0|B=n0|HeiUEzjc delta 789 zcmV+w1M2+q)Cl#|2#_Ry;d)e9bVOxyV{&P5bZKvH004NLrI*2S;xG(`&*Uk*?Qz2{ z3DEY!rPIz%58YQ_Oe}~8$Ii-1fqnWt(9+OiB)XFe%zTz*S^6bktNX`aPruc}^HcT$ z7;W%srY1i|*x!4h=?``-t^dII#? zjl^UjCd<=gnGFm$y;Cza&8P3nmKK3`V`&i*E}S!*@TF%sYWt8@|(FCXA$-B?x zbd(o)k@ph3K0-Ivwi-H99Khk6$lu=Vz>x=dGOjdLseV zfcO05K(!ztRxZ3iWU*KW0aa^k1ijDk*=KB&*jl0H#WR9~ih?8-I!3`UK_d?tOEut> zSM7!C5O;!q*jm8}P%jo>q#R%0ui$r{M6iAtuu4oHJ@T6z-KW9NwRP?iHqop46Hs2} zWlAJ^mJ;V4f3S4g&Xyk=jK+0Q-if#ye$q7>*JEBv4R)(lBIU~4&tiJfchsiJye#`| z$_E=$^Xce6H$LN1?`7s(Ulmj1gbUSLP)8f>*4D3o_~PiimvFu#v}A+lW#fSIrFlU4 z%s8NY>K;%&En9>bJIQ1FjTFr92lT>M|JyqG4i|1boD90P|O0|B=j0|Hkk1?z>q diff --git a/icons/mob/screen1_Orange.dmi b/icons/mob/screen1_Orange.dmi index 772a62386c974caddea41d8b36582948e34fe7f6..c5824e67908f88a99b09fedf8c6938832f8237c0 100644 GIT binary patch delta 796 zcmV+%1LOSB$OzBK2#_QJT9G9;0!b*5ULb$Kd1Z}Qh}pMEFj}b`OR*5sI2e_nmL+a~ zJW2$y5H~l$C|Aylg?I=?g_AXSu@KP#NM%;F4T&j(;EdFh0~uW=BQ_bIC*xq0gO(ey z5c6<;W`e}(oIeSRE|dd0#6mgf39rxTLOJM(vt!tn?wEmzp0k zL$uAvVH}Jctdz+=@O_E3|fEOh#Hj#6^LN_^SMx$j`vYXC-(ao~}ryar&@ zA_pF6%3{e-^itb5@U&;8Wl*JbHKU!-wBU2)IkuKg(uKx@h72udEu{C1FcIoT_x2>+ z3@#mQEmv5Ao73t@b?e-Qu?c^Q5vr4E3UnUZakScY;8%`%l_{*t=;iyuN4I+UUMa1I zusx-{+g65g822Txj-{Tsrze&^lL*&z$CgW1MezfRyQA+SxpdW(E(W=4m&+bu#`hn~ z!JzM`Y{y|7cgwc1%J*FjCZC-6f=iu80Ij=8wy#IiHmew?%_k>ywWmaJC}gJ0k~FuH zy5exIHHO3GkXfw^-O=qY0jvju$LHTaNXWG46e?@zJh?~dT(n1NksqwGf;w0phSO(! zkJ9J2ao~NEJp&jrgNbAmj2+5qTy`w8f7#KjHs;+6j@^IOK;nT8jc9pp#q+Nx@$~u< a{09_@T^s&`FqDId1BZzN0k??*0>~gND2sjo delta 798 zcmV+(1L6G7$OzHM2#_QJT#+R=0zoQ~ULbz}ow7zO#O&K77_C(9OR*5sI2e_nmZjhR zI4?bjg}Av1M!7;K7UCfo6)0Z zA?D%y%mj(mIe!usT_^-P#6ltTgxBYEp%8lF>=?G|4Lv&>VnuA%n}MNtyQb&&cFljA z-`h2j0a@xT`3Kt${ayGfy>M%C!2i19HV4OlhcQPO%t>ciP(Q#=q@!s zWQJ&)k;6C`A*__iKje2qXMjRWSN2eoqbzj#b&gVU!AgAD%DL}g*=YbqkwI{trkn;~ z)FK4uY0CPNq3ETyZ{TRpO3R>1i8Z60(6r!lsacEdwOE&Gl_6bcWk-DDvBRi+#P)v$t6}(x)|ixE|)#RjPE~| zgF)X>*^a|F?v`z1mFv42Og=gB1(!OH09tpGY+sM2ZB{W(n@djWYEMMtP{>S~C24LY zb;aSZHHO3GkXfw^-O=qY0jvju$LHTaNXWDvl~>l#d2)}^xoD5lB0pGV1$D4I45!cd z9;MH3gWz0~Jp&jt;}gj!7(0~Jxa?SF|FWZ5ZOpqDEz;N5f7U?afDVmld2Yq?uP5>J c`V#yHAnsi@BSmclgNFl$hXVn(hXVr0AdjSd6aWAK diff --git a/icons/mob/screen1_White.dmi b/icons/mob/screen1_White.dmi index 4b0a1a4a0739087dae12073af866bf1466fbdb49..0c852e859ea0fa92efb4590381d4be636088eb1c 100644 GIT binary patch delta 788 zcmV+v1MB>k=?9hR2aqIx^LkWRbVOxyV{&P5bZKvH004NLrI*2Sqc9AH&+ru9_PAs> zkfiM;mrgr7J+!aDIG}(h#%5*HkbU|+q)kYRk=+iLWaj&2Vf~WLHM@WO^Yp?Vo}c1Z zKqItbYqtC~kE6XPZOztfk;PFBqN?rjkFneWTeGXHI4T7iwq|L69Bq*|aQuA>CB& z%egn1dXw2WnZ;2Fk{{Tbt&-JQwiO6;8e4(jNMS0lBbPy7-5==Hb$BY5G7ZX_>ueiT=t;TFc>@HCru&gp?udmY()WmSipq4k9_;d+{OCc$}UdktN4nn%#MEH}t7qa@;NGMlG?cDuCdx%N~b`FI^$0 zZ$9r?_{42H=MYQdNNU|)^1QG)f)U0BifoN~pX;rEWA;)y6(}oFJ4-MkDL`3pp2vt1p#~|^(&YFfvI&6KV{i5e4@`r@aa|?d*6v}8{Hmm zOwjuR$FS`YA?4b0xf7}iP++H2nBt#SkQ;E0#u15yrj^c5?lit;k1r4G;rS{454KKQ S40H4X#WI5;1Ggdr0d?{1j)g7& delta 790 zcmV+x1L^#g=?9nT2aqIx^?FoTbVOxyV{&P5bZKvH004NLrI*ce+At8u&-PQO$+4!z z29jL3WRmIRki3FN*bCAiOYTYz(5LT#1WaOirDS}8ncsi4+Am4h?Edl3(+hieeo9{f ztu&e~+5FcuO?I+&f-TvsND~2aBi!+ib=(14va72!sU=#rWOKhUe2{ULI3XZEyNXZCbh z1#smAZS2T}+M@$=~pc0 zW_gxp{epm|4JaFbXj(eY4w{zEvV*3jbL^mLJsIvLVV2Dvf-d8g>JSekwn4sHK^@A`1K|z)Ns|atuMJk7N!ufTgrl{z z9Gl-;sZ{;W(-I3G?uKh=2w`wm z(|CHgWX$t&%yVjU?3BVhJ?XNKy%4+~d&v4+8rYtrLMc3NCf~P%eEQ4yKYZ+}{ z(}FLR=h&*9q#J?<4Fy`xw~*d5!bE609h@D8l~y|1TB)!BH>cH+>)yFH#vv$1s7~fN z&~1I&6zODnpOm9E7gNvSM)L8VLMX?Y`8mH-S5;s=)&I z;>KrO8eG=39v0cqETwI+WMrGqj{0g~aHwRVOih|wNxkH7t~Z9ml~83^tqeU)?S^&M z#s2>B&o2@(JvxQT8oEyIP`VcFP+H`BtE`~*mM_EU9N(dI{&o($?>RrJb|lN&cbai? z+@Tl#yL(^9-{BKK2MuPD(J;0sYjD}J%=u+Yv&NWrFF1DpSp%5|lV1ZD2$AtjK;)mq N3WI(Fw|)ZwBf9=AeFOji delta 785 zcmV+s1Md8v`v#%=29P8HQIRDz0=g2BTp@p;Q`U%unEjYUqm?RsBNk$sMxzE)-T2Lm z^U{M@h^wn;R4R00A?~74g|Y=F79!aLxh$4_M`Fr&KqK{JPbTNdgiWTW$ut_3pyiub zhk3Ly~Zz_4Av(Yv!DR>XGwc3~*quIc@~UGsnT z_jXMyrR%kx$Og3EZ4GF@+fIkD?OZsXZz67`6N!_Bpxae+KwS?XggXC9@>r;gNL@GrQo6M0zw#^ z)ijXi;6S8SP0HK0|QIc^2v$w5!Zk)g`oH z!6n*`1mSP5=sunwWYR3qGfNW5L3%!{`PF zP+(J8`0VH~&X{Ag7HLX4N!K(%86!pF zIj9!L&p`6o87t{|E2o~lWv2lc%>co9nsOR|(K8U7rzz_jhN5e2U%}CyHI_j&5?e;w z*R1I%3U)KR)rnev4!9`CrYOHsi^B&o2@(y+`GhHFTZap>!?Up|r^NR#`#qEnkMyIle>b{Ou5&>p4HFb|lN&cbai? z+@Tl#yL(^9-{BKK2aV4pqhV}O*5I;bne)q*W{olLUi3&`GyhownFEtu0~ZLP>r7iR PVWhu