From 6e92f889457a65ebf9db2b72051a722d304776bc Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Mon, 6 Jul 2020 19:53:05 +0800 Subject: [PATCH] Lighter inhands exist and update properly now. (#9293) * lighter inhands exist and update properly now. * oops --- .../objects/items/weapons/cigs_lighters.dm | 1 + html/changelogs/wezzy_lighter_inhands.yml | 42 ++++++++++++++++++ icons/mob/items/lefthand_cigs_lighters.dmi | Bin 1679 -> 2076 bytes icons/mob/items/righthand_cigs_lighters.dmi | Bin 1614 -> 1990 bytes 4 files changed, 43 insertions(+) create mode 100644 html/changelogs/wezzy_lighter_inhands.yml diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index dae54ca2676..de3c1ff4f48 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -615,6 +615,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM else icon_state = "[base_state]" item_state = "[base_state]" + update_held_icon() /obj/item/flame/lighter/attack_self(mob/living/user) if(!base_state) diff --git a/html/changelogs/wezzy_lighter_inhands.yml b/html/changelogs/wezzy_lighter_inhands.yml new file mode 100644 index 00000000000..60613bdb743 --- /dev/null +++ b/html/changelogs/wezzy_lighter_inhands.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Lighters actually update their inhands now." + - imageadd: "Lighters actually have inhands now." diff --git a/icons/mob/items/lefthand_cigs_lighters.dmi b/icons/mob/items/lefthand_cigs_lighters.dmi index 1c087488e5d1fb2cf8d750e9c0257bbbac75dbca..b7bf2edc92adaedb99d7a8c4edccf7e1539ab459 100644 GIT binary patch literal 2076 zcmZuy3pAVA7XH-~x2ox#nY+xiTBg$(4eHs8rj5kARO8K<5}8Y-+78C69+ebhRC|Ti zyE+n#P_JmCRU-ak?rlAaNLo@NlpsYsLL!2H;?BBj^)Y*`v-aNWoV~xjzje+&8EzOy zjXekU005xjbjHpD0Cu5wmYOmE03LSmPZTQ7&Be=Jp%W4kxLht8jb<`I8jXg^zUJq{ z#Nlv4+7I%vL^2%XRGIBl*c%@ozwy}ZHO4Y8FK@UJfQA84iEl3eaE<{S2Y?d?a4G;u z=m|j(%D~`zYj|f&0F6(AW{$iSvQpKz;xGo!#(iuS;G0_f@C z5QVLl;PqX!-G!*2$k2%B(C{!tiT5fv?W7dr{nsbVl5RTCYTRRCiOUqFOx2{c7uS_f z_~@|9+AH}T4w=RKzuj+`w#m-gKX`xiXU3MhN;>n&kuSZcBEJEr)hBqIt`N~QTNC?> z-ivvD<^vq-xb6ezvp4!L>UNxho4%kdeVU?fJ}0R0H)CkfqfFiQswDPYZw`7s|F~DQ z%e;?J?XMp;;zwXqR+WbRVl`F|owxgkpf=0*=->2v(!tvYD{U@QIn>D$I#fZ&gFF4y zO_TiOZuCv9`P-xcQMJJ>Y*k&$7f@!rhH!cneYb)+g6b*#A&Ib38F}mxA0KiI~DPtxW1MP9CW&uUlMrG7`WY^dK-e*`gd z!dE3M-XTu}v{V|jF=6|^nmH|jH}Ju4{lZYOB-EJCb6BkA_e1QZe^X9T2R49TV?Zab z1l8(>DSSRWqj|v!-u{H#d*{`b!+AQlRjU_I-y@VE>D;oo)~ejV%dmG)|1@c4#YuXH ziHHcW_ll%BZc{cc3%vO(P)~rD_J;JlS$^n2i0yB~qCN_g-(GAACrLOTh2`5E@X|j-(u8?a6oo}$?BT1ogu$P-b{ytx~xiSf4wP@Aq3x-~QKqLS>t*Q076`4I>5%1o@ zr^bMNB^zmjvO0NQzCeeozWcqT3J3jlS4p8{%RKR|)JYV|3vcAs_OvI^@89`LsvdF; zy4%Y(q11L}QKIkN?JDA4$rs@6YpQ*SF@El>`(koQP79zcmzo3bT-VOsjDmJG|UPSxt%TGxD zC~mAV*wsZ&C`PWye-n>L4)V?o32;be&0n_>X%Uc{YF~jZoGM`~%47E3g95;TWHC7B zTb)B5jj{;HPp!b}ybnS#{!#;La(6!5B78LXgs^RkRXQ6tebmx=B8>EGZ3?m8v2;jb zI_2O|Dg53LzzfAMz1H-$-^C-8Sokervf`w#t;Ib9rd|H~(p|Hb{~$7?ymd z_3+wu=jmRe41o282fzjq(28{2dCd~dB1K3|1Wj$pb>dF-^?#DVf`jXwQ%$0R&|it% zNzCpx2PvE`S6g|n2|#DAZRWHsh`}}nJr~&qK*YUo3s^L^Ik>O}J;t2@d+nEU#)8Yh z_*S)*@}2U?CS=GMCN`siKW%$PWQMV2x>>H)gvP|7?1b!MREqw~Nx=S82X6(6lABn< zk^9^lzaC{?Hd38EQm{2jvbI>#?Sh4`cv=ycln!u=qS%wpyA8|ca=Bad8NS34o?JP5 z&uduYU8Vs58looC3WOLogx zqBkeo`wRPth3T@QA(Zi-G}fR}|6kg(Tz*R+HHHwU)W0H2Y)(eG5atL)uVlVRk=M9E zi)#_jG5dpw<0nPVxP38Tq@22O0q2HPvqbMTs|r+n915Z2gMgM}=;t`4=8HSNlRd_+ I-UgTQ2gNDNCjbBd literal 1679 zcmZWp3pCVe6#tWF<&oFgns!83ttF2zP7INn%@~x|$Rm%itUShR$iGdtV=W`EB99bG zyMt24@DYMOo}HLb0yk3+D)`Ui}sD2|sYjt?qQhO9aK#6mbnyR(1=ee@##GLJv! zinI2Q^of{nuB|Ek zp|@XB9%XDWz@ejC9$2+`!)?gOYqQTv<(yE)I7H#Tr6Y0!=!USAzw&yT6ODdKx>(-m zdt*elIIk%sN1|d(rOr`OGq^-R1qFxy$Ml zdhT3UuvHe}gV{8>M~)Tilz+FD38mSdcaBRpjG8w&aJuyQ6<@Rtb}l_!D^S62uUdSG zT1booW#rC-du+qX;{DS@Domm-U8sm+>Sr3W=>z~GWR$h#x!8i`iE->0Rzb`@XY7bm z<&Sd;_VWu|czD2@WzmwnQIt|NA-p@JeN$6b&vT8`%Y;_y={7Ne$5C|mX zB>Q1xLKHVY^7mz(2^{G<3T_YSMb&_0a}6BB%Y(aGbIXdjr;V`zk}MbLUQL6Nh0u_> z`PQn{VhJsoVCJRrjX380h5>#ga~G*Bt4N4Vs7T;m=gFbj29KdT*?UC)tMZfIxXsEv zG5e@uoa8_PXVdTrwofeCE$Ucf4CdhQ{rlMmN+V+`qM;u5W3FwT4Bf&R-C}vB%v&9D z_2bye%yvuu>z9)f=6Q!OY%!E;M7h`!v@vm66Q&H;tS^m*P{I0}Sm|~<4atR7v#j36 zSTl5=_%;CmaHl$u(B-H9gXdr-TXTBz!!#@5{np7<{Ecil%^*)Zm2!p)-$4PuF}1Z^p+6m*@sY z=)q0Fm!RxUUZ>k(7Di;Wm!md2%$8Uy93+m{3aRX10>2r+TR9AH+In-t`j7&eG+H{jO^1n0$kDH^hlg47S=-Gymq3Q*l&nuegVwn?&((!EXVrI$Sm8v3On z1(TKgZgk~fBelFVYs#NUg@-n2Av;Tsy=h^R{JZ!e&Sh}Jj3Jg%h443*oKOin-3(1z zbKz54ZV2V(?Q=F!`_o-`wm2@aR(;ZsE6*G>L%x=)rNKxD8(tpcI!}IsfbOQlYY@eh zIp}R4ggDQusowJHoTIez##qA4!Q&(~{2&Tr&!aN7Ne0}0UiZql7Y&I9gc7NRd&j|! nxJnu%*uajwVWiOKcI?^^@4VzDKB;O{A_$;P+F4hh@V@#l-cIMm diff --git a/icons/mob/items/righthand_cigs_lighters.dmi b/icons/mob/items/righthand_cigs_lighters.dmi index 3118163108c4c6d28cac3739cb84ce38f530fd2e..17989ce70dca4320c67f8067526006232341f205 100644 GIT binary patch literal 1990 zcmZ`)4K&;59{yw1(rTP_J#;Ra&aUa)ro^p}Dw&{cEvXjOs%WWFEk=a+h^)7gX)n?m z?$C;`$n0D7Jtu08;uiQ4Epv;Y9`akcnBJtSj}pLT0$X-P^-;&Qnt6soBSWHOn~ z)RX|frr_Y{{R0%7ejhUaCMo0|&_1H+Gi9srQs^XGgHaNGe- zBETsFpt)1dmX;6%o&D0{Y5aL8eJ50pDg%Ht0I&@6&l)NNive*)5QR0V<~`TS0M#-y za6VqA0F+=jOg-O`bova=^-^3&Y(xw$B035H5{t?>ty$L(>60drsW;u34^QG@$;&j2 z%`H9P@n4`F|{hF5-OY~)x4_+PUX%SASt$o{qosFaRMjtn6YqodfeMR^^ z)hLJZQ$hhEr!$`(6S6{0SQ_zL9&Dl3W!2rR(tSq^s9OxC!pz+G)TpWoQWoi8CVvUCr>Xw^m?WNf_ zEz=Ce-}%Bw>NE7&wA$Bek^C0kb_RZZb?WO^lv%N`=r_}A zn$fiCg?0^<0o5+le*(#R2W$bCXV7Q=9jp3ZQGbk!2+W64KQZwxPvz3+fym%~gU?GL zvDsae1;!Yn{nquQJn60WOatMkySTm$_sGR7eAEC8GofeGrqA1p0|U+Aw0oIqi31C= zfS@4qDmLgKT7>qSRQiS+Z{Y$+4%KZcYky-AL1jHOsT7@*Mz_grOWv4@V%8lVIfYh= zwr_<@q)x9kb0o5gv1pD>tCFr$1>=s6lUMoUQ7)pb!2qX5SJwSVHjAr*J<%1`$rRH9 zEJZq^$c)`!5+C(CFG3GaD&zfjzXv76CS$M2M&409(h)}g|MbHtgKzz+RphFZHJVtw zmu%&&=(>ur#ZwLZ@VEp6URpw(PSwWKv8iD?4vZrD$3yySou&^I@yD4tg=xm@=tYCB zUQkD^|MU1NSO7&TO}f7cwy|L4j3|5>_;ftzEhd)sdLDv8_ndvtK3bM&Q@I!BES9MF z-iJ%#x5feUXVMjyc*$3P9i#-NtIdv&l`@~o#VVI4a@$Ges!3V(#sL$9vOn4kU6LE0 z7>{F3hu@e>3C{7H*O})I+J`ncJ(o{w6?zLYjF4nAn6UrjDLsz88Nsf2@R%LyNfV-0 zaqWss!I9V|S;41_U)r}9ANp%vQYx~`pd$&yt7@bcNO);;X#(ry;-1R8-X*eY`SJ?z z0v%6miM?+htxD`O)p@$ueaAc`5GA9+oA`5S@&Sd_N&|TmHsfpw1L^6GVY}o>^(lr0 zg$4X%(h(^|m?s#Lr~vu zb+_kK0bzC>Dy5l(E?@pr2b8@2jPS>5WeNHXxEr=>pHxE2WMz&ov%Z*>N`P!27RSprajpAQ0bMlyc#(=tZ;t%TLr7@t_nDSp8Q|-zC zwSdHWe)wBcmX}nBUgj9$)RDAR|3Ag3O=-ZYPhv&Sk!@%#&{8twwTequgmCk5u+j9F z=8k4(`DRn7^G@}}VMY+>e8ylW(Uar+H H!Pox_$sMFs literal 1614 zcmZuv2~d+)5dPItLBstM5_s7PumM0=6VBZMa6JHSCctd~pxF@6 z+8TnONEfS)wCIURUheq3J|*t-aZKv*V`{x8}e*7c?>OX(K%TV1n(-))Qp$FBvG|HqYX8s6UL z%&{A-aV3MB$XD*=mucR7WqvnUOXCDzTJ?GxVq=eyUH8^4Cg0{vcLF_v;;2xLh zj;`O1tKEJwBWP&wTI2O4coW%p@|n4a4&$w=8FD)6lpzfRfUkvg1<&-_&s58hcFdZ|L`tG}mf(;jocPtL0_O3rQ9|p0j+k zhun)pBnwZhZ7E;iSv$u@WykE_TfwMrk7e|DuJMgoqB}^@s2*Qv@jEjeYwRp5exB8N zX4rQ_^v4+RRL<2Lmu4yjhQOqh=C~v!-B4M$DwUP2iY+9=_<3@KV_Huxo!+T|_>tKi zm3GRxfuZs-bw)gAaLl|z&V~(G!3fL=7iKK3{yaYKw0!)DL_4c zV^b^P$TvdrK@!i3g;6e~yb!+G!J&?VtJRRm=tLT!PKOin5Q8_Yq;TwY5j1xQ{;+&X7PB~fAPZWFNm1m{uPq=OCBmuYn zCYI>P{O>2!k?(&Ug`N||RT1K$@_<@#K>0ty<9qL7ef0i^I;BKe(67u7qd`Y#gym+u zy#B>*`YgTkZ$Q*x?MFpRwOc!lnlt8SIjrS za*3nPvc3f|K764eR4I|SOx+*HLf37{M6(j@-Agu?m@aK%??%PfoYFV*R%{aJgR@AG z5L82fm91!R?#A2c5K%rgcY74HU?$;%1xhVxns^``6!$4jbM$8*T#n=iXpR~;4fTRD z*;Z*88Jx}GnskF7w1dY$i&$u7ryjYq$zYC!rSs%#%>&EFD}`A#ZP~R^=zSJ)0b1JV WZXHoN>6zHI9PxJdcWd5<%KHoMV9rDU