Polaris sync

code/modules/reagents/reagent_containers/drinkingglass/drinkingglass.dm

@@ -25,6 +25,8 @@
 	possible_transfer_amounts = list(5,10,15,30)
 	flags = OPENCONTAINER
 
+	matter = list("glass" = 60)
+
 /obj/item/weapon/reagent_containers/food/drinks/glass2/examine(mob/M as mob)
 	..()
 

code/modules/reagents/reagent_containers/drinkingglass/glass_types.dm

@@ -7,6 +7,7 @@
 	volume = 30
 	possible_transfer_amounts = list(5,10,15,30)
 	rim_pos = list(23,13,20) // y, x0, x1
+	matter = list("glass" = 60)
 
 /obj/item/weapon/reagent_containers/food/drinks/glass2/rocks
 	name = "rocks glass"
@@ -16,6 +17,7 @@
 	volume = 20
 	possible_transfer_amounts = list(5,10,20)
 	rim_pos = list(21, 10, 23)
+	matter = list("glass" = 40)
 
 /obj/item/weapon/reagent_containers/food/drinks/glass2/shake
 	name = "milkshake glass"
@@ -25,6 +27,7 @@
 	volume = 30
 	possible_transfer_amounts = list(5,10,15,30)
 	rim_pos = list(25, 13, 21)
+	matter = list("glass" = 30)
 
 /obj/item/weapon/reagent_containers/food/drinks/glass2/cocktail
 	name = "cocktail glass"
@@ -34,6 +37,7 @@
 	volume = 15
 	possible_transfer_amounts = list(5,10,15)
 	rim_pos = list(22, 13, 21)
+	matter = list("glass" = 30)
 
 /obj/item/weapon/reagent_containers/food/drinks/glass2/shot
 	name = "shot glass"
@@ -43,6 +47,7 @@
 	volume = 5
 	possible_transfer_amounts = list(1,2,5)
 	rim_pos = list(17, 13, 21)
+	matter = list("glass" = 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/glass2/pint
 	name = "pint glass"
@@ -52,6 +57,7 @@
 	volume = 60
 	possible_transfer_amounts = list(5,10,15,30,60)
 	rim_pos = list(25, 12, 21)
+	matter = list("glass" = 120)
 
 /obj/item/weapon/reagent_containers/food/drinks/glass2/mug
 	name = "glass mug"
@@ -61,6 +67,7 @@
 	volume = 40
 	possible_transfer_amounts = list(5,10,20,40)
 	rim_pos = list(22, 12, 20)
+	matter = list("glass" = 80)
 
 /obj/item/weapon/reagent_containers/food/drinks/glass2/wine
 	name = "wine glass"
@@ -70,3 +77,4 @@
 	volume = 25
 	possible_transfer_amounts = list(5, 10, 15, 25)
 	rim_pos = list(25, 12, 21)
+	matter = list("glass" = 50)

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

@@ -167,7 +167,6 @@
 	desc = "A big bag of flour. Good for baking!"
 	icon = 'icons/obj/food.dmi'
 	icon_state = "flour"
-	item_state = "flour"
 
 /obj/item/weapon/reagent_containers/food/condiment/flour/on_reagent_change()
 	return

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

@@ -14,7 +14,7 @@
 	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)
@@ -3197,6 +3197,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_containers/pill.dm

@@ -19,10 +19,15 @@
 	if(!icon_state)
 		icon_state = "pill[rand(1, 20)]"
 
-/obj/item/weapon/reagent_containers/pill/attack(mob/M as mob, mob/user as mob, def_zone)
 
+/obj/item/weapon/reagent_containers/pill/do_surgery(mob/M, mob/user)
+	if(user.a_intent != I_HELP) //in case it is ever used as a surgery tool
+		return ..()
+	attack(M, user) //default surgery behaviour is just to scan as usual
+	return 1
+
+/obj/item/weapon/reagent_containers/pill/attack(mob/M as mob, mob/user as mob)
 	if(M == user)
-
 		if(istype(M, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = M
 			if(!H.check_has_mouth())

code/modules/reagents/reagent_containers/spray.dm

@@ -38,8 +38,6 @@
 
 	Spray_at(A, user, proximity)
 
-	playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
-
 	user.setClickCooldown(4)
 
 	if(reagents.has_reagent("sacid"))
@@ -54,6 +52,7 @@
 	return
 
 /obj/item/weapon/reagent_containers/spray/proc/Spray_at(atom/A as mob|obj, mob/user as mob, proximity)
+	playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
 	if (A.density && proximity)
 		A.visible_message("[usr] sprays [A] with [src].")
 		reagents.splash(A, amount_per_transfer_from_this)