From 0d0f1a5f0da3ec95a0944f451d7c0ece20daacbb Mon Sep 17 00:00:00 2001 From: Jordie Date: Sat, 27 Jun 2015 15:25:58 +1000 Subject: [PATCH 1/2] fixes dropper sprite --- code/modules/reagents/reagent_containers/dropper.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index f67392fab7d..be16ecc6148 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -2,7 +2,7 @@ name = "dropper" desc = "A dropper. Holds up to 5 units." icon = 'icons/obj/chemical.dmi' - icon_state = "dropper" + icon_state = "dropper0" amount_per_transfer_from_this = 5 possible_transfer_amounts = list(1, 2, 3, 4, 5) volume = 5 @@ -87,4 +87,4 @@ if(reagents.total_volume) var/image/filling = image('icons/obj/reagentfillings.dmi', src, "dropper") filling.color = mix_color_from_reagents(reagents.reagent_list) - overlays += filling \ No newline at end of file + overlays += filling From 5e27cc1fec884c8dfc92fdb4c093dcdb8b6e3767 Mon Sep 17 00:00:00 2001 From: Jordie Date: Sat, 27 Jun 2015 20:49:37 +1000 Subject: [PATCH 2/2] fixes syringe filling with < 3 volume --- 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 ad9c064c873..61dae7c6c2c 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -180,7 +180,7 @@ /obj/item/weapon/reagent_containers/syringe/update_icon() - var/rounded_vol = min(round(reagents.total_volume,5), 15) + var/rounded_vol = min(max(round(reagents.total_volume,5),5),15) overlays.Cut() if(ismob(loc)) var/injoverlay