From b4270d862db5b65f5cd53744643cb266bf88a6d7 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Thu, 10 Dec 2015 16:47:20 -0500 Subject: [PATCH 1/2] Empty syringes no longer appear to have a fill. --- .../reagents/reagent_containers/syringes.dm | 2 +- icons/obj/syringe.dmi | Bin 4439 -> 4441 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 057c8aa21e5..a9a03650364 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -181,7 +181,7 @@ /obj/item/weapon/reagent_containers/syringe/update_icon() - var/rounded_vol = min(max(round(reagents.total_volume,5),5),15) + var/rounded_vol = round(reagents.total_volume,5) overlays.Cut() if(ismob(loc)) var/injoverlay diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi index 647f1d492c86bf212e4c47979a0c99df7cae16ac..2ea8825b2672d48d448fc1e54f57c3fb3b655582 100644 GIT binary patch delta 3393 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 XMmzI(h!fQ<00000NkvXXu0mjf^52y) delta 3412 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 Date: Thu, 17 Dec 2015 14:39:13 -0500 Subject: [PATCH 2/2] uses Clamp() now --- code/modules/reagents/reagent_containers/syringes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index a9a03650364..56833b519f1 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -181,7 +181,7 @@ /obj/item/weapon/reagent_containers/syringe/update_icon() - var/rounded_vol = round(reagents.total_volume,5) + var/rounded_vol = Clamp(round(reagents.total_volume,5), 0, 15) overlays.Cut() if(ismob(loc)) var/injoverlay