From 13d1c92995b1b68200f70ad6d222e2fbd2176d43 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Mon, 30 Sep 2019 18:50:17 -0400 Subject: [PATCH] fixes --- code/modules/reagents/reagent_containers/syringes.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 6fb85da6bce..13c755214a4 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -43,9 +43,13 @@ ..() update_icon() -/obj/item/reagent_containers/syringe/attackby(obj/item/I, mob/user, params) +/obj/item/reagent_containers/syringe/attack(mob/living/M, mob/living/user, def_zone) return +/obj/item/reagent_containers/syringe/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/storage/bag)) + ..() + /obj/item/reagent_containers/syringe/afterattack(atom/target, mob/user , proximity) if(!proximity) return @@ -147,7 +151,7 @@ if(reagents && 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) + filling_overlay.icon += mix_color_from_reagents(reagents.reagent_list) add_overlay(filling_overlay) else rounded_vol = 0