Introduces function for exact item placement of food and applies it to each food item in the game

code/modules/reagents/reagent_containers/food.dm

@@ -6,7 +6,29 @@
 	volume = 50 //Sets the default container amount for all food items.
 	var/filling_color = "#FFFFFF" //Used by sandwiches.
 
+	var/list/CoM = newlist() //Center of mass
+
 /obj/item/weapon/reagent_containers/food/New()
 	..()
-		src.pixel_x = rand(-10.0, 10) //Randomizes postion
+	if (!pixel_x && !pixel_y)
-		src.pixel_y = rand(-10.0, 10)
+		src.pixel_x = rand(-6.0, 6) //Randomizes postion
+		src.pixel_y = rand(-6.0, 6)
+
+/obj/item/weapon/reagent_containers/food/afterattack(atom/A, mob/user, proximity, params)
+	if(proximity && params && istype(A, /obj/structure/table) && CoM.len)
+		//Places the item on a grid
+		var/list/mouse_control = params2list(params)
+		var/cellnumber = 4
+
+		var/mouse_x = text2num(mouse_control["icon-x"])
+		var/mouse_y = text2num(mouse_control["icon-y"])
+
+		var/grid_x = round(mouse_x, 32/cellnumber)
+		var/grid_y = round(mouse_y, 32/cellnumber)
+
+		if(mouse_control["icon-x"])
+			var/sign = mouse_x - grid_x != 0 ? sign(mouse_x - grid_x) : -1 //positive if rounded down, else negative
+			pixel_x = grid_x - CoM["x"] + sign*16/cellnumber //center of the cell
+		if(mouse_control["icon-y"])
+			var/sign = mouse_y - grid_y != 0 ? sign(mouse_y - grid_y) : -1
+			pixel_y = grid_y - CoM["y"] + sign*16/cellnumber

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

@@ -135,129 +135,118 @@
 	name = "Space Cola"
 	desc = "Cola. in space."
 	icon_state = "cola"
+	CoM = list("x"=16, "y"=10)
 	New()
 		..()
 		reagents.add_reagent("cola", 30)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle
 	name = "Bottled Water"
 	desc = "Introduced to the vending machines by Skrellian request, this water comes straight from the Martian poles."
 	icon_state = "waterbottle"
+	CoM = list("x"=15, "y"=8)
 	New()
 		..()
 		reagents.add_reagent("water", 30)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/beer
 	name = "Space Beer"
 	desc = "Contains only water, malt and hops."
 	icon_state = "beer"
+	CoM = list("x"=16, "y"=12)
 	New()
 		..()
 		reagents.add_reagent("beer", 30)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/ale
 	name = "Magm-Ale"
 	desc = "A true dorf's drink of choice."
 	icon_state = "alebottle"
 	item_state = "beer"
+	CoM = list("x"=16, "y"=10)
 	New()
 		..()
 		reagents.add_reagent("ale", 30)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind
 	name = "Space Mountain Wind"
 	desc = "Blows right through you like a space wind."
 	icon_state = "space_mountain_wind"
+	CoM = list("x"=16, "y"=10)
 	New()
 		..()
 		reagents.add_reagent("spacemountainwind", 30)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/thirteenloko
 	name = "Thirteen Loko"
 	desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsibly."
 	icon_state = "thirteen_loko"
+	CoM = list("x"=16, "y"=8)
 	New()
 		..()
 		reagents.add_reagent("thirteenloko", 30)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb
 	name = "Dr. Gibb"
 	desc = "A delicious mixture of 42 different flavors."
 	icon_state = "dr_gibb"
+	CoM = list("x"=16, "y"=10)
 	New()
 		..()
 		reagents.add_reagent("dr_gibb", 30)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/starkist
 	name = "Star-kist"
 	desc = "The taste of a star in liquid form. And, a bit of tuna...?"
 	icon_state = "starkist"
+	CoM = list("x"=16, "y"=10)
 	New()
 		..()
 		reagents.add_reagent("cola", 15)
 		reagents.add_reagent("orangejuice", 15)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/space_up
 	name = "Space-Up"
 	desc = "Tastes like a hull breach in your mouth."
 	icon_state = "space-up"
+	CoM = list("x"=16, "y"=10)
 	New()
 		..()
 		reagents.add_reagent("space_up", 30)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/lemon_lime
 	name = "Lemon-Lime"
 	desc = "You wanted ORANGE. It gave you Lemon Lime."
 	icon_state = "lemon-lime"
+	CoM = list("x"=16, "y"=10)
 	New()
 		..()
 		reagents.add_reagent("lemon_lime", 30)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea
 	name = "Vrisk Serket Iced Tea"
 	desc = "That sweet, refreshing southern earthy flavor. That's where it's from, right? South Earth?"
 	icon_state = "ice_tea_can"
+	CoM = list("x"=16, "y"=10)
 	New()
 		..()
 		reagents.add_reagent("icetea", 30)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice
 	name = "Grapel Juice"
 	desc = "500 pages of rules of how to appropriately enter into a combat with this juice!"
 	icon_state = "purple_can"
+	CoM = list("x"=16, "y"=10)
 	New()
 		..()
 		reagents.add_reagent("grapejuice", 30)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/tonic
 	name = "T-Borg's Tonic Water"
 	desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
 	icon_state = "tonic"
+	CoM = list("x"=16, "y"=10)
 	New()
 		..()
 		reagents.add_reagent("tonic", 50)
