Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard

code/modules/reagents/Chemistry-Machinery.dm

@@ -22,8 +22,8 @@
 	var/condi = 0
 	var/useramount = 15 // Last used amount
 	var/pillamount = 10
-	var/bottlesprite = 1
-	var/pillsprite = 1
+	var/bottlesprite = "1"
+	var/pillsprite = "1"
 	var/max_pill_count = 20
 	var/tab = "home"
 	var/analyze_data[0]
@@ -249,7 +249,7 @@
 				P.name = "[name] bottle"
 				P.pixel_x = rand(-7, 7) //random position
 				P.pixel_y = rand(-7, 7)
-				P.icon_state = "bottle"+bottlesprite
+				P.icon_state = "bottle-"+bottlesprite
 				reagents.trans_to_obj(P,60)
 				P.update_icon()
 			else

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -924,6 +924,50 @@
 	glass_desc = "A tangy substance made of 0.5% natural citrus!"
 	glass_special = list(DRINK_FIZZ)
 
+/datum/reagent/drink/shirley_temple
+	name = "Shirley Temple"
+	description = "A sweet concotion hated even by its namesake."
+	id =  "shirley_temple"
+	color = "#EF304F"
+	adj_temp = -8
+
+	glass_name = "shirley temple"
+	glass_desc = "A sweet concotion hated even by its namesake."
+	glass_special = list(DRINK_FIZZ)
+
+/datum/reagent/drink/roy_rogers
+	name = "Roy Rogers"
+	description = "I'm a cowboy, on a steel horse I ride."
+	id = "roy_rogers"
+	color = "#4F1811"
+	adj_temp = -8
+
+	glass_name = "roy rogers"
+	glass_desc = "I'm a cowboy, on a steel horse I ride"
+	glass_special = list(DRINK_FIZZ)
+
+/datum/reagent/drink/collins_mix
+	name = "Collins Mix"
+	description = "Best hope it isn't a hoax."
+	id = "collins_mix"
+	color = "#D7D0B3"
+	adj_temp = -8
+
+	glass_name = "collins mix"
+	glass_desc = "Best hope it isn't a hoax."
+	glass_special = list(DRINK_FIZZ)
+
+/datum/reagent/drink/arnold_palmer
+	name = "Arnold Palmer"
+	description = "Tastes just like the old man."
+	id = "arnold_palmer"
+	color = "#AF5517"
+	adj_temp = -8
+
+	glass_name = "arnold palmer"
+	glass_desc = "Tastes just like the old man."
+	glass_special = list(DRINK_FIZZ)
+
 /datum/reagent/drink/doctor_delight
 	name = "The Doctor's Delight"
 	id = "doctorsdelight"

code/modules/reagents/Chemistry-Recipes.dm

@@ -1748,3 +1748,30 @@
 	required_reagents = list("hydrogen" = 2, "carbon" = 2, "ammonia" = 2)
 	result_amount = 6
 
+/datum/chemical_reaction/shirleytemple
+	name = "Shirley Temple"
+	id = "shirley_temple"
+	result = "shirley_temple"
+	required_reagents = list("lemon_lime" = 4, "grenadine" = 1)
+	result_amount = 5
+
+/datum/chemical_reaction/royrogers
+	name = "Roy Rogers"
+	id = "roy_rogers"
+	result = "roy_rogers"
+	required_reagents = list("cola" = 4, "grenadine" = 1)
+	result_amount = 5
+
+/datum/chemical_reaction/collinsmix
+	name = "Collins Mix"
+	id = "collins_mix"
+	result = "collins_mix"
+	required_reagents = list("lemon_lime" = 3, "sodawater" = 1)
+	result_amount = 4
+
+/datum/chemical_reaction/arnoldpalmer
+	name = "Arnold Palmer"
+	id = "arnold_palmer"
+	result = "arnold_palmer"
+	required_reagents = list("icetea" = 1, "lemonade" = 1)
+	result_amount = 2

code/modules/reagents/reagent_containers/food/drinks.dm

@@ -204,6 +204,7 @@
 	possible_transfer_amounts = null
 	volume = 10
 	center_of_mass = list("x"=16, "y"=12)
+
 /obj/item/weapon/reagent_containers/food/drinks/sillycup/New()
 	..()
 
@@ -214,6 +215,17 @@
 	else
 		icon_state = "water_cup_e"
 
+/obj/item/weapon/reagent_containers/food/drinks/sillycup/MouseDrop(obj/over_object as obj)
+	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++
+				usr << "<span class='notice'>You put the [src] in the cup dispenser.</span>"
+				qdel(src)
+				W.update_icon()
+	else
+		return ..()
 
 //////////////////////////drinkingglass and shaker//
 //Note by Darem: This code handles the mixing of drinks. New drinks go in three places: In Chemistry-Reagents.dm (for the drink

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -11,9 +11,15 @@
 	var/slices_num
 	var/dried_type = null
 	var/dry = 0
