Merge pull request #10200 from Jordie0608/whoevenusesthese

Fixes Cheridan being a dork
This commit is contained in:
Cheridan
2015-06-28 02:27:33 -05:00
2 changed files with 3 additions and 3 deletions
@@ -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
overlays += filling
@@ -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