@@ -266,6 +255,7 @@
 	name = "Soda Water"
 	desc = "A can of soda water. Still water's more refreshing cousin."
 	icon_state = "sodawater"
+	CoM = list("x"=16, "y"=10)
 	New()
 		..()
 		reagents.add_reagent("sodawater", 50)

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

@@ -12,6 +12,7 @@
 	icon_state = "emptycondiment"
 	flags = FPRINT | TABLEPASS | OPENCONTAINER
 	possible_transfer_amounts = list(1,5,10)
+	CoM = list("x"=16, "y"=6)
 	volume = 50
 
 	attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -90,37 +91,46 @@
 					name = "Ketchup"
 					desc = "You feel more American already."
 					icon_state = "ketchup"
+					CoM = list("x"=16, "y"=6)
 				if("capsaicin")
 					name = "Hotsauce"
 					desc = "You can almost TASTE the stomach ulcers now!"
 					icon_state = "hotsauce"
+					CoM = list("x"=16, "y"=6)
 				if("enzyme")
 					name = "Universal Enzyme"
 					desc = "Used in cooking various dishes."
 					icon_state = "enzyme"
+					CoM = list("x"=16, "y"=6)
 				if("soysauce")
 					name = "Soy Sauce"
 					desc = "A salty soy-based flavoring."
 					icon_state = "soysauce"
+					CoM = list("x"=16, "y"=6)
 				if("frostoil")
 					name = "Coldsauce"
 					desc = "Leaves the tongue numb in its passage."
 					icon_state = "coldsauce"
+					CoM = list("x"=16, "y"=6)
 				if("sodiumchloride")
 					name = "Salt Shaker"
 					desc = "Salt. From space oceans, presumably."
 					icon_state = "saltshaker"
+					CoM = list("x"=16, "y"=10)
 				if("blackpepper")
 					name = "Pepper Mill"
 					desc = "Often used to flavor food or make people sneeze."
 					icon_state = "peppermillsmall"
+					CoM = list("x"=16, "y"=10)
 				if("cornoil")
 					name = "Corn Oil"
 					desc = "A delicious oil used in cooking. Made from corn."
 					icon_state = "oliveoil"
+					CoM = list("x"=16, "y"=6)
 				if("sugar")
 					name = "Sugar"
 					desc = "Tastey space sugar!"
+					CoM = list("x"=16, "y"=6)
 				else
 					name = "Misc Condiment Bottle"
 					if (reagents.reagent_list.len==1)
@@ -128,10 +138,12 @@
 					else
 						desc = "A mixture of various condiments. [reagents.get_master_reagent_name()] is one of them."
 					icon_state = "mixedcondiments"
+					CoM = list("x"=16, "y"=6)
 		else
 			icon_state = "emptycondiment"
 			name = "Condiment Bottle"
 			desc = "An empty condiment bottle."
+			CoM = list("x"=16, "y"=6)
 			return
 
 /obj/item/weapon/reagent_containers/food/condiment/enzyme

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

@@ -120,7 +120,7 @@
 					reagents.add_reagent(refill, trans)
 					user << "Cyborg [src] refilled."
 
-		return
+		return ..()
 
 	examine()
 		set src in view()
@@ -169,11 +169,10 @@
 	desc = "It's milk. White and nutritious goodness!"
 	icon_state = "milk"
 	item_state = "carton"