+	var/nutriment_amt = 0
 	center_of_mass = list("x"=16, "y"=16)
 	w_class = 2
 
+/obj/item/weapon/reagent_containers/food/snacks/New()
+	..()
+	if(nutriment_amt)
+		reagents.add_reagent("nutriment", nutriment_amt)
+
 	//Placeholder for effect that trigger on eating that aren't tied to reagents.
 /obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume(var/mob/M)
 	if(!usr)	return
@@ -3176,6 +3182,17 @@
 	else
 		..()
 
+/obj/item/weapon/reagent_containers/food/snacks/bunbun
+	name = "\improper Bun Bun"
+	desc = "A small bread monkey fashioned from two burger buns."
+	icon_state = "bunbun"
+	bitesize = 2
+	center_of_mass = list("x"=16, "y"=8)
+
+/obj/item/weapon/reagent_containers/food/snacks/bunbun/New()
+	..()
+	reagents.add_reagent("nutriment", 8)
+
 /obj/item/weapon/reagent_containers/food/snacks/taco
 	name = "taco"
 	desc = "Take a bite!"

code/modules/reagents/reagent_containers/glass.dm

@@ -255,7 +255,7 @@
 	name = "water-cooler bottle"
 	icon = 'icons/obj/vending.dmi'
 	icon_state = "water_cooler_bottle"
-	matter = list(DEFAULT_WALL_MATERIAL = 200)
+	matter = list("glass" = 2000)
 	w_class = 3.0
 	amount_per_transfer_from_this = 20
 	possible_transfer_amounts = list(10,20,30,60,120)

code/modules/reagents/reagent_dispenser.dm

@@ -26,12 +26,12 @@
 	examine(mob/user)
 		if(!..(user, 2))
 			return
-		user << "\blue It contains:"
+		user << "<span class='notice'>It contains:</span>"
 		if(reagents && reagents.reagent_list.len)
 			for(var/datum/reagent/R in reagents.reagent_list)
-				user << "\blue [R.volume] units of [R.name]"
+				user << "<span class='notice'>[R.volume] units of [R.name]</span>"
 		else
-			user << "\blue Nothing."
+			user << "<span class='notice'>Nothing.</span>"
 
 	verb/set_APTFT() //set amount_per_transfer_from_this
 		set name = "Set transfer amount"
@@ -92,7 +92,7 @@
 	if(!..(user, 2))
 		return
 	if (modded)
-		user << "\red Fuel faucet is wrenched open, leaking the fuel!"
+		user << "<span class='warning'>Fuel faucet is wrenched open, leaking the fuel!</span>"
 	if(rig)
 		user << "<span class='notice'>There is some kind of device rigged to the tank.</span>"
 
@@ -100,7 +100,7 @@
 	if (rig)
 		usr.visible_message("[usr] begins to detach [rig] from \the [src].", "You begin to detach [rig] from \the [src]")
 		if(do_after(usr, 20))
-			usr.visible_message("\blue [usr] detaches [rig] from \the [src].", "\blue  You detach [rig] from \the [src]")
+			usr.visible_message("<span class='notice'>[usr] detaches [rig] from \the [src].</span>", "<span class='notice'>You detach [rig] from \the [src]</span>")
 			rig.loc = get_turf(usr)
 			rig = null
 			overlays = new/list()
@@ -117,11 +117,11 @@
 			leak_fuel(amount_per_transfer_from_this)
 	if (istype(W,/obj/item/device/assembly_holder))
 		if (rig)
-			user << "\red There is another device in the way."
+			user << "<span class='warning'>There is another device in the way.</span>"
 			return ..()
 		user.visible_message("[user] begins rigging [W] to \the [src].", "You begin rigging [W] to \the [src]")
 		if(do_after(user, 20))
-			user.visible_message("\blue [user] rigs [W] to \the [src].", "\blue  You rig [W] to \the [src]")
+			user.visible_message("<span class='notice'>[user] rigs [W] to \the [src].</span>", "<span class='notice'>You rig [W] to \the [src]</span>")
 
 			var/obj/item/device/assembly_holder/H = W
 			if (istype(H.a_left,/obj/item/device/assembly/igniter) || istype(H.a_right,/obj/item/device/assembly/igniter))
@@ -203,13 +203,24 @@
 	possible_transfer_amounts = null
 	anchored = 1
 	var/bottle = 0
