water cooler fixes

This commit is contained in:
SinTwo
2016-06-29 16:36:43 -04:00
parent 8ecc72412d
commit c7db22b985
5 changed files with 3 additions and 3 deletions

View File

@@ -216,8 +216,8 @@
icon_state = "water_cup_e"
/obj/item/weapon/reagent_containers/food/drinks/sillycup/MouseDrop(obj/over_object as obj)
if(!reagents.total_volume)
if(istype(over_object, /obj/structure/reagent_dispensers/water_cooler))
if(!reagents.total_volume && istype(over_object, /obj/structure/reagent_dispensers/water_cooler))
if(over_object.Adjacent(usr))
var/obj/structure/reagent_dispensers/water_cooler/W = over_object
if(W.cupholder && W.cups < 10)
W.cups++

View File

@@ -311,7 +311,7 @@
new /obj/item/weapon/reagent_containers/food/drinks/sillycup(src.loc)
cups--
update_icon()
return
return
/obj/structure/reagent_dispensers/water_cooler/update_icon()
icon_state = "water_cooler"