Merge branch 'master' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	.gitignore
#	vorestation.dme

code/modules/reagents/reagent_containers/dropper.dm

@@ -75,7 +75,7 @@
 			return
 
 		else
-			trans = reagents.splash(target, amount_per_transfer_from_this, max_spill=30) //sprinkling reagents on generic non-mobs
+			trans = reagents.splash(target, amount_per_transfer_from_this, max_spill=0) //sprinkling reagents on generic non-mobs
 			user << "<span class='notice'>You transfer [trans] units of the solution.</span>"
 
 	else // Taking from something

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

@@ -131,23 +131,28 @@
 	..()
 	reagents.add_reagent("soymilk", 50)
 
-/obj/item/weapon/reagent_containers/food/drinks/milk/smallcarton
+/obj/item/weapon/reagent_containers/food/drinks/smallmilk
 	name = "small milk carton"
+	desc = "It's milk. White and nutritious goodness!"
 	volume = 30
 	icon_state = "mini-milk"
-/obj/item/weapon/reagent_containers/food/drinks/milk/smallcarton/New()
+	item_state = "carton"
+	center_of_mass = list("x"=16, "y"=9)
+/obj/item/weapon/reagent_containers/food/drinks/smallmilk/New()
 	..()
 	reagents.add_reagent("milk", 30)
 
-/obj/item/weapon/reagent_containers/food/drinks/milk/smallcarton/chocolate
+/obj/item/weapon/reagent_containers/food/drinks/smallchocmilk
 	name = "small chocolate milk carton"
 	desc = "It's milk! This one is in delicious chocolate flavour."
+	volume = 30
 	icon_state = "mini-milk_choco"
-/obj/item/weapon/reagent_containers/food/drinks/milk/smallcarton/chocolate/New()
+	item_state = "carton"
+	center_of_mass = list("x"=16, "y"=9)
+/obj/item/weapon/reagent_containers/food/drinks/smallchocmilk/New()
 	..()
 	reagents.add_reagent("chocolate_milk", 30)
 
-
 /obj/item/weapon/reagent_containers/food/drinks/coffee
 	name = "\improper Robust Coffee"
 	desc = "Careful, the beverage you're about to enjoy is extremely hot."

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

@@ -22,16 +22,16 @@
 		if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/breadslice))
 			sandwich_limit += 4
 
-	if(src.contents.len > sandwich_limit)
-		user << "\red If you put anything else on \the [src] it's going to collapse."
-		return
-	else if(istype(W,/obj/item/weapon/material/shard))
+	if(istype(W,/obj/item/weapon/material/shard))
 		user << "\blue You hide [W] in \the [src]."
 		user.drop_item()
 		W.loc = src
 		update()
 		return
 	else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks))
+		if(src.contents.len > sandwich_limit)
+			user << "\red If you put anything else on \the [src] it's going to collapse."
+			return
 		user << "\blue You layer [W] over \the [src]."
 		var/obj/item/weapon/reagent_containers/F = W
 		F.reagents.trans_to_obj(src, F.reagents.total_volume)

code/modules/reagents/reagent_containers/spray_vr.dm

@@ -0,0 +1,12 @@
+/obj/item/weapon/reagent_containers/spray/windowsealant
+	name = "Krak-b-gone"
+	desc = "A spray bottle of silicate sealant for rapid window repair."
+	icon = 'icons/obj/items_vr.dmi'
+	icon_state = "windowsealant"
+	item_state = "spraycan"
+	possible_transfer_amounts = null
+	volume = 80
+
+/obj/item/weapon/reagent_containers/spray/windowsealant/New()
+	..()
+	reagents.add_reagent("silicate", 80)