From e452f3d76044a9a2b887f29cb6354d52b00f572f Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Wed, 22 Apr 2020 04:01:30 +0100 Subject: [PATCH] Unique S/H Cell Icons --- code/modules/power/cells/device_cells.dm | 12 +++++++++--- icons/obj/power_yw.dmi | Bin 1713 -> 2022 bytes 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/code/modules/power/cells/device_cells.dm b/code/modules/power/cells/device_cells.dm index d0d3e63c62..5639f85c43 100644 --- a/code/modules/power/cells/device_cells.dm +++ b/code/modules/power/cells/device_cells.dm @@ -30,10 +30,13 @@ /obj/item/weapon/cell/device/super name = "super device power cell" desc = "A small upgraded power cell designed to power handheld devices." - icon_state = "wcell" //TODO: Different sprite + icon = 'icons/obj/power_yw.dmi' + icon_state = "swcell" maxcharge = 3600 charge_amount = 20 origin_tech = list(TECH_POWER = 3) + overlay_half_state = "swcell-partial" + overlay_full_state = "swcell-full" /obj/item/weapon/cell/device/super/empty/Initialize() . = ..() @@ -43,10 +46,13 @@ /obj/item/weapon/cell/device/hyper name = "hyper device power cell" desc = "A small upgraded power cell designed to hold much more power for handheld devices." - icon_state = "wcell" //TODO: Different sprite + icon = 'icons/obj/power_yw.dmi' + icon_state = "hwcell" maxcharge = 4800 charge_amount = 20 origin_tech = list(TECH_POWER = 4) + overlay_half_state = "hwcell-partial" + overlay_full_state = "hwcell-full" /obj/item/weapon/cell/device/hyper/empty/Initialize() . = ..() @@ -57,7 +63,7 @@ /obj/item/weapon/cell/device/weapon/recharge name = "self-charging weapon power cell" desc = "A small power cell designed to power handheld weaponry. This one recharges itself." -// icon_state = "wcell" //TODO: Different sprite +// icon_state = "wcell" //doesn't matter, not seen anywhere (all weapons that have it are batterylocked) self_recharge = TRUE charge_amount = 120 charge_delay = 75 diff --git a/icons/obj/power_yw.dmi b/icons/obj/power_yw.dmi index 9a881c5bf84a0ac9c7105f8d7ff5d02f89bcc80a..18851ad94885661f0bf2f152b40457e78cdd6bb7 100644 GIT binary patch literal 2022 zcmYjSdpy(YAAe?<8k*8+?$(8Lim^Gl#gK%MY9!J`7jp@v+;_pTI;K%1*R6v>LLIeo zu$3aAMSkv@OFFTaTPsG^_e{TYey`vAkI(1*`h1@E^Z7il*YkXys~+wLl#v=p0D!Wy zlfw}JU@{5=YvD2%Qt3^Uxdsnc;(mxmlTi~BlaY~;nVFgD>S{C^E%Em+tC7US#0(7$ z)z;SP=;+Kz%KRfFpFVvmD=SNaTtPd4AUq^f>O(T%@pz~YSXfwidU_IxL;``()zzh? zrPbfxub}}oG&HoewNWS(00Bow$CQ+mb^xGUnFc@@43rB19?H4@)X30KTU*-`fU^MD z5eN_j+GSPR0gnaRb7fL|8~{vNR>ov{S%gN*D?E2u)&nf+i2G4s`>{`^gjvQBy`vn? zTnxNGj))?Mp9dhOAUpfnwPcJ+s^IgcI}P^mvOn)OgbtWmhYIOFKCdcF?R$s0q{lj5 z#4eK;DO(_d_{@vQ!p7MJMqr)PoP+K63CsIp*kQIwuh7P7BAHq2;GF1Lg{o9_U!Hau za;dX#J2&cc2xUE2b9)Z1&Py z&>s-Qj<UY%|opdJ{IM7jPk| zEcmvjLLEo=K+&?39v5z4tSkQ){LzpImvIfYq?W<@Vc<*V87!Hh2`-mb{>))YEXHcD zyb?p<1>wlOG5WDai{2f3)i#-{ZALa%fXWB4B}MaYh-u4VZ7xgq4YoADWyq!BZ8!k( zna&P&#F&EV0>$V7bCq9BnnS%e=6RK5seCeW-ec-~aD4CO{1yoE-PLdMDBUzUj0uKk z0pndrdWmShm^tRSdd&bovR=z=5I$g9Bz!%>ft3%>#?#XfwW>;pl}!J&r+f)c2Bo{; zmek8uj7*r#DSl=o?ZAP`s*{%{6&l{#9ZJmV%7zVRQ%bc1b6d%ZQ|E5+s?tkkVn z8d@f;-S6Ts11$~+r%YqcA0h;?gC-Q|rsOmDW7`eBsMqwK#wIT-^@V&$&tMNJYHPlM z#kkib2xhI z((UpN!MIqDA+ZVLV*%yAEhN-XMCkUsN|*eWEY4y@}E5d7J!jB>UJ1$)?dl4tXYT~t)` ziu;U4;qhWLakMxaxnl%wHEOwObk3oXr}T@!Y@~?Fx6!5FV-NNo-Faf)iZ&+u`C~=^ zgNPi|S)F13#pC4P2sdJ4drnZRttd@xD>Hsis7u)5&i?+Otb}VfEz3%JwFx-?q2NdL z*QIUB`ZvD!Uj2YwDi`@*x35;6KK2{QZLwwJByGxBNHC$~ZrJ5oQ?K(9il;Xw>iKn0 z2hOvKchA*I(KvpfzPAT!jJ<=f#6IMR&RZb+q1mBW<)G+0erM>WTd2&7;u~@I5ijNi zSS$;x=LkPi*8?gVaGb%y%iqZ@%`DDh31Mc+;qh5Tg<8`Ro6)$c>A<9sR%y!I>{WCbOcdg_!h;f zZ`2~4v(1zoMAW`F^bqa%pq=>!Y^BsbGf4aBSW*>*@ zYqs#1XYn22_qKb>%*NoTz;EW?Ju4Msk=UQu!NO2^`fO`Fn4qJBlrdwo2?!^Jyber8 z4wY<|1@v&7=4Hz8JbJx^jy9z39N^U*4(@guo);c|hfH{cjGClcx*~eq{eKHNHa>uC-kL%B@|Ytmj+Bx*HkFlGtc;YIHOq zjMb!ZSnf%I+$+$F_t!}+LZ@cI7Ezj->GEF2BcqXl#Si%JcpDBqZaKw*o@cm&ys)y) zW13CTy|Zin*OjaeM)4-fTw44<)TThOCNM_DV(j2}O{(~1;A#HP>T?l?6k<Sq>9I;BaXkPr0?ku_^_r`em#q6cOmJt6iPQ)`>&`EK=APZb*~Qc Rx5d?%^L}@SDtrH=zX8ptptb-2 delta 1685 zcmYjS3slmF8vh$bwt?PFTSzKqX%dwWGM^Lls;QM%1tXn?j-gWKV?JlRd~6kW=w>-G z@sVE3nrUeZwHYz5nPR4>VPTh)b#^=VJLmiTzH`3se6RDJ^GzAwhTEJE z2|fh>1o;U70Pw&7-!MIoy;nns9``L?9@G=(XB$UW9(V-k1(Zr92x9B%>WD-l4u=B) zz}(#Y*|TRzBna4o?d|O#2r`*W00jK~{d)lbi^YN?fSa3Jcz8Hiij_ztSP&44#RUZg zpp_L^s*eCcHd_~Jt<)DXNDm7p0QjkqIK2(cAs$cnrKVB7rKP0PSjkBMkj*c-=xv;5 zW!m**0evaD)*!CD?M~EUh&-25Tq0pp8Eba-w5AHh9~2>|5bRFNBduN?8Q0v!XVK~< z&L<|GU97GPJw(!4PulINb>}tgt2YVOp5B|Z8Cj#O`%z=_&w=i9L3h`Z1Fr3QK-CdX zbS^UZcQ7^Ud$;$o_A{F+hl>`+T|v%ZK}NF8l5H>5)fM%-z=X$jlKA-V#H8xxcs3Ec zO%VYC?9MY`bNNfCtv?j8Av;yxij6CXORskjZHOwovHG)|Dx7)3(&Y_np((ijM_=;t zT%l?T9`^x^)CxRK53#~6eOYr)k{33uQcsTiu!?Fk0bpZCpszPEo3G-3N}6yt{T@y; zYqcx9{YQJ>3bG(}2n5%XiX*QUz2d9=4oh{vP+Lb|?J6_*T=jEQlzzQH%)+_Po3Csh za`y4xWSii?^FmLck^J~<7*jl7fQS_KrrdZqHc>e_(Sy8LAUgF1XlRUhLD$rh8;-Gf zn8h(7S40hgu0s&VjUSCYARH(+xLD!UQ8TA@gf{kh=GTj^+dC2Dw$`O8&D#U;=e<;^ zDcnD`V#bVLg2=(Y@8ECYL)16lyq$9~vn;>f$R!I`b(BNY4ru<>4i6NtN z1`|w9buaNQ>zF})!@{~Qpht2z8~&F<&v=WLC)*06r{O)a4JAhI((r3I+Ho#u?B-*#9Wrp-ynDxxKcMOL& znF^a84b2K;q2P%>Ne=f$2?u^>80WA>vU{F|q?94|;!*kTz@Drz{-J~2 zhh?X$D=Lh}bmwIFw05MNHlMMs)oQC6$zNSF(7p=|5u*c!evB_D2nlz)=y@cu)-Q0(C6@O(>z0ZAi*~BTq{FpdiK>;Z( zmcs(+e__W;+k`XQH-0=%0N|rhDAa#+YPIidWo2a|>InSJ*8-Ww3;KUCAIt~jkdF7C d1puy%v$jx2Xgyn2^-lx<0{w!08+>B&{sNo%C@TN}