Merge pull request #8701 from GinjaNinja32/patch-1

Fixes #8700
This commit is contained in:
Zuhayr
2015-04-01 22:40:00 +10:30
@@ -89,6 +89,10 @@
C.loc = loc
else if(istype(W, /obj/item/weapon/reagent_containers/glass) || istype(W, /obj/item/weapon/reagent_containers/food))
if(container)
user << "<span class='warning'>There is already \a [container] on \the [src]!</span>"
return
var/obj/item/weapon/reagent_containers/RC = W
if(!accept_drinking && istype(RC,/obj/item/weapon/reagent_containers/food))
@@ -172,4 +176,4 @@
/obj/machinery/chemical_dispenser/attack_hand(mob/user as mob)
if(stat & BROKEN)
return
ui_interact(user)
ui_interact(user)