diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 3f38be95c9..f4a4919919 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -101,7 +101,7 @@ var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) // transfer from, transfer to - who cares? - to_chat(user, "You fill [src] with [trans] units of the solution.") + to_chat(user, "You fill [src] with [trans] units of the solution. It now contains [reagents.total_volume] units.") if (reagents.total_volume >= reagents.maximum_volume) mode=!mode update_icon() @@ -154,9 +154,19 @@ /obj/item/reagent_containers/syringe/update_icon() - var/rounded_vol = CLAMP(round((reagents.total_volume / volume * 15),5), 0, 15) cut_overlays() + var/rounded_vol + if(reagents.total_volume) + rounded_vol = CLAMP(round((reagents.total_volume / volume * 15),5), 1, 15) + var/image/filling_overlay = mutable_appearance('icons/obj/reagentfillings.dmi', "syringe[rounded_vol]") + filling_overlay.color = mix_color_from_reagents(reagents.reagent_list) + add_overlay(filling_overlay) + else + rounded_vol = 0 + icon_state = "[rounded_vol]" + item_state = "syringe_[rounded_vol]" if(ismob(loc)) + var/mob/M = loc var/injoverlay switch(mode) if (SYRINGE_DRAW) @@ -164,13 +174,7 @@ if (SYRINGE_INJECT) injoverlay = "inject" add_overlay(injoverlay) - icon_state = "[rounded_vol]" - item_state = "syringe_[rounded_vol]" - - if(reagents.total_volume) - var/image/filling_overlay = mutable_appearance('icons/obj/reagentfillings.dmi', "syringe[rounded_vol]") - filling_overlay.color = mix_color_from_reagents(reagents.reagent_list) - add_overlay(filling_overlay) + M.update_inv_hands() /obj/item/reagent_containers/syringe/epinephrine name = "syringe (epinephrine)" diff --git a/icons/mob/inhands/equipment/medical_lefthand.dmi b/icons/mob/inhands/equipment/medical_lefthand.dmi index 24c79727d0..ad3dede201 100644 Binary files a/icons/mob/inhands/equipment/medical_lefthand.dmi and b/icons/mob/inhands/equipment/medical_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/medical_righthand.dmi b/icons/mob/inhands/equipment/medical_righthand.dmi index 427e29c49c..de57235f29 100644 Binary files a/icons/mob/inhands/equipment/medical_righthand.dmi and b/icons/mob/inhands/equipment/medical_righthand.dmi differ diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index aa4a6fc299..e4a2ea7a34 100644 Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi index 2ea8825b26..f77735fc3e 100644 Binary files a/icons/obj/syringe.dmi and b/icons/obj/syringe.dmi differ