From ee664a866feab79b0ab0b420f07e3275cd75ee21 Mon Sep 17 00:00:00 2001 From: Iren <69871346+Kiyahitayika@users.noreply.github.com> Date: Sat, 31 Oct 2020 17:44:45 -0400 Subject: [PATCH] Automender Tweaks (#14704) * Applicator Tweaks * Automender Tweaks * Sprite Adjustment * Reintroduces Smallhealth * The Proper Way with Mutable Appearance --- .../reagents/reagent_containers/applicator.dm | 16 ++++++++++++++-- icons/goonstation/objects/objects.dmi | Bin 2059 -> 2417 bytes 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/applicator.dm b/code/modules/reagents/reagent_containers/applicator.dm index 87be22d3c8f..42f001d3de7 100644 --- a/code/modules/reagents/reagent_containers/applicator.dm +++ b/code/modules/reagents/reagent_containers/applicator.dm @@ -41,11 +41,20 @@ /obj/item/reagent_containers/applicator/update_icon() cut_overlays() - if(reagents.total_volume) var/mutable_appearance/filling = mutable_appearance('icons/goonstation/objects/objects.dmi', "mender-fluid") filling.color = mix_color_from_reagents(reagents.reagent_list) add_overlay(filling) + var/reag_pct = round((reagents.total_volume / volume) * 100) + var/mutable_appearance/applicator_bar = mutable_appearance('icons/goonstation/objects/objects.dmi', "app_e") + switch(reag_pct) + if(51 to 100) + applicator_bar.icon_state = "app_hf" + if(1 to 50) + applicator_bar.icon_state = "app_he" + if(0) + applicator_bar.icon_state = "app_e" + add_overlay(applicator_bar) /obj/item/reagent_containers/applicator/attack(mob/living/M, mob/user) if(!reagents.total_volume) @@ -69,9 +78,12 @@ while(do_after(user, 10, target = M)) measured_health = M.health apply_to(M, user, 1, FALSE) - if((measured_health == M.health) || !reagents.total_volume) + if(measured_health == M.health) to_chat(user, "[M] is finished healing and [src] powers down automatically.") break + if(!reagents.total_volume) + to_chat(user, "[src] is out of reagents and powers down automatically.") + break applying = FALSE icon_state = "mender" user.changeNext_move(CLICK_CD_MELEE) diff --git a/icons/goonstation/objects/objects.dmi b/icons/goonstation/objects/objects.dmi index 2707ce8b9b81606e88f29d9c830f7f49a0db0427..76c8e17c99a164f741723712c5c43eebc7a61c7a 100644 GIT binary patch literal 2417 zcmZ`*c{JPG7XArE6iE$Lg5=gvvrtrv#87lVYp#}tR*fYw)eu7rl<@4e1mXPy0hXYGBGuUeT4@Ja9i03dMj z!g-rROZao~avx$l%I&v9(;Q)UE%^MMpxc4oxL|LrKLCW~rF?DUi%0TvPX=v>7}fY& zoC#gLqtG5tjuV0T8R=E#zkW|Mx_UxbE}IL*Mx#)Do(`_*p2&2m&EF7RqdTCxeSL~E zVJQT~zLdZX4c#f;vk@tBn$pP1C4!`h>swK&FMB1j^~FM;9*vhtiHGOpFKktRw^mUq zH{Y#UX_b9TkC$wBeX4D|8CAJ3F5kOdHd4WKgDG8yC&!=2DZ2pk;5Rs97<m%m3{ti-7NmN# z!uN;!!%W5!;_(ajzLSb5&4HC|4&Dc)9V;?181nXowe8Hndj3Q;e7YKtp>h|XzvB40 zof{ztBj{G1F)Y3cy>DzJ>ylbmQo5vri)KqvTrp%8UM^L$BJn4s@+(~>a=AU+IZiqE z1UiyhoSxjfH9JQ;hCUb$81x&Sa#K;=H*Em_GVG+`sKf!N6bIJlT|b?m+4}p(x*k{d5~|As_r?HVsO#5r1tQph;>ocW=a5lU+lf~ zXH#iHAHHJbAWtd;@02Ovh58jf6WA}jLxuJ!_ zg&6%=a&C1Do5E(flhIWoiRu<0YR#+7Z;~&1=DASUPA@GnA_QztmA^_*oP0wuUaYe{ z8+F|}#N~tiUQX_)Ao=YtOS6dVj8Tvsk@^JTNVG4DYAoCjlW_HLyZ!?{&bjf)c5sP@ zt?v_~6Z5tf?}nxJ%C=zzl^M3hTf*E&hQuR_w3*-51%+oyvxxhA z6nD*!*q(f@2qE3oX%rqrcqpd6e2s?UXr0(#6n*!Z`kbZA2k4KCoxkJvB`Bh9-EP_2v{h-a`Er9B21E@E8?JBL=>Nt7_xT?Cko|Ja@ zkS~?l_{2j>e?$?CixGMGuOg~b+0CPn90vyn9Akkx1adR@DFa z;n~rBUFuFPw}qh!XmT=DBN>Eg%dSjINW;7)*EAAJH>RC11&1EcQrUaldhT;ASw9M+ zO(-0gN7AF+qQZB{a4xxgIAu3*lhc6D>KwX&@q7@%@_cmTC;IPcp8H-5lT%6ZeIhSpI2nCh5v{P71U?`~r1bj?^7$VUv zj$jlD=w-2PcIprci4P*8qt)qqI=J^De#&B&vqbC0GOw;;8j%Tu6T%Mn`okju`p!=C z*X3zWD1}mPIJd^}^W5C_x%@63L_s0e`ow{=^NDMgRZhbrBSJ73?D66T6F}9onIgMM z5E(^b3kwTGMmNGoc$Eoo{Oa+B{$mnjeK4!nv@I)!?@#~Y(Ye33y*8@n)Rc`EN=BtY zpg_M?maH%65R;R^n{eq*_o=ZLHp3$c1bvA7hvclpUR4&zBJBOzVO9@XLrULS16 zwEhkyo@}a`zxSF2Vhq zr6Hihjq@+c{yB(*72T}4+GLVP@wK@7@*rNLZ_urCc{cwwgxd zTHutGN+@OEAGhWkdO}kjh{?|;%~#g1;>Lv*@>@Ni=V$j;V#}{QSIfZeM{&m2`ff`U zV>vDR?bspnS2OQ`s}9CjmgQg2l!F>BqkZD5Pj literal 2059 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