+	CoM = list("x"=16, "y"=9)
 	New()
 		..()
 		reagents.add_reagent("milk", 50)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 /* Flour is no longer a reagent
 /obj/item/weapon/reagent_containers/food/drinks/flour
@@ -194,63 +193,57 @@
 	desc = "It's soy milk. White and nutritious goodness!"
 	icon_state = "soymilk"
 	item_state = "carton"
+	CoM = list("x"=16, "y"=9)
 	New()
 		..()
 		reagents.add_reagent("soymilk", 50)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/coffee
 	name = "Robust Coffee"
 	desc = "Careful, the beverage you're about to enjoy is extremely hot."
 	icon_state = "coffee"
+	CoM = list("x"=15, "y"=10)
 	New()
 		..()
 		reagents.add_reagent("coffee", 30)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/tea
 	name = "Duke Purple Tea"
 	desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
 	icon_state = "teacup"
 	item_state = "coffee"
+	CoM = list("x"=16, "y"=14)
 	New()
 		..()
 		reagents.add_reagent("tea", 30)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/ice
 	name = "Ice Cup"
 	desc = "Careful, cold ice, do not chew."
 	icon_state = "coffee"
+	CoM = list("x"=15, "y"=10)
 	New()
 		..()
 		reagents.add_reagent("ice", 30)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/h_chocolate
 	name = "Dutch Hot Coco"
 	desc = "Made in Space South America."
 	icon_state = "hot_coco"
 	item_state = "coffee"
+	CoM = list("x"=15, "y"=13)
 	New()
 		..()
 		reagents.add_reagent("hot_coco", 30)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/dry_ramen
 	name = "Cup Ramen"
 	desc = "Just add 10ml water, self heats! A taste that reminds you of your school years."
 	icon_state = "ramen"
+	CoM = list("x"=16, "y"=11)
 	New()
 		..()
 		reagents.add_reagent("dry_ramen", 30)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 
 
 /obj/item/weapon/reagent_containers/food/drinks/sillycup
@@ -259,10 +252,9 @@
 	icon_state = "water_cup_e"
 	possible_transfer_amounts = null
 	volume = 10
+	CoM = list("x"=16, "y"=12)
 	New()
 		..()
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
 	on_reagent_change()
 		if(reagents.total_volume)
 			icon_state = "water_cup"
@@ -281,33 +273,39 @@
 	icon_state = "shaker"
 	amount_per_transfer_from_this = 10
 	volume = 100
+	CoM = list("x"=17, "y"=10)
 
 /obj/item/weapon/reagent_containers/food/drinks/flask
 	name = "Captain's Flask"
 	desc = "A metal flask belonging to the captain"
 	icon_state = "flask"
 	volume = 60
+	CoM = list("x"=17, "y"=7)
 
 /obj/item/weapon/reagent_containers/food/drinks/flask/detflask
 	name = "Detective's Flask"
 	desc = "A metal flask with a leather band and golden badge belonging to the detective."
 	icon_state = "detflask"
 	volume = 60
+	CoM = list("x"=17, "y"=8)
 
 /obj/item/weapon/reagent_containers/food/drinks/flask/barflask
 	name = "flask"
 	desc = "For those who can't be bothered to hang out at the bar to drink."
 	icon_state = "barflask"
 	volume = 60
+	CoM = list("x"=17, "y"=7)
 
 /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask
 	name = "vacuum flask"
 	desc = "Keeping your drinks at the perfect temperature since 1892."
 	icon_state = "vacuumflask"
 	volume = 60
+	CoM = list("x"=15, "y"=4)
 
 /obj/item/weapon/reagent_containers/food/drinks/britcup
 	name = "cup"
 	desc = "A cup with the British flag emblazoned on it."
 	icon_state = "britcup"
 	volume = 30
+	CoM = list("x"=15, "y"=13)

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

@@ -138,6 +138,7 @@
 	name = "Griffeater Gin"
 	desc = "A bottle of high quality gin, produced in the New London Space Station."
 	icon_state = "ginbottle"
+	CoM = list("x"=16, "y"=4)
 	New()
 		..()
 		reagents.add_reagent("gin", 100)
@@ -146,6 +147,7 @@
 	name = "Uncle Git's Special Reserve"
 	desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES."
 	icon_state = "whiskeybottle"
+	CoM = list("x"=16, "y"=3)
 	New()
 		..()
 		reagents.add_reagent("whiskey", 100)
@@ -154,6 +156,7 @@
 	name = "Tunguska Triple Distilled"
 	desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide."
 	icon_state = "vodkabottle"
+	CoM = list("x"=17, "y"=3)
 	New()
 		..()
 		reagents.add_reagent("vodka", 100)
@@ -162,6 +165,7 @@
 	name = "Caccavo Guaranteed Quality Tequilla"
 	desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!"
 	icon_state = "tequillabottle"
+	CoM = list("x"=16, "y"=3)
 	New()
 		..()
 		reagents.add_reagent("tequilla", 100)
@@ -170,6 +174,7 @@
 	name = "Bottle of Nothing"
 	desc = "A bottle filled with nothing"
 	icon_state = "bottleofnothing"
+	CoM = list("x"=17, "y"=5)
 	New()
 		..()
 		reagents.add_reagent("nothing", 100)
@@ -178,6 +183,7 @@
 	name = "Wrapp Artiste Patron"
 	desc = "Silver laced tequilla, served in space night clubs across the galaxy."
 	icon_state = "patronbottle"
+	CoM = list("x"=16, "y"=6)
 	New()
 		..()
 		reagents.add_reagent("patron", 100)
@@ -186,6 +192,7 @@
 	name = "Captain Pete's Cuban Spiced Rum"
 	desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle."
 	icon_state = "rumbottle"
+	CoM = list("x"=16, "y"=8)
 	New()
 		..()
 		reagents.add_reagent("rum", 100)
@@ -194,6 +201,7 @@
 	name = "Flask of Holy Water"
 	desc = "A flask of the chaplain's holy water."
 	icon_state = "holyflask"
+	CoM = list("x"=17, "y"=10)
 	New()
 		..()
 		reagents.add_reagent("holywater", 100)
@@ -202,6 +210,7 @@
 	name = "Goldeneye Vermouth"
 	desc = "Sweet, sweet dryness~"
 	icon_state = "vermouthbottle"
+	CoM = list("x"=17, "y"=3)
 	New()
 		..()
 		reagents.add_reagent("vermouth", 100)
@@ -210,6 +219,7 @@
 	name = "Robert Robust's Coffee Liqueur"
 	desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK"
 	icon_state = "kahluabottle"
+	CoM = list("x"=17, "y"=3)
 	New()
 		..()
 		reagents.add_reagent("kahlua", 100)
@@ -218,6 +228,7 @@
 	name = "College Girl Goldschlager"
 	desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps."
 	icon_state = "goldschlagerbottle"
+	CoM = list("x"=15, "y"=3)
 	New()
 		..()
 		reagents.add_reagent("goldschlager", 100)
@@ -226,6 +237,7 @@
 	name = "Chateau De Baton Premium Cognac"
 	desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time."
 	icon_state = "cognacbottle"
+	CoM = list("x"=16, "y"=6)
 	New()
 		..()
 		reagents.add_reagent("cognac", 100)
@@ -234,6 +246,7 @@
 	name = "Doublebeard Bearded Special Wine"
 	desc = "A faint aura of unease and asspainery surrounds the bottle."
 	icon_state = "winebottle"
+	CoM = list("x"=16, "y"=4)
 	New()
 		..()
 		reagents.add_reagent("wine", 100)
@@ -242,6 +255,7 @@
 	name = "Jailbreaker Verte"
 	desc = "One sip of this and you just know you're gonna have a good time."
 	icon_state = "absinthebottle"
+	CoM = list("x"=16, "y"=6)
 	New()
 		..()
 		reagents.add_reagent("absinthe", 100)
@@ -250,6 +264,7 @@
 	name = "Emeraldine Melon Liquor"
 	desc = "A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light."
 	icon_state = "alco-green" //Placeholder.
+	CoM = list("x"=16, "y"=6)
 	New()
 		..()
 		reagents.add_reagent("melonliquor", 100)
@@ -258,6 +273,7 @@
 	name = "Miss Blue Curacao"
 	desc = "A fruity, exceptionally azure drink. Does not allow the imbiber to use the fifth magic."
 	icon_state = "alco-blue" //Placeholder.
+	CoM = list("x"=16, "y"=6)
 	New()
 		..()
 		reagents.add_reagent("bluecuracao", 100)
@@ -266,6 +282,7 @@
 	name = "Briar Rose Grenadine Syrup"
 	desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks."
 	icon_state = "grenadinebottle"
+	CoM = list("x"=16, "y"=6)
 	New()
 		..()
 		reagents.add_reagent("grenadine", 100)
@@ -274,6 +291,7 @@
 	name = "Warlock's Velvet"
 	desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!"
 	icon_state = "pwinebottle"
+	CoM = list("x"=16, "y"=4)
 	New()
 		..()
 		reagents.add_reagent("pwine", 100)
@@ -285,6 +303,7 @@
 	desc = "Full of vitamins and deliciousness!"
 	icon_state = "orangejuice"
 	item_state = "carton"
+	CoM = list("x"=16, "y"=7)
 	isGlass = 0
 	New()
 		..()
@@ -295,6 +314,7 @@
 	desc = "It's cream. Made from milk. What else did you think you'd find in there?"
 	icon_state = "cream"
 	item_state = "carton"
+	CoM = list("x"=16, "y"=8)
 	isGlass = 0
 	New()
 		..()
@@ -305,6 +325,7 @@
 	desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
 	icon_state = "tomatojuice"
 	item_state = "carton"
+	CoM = list("x"=16, "y"=8)
 	isGlass = 0
 	New()
 		..()
@@ -315,6 +336,7 @@
 	desc = "Sweet-sour goodness."
 	icon_state = "limejuice"
 	item_state = "carton"
+	CoM = list("x"=16, "y"=8)
 	isGlass = 0
 	New()
 		..()

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

@@ -6,6 +6,7 @@
 	icon_state = "glass_empty"
 	amount_per_transfer_from_this = 10
 	volume = 50
+	CoM = list("x"=16, "y"=10)
 
 	on_reagent_change()
 		/*if(reagents.reagent_list.len > 1 )
@@ -22,142 +23,177 @@
 					icon_state = "beerglass"
 					name = "Beer glass"
 					desc = "A freezing pint of beer"
+					CoM = list("x"=16, "y"=8)
 				if("beer2")
 					icon_state = "beerglass"
 					name = "Beer glass"
 					desc = "A freezing pint of beer"
+					CoM = list("x"=16, "y"=8)
 				if("ale")
 					icon_state = "aleglass"
 					name = "Ale glass"
 					desc = "A freezing pint of delicious Ale"
+					CoM = list("x"=16, "y"=8)
 				if("milk")
 					icon_state = "glass_white"
 					name = "Glass of milk"
 					desc = "White and nutritious goodness!"
+					CoM = list("x"=16, "y"=10)
 				if("cream")
 					icon_state  = "glass_white"
 					name = "Glass of cream"
 					desc = "Ewwww..."
+					CoM = list("x"=16, "y"=10)
 				if("chocolate")
 					icon_state  = "chocolateglass"
 					name = "Glass of chocolate"
 					desc = "Tasty"
+					CoM = list("x"=16, "y"=10)
 				if("lemonjuice")
 					icon_state  = "lemonglass"
 					name = "Glass of lemonjuice"
 					desc = "Sour..."
+					CoM = list("x"=16, "y"=10)
 				if("cola")
 					icon_state  = "glass_brown"
 					name = "Glass of Space Cola"
 					desc = "A glass of refreshing Space Cola"
+					CoM = list("x"=16, "y"=10)
 				if("nuka_cola")
 					icon_state = "nuka_colaglass"
 					name = "Nuka Cola"
 					desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland"
+					CoM = list("x"=16, "y"=6)
 				if("orangejuice")
 					icon_state = "glass_orange"
 					name = "Glass of Orange juice"
 					desc = "Vitamins! Yay!"
+					CoM = list("x"=16, "y"=10)
 				if("tomatojuice")
 					icon_state = "glass_red"
 					name = "Glass of Tomato juf"
 					desc = "Are you sure this is tomato juice?"
+					CoM = list("x"=16, "y"=10)
 				if("blood")
 					icon_state = "glass_red"
 					name = "Glass of Tomato juice"
 					desc = "Are you sure this is tomato juice?"
+					CoM = list("x"=16, "y"=10)
 				if("limejuice")
 					icon_state = "glass_green"
 					name = "Glass of Lime juice"
 					desc = "A glass of sweet-sour lime juice."
+					CoM = list("x"=16, "y"=10)
 				if("whiskey")
 					icon_state = "whiskeyglass"
 					name = "Glass of whiskey"
 					desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy."
+					CoM = list("x"=16, "y"=12)
 				if("gin")
 					icon_state = "ginvodkaglass"
 					name = "Glass of gin"
 					desc = "A crystal clear glass of Griffeater gin."
+					CoM = list("x"=16, "y"=12)
 				if("vodka")
 					icon_state = "ginvodkaglass"
 					name = "Glass of vodka"
 					desc = "The glass contain wodka. Xynta."
+					CoM = list("x"=16, "y"=12)
 				if("sake")
 					icon_state = "ginvodkaglass"
 					name = "Glass of Sake"
 					desc = "A glass of Sake."
+					CoM = list("x"=16, "y"=12)
 				if("goldschlager")
 					icon_state = "ginvodkaglass"
 					name = "Glass of goldschlager"
 					desc = "100 proof that teen girls will drink anything with gold in it."
+					CoM = list("x"=16, "y"=12)
 				if("wine")
 					icon_state = "wineglass"
 					name = "Glass of wine"
 					desc = "A very classy looking drink."
+					CoM = list("x"=15, "y"=7)
 				if("cognac")
 					icon_state = "cognacglass"
 					name = "Glass of cognac"
 					desc = "Damn, you feel like some kind of French aristocrat just by holding this."
+					CoM = list("x"=16, "y"=6)
 				if ("kahlua")
 					icon_state = "kahluaglass"
 					name = "Glass of RR coffee Liquor"
 					desc = "DAMN, THIS THING LOOKS ROBUST"
+					CoM = list("x"=15, "y"=7)
 				if("vermouth")
 					icon_state = "vermouthglass"
 					name = "Glass of Vermouth"
 					desc = "You wonder why you're even drinking this straight."
+					CoM = list("x"=16, "y"=12)
 				if("tequilla")
 					icon_state = "tequillaglass"
 					name = "Glass of Tequilla"
 					desc = "Now all that's missing is the weird colored shades!"
+					CoM = list("x"=16, "y"=12)
 				if("patron")
 					icon_state = "patronglass"
 					name = "Glass of Patron"
 					desc = "Drinking patron in the bar, with all the subpar ladies."
+					CoM = list("x"=7, "y"=8)
 				if("rum")
 					icon_state = "rumglass"
 					name = "Glass of Rum"
 					desc = "Now you want to Pray for a pirate suit, don't you?"
+					CoM = list("x"=16, "y"=12)
 				if("gintonic")
 					icon_state = "gintonicglass"
 					name = "Gin and Tonic"
 					desc = "A mild but still great cocktail. Drink up, like a true Englishman."
+					CoM = list("x"=16, "y"=7)
 				if("whiskeycola")
 					icon_state = "whiskeycolaglass"
 					name = "Whiskey Cola"
 					desc = "An innocent-looking mixture of cola and Whiskey. Delicious."
+					CoM = list("x"=16, "y"=9)
 				if("whiterussian")
 					icon_state = "whiterussianglass"
 					name = "White Russian"
 					desc = "A very nice looking drink. But that's just, like, your opinion, man."
+					CoM = list("x"=16, "y"=9)
 				if("screwdrivercocktail")
 					icon_state = "screwdriverglass"
 					name = "Screwdriver"
 					desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer."
+					CoM = list("x"=15, "y"=10)
 				if("bloodymary")
 					icon_state = "bloodymaryglass"
 					name = "Bloody Mary"
 					desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder."
+					CoM = list("x"=16, "y"=10)
 				if("martini")
 					icon_state = "martiniglass"
 					name = "Classic Martini"
 					desc = "Damn, the bartender even stirred it, not shook it."
+					CoM = list("x"=17, "y"=8)
 				if("vodkamartini")
 					icon_state = "martiniglass"
 					name = "Vodka martini"
 					desc ="A bastardisation of the classic martini. Still great."
+					CoM = list("x"=17, "y"=8)
 				if("gargleblaster")
 					icon_state = "gargleblasterglass"
 					name = "Pan-Galactic Gargle Blaster"
 					desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy."
+					CoM = list("x"=17, "y"=6)
 				if("bravebull")
 					icon_state = "bravebullglass"
 					name = "Brave Bull"
 					desc = "Tequilla and Coffee liquor, brought together in a mouthwatering mixture. Drink up."
+					CoM = list("x"=15, "y"=8)
 				if("tequillasunrise")
 					icon_state = "tequillasunriseglass"
 					name = "Tequilla Sunrise"
 					desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
+					CoM = list("x"=16, "y"=10)
 				if("phoronspecial")
 					icon_state = "phoronspecialglass"
 					name = "Toxins Special"
@@ -166,330 +202,412 @@
 					icon_state = "beepskysmashglass"
 					name = "Beepsky Smash"
 					desc = "Heavy, hot and strong. Just like the Iron fist of the LAW."
+					CoM = list("x"=18, "y"=10)
 				if("doctorsdelight")
 					icon_state = "doctorsdelightglass"
 					name = "Doctor's Delight"
 					desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place."
+					CoM = list("x"=16, "y"=8)
 				if("manlydorf")
 					icon_state = "manlydorfglass"
 					name = "The Manly Dorf"
 					desc = "A manly concotion made from Ale and Beer. Intended for true men only."
+					CoM = list("x"=16, "y"=10)
 				if("irishcream")
 					icon_state = "irishcreamglass"
 					name = "Irish Cream"
 					desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?"
+					CoM = list("x"=16, "y"=9)
 				if("cubalibre")
 					icon_state = "cubalibreglass"
 					name = "Cuba Libre"
 					desc = "A classic mix of rum and cola."
+					CoM = list("x"=16, "y"=8)
 				if("b52")
 					icon_state = "b52glass"
 					name = "B-52"
 					desc = "Kahlua, Irish Cream, and congac. You will get bombed."
+					CoM = list("x"=16, "y"=10)
 				if("atomicbomb")
 					icon_state = "atomicbombglass"
 					name = "Atomic Bomb"
 					desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing."
+					CoM = list("x"=15, "y"=7)
 				if("longislandicedtea")
 					icon_state = "longislandicedteaglass"
 					name = "Long Island Iced Tea"
 					desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
+					CoM = list("x"=16, "y"=8)
 				if("threemileisland")
 					icon_state = "threemileislandglass"
 					name = "Three Mile Island Ice Tea"
 					desc = "A glass of this is sure to prevent a meltdown."
+					CoM = list("x"=16, "y"=2)
 				if("margarita")
 					icon_state = "margaritaglass"
 					name = "Margarita"
 					desc = "On the rocks with salt on the rim. Arriba~!"
+					CoM = list("x"=16, "y"=8)
 				if("blackrussian")
 					icon_state = "blackrussianglass"
 					name = "Black Russian"
 					desc = "For the lactose-intolerant. Still as classy as a White Russian."
+					CoM = list("x"=16, "y"=9)
 				if("vodkatonic")
 					icon_state = "vodkatonicglass"
 					name = "Vodka and Tonic"
 					desc = "For when a gin and tonic isn't russian enough."
+					CoM = list("x"=16, "y"=7)
 				if("manhattan")
 					icon_state = "manhattanglass"
 					name = "Manhattan"
 					desc = "The Detective's undercover drink of choice. He never could stomach gin..."
+					CoM = list("x"=17, "y"=8)
 				if("manhattan_proj")
 					icon_state = "proj_manhattanglass"
 					name = "Manhattan Project"
 					desc = "A scienitst drink of choice, for thinking how to blow up the station."
+					CoM = list("x"=17, "y"=8)
 				if("ginfizz")
 					icon_state = "ginfizzglass"
 					name = "Gin Fizz"
 					desc = "Refreshingly lemony, deliciously dry."
+					CoM = list("x"=16, "y"=7)
 				if("irishcoffee")
 					icon_state = "irishcoffeeglass"
 					name = "Irish Coffee"
 					desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning."
+					CoM = list("x"=15, "y"=10)
 				if("hooch")
 					icon_state = "glass_brown2"
 					name = "Hooch"
 					desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
+					CoM = list("x"=16, "y"=10)
 				if("whiskeysoda")
 					icon_state = "whiskeysodaglass2"
 					name = "Whiskey Soda"
 					desc = "Ultimate refreshment."
+					CoM = list("x"=16, "y"=9)
 				if("tonic")
 					icon_state = "glass_clear"
 					name = "Glass of Tonic Water"
 					desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
+					CoM = list("x"=16, "y"=10)
 				if("sodawater")
 					icon_state = "glass_clear"
 					name = "Glass of Soda Water"
 					desc = "Soda water. Why not make a scotch and soda?"
+					CoM = list("x"=16, "y"=10)
 				if("water")
 					icon_state = "glass_clear"
 					name = "Glass of Water"
 					desc = "The father of all refreshments."
+					CoM = list("x"=16, "y"=10)
 				if("spacemountainwind")
 					icon_state = "Space_mountain_wind_glass"
 					name = "Glass of Space Mountain Wind"
 					desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
+					CoM = list("x"=16, "y"=10)
 				if("thirteenloko")
 					icon_state = "thirteen_loko_glass"
 					name = "Glass of Thirteen Loko"
 					desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass"
+					CoM = list("x"=16, "y"=10)
 				if("dr_gibb")
 					icon_state = "dr_gibb_glass"
 					name = "Glass of Dr. Gibb"
 					desc = "Dr. Gibb. Not as dangerous as the name might imply."
+					CoM = list("x"=16, "y"=10)
 				if("space_up")
 					icon_state = "space-up_glass"
 					name = "Glass of Space-up"
 					desc = "Space-up. It helps keep your cool."
+					CoM = list("x"=16, "y"=10)
 				if("moonshine")
 					icon_state = "glass_clear"
 					name = "Moonshine"
 					desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
+					CoM = list("x"=16, "y"=10)
 				if("soymilk")
 					icon_state = "glass_white"
 					name = "Glass of soy milk"
 					desc = "White and nutritious soy goodness!"
+					CoM = list("x"=16, "y"=10)
 				if("berryjuice")
 					icon_state = "berryjuice"
 					name = "Glass of berry juice"
 					desc = "Berry juice. Or maybe its jam. Who cares?"
+					CoM = list("x"=16, "y"=10)
 				if("poisonberryjuice")
 					icon_state = "poisonberryjuice"
 					name = "Glass of poison berry juice"
 					desc = "A glass of deadly juice."
+					CoM = list("x"=16, "y"=10)
 				if("carrotjuice")
 					icon_state = "carrotjuice"
 					name = "Glass of  carrot juice"
 					desc = "It is just like a carrot but without crunching."
+					CoM = list("x"=16, "y"=10)
 				if("banana")
 					icon_state = "banana"
 					name = "Glass of banana juice"
 					desc = "The raw essence of a banana. HONK"
+					CoM = list("x"=16, "y"=10)
 				if("bahama_mama")
 					icon_state = "bahama_mama"
 					name = "Bahama Mama"
 					desc = "Tropic cocktail"
+					CoM = list("x"=16, "y"=5)
 				if("singulo")
 					icon_state = "singulo"
 					name = "Singulo"
 					desc = "A blue-space beverage."
+					CoM = list("x"=17, "y"=4)
 				if("alliescocktail")
 					icon_state = "alliescocktail"
 					name = "Allies cocktail"
 					desc = "A drink made from your allies."
+					CoM = list("x"=17, "y"=8)
 				if("antifreeze")
 					icon_state = "antifreeze"
 					name = "Anti-freeze"
 					desc = "The ultimate refreshment."
+					CoM = list("x"=16, "y"=8)
 				if("barefoot")
 					icon_state = "b&p"
 					name = "Barefoot"
 					desc = "Barefoot and pregnant"
+					CoM = list("x"=17, "y"=8)
 				if("demonsblood")
 					icon_state = "demonsblood"
 					name = "Demons Blood"
 					desc = "Just looking at this thing makes the hair at the back of your neck stand up."
+					CoM = list("x"=16, "y"=2)
 				if("booger")
 					icon_state = "booger"
 					name = "Booger"
 					desc = "Ewww..."
+					CoM = list("x"=16, "y"=10)
 				if("snowwhite")
 					icon_state = "snowwhite"
 					name = "Snow White"
 					desc = "A cold refreshment."
+					CoM = list("x"=16, "y"=8)
 				if("aloe")
 					icon_state = "aloe"
 					name = "Aloe"
 					desc = "Very, very, very good."
+					CoM = list("x"=17, "y"=8)
 				if("andalusia")
 					icon_state = "andalusia"
 					name = "Andalusia"
 					desc = "A nice, strange named drink."
+					CoM = list("x"=16, "y"=9)
 				if("sbiten")
 					icon_state = "sbitenglass"
 					name = "Sbiten"
 					desc = "A spicy mix of Vodka and Spice. Very hot."
+					CoM = list("x"=17, "y"=8)
 				if("red_mead")
 					icon_state = "red_meadglass"
 					name = "Red Mead"
 					desc = "A True Vikings Beverage, though its color is strange."
+					CoM = list("x"=17, "y"=10)
 				if("mead")
 					icon_state = "meadglass"
 					name = "Mead"
 					desc = "A Vikings Beverage, though a cheap one."
+					CoM = list("x"=17, "y"=10)
 				if("iced_beer")
 					icon_state = "iced_beerglass"
 					name = "Iced Beer"
 					desc = "A beer so frosty, the air around it freezes."
+					CoM = list("x"=16, "y"=7)
 				if("grog")
 					icon_state = "grogglass"
 					name = "Grog"
 					desc = "A fine and cepa drink for Space."
+					CoM = list("x"=16, "y"=10)
 				if("soy_latte")
 					icon_state = "soy_latte"
 					name = "Soy Latte"
 					desc = "A nice and refrshing beverage while you are reading."
+					CoM = list("x"=15, "y"=9)
 				if("cafe_latte")
 					icon_state = "cafe_latte"
 					name = "Cafe Latte"
 					desc = "A nice, strong and refreshing beverage while you are reading."
+					CoM = list("x"=15, "y"=9)
 				if("acidspit")
 					icon_state = "acidspitglass"
 					name = "Acid Spit"
 					desc = "A drink from Nanotrasen. Made from live aliens."
+					CoM = list("x"=16, "y"=7)
 				if("amasec")
 					icon_state = "amasecglass"
 					name = "Amasec"
 					desc = "Always handy before COMBAT!!!"
+					CoM = list("x"=16, "y"=9)
 				if("neurotoxin")
 					icon_state = "neurotoxinglass"
 					name = "Neurotoxin"
 					desc = "A drink that is guaranteed to knock you silly."
+					CoM = list("x"=16, "y"=8)
 				if("hippiesdelight")
 					icon_state = "hippiesdelightglass"
 					name = "Hippie's Delight"
 					desc = "A drink enjoyed by people during the 1960's."
+					CoM = list("x"=16, "y"=8)
 				if("bananahonk")
 					icon_state = "bananahonkglass"
 					name = "Banana Honk"
 					desc = "A drink from Banana Heaven."
+					CoM = list("x"=16, "y"=8)
 				if("silencer")
 					icon_state = "silencerglass"
 					name = "Silencer"
 					desc = "A drink from mime Heaven."
+					CoM = list("x"=16, "y"=9)
 				if("nothing")
 					icon_state = "nothing"
 					name = "Nothing"
 					desc = "Absolutely nothing."
+					CoM = list("x"=16, "y"=10)
 				if("devilskiss")
 					icon_state = "devilskiss"
 					name = "Devils Kiss"
 					desc = "Creepy time!"
+					CoM = list("x"=16, "y"=8)
 				if("changelingsting")
 					icon_state = "changelingsting"
 					name = "Changeling Sting"
 					desc = "A stingy drink."
+					CoM = list("x"=16, "y"=10)
 				if("irishcarbomb")
 					icon_state = "irishcarbomb"
 					name = "Irish Car Bomb"
 					desc = "An irish car bomb."
+					CoM = list("x"=16, "y"=8)
 				if("syndicatebomb")
 					icon_state = "syndicatebomb"
 					name = "Syndicate Bomb"
 					desc = "A syndicate bomb."
+					CoM = list("x"=16, "y"=4)
 				if("erikasurprise")
 					icon_state = "erikasurprise"
 					name = "Erika Surprise"
 					desc = "The surprise is, it's green!"
+					CoM = list("x"=16, "y"=9)
 				if("driestmartini")
 					icon_state = "driestmartiniglass"
 					name = "Driest Martini"
 					desc = "Only for the experienced. You think you see sand floating in the glass."
+					CoM = list("x"=17, "y"=8)
 				if("ice")
 					icon_state = "iceglass"
 					name = "Glass of ice"
 					desc = "Generally, you're supposed to put something else in there too..."
+					CoM = list("x"=16, "y"=10)
 				if("icecoffee")
 					icon_state = "icedcoffeeglass"
 					name = "Iced Coffee"
 					desc = "A drink to perk you up and refresh you!"
+					CoM = list("x"=16, "y"=10)
 				if("coffee")
 					icon_state = "glass_brown"
 					name = "Glass of coffee"
 					desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
+					CoM = list("x"=16, "y"=10)
 				if("bilk")
 					icon_state = "glass_brown"
 					name = "Glass of bilk"
 					desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
+					CoM = list("x"=16, "y"=10)
 				if("fuel")
 					icon_state = "dr_gibb_glass"
 					name = "Glass of welder fuel"
 					desc = "Unless you are an industrial tool, this is probably not safe for consumption."
+					CoM = list("x"=16, "y"=10)
 				if("brownstar")
 					icon_state = "brownstar"
 					name = "Brown Star"
 					desc = "It's not what it sounds like..."
+					CoM = list("x"=16, "y"=10)
 				if("grapejuice")
 					icon_state = "grapejuice"
 					name = "Glass of grape juice"
 					desc = "It's grrrrrape!"
+					CoM = list("x"=16, "y"=10)
 				if("grapesoda")
 					icon_state = "grapesoda"
 					name = "Can of Grape Soda"
 					desc = "Looks like a delicious drank!"
+					CoM = list("x"=16, "y"=10)
 				if("icetea")
 					icon_state = "icedteaglass"
 					name = "Iced Tea"
 					desc = "No relation to a certain rap artist/ actor."
+					CoM = list("x"=15, "y"=10)
 				if("grenadine")
 					icon_state = "grenadineglass"
 					name = "Glass of grenadine syrup"
 					desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks."
+					CoM = list("x"=17, "y"=6)
 				if("milkshake")
 					icon_state = "milkshake"
 					name = "Milkshake"
 					desc = "Glorious brainfreezing mixture."
+					CoM = list("x"=16, "y"=7)
 				if("lemonade")
 					icon_state = "lemonadeglass"
 					name = "Lemonade"
 					desc = "Oh the nostalgia..."
+					CoM = list("x"=16, "y"=10)
 				if("kiraspecial")
 					icon_state = "kiraspecial"
 					name = "Kira Special"
 					desc = "Long live the guy who everyone had mistaken for a girl. Baka!"
+					CoM = list("x"=16, "y"=12)
 				if("rewriter")
 					icon_state = "rewriter"
 					name = "Rewriter"
 					desc = "The secret of the sanctuary of the Libarian..."
+					CoM = list("x"=16, "y"=9)
 				if("suidream")
 					icon_state = "sdreamglass"
 					name = "Sui Dream"
 					desc = "A froofy, fruity, and sweet mixed drink. Understanding the name only brings shame."
+					CoM = list("x"=16, "y"=5)
 				if("melonliquor")
 					icon_state = "emeraldglass"
 					name = "Glass of Melon Liquor"
 					desc = "A relatively sweet and fruity 46 proof liquor."
+					CoM = list("x"=16, "y"=5)
 				if("bluecuracao")
 					icon_state = "curacaoglass"
 					name = "Glass of Blue Curacao"
 					desc = "Exotically blue, fruity drink, distilled from oranges."
+					CoM = list("x"=16, "y"=5)
 				if("absinthe")
 					icon_state = "absintheglass"
 					name = "Glass of Absinthe"
 					desc = "Wormwood, anise, oh my."
+					CoM = list("x"=16, "y"=5)
 				if("pwine")
 					icon_state = "pwineglass"
 					name = "Glass of ???"
 					desc = "A black ichor with an oily purple sheer on top. Are you sure you should drink this?"
+					CoM = list("x"=16, "y"=5)
 				else
 					icon_state ="glass_brown"
 					name = "Glass of ..what?"
 					desc = "You can't really tell what this is."
+					CoM = list("x"=16, "y"=10)
 		else
 			icon_state = "glass_empty"
 			name = "Drinking glass"
 			desc = "Your standard drinking glass"
+			CoM = list("x"=16, "y"=10)
 			return
 
 // for /obj/machinery/vending/sovietsoda

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

@@ -7,6 +7,7 @@
 	desc = "A jar. You're not sure what it's supposed to hold."
 	icon_state = "jar"
 	item_state = "beaker"
+	CoM = list("x"=15, "y"=8)
 	New()
 		..()
 		reagents.add_reagent("slime", 50)

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

@@ -9,6 +9,7 @@
 	var/trash = null
 	var/slice_path
 	var/slices_num
+	CoM = list("x"=15, "y"=15)
 
 	//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)
@@ -107,7 +108,7 @@
 	return 0
 
 /obj/item/weapon/reagent_containers/food/snacks/afterattack(obj/target, mob/user, proximity)
-	return
+	return ..()
 
 /obj/item/weapon/reagent_containers/food/snacks/examine()
 	set src in view()