The Great Rotation (And water cooler fix)

code/modules/reagents/reagent_dispenser.dm

@@ -261,6 +261,17 @@
 	if(cupholder)
 		. += "<span class='notice'>There are [cups] cups in the cup dispenser.</span>"
 
+/obj/structure/reagent_dispensers/water_cooler/verb/rotate_clockwise()
+	set name = "Rotate Cooler Clockwise"
+	set category = "Object"
+	set src in oview(1)
+
+	if (src.anchored || usr:stat)
+		to_chat(usr, "It is fastened to the floor!")
+		return 0
+	src.set_dir(turn(src.dir, 270))
+	return 1
+
 /obj/structure/reagent_dispensers/water_cooler/attackby(obj/item/I as obj, mob/user as mob)
 	if(I.is_wrench())
 		src.add_fingerprint(user)
@@ -350,7 +361,7 @@
 	if(cups)
 		new /obj/item/weapon/reagent_containers/food/drinks/sillycup(src.loc)
 		cups--
-		update_icon()
+		flick("[icon_state]-vend", src)
 		return
 
 /obj/structure/reagent_dispensers/water_cooler/update_icon()
@@ -361,6 +372,7 @@
 	if(bottle)
 		I = image(icon, "water_cooler_bottle")
 		overlays += I
+<<<<<<< HEAD
 	if(cupholder)
 		I = image(icon, "water_cooler_cupholder")
 		overlays += I
@@ -368,6 +380,8 @@
 		I = image(icon, "water_cooler_cups")
 		overlays += I
 	*/
+=======
+>>>>>>> 767ab7b... Merge pull request #7239 from Cerebulon/rotatemapstuff
 	return
 
 /obj/structure/reagent_dispensers/beerkeg