+	var/cups = 0
+	var/cupholder = 0
+
+/obj/structure/reagent_dispensers/water_cooler/full
+	bottle = 1
+	cupholder = 1
+	cups = 10
 
 /obj/structure/reagent_dispensers/water_cooler/New()
-	if(bottle == 1)
+	if(bottle)
 		..()
 		reagents.add_reagent("water",120)
-	else
-		icon_state = "water_cooler_0"
+	update_icon()
+
+/obj/structure/reagent_dispensers/water_cooler/examine(mob/user)
+	..()
+	if(cupholder)
+		user << "<span class='notice'>There are [cups] cups in the cup dispenser.</span>"
 
 /obj/structure/reagent_dispensers/water_cooler/attackby(obj/item/I as obj, mob/user as mob)
 	if(istype(I, /obj/item/weapon/wrench))
@@ -224,7 +235,7 @@
 					G.reagents.add_reagent(R.id, total_reagent)
 				reagents.clear_reagents()
 				bottle = 0
-				icon_state = "water_cooler_0"
+				update_icon()
 		else
 			if(anchored)
 				user.visible_message("\The [user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.")
@@ -237,11 +248,24 @@
 		return
 
 	if(istype(I, /obj/item/weapon/screwdriver))
-		if(!bottle)
+		if(cupholder)
 			playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
-			user << "<span class='notice'>You take the water-cooler apart.</span>"
-			new /obj/item/stack/material/plastic( src.loc, 4 )
-			qdel(src)
+			user << "<span class='notice'>You take the cup dispenser off.</span>"
+			new /obj/item/stack/material/plastic( src.loc )
+			if(cups)
+				for(var/i = 0 to cups)
+					new /obj/item/weapon/reagent_containers/food/drinks/sillycup(src.loc)
+			cups = 0
+			cupholder = 0
+			update_icon()
+			return
+		if(!bottle && !cupholder)
+			playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+			user << "<span class='notice'>You start taking the water-cooler apart.</span>"
+			if(do_after(user, 20))
+				user << "<span class='notice'>You take the water-cooler apart.</span>"
+				new /obj/item/stack/material/plastic( src.loc, 4 )
+				qdel(src)
 		return
 
 	if(istype(I, /obj/item/weapon/reagent_containers/glass/cooler_bottle))
@@ -252,8 +276,8 @@
 				user << "<span class='notice'>You start to screw the bottle onto the water-cooler.</span>"
 				if(do_after(user, 20))
 					bottle = 1
-					icon_state = "water_cooler"
-					user << "<span class='notice'>You screw the bottle onto the water-cooler but accidently spill some!</span>" //you spill some because it for somereason transfers 5 units to the bottle after it gets attached but before it's deleted...
+					update_icon()
+					user << "<span class='notice'>You screw the bottle onto the water-cooler!</span>"
 					for(var/datum/reagent/R in G.reagents.reagent_list)
 						var/total_reagent = G.reagents.get_reagent_amount(R.id)
 						reagents.add_reagent(R.id, total_reagent)
@@ -263,8 +287,46 @@
 		else
 			user << "<span class='warning'>There is already a bottle there!</span>"
 		return
-	else
-		return ..()
+
+	if(istype(I, /obj/item/stack/material/plastic))
+		if(!cupholder)
+			if(anchored)
+				var/obj/item/stack/material/plastic/P = I
+				src.add_fingerprint(user)
+				user << "<span class='notice'>You start to attach a cup dispenser onto the water-cooler.</span>"
+				playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+				if(do_after(user, 20))
+					if (P.use(1))
+						user << "<span class='notice'>You attach a cup dispenser onto the water-cooler.</span>"
+						cupholder = 1
+						update_icon()
+			else
+				user << "<span class='warning'>You need to wrench down the cooler first.</span>"
+		else
+			user << "<span class='warning'>There is already a cup dispenser there!</span>"
+		return
+
+/obj/structure/reagent_dispensers/water_cooler/attack_hand(mob/user)
+	if(cups)
+		new /obj/item/weapon/reagent_containers/food/drinks/sillycup(src.loc)
+		cups--
+		update_icon()
+		return
+
+/obj/structure/reagent_dispensers/water_cooler/update_icon()
+	icon_state = "water_cooler"
+	overlays.Cut()
+	var/image/I
+	if(bottle)
+		I = image(icon, "water_cooler_bottle")
+		overlays += I
+	if(cupholder)
+		I = image(icon, "water_cooler_cupholder")
+		overlays += I
+	if(cups)
+		I = image(icon, "water_cooler_cups")
+		overlays += I
+	return
 
 /obj/structure/reagent_dispensers/beerkeg
 	name = "beer keg"