diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 2c8dea17e3..723e73e73b 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -1062,12 +1062,11 @@ closest to where the cursor has clicked on.
 Note: This proc can be overwritten to allow for different types of auto-alignment.
 */
 
-///obj/item/var/list/center_of_mass = list("x" = 16,"y" = 16) CHOMPEdit NO STOP PLEASE -- center_of_mass - 52.0879 mb total
-/obj/item/var/center_of_mass_x = 16 //CHOMPEdit
-/obj/item/var/center_of_mass_y = 16 //CHOMPEdit
+/obj/item/var/center_of_mass_x = 16
+/obj/item/var/center_of_mass_y = 16
 
 /proc/auto_align(obj/item/W, click_parameters, var/animate = FALSE)
-	if(!W.center_of_mass_x && !W.center_of_mass_y) //CHOMPEdit
+	if(!W.center_of_mass_x && !W.center_of_mass_y)
 		W.randpixel_xy()
 		return
 
@@ -1083,8 +1082,8 @@ Note: This proc can be overwritten to allow for different types of auto-alignmen
 		var/cell_x = max(0, min(CELLS-1, round(mouse_x/CELLSIZE)))
 		var/cell_y = max(0, min(CELLS-1, round(mouse_y/CELLSIZE)))
 
-		var/target_x = (CELLSIZE * (0.5 + cell_x)) - W.center_of_mass_x //CHOMPEdit
-		var/target_y = (CELLSIZE * (0.5 + cell_y)) - W.center_of_mass_y //CHOMPEdit
+		var/target_x = (CELLSIZE * (0.5 + cell_x)) - W.center_of_mass_x
+		var/target_y = (CELLSIZE * (0.5 + cell_y)) - W.center_of_mass_y
 		if(animate)
 			var/dist_x = abs(W.pixel_x - target_x)
 			var/dist_y = abs(W.pixel_y - target_y)
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 928e8c27c5..b2fa5731ba 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -313,8 +313,8 @@
 	desc = "A desk lamp with an adjustable mount."
 	icon_state = "lamp"
 	force = 10
-	center_of_mass_x = 13 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 13
+	center_of_mass_y = 11
 	light_range = 5
 	w_class = ITEMSIZE_LARGE
 	power_use = 0
@@ -333,16 +333,16 @@
 /obj/item/flashlight/lamp/green
 	desc = "A classic green-shaded desk lamp."
 	icon_state = "lampgreen"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 11
 	light_color = "#FFC58F"
 
 // clown lamp
 /obj/item/flashlight/lamp/clown
 	desc = "A whacky banana peel shaped lamp."
 	icon_state = "bananalamp"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 11
 
 
 /*
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 262cdc9865..44af72f224 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -14,8 +14,8 @@
 	origin_tech = list(TECH_MATERIAL = 1)
 	icon = 'icons/obj/stacks_ch.dmi' //CHOMPedit - materials update
 	randpixel = 7
-	center_of_mass_x = 0 //CHOMPEdit
-	center_of_mass_y = 0 //CHOMPEdit
+	center_of_mass_x = 0
+	center_of_mass_y = 0
 	var/list/datum/stack_recipe/recipes
 	var/singular_name
 	var/amount = 1
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 75aa337253..ea5acddb63 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -25,8 +25,8 @@
 	icon = 'icons/obj/boxes.dmi'
 	icon_state = "box"
 	item_state = "syringe_kit"
-	center_of_mass_x = 13 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 13
+	center_of_mass_y = 10
 	var/foldable = /obj/item/stack/material/cardboard	// BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard
 	var/trash = null  // if set, can be crushed into a trash item when empty
 	max_w_class = ITEMSIZE_SMALL
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index b629a3a972..5fe11f61f8 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -52,8 +52,8 @@
 	icon_state = "eggbox"
 	icon_type = REAGENT_ID_EGG
 	name = "egg box"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 7 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 7
 	storage_slots = 12
 	can_hold = list(
 		/obj/item/reagent_containers/food/snacks/egg,
diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm
index e5b32a95bf..e722bfa65b 100644
--- a/code/game/objects/items/weapons/storage/misc.dm
+++ b/code/game/objects/items/weapons/storage/misc.dm
@@ -33,8 +33,8 @@ var/list/random_weighted_donuts = list(
 	icon_state = "donutbox"
 	name = "donut box"
 	desc = "A box that holds tasty donuts, if you're lucky."
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 9
 	max_storage_space = ITEMSIZE_COST_SMALL * 6
 	can_hold = list(/obj/item/reagent_containers/food/snacks/donut)
 	foldable = /obj/item/stack/material/cardboard
diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm
index 6151ec9b2b..9aa4efd6c7 100644
--- a/code/game/objects/items/weapons/storage/toolbox.dm
+++ b/code/game/objects/items/weapons/storage/toolbox.dm
@@ -7,8 +7,8 @@
 	icon = 'icons/obj/storage_vr.dmi'
 	icon_state = "red"
 	item_state_slots = list(slot_r_hand_str = "toolbox_red", slot_l_hand_str = "toolbox_red")
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	force = 10
 	throwforce = 10
 	throw_speed = 1
diff --git a/code/game/objects/items/weapons/tools/screwdriver.dm b/code/game/objects/items/weapons/tools/screwdriver.dm
index fe865848ec..d3d5ec472c 100644
--- a/code/game/objects/items/weapons/tools/screwdriver.dm
+++ b/code/game/objects/items/weapons/tools/screwdriver.dm
@@ -7,8 +7,8 @@
 	//description_fluff = "This could be used to engrave messages on suitable surfaces if you really put your mind to it! Alt-click a floor or wall to engrave with it." //This way it's not a completely hidden, arcane art to engrave. //CHOMP Remove
 	icon = 'icons/obj/tools.dmi'
 	icon_state = "screwdriver"
-	center_of_mass_x = 13 //CHOMPEdit
-	center_of_mass_y= 7 //CHOMPEdit
+	center_of_mass_x = 13
+	center_of_mass_y = 7
 	slot_flags = SLOT_BELT | SLOT_EARS
 	force = 6
 	w_class = ITEMSIZE_TINY
diff --git a/code/game/objects/items/weapons/tools/wirecutters.dm b/code/game/objects/items/weapons/tools/wirecutters.dm
index 532c50d561..a63aa34aec 100644
--- a/code/game/objects/items/weapons/tools/wirecutters.dm
+++ b/code/game/objects/items/weapons/tools/wirecutters.dm
@@ -8,8 +8,8 @@
 	icon = 'icons/obj/tools.dmi'
 	icon_state = "cutters"
 	item_state = "cutters"
-	center_of_mass_x = 18 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 18
+	center_of_mass_y = 10
 	slot_flags = SLOT_BELT
 	force = 6
 	throw_speed = 2
diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm
index 3d04d1762a..cbd31a5b5b 100644
--- a/code/game/objects/items/weapons/traps.dm
+++ b/code/game/objects/items/weapons/traps.dm
@@ -13,8 +13,8 @@
 	icon_state = "beartrap0"
 	desc = "A mechanically activated leg trap. Low-tech, but reliable. Looks like it could really hurt if you set it off."
 	randpixel = 0
-	center_of_mass_x = 0 //CHOMPEdit
-	center_of_mass_y = 0 //CHOMPEdit
+	center_of_mass_x = 0
+	center_of_mass_y = 0
 	throwforce = 0
 	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_MATERIAL = 1)
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 6e38e837d2..465d674138 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -268,8 +268,8 @@
 	desc = "A collapsed roller bed that can be carried around."
 	icon = 'icons/obj/rollerbed.dmi'
 	icon_state = "folded_rollerbed"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 7 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 7
 	slot_flags = SLOT_BACK
 	w_class = ITEMSIZE_LARGE
 	var/rollertype = /obj/item/roller
diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
index 0d3335503f..1800a68bff 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
@@ -7,8 +7,8 @@ var/global/list/stool_cache = list() //haha stool
 	icon = 'icons/obj/furniture_vr.dmi' //VOREStation Edit - new Icons
 	icon_state = "stool_preview" //set for the map
 	randpixel = 0
-	center_of_mass_x = 0 //CHOMPEdit
-	center_of_mass_y = 0 //CHOMPEdit
+	center_of_mass_x = 0
+	center_of_mass_y = 0
 	force = 10
 	throwforce = 10
 	w_class = ITEMSIZE_HUGE
diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm b/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm
index 01eae75e4e..b13b72bf03 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm
@@ -4,8 +4,8 @@
 	icon = 'icons/obj/furniture_vr.dmi' //VOREStation Edit - new Icons
 	icon_state = "bar_stool_preview" //set for the map
 	randpixel = 0
-	center_of_mass_x = 0 //CHOMPEdit
-	center_of_mass_y = 0 //CHOMPEdit
+	center_of_mass_x = 0
+	center_of_mass_y = 0
 	force = 10
 	throwforce = 10
 	w_class = ITEMSIZE_HUGE
diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
index cdc63bc8e9..a518d19793 100644
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -5,8 +5,8 @@
 	flags = PHORONGUARD
 	item_state_slots = list(slot_r_hand_str = "magboots", slot_l_hand_str = "magboots")
 	species_restricted = null
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 12
 	force = 3
 	overshoes = 1
 	shoes_under_pants = -1	//These things are huge
diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm
index 9adf07a86a..68b2a123ed 100644
--- a/code/modules/clothing/spacesuits/spacesuits.dm
+++ b/code/modules/clothing/spacesuits/spacesuits.dm
@@ -7,8 +7,8 @@
 	icon_state = "space"
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment."
 	randpixel = 0
-	center_of_mass_x = 0 //CHOMPEdit
-	center_of_mass_y = 0 //CHOMPEdit
+	center_of_mass_x = 0
+	center_of_mass_y = 0
 	flags = PHORONGUARD
 	item_flags = THICKMATERIAL | AIRTIGHT | ALLOW_SURVIVALFOOD
 	permeability_coefficient = 0  //Chompedit was 0.01, zeroed to test protecting those who are vulnerable to water.
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index 83c8410bbc..2efeb233da 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -4,8 +4,8 @@
 	icon_state = "bio"
 	desc = "A hood that protects the head and face from biological comtaminants."
 	randpixel = 0
-	center_of_mass_x = 0 //CHOMPEdit
-	center_of_mass_y = 0 //CHOMPEdit
+	center_of_mass_x = 0
+	center_of_mass_y = 0
 	permeability_coefficient = 0.01
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|BLOCKHAIR
diff --git a/code/modules/food/drinkingglass/drinkingglass.dm b/code/modules/food/drinkingglass/drinkingglass.dm
index a9c77876f5..a528fb9aab 100644
--- a/code/modules/food/drinkingglass/drinkingglass.dm
+++ b/code/modules/food/drinkingglass/drinkingglass.dm
@@ -18,8 +18,8 @@
 
 	var/rim_pos
 
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list(5,10,15,30)
diff --git a/code/modules/food/drinkingglass/metaglass.dm b/code/modules/food/drinkingglass/metaglass.dm
index 9c100a2798..8af71fe291 100644
--- a/code/modules/food/drinkingglass/metaglass.dm
+++ b/code/modules/food/drinkingglass/metaglass.dm
@@ -5,8 +5,8 @@
 	amount_per_transfer_from_this = 5
 	volume = 30
 	unacidable = TRUE //glass
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	matter = list(MAT_GLASS = 500)
 	icon = 'icons/obj/drinks.dmi'
 
@@ -40,12 +40,12 @@
 		else
 			desc = "You can't really tell what this is."
 
-		if(R.glass_center_of_mass)
-			center_of_mass_x = R.glass_center_of_mass["x"] //CHOMPEdit
-			center_of_mass_y = R.glass_center_of_mass["x"] //CHOMPEdit
+		if(R.glass_center_of_mass_x || R.glass_center_of_mass_y)
+			center_of_mass_x = R.glass_center_of_mass_x
+			center_of_mass_y = R.glass_center_of_mass_y
 		else
-			center_of_mass_x = 16 //CHOMPEdit
-			center_of_mass_y= 10 //CHOMPEdit
+			center_of_mass_x = 16
+			center_of_mass_y= 10
 
 		if(R.price_tag)
 			price_tag = R.price_tag
@@ -56,14 +56,14 @@
 			icon_state = "pglass_empty"
 			name = "metamorphic pint glass"
 			desc = "This glass changes shape and form depending on the drink inside... fancy!"
-			center_of_mass_x = 16 //CHOMPEdit
-			center_of_mass_y= 10 //CHOMPEdit
+			center_of_mass_x = 16
+			center_of_mass_y= 10
 		else
 			icon_state = "glass_empty"
 			name = "metamorphic glass"
 			desc = "This glass changes shape and form depending on the drink inside... fancy!"
-			center_of_mass_x = 16 //CHOMPEdit
-			center_of_mass_y= 10 //CHOMPEdit
+			center_of_mass_x = 16
+			center_of_mass_y= 10
 			return
 
 /*
@@ -73,7 +73,8 @@ Drinks Data
 /datum/reagent
 	var/glass_icon_file = null
 	var/glass_icon_state = null
-	var/glass_center_of_mass = null
+	var/glass_center_of_mass_x = 0
+	var/glass_center_of_mass_y = 0
 	var/glass_icon_source = null //CHOMP A way for us to have metaglass identify and decide which dmi it wants to grab sprites from - Jack
 
 /datum/reagent/adminordrazine
@@ -81,7 +82,8 @@ Drinks Data
 
 /datum/reagent/chloralhydrate/beer2
 	glass_icon_state = "beerglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/blood
 	glass_icon_state = "glass_red"
@@ -145,7 +147,8 @@ Drinks Data
 
 /datum/reagent/drink/tea/icetea
 	glass_icon_state = "icedteaglass"
-	glass_center_of_mass = list("x"=15, "y"=10)
+	glass_center_of_mass_x = 15
+	glass_center_of_mass_y = 10
 
 /datum/reagent/drink/coffee
 	glass_icon_state = "hot_coffee"
@@ -155,11 +158,13 @@ Drinks Data
 
 /datum/reagent/drink/soy_latte
 	glass_icon_state = "soy_latte"
-	glass_center_of_mass = list("x"=15, "y"=9)
+	glass_center_of_mass_x = 15
+	glass_center_of_mass_y = 9
 
 /datum/reagent/drink/cafe_latte
 	glass_icon_state = "cafe_latte"
-	glass_center_of_mass = list("x"=15, "y"=9)
+	glass_center_of_mass_x = 15
+	glass_center_of_mass_y = 9
 
 /datum/reagent/drink/hot_coco
 	glass_icon_state = "chocolateglass"
@@ -178,26 +183,31 @@ Drinks Data
 
 /datum/reagent/drink/soda/kiraspecial
 	glass_icon_state = "kiraspecial"
-	glass_center_of_mass = list("x"=16, "y"=12)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 12
 
 /datum/reagent/drink/soda/brownstar
 	glass_icon_state = "brownstar"
 
 /datum/reagent/drink/milkshake
 	glass_icon_state = "milkshake"
-	glass_center_of_mass = list("x"=16, "y"=7)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 7
 
 /datum/reagent/drink/rewriter
 	glass_icon_state = "rewriter"
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 
 /datum/reagent/drink/soda/nuka_cola
 	glass_icon_state = "nuka_colaglass"
-	glass_center_of_mass = list("x"=16, "y"=6)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 6
 
 /datum/reagent/drink/grenadine
 	glass_icon_state = "grenadineglass"
-	glass_center_of_mass = list("x"=17, "y"=6)
+	glass_center_of_mass_x = 17
+	glass_center_of_mass_y = 6
 
 /datum/reagent/drink/soda/space_cola
 	glass_icon_state = "glass_brown"
@@ -216,7 +226,8 @@ Drinks Data
 
 /datum/reagent/drink/doctor_delight
 	glass_icon_state = "doctorsdelightglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/drink/ice
 	glass_icon_state = "iceglass"
@@ -226,140 +237,172 @@ Drinks Data
 
 /datum/reagent/drink/oilslick
 	glass_icon_state = "jar_oil"
-	glass_center_of_mass = list("x"=15, "y"=12)
+	glass_center_of_mass_x = 15
+	glass_center_of_mass_y = 12
 
 /datum/reagent/drink/nuclearwaste
 	glass_icon_state = "jar_rad"
-	glass_center_of_mass = list("x"=15, "y"=12)
+	glass_center_of_mass_x = 15
+	glass_center_of_mass_y = 12
 
 /datum/reagent/drink/sodaoil
 	glass_icon_state = "jar_water"
-	glass_center_of_mass = list("x"=15, "y"=12)
+	glass_center_of_mass_x = 15
+	glass_center_of_mass_y = 12
 
 /datum/reagent/ethanol/absinthe
 	glass_icon_state = "absintheglass"
-	glass_center_of_mass = list("x"=16, "y"=5)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 5
 
 /datum/reagent/ethanol/ale
 	glass_icon_state = "aleglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/beer
 	glass_icon_state = "beerglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/bluecuracao
 	glass_icon_state = "curacaoglass"
-	glass_center_of_mass = list("x"=16, "y"=5)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 5
 
 /datum/reagent/ethanol/cognac
 	glass_icon_state = "cognacglass"
-	glass_center_of_mass = list("x"=16, "y"=6)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 6
 
 /datum/reagent/ethanol/deadrum
 	glass_icon_state = "rumglass"
-	glass_center_of_mass = list("x"=16, "y"=12)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 12
 
 /datum/reagent/ethanol/gin
 	glass_icon_state = "ginvodkaglass"
-	glass_center_of_mass = list("x"=16, "y"=12)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 12
 
 /datum/reagent/ethanol/coffee/kahlua
 	glass_icon_state = "kahluaglass"
-	glass_center_of_mass = list("x"=15, "y"=7)
+	glass_center_of_mass_x = 15
+	glass_center_of_mass_y = 7
 
 /datum/reagent/ethanol/melonliquor
 	glass_icon_state = "emeraldglass"
-	glass_center_of_mass = list("x"=16, "y"=5)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 5
 
 /datum/reagent/ethanol/rum
 	glass_icon_state = "rumglass"
-	glass_center_of_mass = list("x"=16, "y"=12)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 12
 
 /datum/reagent/ethanol/sake
 	glass_icon_state = "sakecup"
-	glass_center_of_mass = list("x"=16, "y"=12)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 12
 
 /datum/reagent/ethanol/godsake
 	glass_icon_state = "sakeporcelain"
-	glass_center_of_mass = list("x"=16, "y"=12)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 12
 
 /datum/reagent/ethanol/tequila
 	glass_icon_state = "tequillaglass"
-	glass_center_of_mass = list("x"=16, "y"=12)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 12
 
 /datum/reagent/ethanol/thirteenloko
 	glass_icon_state = "thirteen_loko_glass"
 
 /datum/reagent/ethanol/vermouth
 	glass_icon_state = "vermouthglass"
-	glass_center_of_mass = list("x"=16, "y"=12)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 12
 
 /datum/reagent/ethanol/vodka
 	glass_icon_state = "ginvodkaglass"
-	glass_center_of_mass = list("x"=16, "y"=12)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 12
 
 /datum/reagent/ethanol/whiskey
 	glass_icon_state = "whiskeyglass"
-	glass_center_of_mass = list("x"=16, "y"=12)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 12
 
 /datum/reagent/ethanol/wine
 	glass_icon_state = "wineglass"
-	glass_center_of_mass = list("x"=15, "y"=7)
+	glass_center_of_mass_x = 15
+	glass_center_of_mass_y = 7
 
 /datum/reagent/ethanol/acid_spit
 	glass_icon_state = "acidspitglass"
-	glass_center_of_mass = list("x"=16, "y"=7)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 7
 
 /datum/reagent/ethanol/alliescocktail
 	glass_icon_state = "alliescocktail"
-	glass_center_of_mass = list("x"=17, "y"=8)
+	glass_center_of_mass_x = 17
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/aloe
 	glass_icon_state = "aloe"
-	glass_center_of_mass = list("x"=17, "y"=8)
+	glass_center_of_mass_x = 17
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/amasec
 	glass_icon_state = "amasecglass"
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 
 /datum/reagent/ethanol/andalusia
 	glass_icon_state = "andalusia"
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 
 /datum/reagent/ethanol/antifreeze
 	glass_icon_state = "antifreeze"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/atomicbomb
 	glass_icon_state = "atomicbombglass"
-	glass_center_of_mass = list("x"=15, "y"=7)
+	glass_center_of_mass_x = 15
+	glass_center_of_mass_y = 7
 
 /datum/reagent/ethanol/coffee/b52
 	glass_icon_state = "b52glass"
 
 /datum/reagent/ethanol/bahama_mama
 	glass_icon_state = "bahama_mama"
-	glass_center_of_mass = list("x"=16, "y"=5)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 5
 
 /datum/reagent/ethanol/bananahonk
 	glass_icon_state = "bananahonkglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/barefoot
 	glass_icon_state = "b&p"
-	glass_center_of_mass = list("x"=17, "y"=8)
+	glass_center_of_mass_x = 17
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/beepsky_smash
 	glass_icon_state = "beepskysmashglass"
-	glass_center_of_mass = list("x"=18, "y"=10)
+	glass_center_of_mass_x = 18
+	glass_center_of_mass_y = 10
 
 /datum/reagent/ethanol/bilk
 	glass_icon_state = "glass_brown"
 
 /datum/reagent/ethanol/black_russian
 	glass_icon_state = "blackrussianglass"
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 
 /datum/reagent/ethanol/bloody_mary
 	glass_icon_state = "bloodymaryglass"
@@ -369,310 +412,385 @@ Drinks Data
 
 /datum/reagent/ethanol/coffee/brave_bull
 	glass_icon_state = "bravebullglass"
-	glass_center_of_mass = list("x"=15, "y"=8)
+	glass_center_of_mass_x = 15
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/changelingsting
 	glass_icon_state = "changelingsting"
 
 /datum/reagent/ethanol/martini
 	glass_icon_state = "martiniglass"
-	glass_center_of_mass = list("x"=17, "y"=8)
+	glass_center_of_mass_x = 17
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/rum_and_cola
 	glass_icon_state = "rumcolaglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/cuba_libre
 	glass_icon_state = "cubalibreglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/demonsblood
 	glass_icon_state = "demonsblood"
-	glass_center_of_mass = list("x"=16, "y"=2)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 2
 
 /datum/reagent/ethanol/devilskiss
 	glass_icon_state = "devilskiss"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/driestmartini
 	glass_icon_state = "driestmartiniglass"
-	glass_center_of_mass = list("x"=17, "y"=8)
+	glass_center_of_mass_x = 17
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/ginfizz
 	glass_icon_state = "ginfizzglass"
-	glass_center_of_mass = list("x"=16, "y"=7)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 7
 
 /datum/reagent/ethanol/grog
 	glass_icon_state = "grogglass"
 
 /datum/reagent/ethanol/erikasurprise
 	glass_icon_state = "erikasurprise"
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 
 /datum/reagent/ethanol/gargle_blaster
 	glass_icon_state = "gargleblasterglass"
-	glass_center_of_mass = list("x"=17, "y"=6)
+	glass_center_of_mass_x = 17
+	glass_center_of_mass_y = 6
 
 /datum/reagent/ethanol/gintonic
 	glass_icon_state = "gintonicglass"
 
 /datum/reagent/ethanol/goldschlager
 	glass_icon_state = "goldschlagerglass"
-	glass_center_of_mass = list("x"=16, "y"=12)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 12
 
 /datum/reagent/ethanol/hippies_delight
 	glass_icon_state = "hippiesdelightglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/hooch
 	glass_icon_state = "glass_brown2"
 
 /datum/reagent/ethanol/iced_beer
 	glass_icon_state = "iced_beerglass"
-	glass_center_of_mass = list("x"=16, "y"=7)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 7
 
 /datum/reagent/ethanol/irishcarbomb
 	glass_icon_state = "irishcarbomb"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/coffee/irishcoffee
 	glass_icon_state = "irishcoffeeglass"
-	glass_center_of_mass = list("x"=15, "y"=10)
+	glass_center_of_mass_x = 15
+	glass_center_of_mass_y = 10
 
 /datum/reagent/ethanol/irish_cream
 	glass_icon_state = "irishcreamglass"
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 
 /datum/reagent/ethanol/longislandicedtea
 	glass_icon_state = "longislandicedteaglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/manhattan
 	glass_icon_state = "manhattanglass"
-	glass_center_of_mass = list("x"=17, "y"=8)
+	glass_center_of_mass_x = 17
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/manhattan_proj
 	glass_icon_state = "proj_manhattanglass"
-	glass_center_of_mass = list("x"=17, "y"=8)
+	glass_center_of_mass_x = 17
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/manly_dorf
 	glass_icon_state = "manlydorfglass"
 
 /datum/reagent/ethanol/margarita
 	glass_icon_state = "margaritaglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/mead
 	glass_icon_state = "meadglass"
-	glass_center_of_mass = list("x"=17, "y"=10)
+	glass_center_of_mass_x = 17
+	glass_center_of_mass_y = 10
 
 /datum/reagent/ethanol/moonshine
 	glass_icon_state = "glass_clear"
 
 /datum/reagent/ethanol/neurotoxin
 	glass_icon_state = "neurotoxinglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/patron
 	glass_icon_state = "patronglass"
-	glass_center_of_mass = list("x"=7, "y"=8)
+	glass_center_of_mass_x = 7
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/pwine
 	glass_icon_state = "pwineglass"
-	glass_center_of_mass = list("x"=16, "y"=5)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 5
 
 /datum/reagent/ethanol/red_mead
 	glass_icon_state = "red_meadglass"
-	glass_center_of_mass = list("x"=17, "y"=10)
+	glass_center_of_mass_x = 17
+	glass_center_of_mass_y = 10
 
 /datum/reagent/ethanol/sbiten
 	glass_icon_state = "sbitenglass"
-	glass_center_of_mass = list("x"=17, "y"=8)
+	glass_center_of_mass_x = 17
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/screwdrivercocktail
 	glass_icon_state = "screwdriverglass"
-	glass_center_of_mass = list("x"=15, "y"=10)
+	glass_center_of_mass_x = 15
+	glass_center_of_mass_y = 10
 
 /datum/reagent/ethanol/silencer
 	glass_icon_state = "silencerglass"
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 
 /datum/reagent/ethanol/singulo
 	glass_icon_state = "singulo"
-	glass_center_of_mass = list("x"=17, "y"=4)
+	glass_center_of_mass_x = 17
+	glass_center_of_mass_y = 4
 
 /datum/reagent/ethanol/snowwhite
 	glass_icon_state = "snowwhite"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/suidream
 	glass_icon_state = "sdreamglass"
-	glass_center_of_mass = list("x"=16, "y"=5)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 5
 
 /datum/reagent/ethanol/syndicatebomb
 	glass_icon_state = "syndicatebomb"
-	glass_center_of_mass = list("x"=16, "y"=4)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 4
 
 /datum/reagent/ethanol/tequilla_sunrise
 	glass_icon_state = "tequillasunriseglass"
 
 /datum/reagent/ethanol/threemileisland
 	glass_icon_state = "threemileislandglass"
-	glass_center_of_mass = list("x"=16, "y"=2)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 2
 
 /datum/reagent/ethanol/toxins_special
 	glass_icon_state = "toxinsspecialglass"
 
 /datum/reagent/ethanol/vodkamartini
 	glass_icon_state = "martiniglass"
-	glass_center_of_mass = list("x"=17, "y"=8)
+	glass_center_of_mass_x = 17
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/vodkatonic
 	glass_icon_state = "vodkatonicglass"
-	glass_center_of_mass = list("x"=16, "y"=7)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 7
 
 /datum/reagent/ethanol/white_russian
 	glass_icon_state = "whiterussianglass"
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 
 /datum/reagent/ethanol/whiskey_cola
 	glass_icon_state = "whiskeycolaglass"
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 
 /datum/reagent/ethanol/whiskeysoda
 	glass_icon_state = "whiskeysodaglass2"
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 
 /datum/reagent/ethanol/specialwhiskey
 	glass_icon_state = "whiskeyglass"
-	glass_center_of_mass = list("x"=16, "y"=12)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 12
 
 /datum/reagent/ethanol/godka
 	glass_icon_state = "godkabottle"
-	glass_center_of_mass = list("x"=17, "y"=15)
+	glass_center_of_mass_x = 17
+	glass_center_of_mass_y = 15
 
 /datum/reagent/ethanol/holywine
 	glass_icon_state = "holywineglass"
-	glass_center_of_mass = list("x"=15, "y"=7)
+	glass_center_of_mass_x = 15
+	glass_center_of_mass_y = 7
 
 /datum/reagent/ethanol/holy_mary
 	glass_icon_state = "holymaryglass"
 
 /datum/reagent/ethanol/angelswrath
 	glass_icon_state = "angelswrath"
-	glass_center_of_mass = list("x"=16, "y"=2)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 2
 
 /datum/reagent/ethanol/angelskiss
 	glass_icon_state = "angelskiss"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/ichor_mead
 	glass_icon_state = "ichor_meadglass"
-	glass_center_of_mass = list("x"=17, "y"=10)
+	glass_center_of_mass_x = 17
+	glass_center_of_mass_y = 10
 
 /datum/reagent/drink/eggnog
 	glass_icon_state = "eggnog"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/drink/cider
 	glass_icon_state = "ciderglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/drink/driverspunch
 	glass_icon_state = "driverspunch"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/coffee/elysiumfacepunch
 	glass_icon_state = "elysiumfacepunch"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/drink/entdraught
 	glass_icon_state = "entdraught"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/erebusmoonrise
 	glass_icon_state = "erebusmoonrise"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/euphoria
 	glass_icon_state = "euphoria"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/drink/collins_mix
 	glass_icon_state = "collinsmix"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/daiquiri
 	glass_icon_state = "daiquiri"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/drink/dreamcream
 	glass_icon_state = "dreamcream"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/debugger
 	glass_icon_state = "debugger"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/binmanbliss
 	glass_icon_state = "binmanbliss"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/bitters
 	glass_icon_state = "bitters"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/chrysanthemum
 	glass_icon_state = "chrysanthemum"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
+
+/datum/reagent/ethanol/cloverclub
+	glass_icon_state = "cloverclub"
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/coldfront
 	glass_icon_state = "coldfront"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/balloon
 	glass_icon_state = "balloon"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/drink/berrycordial
 	glass_icon_state = "berrycordial"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/drink/milkshake/chocoshake
 	glass_icon_state = "chocoshake"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/drink/milkshake/coffeeshake
 	glass_icon_state = "coffeeshake"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/drink/milkshake/berryshake
 	glass_icon_state = "berryshake"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/drink/soda/melonade
 	glass_icon_state = "melonade"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/drink/soda/appleade
 	glass_icon_state = "appleade"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/drink/mintapplesparkle
 	glass_icon_state = "mintapplesparkle"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/drink/soda/pineappleade
 	glass_icon_state = "pineappleade"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/drink/soda/lemonade
 	glass_icon_state = "lemonade"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/drink/arnold_palmer
 	glass_icon_state = "arnoldpalmer"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/mojito
 	glass_icon_state = "mojito"
diff --git a/code/modules/food/drinkingglass/metaglass_vr.dm b/code/modules/food/drinkingglass/metaglass_vr.dm
index 579a0cea87..0508ed1df4 100644
--- a/code/modules/food/drinkingglass/metaglass_vr.dm
+++ b/code/modules/food/drinkingglass/metaglass_vr.dm
@@ -1,151 +1,181 @@
 /datum/reagent/ethanol/ginzamary
 	glass_icon_state = "ginzamaryglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/deathbell
 	glass_icon_state = "deathbellglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/drink/brownstar
 	glass_icon_state = "brownstarglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/spacersbrew
 	glass_icon_state = "spacersbrewglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/galacticpanic
 	glass_icon_state = "galacticpanicglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/bulldog
 	glass_icon_state = "bulldogglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/sbagliato
 	glass_icon_state = "sbagliatoglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/italiancrisis
 	glass_icon_state = "italiancrisisglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/bigbeer
 	glass_icon_state = "bigbeerglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/sugarrush
 	glass_icon_state = "sugarrushglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/lotus
 	glass_icon_state = "lotusglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/shroomjuice
 	glass_icon_state = "shroomjuiceglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/russianroulette
 	glass_icon_state = "russianrouletteglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/lovepotion
 	glass_icon_state = "lovepotionglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/honeyshot
 	glass_icon_state = "honeyshotglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/appletini
 	glass_icon_state = "appletiniglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/glowingappletini
 	glass_icon_state = "glowingappletiniglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/scsatw
 	glass_icon_state = "slowcomfortablescrewagainstthewallglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/drink/choccymilk
 	glass_icon_state = "choccymilkglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/drink/sweettea
 	glass_icon_state = "sweetteaglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/redspaceflush
 	glass_icon_state = "redspaceflushglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/drink/graveyard
 	glass_icon_state = "graveyardglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/unsweettea
 	glass_icon_state = "unsweetteaglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/hairoftherat
 	glass_icon_state = "hairoftheratglass"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/pink_russian
 	glass_icon_state = "pinkrussianglass"
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/originalsin
 	glass_icon_state = "originalsinglass"
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/whiskeysour
 	glass_icon_state = "whiskeysourglass"
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/newyorksour
 	glass_icon_state = "newyorksourglass"
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/mudslide
 	glass_icon_state = "mudslideglass"
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/windgarita
 	glass_icon_state = "windgaritaglass"
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/drink/soda/kiraspecial
@@ -237,7 +267,8 @@
 
 /datum/reagent/ethanol/burnout
 	glass_icon_state = "burnout"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
 /datum/reagent/ethanol/manager_summoner
diff --git a/code/modules/food/drinkingglass/mugs.dm b/code/modules/food/drinkingglass/mugs.dm
index b1e8117558..1d6dacce6b 100644
--- a/code/modules/food/drinkingglass/mugs.dm
+++ b/code/modules/food/drinkingglass/mugs.dm
@@ -15,8 +15,8 @@
 	desc = "A cup with the British flag emblazoned on it."
 	icon_state = "britcup"
 	volume = 30
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 13
 
 /obj/item/reagent_containers/food/drinks/britcup/on_reagent_change()
 	..()
@@ -30,8 +30,8 @@
 	icon = 'icons/obj/drinks_vr.dmi'
 	icon_state = "textmug"
 	volume = 30
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 13
 
 /*
  * Coffee Mugs
diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm
index 23c7beaa8a..25a941a243 100644
--- a/code/modules/food/food.dm
+++ b/code/modules/food/food.dm
@@ -34,7 +34,7 @@
 
 /obj/item/reagent_containers/food/Initialize()
 	. = ..()
-	if ((center_of_mass_x || center_of_mass_y) && !pixel_x && !pixel_y) //CHOMPEdit
+	if ((center_of_mass_x || center_of_mass_y) && !pixel_x && !pixel_y)
 		src.pixel_x = rand(-6.0, 6) //Randomizes postion
 		src.pixel_y = rand(-6.0, 6)
 
@@ -52,8 +52,8 @@
 		var/cell_x = max(0, min(CELLS-1, round(mouse_x/CELLSIZE)))
 		var/cell_y = max(0, min(CELLS-1, round(mouse_y/CELLSIZE)))
 
-		pixel_x = (CELLSIZE * (0.5 + cell_x)) - center_of_mass_x //CHOMPEdit
-		pixel_y = (CELLSIZE * (0.5 + cell_y)) - center_of_mass_y //CHOMPEdit
+		pixel_x = (CELLSIZE * (0.5 + cell_x)) - center_of_mass_x
+		pixel_y = (CELLSIZE * (0.5 + cell_y)) - center_of_mass_y
 
 /obj/item/reagent_containers/food/container_resist(mob/living/M)
 	if(istype(M, /mob/living/voice)) return	// CHOMPAdd - Stops sentient food from astral projecting
diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm
index 5efb2b5500..a4391e03f5 100644
--- a/code/modules/food/food/cans.dm
+++ b/code/modules/food/food/cans.dm
@@ -13,8 +13,8 @@
 	desc = "Reassuringly artificial. Contains caffeine."
 	description_fluff = "The 'Space' branding was originally added to the 'Alpha Cola' product line in order to justify selling cans for 50% higher prices to 'off-world' retailers. Despite being chemically identical, Space Cola proved so popular that Centauri Provisions eventually applied the name to the entire product line - price hike and all."
 	icon_state = "cola"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/drinks/cans/cola/Initialize()
 	. = ..()
@@ -25,8 +25,8 @@
 	desc = "More reassuringly artificial than ever before."
 	description_fluff = "The 'Space' branding was originally added to the 'Alpha Cola' product line in order to justify selling cans for 50% higher prices to 'off-world' retailers. Despite being chemically identical, Space Cola proved so popular that Centauri Provisions eventually applied the name to the entire product line - price hike and all."
 	icon_state = "decafcola"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/drinks/cans/decaf_cola/Initialize()
 	. = ..()
@@ -36,8 +36,8 @@
 	name = "bottled water"
 	desc = "Ice cold and utterly tasteless, this 'all-natural' mineral water comes 'fresh' from one of NanoTrasen's heavy-duty bottling plants in the Sivian poles."
 	icon_state = "waterbottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	drop_sound = 'sound/items/drop/disk.ogg'
 	pickup_sound = 'sound/items/pickup/disk.ogg'
 	cant_chance = 0
@@ -51,8 +51,8 @@
 	desc = "Blows right through you like a space wind. Contains caffeine."
 	description_fluff = "The 'Space' branding was originally added to the 'Alpha Cola' product line in order to justify selling cans for 50% higher prices to 'off-world' retailers. Despite being chemically identical, Space Cola proved so popular that Centauri Provisions eventually applied the name to the entire product line - price hike and all."
 	icon_state = "space_mountain_wind"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/space_mountain_wind/Initialize()
 	. = ..()
@@ -62,8 +62,8 @@
 	name = "\improper Thirteen Loko"
 	desc = "The Vir Health Board has advised consumers that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly."
 	icon_state = "thirteen_loko"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/drinks/cans/thirteenloko/Initialize()
 	. = ..()
@@ -74,8 +74,8 @@
 	desc = "A delicious mixture of 42 different flavors. Contains caffine."
 	description_fluff = "Following a 2490 lawsuit and a spate of deaths, Gilthari Exports reminds customers that the 'Dr.' legally stands for 'Drink'."
 	icon_state = "dr_gibb"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/dr_gibb/Initialize()
 	. = ..()
@@ -86,8 +86,8 @@
 	desc = "A delicious mixture of 42 different flavors, one of which is water. Contains caffeine."
 	description_fluff = "Following a 2490 lawsuit and a spate of deaths, Gilthari Exports reminds customers that the 'Dr.' legally stands for 'Drink'."
 	icon_state = "dr_gibb_diet"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/dr_gibb_diet/Initialize()
 	. = ..()
@@ -98,8 +98,8 @@
 	desc = "The taste of a star in liquid form. And, a bit of tuna...? Contains caffeine."
 	description_fluff = "Brought back by popular demand in 2515 after a limited-run release in 2510, the cult success of this bizarre tasting soda has never truly been accounted for by economists."
 	icon_state = "starkist"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/starkist/Initialize()
 	. = ..()
@@ -110,8 +110,8 @@
 	desc = "The taste of a star in liquid form, in a special decaffineated blend. Still tastes faintly of tuna?"
 	description_fluff = "A special variant of the Starkist brand soda introduced after popular outcry following a reformulation of the basic drink decades ago. This decaffineated variant outsells 'New' Starkist in many markets."
 	icon_state = "decafstarkist"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/starkistdecaf/Initialize()
 	. = ..()
@@ -122,8 +122,8 @@
 	desc = "Tastes like a hull breach in your mouth."
 	description_fluff = "The 'Space' branding was originally added to the 'Alpha Cola' product line in order to justify selling cans for 50% higher prices to 'off-world' retailers. Despite being chemically identical, Space Cola proved so popular that Centauri Provisions eventually applied the name to the entire product line - price hike and all."
 	icon_state = "space-up"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/space_up/Initialize()
 	. = ..()
@@ -134,8 +134,8 @@
 	desc = "You wanted ORANGE. It gave you Lemon-Lime."
 	description_fluff = "Not to be confused with 'lemon & lime soda', Lemon-Lime is specially formulated using the highly propriatary Lemon-Lime Fruit. Growing the Lemon-Lime without a license is punishable by fines or jail time. Accept no immitations."
 	icon_state = "lemon-lime"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/lemon_lime/Initialize()
 	. = ..()
@@ -146,8 +146,8 @@
 	desc = "That sweet, refreshing southern earthy flavor. That's where it's from, right? South Earth? Contains caffeine."
 	description_fluff = "Produced exclusively on the planet Oasis, Vrisk Serket Iced Tea is not sold outside of the Golden Crescent, let alone Earth."
 	icon_state = "ice_tea_can"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/iced_tea/Initialize()
 	. = ..()
@@ -158,8 +158,8 @@
 	desc = "500 pages of rules of how to appropriately enter into a combat with this juice!"
 	description_fluff = "Strangely, this unassuming grape soda is a product of Hephaestus Industries."
 	icon_state = "purple_can"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/grape_juice/Initialize()
 	. = ..()
@@ -170,8 +170,8 @@
 	desc = "Quinine tastes funny, but at least it'll keep the Malaria away."
 	description_fluff = "Due to its technically medicinal properties and the complexities of chemical copyright law, T-Borg's Tonic Water is a rare product of Zeng-Hu's 'LifeWater' refreshments division."
 	icon_state = "tonic"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/tonic/Initialize()
 	. = ..()
@@ -181,8 +181,8 @@
 	name = "soda water"
 	desc = "A can of soda water. Still water's more refreshing cousin."
 	icon_state = "sodawater"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/sodawater/Initialize()
 	. = ..()
@@ -193,8 +193,8 @@
 	desc = "For when you need to be more retro than NanoTrasen already pays you for."
 	description_fluff = "'Classic' beverages is a registered trademark of the Centauri Provisions corporation."
 	icon_state = "gingerale"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/gingerale/Initialize()
 	. = ..()
@@ -205,8 +205,8 @@
 	desc = "Guaranteed to be both Rootin' and Tootin'."
 	description_fluff = "Despite centuries of humanity's expansion, this particular soda is still produced almost exclusively on Earth, in North America."
 	icon_state = "root_beer"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/drinks/cans/root_beer/Initialize()
 	. = ..()
@@ -219,8 +219,8 @@
 	desc = "A true Slavic soda."
 	description_fluff = "A classic Slavic beverage which many space-faring Slavs still enjoy to this day. Fun fact, it is actually considered a weak beer by non-Russians."
 	icon_state = "kvass"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/drinks/cans/kvass/Initialize()
 	. = ..()
@@ -231,8 +231,8 @@
 	desc = "A taste of Russia in the summertime - canned for you consumption."
 	description_fluff = "A sweet and fruity beverage that was traditionally used to preserve fruits in harsh Russian winters that is now available for widespread consumption."
 	icon_state = "kompot"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/drinks/cans/kompot/Initialize()
 	. = ..()
@@ -242,8 +242,8 @@
 	name = "\improper Boda"
 	desc = "State regulated soda beverage. Enjoy comrades."
 	icon_state = "boda"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/boda/Initialize()
 	. = ..()
@@ -253,8 +253,8 @@
 	name = "\improper Boda-Plyus"
 	desc = "State regulated soda beverage, now with added surplus flavoring. Enjoy comrades."
 	icon_state = "bodaplus"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/bodaplus/Initialize()
 	. = ..()
@@ -273,8 +273,8 @@
 	name = "\improper Red Army Twist"
 	desc = "A taste of what keeps our glorious nation running! Served as Space Commissariat Stahlin prefers it! Luke warm."
 	icon_state = "red_army"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/redarmy/Initialize()
 	. = ..()
@@ -285,8 +285,8 @@
 	name = "\improper Arstotzka Brü"
 	desc = "Just what any bureaucrat needs to get through the day. Keep stamping those papers!"
 	icon_state = "arst_bru"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/arstbru/Initialize()
 	. = ..()
@@ -297,8 +297,8 @@
 	desc = "Made by the people. Served to the people."
 	description_fluff = "A can of the only soft drink state approved for the benefit of the people. Served at room temperature regardless of ambient temperatures thanks to innovative Terran insulation technology."
 	icon_state = "terra_cola"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/terra_cola/Initialize()
 	. = ..()
@@ -311,8 +311,8 @@
 	name = "\improper Superior Strawberry"
 	desc = "Feel superior above all with Superior Strawberry!"
 	icon_state = "strawcoke"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/straw_cola/Initialize()
 	. = ..()
@@ -322,8 +322,8 @@
 	name = "\improper Andromeda Apple"
 	desc = "Look to the stars and prepare to explore with Andromeda Apple!"
 	icon_state = "applecoke"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/apple_cola/Initialize()
 	. = ..()
@@ -333,8 +333,8 @@
 	name = "\improper Lunar Lemon"
 	desc = "Feel back at home on the Lunar Colonies with this classic beverage straight from the source!"
 	icon_state = "lemoncoke"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/lemon_cola/Initialize()
 	. = ..()
@@ -344,8 +344,8 @@
 	name = "\improper Starship Sarsaparilla"
 	desc = "Take off and shoot for the stars with this classic cowboy cola!"
 	icon_state = "sarsaparilla"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/sarsaparilla/Initialize()
 	. = ..()
@@ -355,8 +355,8 @@
 	name = "\improper Gravity Grape"
 	desc = "Get down with Newton's favorite carbonated science experiment!"
 	icon_state = "grapesoda"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/grape_cola/Initialize()
 	. = ..()
@@ -366,8 +366,8 @@
 	name = "\improper Orion Orange"
 	desc = "Take a taste-tastic trip to Orion's Belt with Orion Orange!"
 	icon_state = "orangesoda"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/orange_cola/Initialize()
 	. = ..()
@@ -377,8 +377,8 @@
 	name = "\improper Bacon Soda"
 	desc = "Taste something out of this world with Bacon Soda!"
 	icon_state = "porkcoke"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/baconsoda/Initialize()
 	. = ..()
@@ -392,8 +392,8 @@
 	popular as Space Cola, many people across known space enjoy the sweet beverage."
 	icon = 'icons/obj/drinks_vr.dmi'
 	icon_state = "bepis"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/drinks/cans/bepis/Initialize()
 	. = ..()
@@ -404,8 +404,8 @@
 	desc = "A can of refreshing 'spring' water! Or so the can claims."
 	icon = 'icons/obj/drinks_vr.dmi'
 	icon_state = "watercan"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/drinks/cans/astrodew/Initialize()
 	. = ..()
@@ -421,8 +421,8 @@
 	years now, however all attempts they've made have failed."
 	icon = 'icons/obj/drinks_vr.dmi'
 	icon_state = "coffeecan"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/drinks/cans/icecoffee/Initialize()
 	. = ..()
@@ -433,8 +433,8 @@
 	desc = "Uses real honey, making it a sweet tooth's dream drink."
 	icon = 'icons/obj/drinks_vr.dmi'
 	icon_state = "buzzfuzz"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/drinks/cans/buzz/Initialize()
 	. = ..()
@@ -445,8 +445,8 @@
 	desc = "~Shake me up some of that Shambler's Juice!~"
 	icon = 'icons/obj/drinks_vr.dmi'
 	icon_state = "shambler"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/drinks/cans/shambler/Initialize()
 	. = ..()
@@ -457,8 +457,8 @@
 	desc = "A delicious blend of fresh cranberry juice and various spices, the perfect drink."
 	icon = 'icons/obj/drinks_vr.dmi'
 	icon_state = "cranberry"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/drinks/cans/cranberry/Initialize()
 	. = ..()
@@ -470,8 +470,8 @@
 	name = "\improper Sunshine Brew"
 	desc = "Beat the heat with this refreshing brewed beverage."
 	icon_state = "beercan"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/beercan/Initialize()
 	. = ..()
@@ -481,8 +481,8 @@
 	name = "\improper Spacecastle Pale Ale"
 	desc = "A delicious IPA that's canned for your pleasure. Drink up!"
 	icon_state = "alecan"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/cans/alecan/Initialize()
 	. = ..()
@@ -494,8 +494,8 @@
 	name = "\improper Nukies - Peach Blaster"
 	desc = "Harness the power of the atom with this over-caffinated energy drink."
 	icon_state = "nukie_peach"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	volume = 60
 
 /obj/item/reagent_containers/food/drinks/cans/nukie_peach/Initialize()
@@ -506,8 +506,8 @@
 	name = "\improper Nukies - Great Pear"
 	desc = "Harness the power of the atom with this over-caffinated energy drink."
 	icon_state = "nukie_pear"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	volume = 60
 
 /obj/item/reagent_containers/food/drinks/cans/nukie_pear/Initialize()
@@ -518,8 +518,8 @@
 	name = "\improper Nukies - Popping Cherry"
 	desc = "Harness the power of the atom with this over-caffinated energy drink."
 	icon_state = "nukie_cherry"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	volume = 60
 
 /obj/item/reagent_containers/food/drinks/cans/nukie_cherry/Initialize()
@@ -530,8 +530,8 @@
 	name = "\improper Nukies - Melon Squirter"
 	desc = "Harness the power of the atom with this over-caffinated energy drink."
 	icon_state = "nukie_melon"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	volume = 60
 
 /obj/item/reagent_containers/food/drinks/cans/nukie_melon/Initialize()
@@ -542,8 +542,8 @@
 	name = "\improper Nukies - Bursting Banana"
 	desc = "Harness the power of the atom with this over-caffinated energy drink."
 	icon_state = "nukie_banana"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	volume = 60
 
 /obj/item/reagent_containers/food/drinks/cans/nukie_banana/Initialize()
@@ -554,8 +554,8 @@
 	name = "\improper Nukies - Insatiable Rose"
 	desc = "Harness the power of the atom with this over-caffinated energy drink."
 	icon_state = "nukie_rose"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	volume = 60
 
 /obj/item/reagent_containers/food/drinks/cans/nukie_rose/Initialize()
@@ -566,8 +566,8 @@
 	name = "\improper Nukies - Citrus Got Real"
 	desc = "Harness the power of the atom with this over-caffinated energy drink."
 	icon_state = "nukie_lemon"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	volume = 60
 
 /obj/item/reagent_containers/food/drinks/cans/nukie_lemon/Initialize()
@@ -578,8 +578,8 @@
 	name = "\improper Nukies - Swelling Fruit"
 	desc = "Harness the power of the atom with this over-caffinated energy drink."
 	icon_state = "nukie_fruit"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	volume = 60
 
 /obj/item/reagent_containers/food/drinks/cans/nukie_fruit/Initialize()
@@ -590,8 +590,8 @@
 	name = "\improper Nukies - Limited Edition"
 	desc = "Harness the power of the atom with this over-caffinated energy drink."
 	icon_state = "nukie_special"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	volume = 60
 
 /obj/item/reagent_containers/food/drinks/cans/nukie_special/Initialize()
@@ -605,8 +605,8 @@
 	name = "\improper Nukies Mega - Plum Peeper"
 	desc = "Harness the power of the atom with this illegal, unfit for organic consumption and absolutely not regulator approved energy drink."
 	icon_state = "nukie_mega_sight"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	volume = 60
 
 /obj/item/reagent_containers/food/drinks/cans/nukie_mega_sight/Initialize()
@@ -617,8 +617,8 @@
 	name = "\improper Nukies Mega - Juice Pumper"
 	desc = "Harness the power of the atom with this illegal, unfit for organic consumption and absolutely not regulator approved energy drink."
 	icon_state = "nukie_mega_heart"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	volume = 60
 
 /obj/item/reagent_containers/food/drinks/cans/nukie_mega_heart/Initialize()
@@ -629,8 +629,8 @@
 	name = "\improper Nukies Nega - Vibrating Nights"
 	desc = "Harness the power of the atom with this illegal, unfit for organic consumption and absolutely not regulator approved energy drink."
 	icon_state = "nukie_mega_sleep"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	volume = 60
 
 /obj/item/reagent_containers/food/drinks/cans/nukie_mega_sleep/Initialize()
@@ -641,8 +641,8 @@
 	name = "\improper Nukies Mega - Jolt Railer"
 	desc = "Harness the power of the atom with this illegal, unfit for organic consumption and absolutely not regulator approved energy drink."
 	icon_state = "nukie_mega_strong"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	volume = 60
 
 /obj/item/reagent_containers/food/drinks/cans/nukie_mega_shock/Initialize()
@@ -653,8 +653,8 @@
 	name = "\improper Nukies Mega - Rapid Rager"
 	desc = "Harness the power of the atom with this illegal, unfit for organic consumption and absolutely not regulator approved energy drink."
 	icon_state = "nukie_mega_fast"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	volume = 60
 
 /obj/item/reagent_containers/food/drinks/cans/nukie_mega_fast/Initialize()
@@ -665,8 +665,8 @@
 	name = "\improper Nukies Mega - Diamond Sky"
 	desc = "Harness the power of the atom with this illegal, unfit for organic consumption and absolutely not regulator approved energy drink."
 	icon_state = "nukie_mega_high"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	volume = 60
 
 /obj/item/reagent_containers/food/drinks/cans/nukie_mega_high/Initialize()
@@ -677,8 +677,8 @@
 	name = "\improper Nukies Mega - Shrinking Flower"
 	desc = "Harness the power of the atom with this illegal, unfit for organic consumption and absolutely not regulator approved energy drink."
 	icon_state = "nukie_mega_shrink"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	volume = 60
 
 /obj/item/reagent_containers/food/drinks/cans/nukie_mega_shrink/Initialize()
@@ -689,8 +689,8 @@
 	name = "\improper Nukies Mega - Growing Geyser"
 	desc = "Harness the power of the atom with this illegal, unfit for organic consumption and absolutely not regulator approved energy drink."
 	icon_state = "nukie_mega_grow"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y = 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	volume = 60
 
 /obj/item/reagent_containers/food/drinks/cans/nukie_mega_grow/Initialize()
diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm
index 8ba5e0ca01..776c1e9814 100644
--- a/code/modules/food/food/condiment.dm
+++ b/code/modules/food/food/condiment.dm
@@ -12,8 +12,8 @@
 	icon_state = "emptycondiment"
 	flags = OPENCONTAINER
 	possible_transfer_amounts = list(1,5,10)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 	volume = 50
 
 /obj/item/reagent_containers/food/condiment/attackby(var/obj/item/W as obj, var/mob/user as mob)
@@ -61,103 +61,103 @@
 				name = REAGENT_KETCHUP
 				desc = "You feel more American already."
 				icon_state = "ketchup"
-				center_of_mass_x = 16 //CHOMPEdit
-				center_of_mass_y= 6 //CHOMPEdit
+				center_of_mass_x = 16
+				center_of_mass_y = 6
 			if(REAGENT_ID_MUSTARD)
 				name = REAGENT_MUSTARD
 				desc = "A somewhat bitter topping."
 				icon_state = "mustard"
-				center_of_mass_x = 16 //CHOMPEdit
-				center_of_mass_y= 6 //CHOMPEdit
+				center_of_mass_x = 16
+				center_of_mass_y = 6
 			if(REAGENT_ID_CAPSAICIN)
 				name = "Hotsauce"
 				desc = "You can almost TASTE the stomach ulcers now!"
 				icon_state = "hotsauce"
-				center_of_mass_x = 16 //CHOMPEdit
-				center_of_mass_y= 6 //CHOMPEdit
+				center_of_mass_x = 16
+				center_of_mass_y = 6
 			if(REAGENT_ID_ENZYME)
 				name = REAGENT_ENZYME
 				desc = "Used in cooking various dishes."
 				icon_state = "enzyme"
-				center_of_mass_x = 16 //CHOMPEdit
-				center_of_mass_y= 6 //CHOMPEdit
+				center_of_mass_x = 16
+				center_of_mass_y = 6
 			if(REAGENT_ID_SOYSAUCE)
 				name = REAGENT_SOYSAUCE
 				desc = "A salty soy-based flavoring."
 				icon_state = "soysauce"
-				center_of_mass_x = 16 //CHOMPEdit
-				center_of_mass_y= 6 //CHOMPEdit
+				center_of_mass_x = 16
+				center_of_mass_y = 6
 			if(REAGENT_ID_VINEGAR)
 				name = REAGENT_VINEGAR
 				desc = "An acetic acid used in various dishes."
 				icon_state = "vinegar"
-				center_of_mass_x = 16 //CHOMPEdit
-				center_of_mass_y= 6 //CHOMPEdit
+				center_of_mass_x = 16
+				center_of_mass_y = 6
 			if(REAGENT_ID_FROSTOIL)
 				name = "Coldsauce"
 				desc = "Leaves the tongue numb in its passage."
 				icon_state = "coldsauce"
-				center_of_mass_x = 16 //CHOMPEdit
-				center_of_mass_y= 6 //CHOMPEdit
+				center_of_mass_x = 16
+				center_of_mass_y = 6
 			if(REAGENT_ID_SODIUMCHLORIDE)
 				name = "Salt Shaker"
 				desc = "Salt. From space oceans, presumably."
 				icon_state = "saltshaker"
-				center_of_mass_x = 17 //CHOMPEdit
-				center_of_mass_y= 11 //CHOMPEdit
+				center_of_mass_x = 17
+				center_of_mass_y = 11
 			if(REAGENT_ID_BLACKPEPPER)
 				name = "Pepper Mill"
 				desc = "Often used to flavor food or make people sneeze."
 				icon_state = "peppermillsmall"
-				center_of_mass_x = 17 //CHOMPEdit
-				center_of_mass_y= 11 //CHOMPEdit
+				center_of_mass_x = 17
+				center_of_mass_y = 11
 			if(REAGENT_ID_COOKINGOIL)
 				name = REAGENT_COOKINGOIL
 				desc = "A delicious oil used in cooking. General purpose."
 				icon_state = "oliveoil"
-				center_of_mass_x = 16 //CHOMPEdit
-				center_of_mass_y= 6 //CHOMPEdit
+				center_of_mass_x = 16
+				center_of_mass_y = 6
 			if(REAGENT_ID_SUGAR)
 				name = REAGENT_SUGAR
 				desc = "Tastey space sugar!"
-				center_of_mass_x = 16 //CHOMPEdit
-				center_of_mass_y= 6 //CHOMPEdit
+				center_of_mass_x = 16
+				center_of_mass_y = 6
 			if(REAGENT_ID_PEANUTBUTTER)
 				name = REAGENT_PEANUTBUTTER
 				desc = "A jar of smooth peanut butter."
 				icon_state = "peanutbutter"
-				center_of_mass_x = 16 //CHOMPEdit
-				center_of_mass_y= 6 //CHOMPEdit
+				center_of_mass_x = 16
+				center_of_mass_y = 6
 			if(REAGENT_ID_MAYO)
 				name = REAGENT_MAYO
 				desc = "A jar of mayonnaise!"
 				icon_state = "mayo"
-				center_of_mass_x = 16 //CHOMPEdit
-				center_of_mass_y= 6 //CHOMPEdit
+				center_of_mass_x = 16
+				center_of_mass_y = 6
 			if(REAGENT_ID_YEAST)
 				name = REAGENT_YEAST
 				desc = "This is what you use to make bread fluffy."
 				icon_state = "yeast"
-				center_of_mass_x = 16 //CHOMPEdit
-				center_of_mass_y= 6 //CHOMPEdit
+				center_of_mass_x = 16
+				center_of_mass_y = 6
 			if(REAGENT_ID_SPACESPICE)
 				name = "bottle of space spice"
 				desc = "An exotic blend of spices for cooking. Definitely not worms."
 				icon_state = "spacespicebottle"
-				center_of_mass_x = 16 //CHOMPEdit
-				center_of_mass_y= 6 //CHOMPEdit
+				center_of_mass_x = 16
+				center_of_mass_y = 6
 			if(REAGENT_ID_BARBECUE)
 				name = "barbecue sauce"
 				desc = "Barbecue sauce, it's labeled 'sweet and spicy'."
 				icon_state = "barbecue"
-				center_of_mass_x = 16 //CHOMPEdit
-				center_of_mass_y= 6 //CHOMPEdit
+				center_of_mass_x = 16
+				center_of_mass_y = 6
 			if(REAGENT_ID_SPRINKLES)
 				name = REAGENT_ID_SPRINKLES
 				desc = "Bottle of sprinkles, colourful!"
 				icon_state= "sprinkles"
-				center_of_mass_x = 16 //CHOMPEdit
-				center_of_mass_y= 6 //CHOMPEdit
+				center_of_mass_x = 16
+				center_of_mass_y = 6
 			else
 				name = "Misc Condiment Bottle"
 				if (reagents.reagent_list.len==1)
@@ -165,14 +165,14 @@
 				else
 					desc = "A mixture of various condiments. [reagents.get_master_reagent_name()] is one of them."
 				icon_state = "mixedcondiments"
-				center_of_mass_x = 16 //CHOMPEdit
-				center_of_mass_y= 6 //CHOMPEdit
+				center_of_mass_x = 16
+				center_of_mass_y = 6
 	else
 		icon_state = "emptycondiment"
 		name = "Condiment Bottle"
 		desc = "An empty condiment bottle."
-		center_of_mass_x = 16 //CHOMPEdit
-		center_of_mass_y= 6 //CHOMPEdit
+		center_of_mass_x = 16
+		center_of_mass_y = 6
 		return
 
 /obj/item/reagent_containers/food/condiment/enzyme
@@ -244,8 +244,8 @@
 	possible_transfer_amounts = list(1,20)
 	amount_per_transfer_from_this = 1
 	volume = 20
-	center_of_mass_x = 0 //CHOMPEdit
-	center_of_mass_y = 0 //CHOMPEdit
+	center_of_mass_x = 0
+	center_of_mass_y = 0
 
 /obj/item/reagent_containers/food/condiment/small/on_reagent_change()
 	return
@@ -254,8 +254,8 @@
 	name = "salt shaker"											//	a large one.
 	desc = "Salt. From space oceans, presumably."
 	icon_state = "saltshakersmall"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 11
 
 /obj/item/reagent_containers/food/condiment/small/saltshaker/Initialize()
 	. = ..()
@@ -265,8 +265,8 @@
 	name = "pepper shaker"
 	desc = "Often used to flavor food or make people sneeze."
 	icon_state = "peppershakersmall"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 11
 
 /obj/item/reagent_containers/food/condiment/small/peppermill/Initialize()
 	. = ..()
@@ -276,8 +276,8 @@
 	name = "pepper mill"
 	desc = "Fancy way to season a dish or make people sneeze."
 	icon_state = "peppermill"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 11
 
 /obj/item/reagent_containers/food/condiment/small/peppermill/Initialize()
 	. = ..()
@@ -490,8 +490,8 @@
 	icon = 'icons/obj/food.dmi'
 	icon_state = "flour"
 	volume = 220
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/condiment/carton/flour/on_reagent_change()
 	update_icon()
@@ -522,8 +522,8 @@
 	desc = "A big carton of sugar. Sweet!"
 	icon_state = REAGENT_ID_SUGAR
 	volume = 120
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/condiment/carton/sugar/on_reagent_change()
 	update_icon()
diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm
index 9b0f6ddef4..34207a6fba 100644
--- a/code/modules/food/food/drinks.dm
+++ b/code/modules/food/food/drinks.dm
@@ -246,8 +246,8 @@
 	description_fluff = "A product of NanoPastures. Who would have thought that cows would thrive in zero-G?"
 	icon_state = "milk"
 	item_state = "carton"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 9
 	drop_sound = 'sound/items/drop/cardboardbox.ogg'
 	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 
@@ -261,8 +261,8 @@
 	description_fluff = "A product of NanoPastures. For those skeptical that cows can thrive in zero-G."
 	icon_state = "soymilk"
 	item_state = "carton"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 9
 	drop_sound = 'sound/items/drop/cardboardbox.ogg'
 	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 
@@ -277,8 +277,8 @@
 	volume = 30
 	icon_state = "mini-milk"
 	item_state = "carton"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 9
 	drop_sound = 'sound/items/drop/cardboardbox.ogg'
 	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 
@@ -293,8 +293,8 @@
 	volume = 30
 	icon_state = "mini-milk_choco"
 	item_state = "carton"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 9
 	drop_sound = 'sound/items/drop/cardboardbox.ogg'
 	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 
@@ -308,8 +308,8 @@
 	description_fluff = "Fresh coffee is almost unheard of outside of planets and stations where it is grown. Robust Coffee proudly advertises the six separate times it is freeze-dried during the production process of every cup of instant."
 	icon_state = "coffee"
 	trash = /obj/item/trash/coffee
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 10
 	drop_sound = 'sound/items/drop/papercup.ogg'
 	pickup_sound = 'sound/items/pickup/papercup.ogg'
 
@@ -324,8 +324,8 @@
 	icon_state = "chai_vended"
 	item_state = "coffee"
 	trash = /obj/item/trash/coffee
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	drop_sound = 'sound/items/drop/papercup.ogg'
 	pickup_sound = 'sound/items/pickup/papercup.ogg'
 
@@ -340,8 +340,8 @@
 	icon_state = "chai_vended"
 	item_state = "coffee"
 	trash = /obj/item/trash/coffee
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	drop_sound = 'sound/items/drop/papercup.ogg'
 	pickup_sound = 'sound/items/pickup/papercup.ogg'
 
@@ -353,8 +353,8 @@
 	name = "cup of ice"
 	desc = "Careful, cold ice, do not chew."
 	icon_state = "ice"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 10
 /obj/item/reagent_containers/food/drinks/ice/Initialize()
 	. = ..()
 	reagents.add_reagent(REAGENT_ID_ICE, 30)
@@ -366,8 +366,8 @@
 	icon_state = "coffee"
 	item_state = "hot_choc"
 	trash = /obj/item/trash/coffee
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 13
 	drop_sound = 'sound/items/drop/papercup.ogg'
 	pickup_sound = 'sound/items/pickup/papercup.ogg'
 
@@ -382,8 +382,8 @@
 	icon_state = "greentea_vended"
 	item_state = "coffee"
 	trash = /obj/item/trash/coffee
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	drop_sound = 'sound/items/drop/papercup.ogg'
 	pickup_sound = 'sound/items/pickup/papercup.ogg'
 
@@ -398,8 +398,8 @@
 	icon_state = "chai_vended"
 	item_state = "coffee"
 	trash = /obj/item/trash/coffee
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	drop_sound = 'sound/items/drop/papercup.ogg'
 	pickup_sound = 'sound/items/pickup/papercup.ogg'
 
@@ -414,8 +414,8 @@
 	icon_state = "coffee"
 	item_state = "coffee"
 	trash = /obj/item/trash/coffee
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	drop_sound = 'sound/items/drop/papercup.ogg'
 	pickup_sound = 'sound/items/pickup/papercup.ogg'
 
@@ -429,8 +429,8 @@
 	description_fluff = "Konohagakure Brand Ramen has been an instant meal staple for centuries. Cheap, quick and available in over two hundred varieties - though most taste like artifical chicken."
 	icon_state = "ramen"
 	trash = /obj/item/trash/ramen
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	drop_sound = 'sound/items/drop/papercup.ogg'
 	pickup_sound = 'sound/items/pickup/papercup.ogg'
 
@@ -444,8 +444,8 @@
 	icon_state = "water_cup_e"
 	possible_transfer_amounts = null
 	volume = 10
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 12
 	drop_sound = 'sound/items/drop/papercup.ogg'
 	pickup_sound = 'sound/items/pickup/papercup.ogg'
 
@@ -482,8 +482,8 @@
 	icon_state = "shaker"
 	amount_per_transfer_from_this = 10
 	volume = 120
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/drinks/shaker/on_reagent_change()
 	..()
@@ -495,8 +495,8 @@
 	item_state = "teapot"
 	amount_per_transfer_from_this = 10
 	volume = 120
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 7 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 7
 
 /obj/item/reagent_containers/food/drinks/teapot/on_reagent_change()
 	..()
@@ -507,8 +507,8 @@
 
 	icon_state = "flask"
 	volume = 60
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 7 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 7
 
 /obj/item/reagent_containers/food/drinks/flask/on_reagent_change()
 	..()
@@ -528,21 +528,21 @@
 	desc = "A metal flask with a leather band and golden badge belonging to the detective."
 	icon_state = "detflask"
 	volume = 60
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 8
 
 /obj/item/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
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 7 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 7
 
 /obj/item/reagent_containers/food/drinks/flask/vacuumflask
 	name = "vacuum flask"
 	desc = "Keeping your drinks at the perfect temperature since 1892."
 	icon_state = "vacuumflask"
 	volume = 60
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 4 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 4
diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm
index a8a60784b1..4632beff27 100644
--- a/code/modules/food/food/drinks/bottle.dm
+++ b/code/modules/food/food/drinks/bottle.dm
@@ -224,8 +224,8 @@
 	name = "Griffeater Gin"
 	desc = "A bottle of high quality gin, produced in Alpha Centauri."
 	icon_state = "ginbottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 4 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 4
 
 /obj/item/reagent_containers/food/drinks/bottle/gin/Initialize()
 	. = ..()
@@ -235,8 +235,8 @@
 	name = "Uncle Git's Special Reserve"
 	desc = "A premium single-malt whiskey, gently matured in a highly classified location."
 	icon_state = "whiskeybottle1"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 3 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 3
 
 /obj/item/reagent_containers/food/drinks/bottle/whiskey/Initialize()
 	. = ..()
@@ -246,8 +246,8 @@
 	name = REAGENT_SPECIALWHISKEY
 	desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything."
 	icon_state = "whiskeybottle2"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 3 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 3
 
 /obj/item/reagent_containers/food/drinks/bottle/specialwhiskey/Initialize()
 	. = ..()
@@ -257,8 +257,8 @@
 	name = "Tunguska Triple Distilled"
 	desc = "Aah, vodka. Prime choice of drink and fuel by Russians worldwide."
 	icon_state = "vodkabottle"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 3 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 3
 
 /obj/item/reagent_containers/food/drinks/bottle/vodka/Initialize()
 	. = ..()
@@ -268,8 +268,8 @@
 	name = "Caccavo Guaranteed Quality Tequilla"
 	desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!"
 	icon_state = "tequilabottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 3 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 3
 
 /obj/item/reagent_containers/food/drinks/bottle/tequilla/Initialize()
 	. = ..()
@@ -279,8 +279,8 @@
 	name = "Bottle of Nothing"
 	desc = "A bottle filled with nothing"
 	icon_state = "bottleofnothing"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 5 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 5
 
 /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing/Initialize()
 	. = ..()
@@ -290,8 +290,8 @@
 	name = "Wrapp Artiste Patron"
 	desc = "Silver laced tequilla, served in night clubs across the galaxy."
 	icon_state = "patronbottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 
 /obj/item/reagent_containers/food/drinks/bottle/patron/Initialize()
 	. = ..()
@@ -301,8 +301,8 @@
 	name = "Captain Pete's Cuban Spiced Rum"
 	desc = "This isn't just rum, oh no. It's practically Cuba in a bottle."
 	icon_state = "rumbottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 
 /obj/item/reagent_containers/food/drinks/bottle/rum/Initialize()
 	. = ..()
@@ -312,8 +312,8 @@
 	name = "Flask of Holy Water"
 	desc = "A flask of the chaplain's holy water."
 	icon_state = "holyflask"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/drinks/bottle/holywater/Initialize()
 	. = ..()
@@ -323,8 +323,8 @@
 	name = "Goldeneye Vermouth"
 	desc = "Sweet, sweet dryness~"
 	icon_state = "vermouthbottle"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 3 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 3
 
 /obj/item/reagent_containers/food/drinks/bottle/vermouth/Initialize()
 	. = ..()
@@ -334,8 +334,8 @@
 	name = "Robert Robust's Coffee Liqueur"
 	desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936."
 	icon_state = "kahluabottle"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 3 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 3
 
 /obj/item/reagent_containers/food/drinks/bottle/kahlua/Initialize()
 	. = ..()
@@ -345,8 +345,8 @@
 	name = "College Girl Goldschlager"
 	desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps."
 	icon_state = "goldschlagerbottle"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 3 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 3
 
 /obj/item/reagent_containers/food/drinks/bottle/goldschlager/Initialize()
 	. = ..()
@@ -356,8 +356,8 @@
 	name = "Chateau De Baton Premium Cognac"
 	desc = "A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing."
 	icon_state = "cognacbottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 
 /obj/item/reagent_containers/food/drinks/bottle/cognac/Initialize()
 	. = ..()
@@ -367,8 +367,8 @@
 	name = "Jailbreaker Verte"
 	desc = "One sip of this and you just know you're gonna have a good time."
 	icon_state = "absinthebottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 
 /obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize()
 	. = ..()
@@ -378,8 +378,8 @@
 	name = "Emeraldine Melon Liqueur"
 	desc = "A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light."
 	icon_state = "melon_liqueur"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 
 /obj/item/reagent_containers/food/drinks/bottle/melonliquor/Initialize()
 	. = ..()
@@ -389,8 +389,8 @@
 	name = "Miss Blue Curacao"
 	desc = "A fruity, exceptionally azure drink. Does not allow the imbiber to use the fifth magic."
 	icon_state = "blue_curacao"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 
 /obj/item/reagent_containers/food/drinks/bottle/bluecuracao/Initialize()
 	. = ..()
@@ -400,8 +400,8 @@
 	name = REAGENT_UNATHILIQUOR
 	desc = "Just opening the top of this bottle makes you feel a bit tipsy. Not for the faint of heart."
 	icon_state = "redeemersbrew"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 3 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 3
 
 /obj/item/reagent_containers/food/drinks/bottle/redeemersbrew/Initialize()
 	. = ..()
@@ -411,8 +411,8 @@
 	name = "Dr. Bone's Peppermint Schnapps"
 	desc = "A flavoured grain liqueur with a fresh, minty taste."
 	icon_state = "schnapps_pep"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 3 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 3
 
 /obj/item/reagent_containers/food/drinks/bottle/peppermintschnapps/Initialize()
 	. = ..()
@@ -422,8 +422,8 @@
 	name = "Dr. Bone's Peach Schnapps"
 	desc = "A flavoured grain liqueur with a fruity peach taste."
 	icon_state = "schnapps_pea"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 3 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 3
 
 /obj/item/reagent_containers/food/drinks/bottle/peachschnapps/Initialize()
 	. = ..()
@@ -433,8 +433,8 @@
 	name = "Dr. Bone's Lemonade Schnapps"
 	desc = "A flavoured grain liqueur with a sweetish, lemon taste."
 	icon_state = "schnapps_lem"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 3 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 3
 
 /obj/item/reagent_containers/food/drinks/bottle/lemonadeschnapps/Initialize()
 	. = ..()
@@ -444,8 +444,8 @@
 	name = "Schusskonig"
 	desc = "A complex tasting digestif. Thank god the original's trademark lapsed."
 	icon_state = "jager_bottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 3 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 3
 
 /obj/item/reagent_containers/food/drinks/bottle/jager/Initialize()
 	. = ..()
@@ -457,8 +457,8 @@
 	name = "Doublebeard Bearded Special Red"
 	desc = "Cheap cooking wine pretending to be drinkable."
 	icon_state = "winebottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 4 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 4
 
 /obj/item/reagent_containers/food/drinks/bottle/wine/Initialize()
 	. = ..()
@@ -468,8 +468,8 @@
 	name = "Doublebeard Bearded Special White"
 	desc = "Cooking wine pretending to be drinkable."
 	icon_state = "whitewinebottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 4 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 4
 
 /obj/item/reagent_containers/food/drinks/bottle/whitewine/Initialize()
 	. = ..()
@@ -479,8 +479,8 @@
 	name = "NanoTrasen Carnoth Red"
 	desc = "A NanoTrasen branded wine given to high ranking staff as gifts. Made special on the agricultural planet Carnoth."
 	icon_state = "carnoth"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 4 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 4
 
 /obj/item/reagent_containers/food/drinks/bottle/carnoth/Initialize()
 	. = ..()
@@ -490,8 +490,8 @@
 	name = "Warlock's Velvet"
 	desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!"
 	icon_state = "pwinebottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 4 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 4
 
 /obj/item/reagent_containers/food/drinks/bottle/pwine/Initialize()
 	. = ..()
@@ -501,8 +501,8 @@
 	name = "Gilthari Luxury Champagne"
 	desc = "For those special occassions."
 	icon_state = "champagne"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 3 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 3
 
 /obj/item/reagent_containers/food/drinks/bottle/champagne/Initialize()
 	. = ..()
@@ -512,8 +512,8 @@
 	name = "Mono-No-Aware Luxury Sake"
 	desc = "Dry alcohol made from rice, a favorite of businessmen."
 	icon_state = "sakebottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 3 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 3
 
 /obj/item/reagent_containers/food/drinks/bottle/sake/Initialize()
 	. = ..()
@@ -525,8 +525,8 @@
 	name = "\improper two-liter Space Cola"
 	desc = "Cola. In space. Contains caffeine."
 	icon_state = "colabottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 
 /obj/item/reagent_containers/food/drinks/bottle/cola/Initialize()
 	. = ..()
@@ -536,8 +536,8 @@
 	name = "\improper two-liter Space Cola Free"
 	desc = "Cola. In space. Caffeine free."
 	icon_state = "decafcolabottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 
 /obj/item/reagent_containers/food/drinks/bottle/decaf_cola/Initialize()
 	. = ..()
@@ -547,8 +547,8 @@
 	name = "\improper two-liter Space-Up"
 	desc = "Tastes like a hull breach in your mouth."
 	icon_state = "space-up_bottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 
 /obj/item/reagent_containers/food/drinks/bottle/space_up/Initialize()
 	. = ..()
@@ -558,8 +558,8 @@
 	name = "\improper two-liter Space Mountain Wind"
 	desc = "Blows right through you like a space wind. Contains caffeine."
 	icon_state = "space_mountain_wind_bottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 
 /obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind/Initialize()
 	. = ..()
@@ -569,8 +569,8 @@
 	name = "\improper two-liter Dr. Gibb"
 	desc = "A delicious mixture of 42 different flavors. Contains caffeine."
 	icon_state = "dr_gibb_bottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 
 /obj/item/reagent_containers/food/drinks/bottle/dr_gibb/Initialize()
 	. = ..()
@@ -581,8 +581,8 @@
 	desc = "Full of vitamins and deliciousness!"
 	icon_state = "orangejuice"
 	item_state = "carton"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 7 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 7
 	isGlass = 0
 
 /obj/item/reagent_containers/food/drinks/bottle/orangejuice/Initialize()
@@ -594,8 +594,8 @@
 	desc = "Squeezed, pressed and ground to perfection!"
 	icon_state = "applejuice"
 	item_state = "carton"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 7 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 7
 	isGlass = 0
 
 /obj/item/reagent_containers/food/drinks/bottle/applejuice/Initialize()
@@ -607,8 +607,8 @@
 	desc = "It's milk. This carton's large enough to serve your biggest milk drinkers."
 	icon_state = "milk"
 	item_state = "carton"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 9
 	isGlass = 0
 
 /obj/item/reagent_containers/food/drinks/bottle/milk/Initialize()
@@ -620,8 +620,8 @@
 	desc = "It's cream. Made from milk. What else did you think you'd find in there?"
 	icon_state = "cream"
 	item_state = "carton"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	isGlass = 0
 
 /obj/item/reagent_containers/food/drinks/bottle/cream/Initialize()
@@ -633,8 +633,8 @@
 	desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
 	icon_state = "tomatojuice"
 	item_state = "carton"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	isGlass = 0
 
 /obj/item/reagent_containers/food/drinks/bottle/tomatojuice/Initialize()
@@ -646,8 +646,8 @@
 	desc = "Sweet-sour goodness."
 	icon_state = "limejuice"
 	item_state = "carton"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	isGlass = 0
 
 /obj/item/reagent_containers/food/drinks/bottle/limejuice/Initialize()
@@ -659,8 +659,8 @@
 	desc = "Sweet-sour goodness. Minus the sweet."
 	icon_state = "lemonjuice"
 	item_state = "carton"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	isGlass = 0
 
 /obj/item/reagent_containers/food/drinks/bottle/lemonjuice/Initialize()
@@ -671,8 +671,8 @@
 	name = "Briar Rose Grenadine Syrup"
 	desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks."
 	icon_state = "grenadinebottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 
 /obj/item/reagent_containers/food/drinks/bottle/grenadine/Initialize()
 	. = ..()
@@ -682,8 +682,8 @@
 	name = "Special Blend Grapejuice"
 	desc = "A delicious blend of various grape species in one succulent blend."
 	icon_state = "grapejuicebottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 3 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 3
 
 /obj/item/reagent_containers/food/drinks/bottle/grapejuice/Initialize()
 	. = ..()
@@ -702,8 +702,8 @@
 	desc = "A remarkably unremarkable pale lager. Barley malt, hops and yeast."
 	description_fluff = "Identical to an earlier Earth-based variety of beer, Spacer beer was rebranded at the height of humanity's first extra-solar colonization boom in the 2130s and become the go-to cheap booze for those dreaming of a brighter future in the stars. Today, the beer is advertised as 'brewed in space, for space."
 	icon_state = "beer"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 12
 
 /obj/item/reagent_containers/food/drinks/bottle/small/beer/Initialize()
 	. = ..()
@@ -735,8 +735,8 @@
 	name = "Crisp's Cider"
 	desc = "Fermented apples never tasted this good."
 	icon_state = "cider"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 12
 
 /obj/item/reagent_containers/food/drinks/bottle/small/cider/Initialize()
 	. = ..()
@@ -747,8 +747,8 @@
 	desc = "A true dorf's drink of choice."
 	icon_state = "alebottle"
 	item_state = "beer"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/drinks/bottle/small/ale/Initialize()
 	. = ..()
@@ -770,8 +770,8 @@
 	name = REAGENT_COLA
 	desc = "Cola. In space."
 	icon_state = "colabottle2"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 
 /obj/item/reagent_containers/food/drinks/bottle/small/cola/Initialize()
 	. = ..()
@@ -781,8 +781,8 @@
 	name = REAGENT_SPACEUP
 	desc = "Tastes like a hull breach in your mouth."
 	icon_state = "space-up_bottle2"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 
 /obj/item/reagent_containers/food/drinks/bottle/small/space_up/Initialize()
 	. = ..()
@@ -792,8 +792,8 @@
 	name = "Space Mountain Wind"
 	desc = "Blows right through you like a space wind."
 	icon_state = "space_mountain_wind_bottle2"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 
 /obj/item/reagent_containers/food/drinks/bottle/small/space_mountain_wind/Initialize()
 	. = ..()
@@ -803,8 +803,8 @@
 	name = REAGENT_DRGIBB
 	desc = "A delicious mixture of 42 different flavors."
 	icon_state = "dr_gibb_bottle2"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 
 /obj/item/reagent_containers/food/drinks/bottle/small/dr_gibb/Initialize()
 	. = ..()
diff --git a/code/modules/food/food/drinks/cup.dm b/code/modules/food/food/drinks/cup.dm
index ed040a611d..743afa144c 100644
--- a/code/modules/food/food/drinks/cup.dm
+++ b/code/modules/food/food/drinks/cup.dm
@@ -4,8 +4,8 @@
 	icon_state = "cup_empty"
 	amount_per_transfer_from_this = 5
 	volume = 30
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 
 /obj/item/reagent_containers/food/drinks/cup/on_reagent_change()
 	..()
@@ -32,17 +32,17 @@
 		else
 			desc = "You can't really tell what this is."
 
-		if(R.cup_center_of_mass)
-			center_of_mass_x = R.cup_center_of_mass["x"] //CHOMPEdit
-			center_of_mass_y = R.cup_center_of_mass["y"] //CHOMPEdit
+		if(R.cup_center_of_mass_x || R.cup_center_of_mass_y)
+			center_of_mass_x = R.cup_center_of_mass_x
+			center_of_mass_y = R.cup_center_of_mass_y
 		else
-			center_of_mass_x = 16 //CHOMPEdit
-			center_of_mass_y= 16 //CHOMPEdit
+			center_of_mass_x = 16
+			center_of_mass_y = 16
 
 	else
 		icon_state = "cup_empty"
 		name = "coffee cup"
 		desc = "The container of oriental luxuries."
-		center_of_mass_x = 16 //CHOMPEdit
-		center_of_mass_y= 16 //CHOMPEdit
+		center_of_mass_x = 16
+		center_of_mass_y = 16
 		return
diff --git a/code/modules/food/food/drinks/drinkingglass.dm b/code/modules/food/food/drinks/drinkingglass.dm
index c4951a379b..c481fec937 100644
--- a/code/modules/food/food/drinks/drinkingglass.dm
+++ b/code/modules/food/food/drinks/drinkingglass.dm
@@ -7,8 +7,8 @@
 	amount_per_transfer_from_this = 5
 	volume = 30
 	unacidable = TRUE //glass
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	matter = list(MAT_GLASS = 500)
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change()
@@ -16,8 +16,8 @@
 		icon_state = "glass_empty"
 		name = "glass"
 		desc = "Your standard drinking glass."
-		center_of_mass_x = 16 //CHOMPEdit
-		center_of_mass_y= 10 //CHOMPEdit
+		center_of_mass_x = 16
+		center_of_mass_y = 10
 		return
 	var/datum/reagent/R = reagents.get_master_reagent()
 
@@ -36,12 +36,12 @@
 	else
 		desc = "You can't really tell what this is."
 
-	if(R.glass_center_of_mass)
-		center_of_mass_x = R.cup_center_of_mass["x"] //CHOMPEdit
-		center_of_mass_y = R.cup_center_of_mass["y"] //CHOMPEdit
+	if(R.glass_center_of_mass_x || R.glass_center_of_mass_y)
+		center_of_mass_x = R.cup_center_of_mass_x
+		center_of_mass_y = R.cup_center_of_mass_y
 	else
-		center_of_mass_x = 16 //CHOMPEdit
-		center_of_mass_y= 10 //CHOMPEdit
+		center_of_mass_x = 16
+		center_of_mass_y = 10
 
 	if(R.price_tag)
 		price_tag = R.price_tag
@@ -54,16 +54,16 @@
 	icon_state = "cup_empty"
 	amount_per_transfer_from_this = 5
 	volume = 30
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 
 /obj/item/reagent_containers/food/drinks/cup/on_reagent_change()
 	if (!length(reagents?.reagent_list))
 		icon_state = "cup_empty"
 		name = "coffee cup"
 		desc = "The container of oriental luxuries."
-		center_of_mass_x = 16 //CHOMPEdit
-		center_of_mass_y= 16 //CHOMPEdit
+		center_of_mass_x = 16
+		center_of_mass_y = 16
 		return
 	var/datum/reagent/R = reagents.get_master_reagent()
 
@@ -87,12 +87,12 @@
 	else
 		desc = "You can't really tell what this is."
 
-	if(R.cup_center_of_mass)
-		center_of_mass_x = R.cup_center_of_mass["x"] //CHOMPEdit
-		center_of_mass_y = R.cup_center_of_mass["y"] //CHOMPEdit
+	if(R.cup_center_of_mass_x || R.cup_center_of_mass_y)
+		center_of_mass_x = R.cup_center_of_mass_x
+		center_of_mass_y = R.cup_center_of_mass_y
 	else
-		center_of_mass_x = 16 //CHOMPEdit
-		center_of_mass_y= 16 //CHOMPEdit
+		center_of_mass_x = 16
+		center_of_mass_y = 16
 
 	if(R.price_tag)
 		price_tag = R.price_tag
@@ -184,16 +184,16 @@
 	icon_state = "tall_cup_empty"
 	amount_per_transfer_from_this = 5
 	volume = 40
-	center_of_mass_x = 16 // CHOMPEdit
-	center_of_mass_y =  16 // CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y =  16
 
 /obj/item/reagent_containers/food/drinks/tall/on_reagent_change()
 	if (!length(reagents?.reagent_list))
 		icon_state = "tall_cup_empty"
 		name = "tall cup"
 		desc = "A larger coffee cup."
-		center_of_mass_x = 16 // CHOMPEdit
-		center_of_mass_y =  16 // CHOMPEdit
+		center_of_mass_x = 16
+		center_of_mass_y =  16
 		return
 	var/datum/reagent/R = reagents.get_master_reagent()
 
@@ -217,12 +217,12 @@
 	else
 		desc = "You can't really tell what this is."
 
-	if(R.cup_center_of_mass)
-		center_of_mass_x = R.cup_center_of_mass["x"] //CHOMPEdit
-		center_of_mass_y = R.cup_center_of_mass["y"] //CHOMPEdit
+	if(R.cup_center_of_mass_x || R.cup_center_of_mass_y)
+		center_of_mass_x = R.cup_center_of_mass_x
+		center_of_mass_y = R.cup_center_of_mass_y
 	else
-		center_of_mass_x = 16 // CHOMPEdit
-		center_of_mass_y =  16 // CHOMPEdit
+		center_of_mass_x = 16
+		center_of_mass_y =  16
 
 	if(R.price_tag)
 		price_tag = R.price_tag
@@ -235,16 +235,16 @@
 	icon_state = "grande_cup_empty"
 	amount_per_transfer_from_this = 5
 	volume = 50
-	center_of_mass_x = 16 // CHOMPEdit
-	center_of_mass_y =  16 // CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y =  16
 
 /obj/item/reagent_containers/food/drinks/grande/on_reagent_change()
 	if (!length(reagents?.reagent_list))
 		icon_state = "grande_cup_empty"
 		name = "grande cup"
 		desc = "A much taller coffee cup for people who really need their coffee."
-		center_of_mass_x = 16 // CHOMPEdit
-		center_of_mass_y =  16 // CHOMPEdit
+		center_of_mass_x = 16
+		center_of_mass_y =  16
 		return
 	var/datum/reagent/R = reagents.get_master_reagent()
 
@@ -268,12 +268,12 @@
 	else
 		desc = "You can't really tell what this is."
 
-	if(R.cup_center_of_mass)
-		center_of_mass_x = R.cup_center_of_mass["x"] //CHOMPEdit
-		center_of_mass_y = R.cup_center_of_mass["y"] //CHOMPEdit
+	if(R.cup_center_of_mass_x || R.cup_center_of_mass_y)
+		center_of_mass_x = R.cup_center_of_mass_x
+		center_of_mass_y = R.cup_center_of_mass_y
 	else
-		center_of_mass_x = 16 // CHOMPEdit
-		center_of_mass_y =  16 // CHOMPEdit
+		center_of_mass_x = 16
+		center_of_mass_y =  16
 
 	if(R.price_tag)
 		price_tag = R.price_tag
@@ -286,16 +286,16 @@
 	icon_state = "venti_cup_empty"
 	amount_per_transfer_from_this = 5
 	volume = 60
-	center_of_mass_x = 16 // CHOMPEdit
-	center_of_mass_y =  16 // CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y =  16
 
 /obj/item/reagent_containers/food/drinks/venti/on_reagent_change()
 	if (!length(reagents?.reagent_list))
 		icon_state = "venti_cup_empty"
 		name = "venti cup"
 		desc = "A huge coffee cup for people who literally cannot function without it."
-		center_of_mass_x = 16 // CHOMPEdit
-		center_of_mass_y =  16 // CHOMPEdit
+		center_of_mass_x = 16
+		center_of_mass_y =  16
 		return
 	var/datum/reagent/R = reagents.get_master_reagent()
 
@@ -319,12 +319,12 @@
 	else
 		desc = "You can't really tell what this is."
 
-	if(R.cup_center_of_mass)
-		center_of_mass_x = R.cup_center_of_mass["x"] //CHOMPEdit
-		center_of_mass_y = R.cup_center_of_mass["y"] //CHOMPEdit
+	if(R.cup_center_of_mass_x || R.cup_center_of_mass_y)
+		center_of_mass_x = R.cup_center_of_mass_x
+		center_of_mass_y = R.cup_center_of_mass_y
 	else
-		center_of_mass_x = 16 // CHOMPEdit
-		center_of_mass_y =  16 // CHOMPEdit
+		center_of_mass_x = 16
+		center_of_mass_y =  16
 
 	if(R.price_tag)
 		price_tag = R.price_tag
diff --git a/code/modules/food/food/drinks/jar.dm b/code/modules/food/food/drinks/jar.dm
index fc7216f2f2..88ea803a60 100644
--- a/code/modules/food/food/drinks/jar.dm
+++ b/code/modules/food/food/drinks/jar.dm
@@ -4,8 +4,8 @@
 	desc = "A jar. You're not sure what it's supposed to hold."
 	icon_state = "jar"
 	item_state = "beaker"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 8
 	unacidable = TRUE
 
 /obj/item/reagent_containers/food/drinks/jar/on_reagent_change()
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index 2cce884894..c0277b3e2a 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -4,8 +4,8 @@
 	desc = "yummy"
 	icon = 'icons/obj/food.dmi'
 	icon_state = null
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	w_class = ITEMSIZE_SMALL
 	force = 0
 	volume = 80
@@ -515,8 +515,8 @@
 	icon_state = "aesirsalad"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#468C00"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 11
 	nutriment_amt = 8
 	nutriment_desc = list("apples" = 3,"salad" = 5)
 	bitesize = 3
@@ -544,8 +544,8 @@
 	description_fluff = "Nobody knows why Nanotrasen keeps making these waxy pieces of sugar and bone glue, but a handful of people swear by them. Purportedly popular with Skrell children, dubiously enough."
 	icon_state = "candy_corn"
 	filling_color = "#FFFCB0"
-	center_of_mass_x = 14 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 14
+	center_of_mass_y = 10
 	nutriment_amt = 4
 	nutriment_desc = list("candy corn" = 4)
 	bitesize = 2
@@ -559,8 +559,8 @@
 	desc = "Such sweet, fattening food."
 	icon_state = "chocolatebar"
 	filling_color = "#7D5F46"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 15 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 15
 	nutriment_amt = 2
 	nutriment_desc = list(REAGENT_ID_CHOCOLATE = 5)
 	bitesize = 2
@@ -575,8 +575,8 @@
 	desc = "A luscious milk chocolate piece filled with gooey caramel."
 	icon_state =  "chocolatepiece"
 	filling_color = "#7D5F46"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 15 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 15
 	nutriment_amt = 1
 	nutriment_desc = list(REAGENT_ID_CHOCOLATE = 3, "caramel" = 2, "lusciousness" = 1)
 	bitesize = 2
@@ -599,8 +599,8 @@
 	desc = "Such sweet, fattening food."
 	icon_state = "chocolateegg"
 	filling_color = "#7D5F46"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	nutriment_amt = 3
 	nutriment_desc = list(REAGENT_ID_CHOCOLATE = 5)
 	bitesize = 2
@@ -917,14 +917,14 @@
 	icon_state = "egg"
 	filling_color = "#FDFFD1"
 	volume = 10
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 
 /obj/item/reagent_containers/food/snacks/egg/Initialize()
 	. = ..()
 	reagents.add_reagent(REAGENT_ID_EGG, 3)
 
-/obj/item/reagent_containers/food/snacks/egg/afterattack(obj/O, mob/user, proximity)
+/obj/item/reagent_containers/food/snacks/egg/afterattack(obj/O as obj, mob/user as mob, proximity)
 	if(istype(O,/obj/machinery/microwave))
 		return . = ..()
 	if(!(proximity && O.is_open_container()))
@@ -984,8 +984,8 @@
 	desc = "A fried egg, with a touch of salt and pepper."
 	icon_state = "friedegg"
 	filling_color = "#FFDF78"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	bitesize = 1
 
 /obj/item/reagent_containers/food/snacks/friedegg/Initialize()
@@ -1010,8 +1010,8 @@
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "appendix"
 	filling_color = "#E00D34"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/organ/Initialize()
@@ -1024,8 +1024,8 @@
 	icon_state = REAGENT_ID_TOFU
 	desc = "We all love tofu."
 	filling_color = "#FFFEE0"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 10
 	nutriment_amt = 3
 	nutriment_desc = list(REAGENT_ID_TOFU = 3, "goeyness" = 3)
 	bitesize = 3
@@ -1035,8 +1035,8 @@
 	desc = "A fake turkey made from tofu."
 	icon_state = "tofurkey"
 	filling_color = "#FFFEE0"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	nutriment_amt = 12
 	nutriment_desc = list("turkey" = 3, REAGENT_ID_TOFU = 5, "goeyness" = 4)
 	bitesize = 3
@@ -1046,8 +1046,8 @@
 	desc = "Moist, peppery breadcrumbs for filling the body cavities of dead birds. Dig in!"
 	icon_state = "stuffing"
 	filling_color = "#C9AC83"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_amt = 3
 	nutriment_desc = list("dryness" = 2, "bread" = 2)
 	bitesize = 1
@@ -1057,8 +1057,8 @@
 	desc = "A fillet of carp meat"
 	icon_state = "fishfillet"
 	filling_color = "#FFDEFE"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 13
 	bitesize = 6
 
 	var/toxin_type = REAGENT_ID_CARPOTOXIN
@@ -1110,8 +1110,8 @@
 	desc = "A finger of fish."
 	icon_state = "fishfingers"
 	filling_color = "#FFDEFE"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/fishfingers/Initialize()
@@ -1123,8 +1123,8 @@
 	desc = "Lightly seasoned fish fillets."
 	icon_state = "zestfish"
 	filling_color = "#FFDEFE"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/zestfish/Initialize()
@@ -1136,8 +1136,8 @@
 	desc = "A slice of mushroom."
 	icon_state = "hugemushroomslice"
 	filling_color = "#E0D7C5"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 16
 	nutriment_amt = 3
 	nutriment_desc = list("raw" = 2, PLANT_MUSHROOMS = 2)
 	bitesize = 6
@@ -1151,8 +1151,8 @@
 	desc = "A slice from a huge tomato"
 	icon_state = "tomatomeat"
 	filling_color = "#DB0000"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 16
 	nutriment_amt = 3
 	nutriment_desc = list("raw" = 2, PLANT_TOMATO = 3)
 	bitesize = 6
@@ -1162,8 +1162,8 @@
 	desc = "A very manly slab of meat."
 	icon_state = "bearmeat"
 	filling_color = "#DB0000"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/bearmeat/Initialize()
@@ -1176,8 +1176,8 @@
 	desc = "A slab of green meat. Smells like acid."
 	icon_state = "xenomeat"
 	filling_color = "#43DE18"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	bitesize = 6
 
 /obj/item/reagent_containers/food/snacks/xenomeat/Initialize()
@@ -1190,8 +1190,8 @@
 	desc = "A slab of green meat."
 	icon_state = "xenomeat"
 	filling_color = "#43DE18"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	bitesize = 6
 
 /obj/item/reagent_containers/food/snacks/xenomeat/spidermeat/Initialize()
@@ -1204,8 +1204,8 @@
 	desc = "A great meal all round."
 	icon_state = "meatball"
 	filling_color = "#DB0000"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/meatball/Initialize()
@@ -1217,8 +1217,8 @@
 	desc = "A piece of mixed, long meat."
 	icon_state = "sausage"
 	filling_color = "#DB0000"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/sausage/Initialize()
@@ -1231,8 +1231,8 @@
 	description_fluff = "DONKpockets were originally a Nanotrasen product, an attempt to break into the food market controlled by Centauri Provisions. Somehow, Centauri wound up with the rights to the DONK brand, ending Nanotrasen's ambitions. They taste pretty okay."
 	icon_state = "donkpocket"
 	filling_color = "#DEDEAB"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_amt = 2
 	nutriment_desc = list("heartiness" = 1, "dough" = 2)
 	var/warm = FALSE
@@ -1335,8 +1335,8 @@
 	desc = "A strange looking burger. It looks almost sentient."
 	icon_state = "brainburger"
 	filling_color = "#F2B6EA"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 11
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/brainburger/Initialize()
@@ -1349,8 +1349,8 @@
 	desc = "Spooky! It doesn't look very filling."
 	icon_state = "ghostburger"
 	filling_color = "#FFF2FF"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_desc = list("buns" = 3, "spookiness" = 3)
 	nutriment_amt = 2
 	bitesize = 2
@@ -1364,8 +1364,8 @@
 	name = "-burger"
 	desc = "A bloody burger."
 	icon_state = "hburger"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/human/burger/Initialize()
@@ -1376,8 +1376,8 @@
 	name = "cheeseburger"
 	desc = "The cheese adds a good flavor."
 	icon_state = "cheeseburger"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_amt = 2
 	nutriment_desc = list(REAGENT_ID_CHEESE = 2, "bun" = 2)
 
@@ -1390,8 +1390,8 @@
 	desc = "The cornerstone of every nutritious breakfast."
 	icon_state = "hburger"
 	filling_color = "#D63C3C"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_amt = 3
 	nutriment_desc = list("bun" = 2)
 	bitesize = 2
@@ -1405,8 +1405,8 @@
 	desc = "Almost like a carp is yelling somewhere... Give me back that fillet -o- carp, give me that carp."
 	icon_state = "fishburger"
 	filling_color = "#FFDEFE"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/fishburger/Initialize()
@@ -1418,8 +1418,8 @@
 	desc = "What.. is that meat?"
 	icon_state = "tofuburger"
 	filling_color = "#FFFEE0"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_amt = 6
 	nutriment_desc = list("bun" = 2, "pseudo-soy meat" = 3)
 	bitesize = 2
@@ -1429,8 +1429,8 @@
 	desc = "The lettuce is the only organic component. Beep."
 	icon_state = "roburger"
 	filling_color = "#CCCCCC"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_amt = 2
 	nutriment_desc = list("bun" = 2, "metal" = 3)
 	bitesize = 2
@@ -1441,8 +1441,8 @@
 	icon_state = "roburger"
 	filling_color = "#CCCCCC"
 	volume = 100
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	bitesize = 0.1
 
 /obj/item/reagent_containers/food/snacks/xenoburger
@@ -1450,8 +1450,8 @@
 	desc = "Smells caustic. Tastes like heresy."
 	icon_state = "xburger"
 	filling_color = "#43DE18"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/xenoburger/Initialize()
@@ -1463,8 +1463,8 @@
 	desc = "This tastes funny..."
 	icon_state = "clownburger"
 	filling_color = "#FF00FF"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 12
 	nutriment_amt = 6
 	nutriment_desc = list("bun" = 2, "clown shoe" = 3)
 	bitesize = 2
@@ -1487,8 +1487,8 @@
 	desc = "Its taste defies language."
 	icon_state = "mimeburger"
 	filling_color = "#FFFFFF"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_amt = 12
 	nutriment_desc = list("bun" = 2, "face paint" = 3)
 	bitesize = 2
@@ -1499,8 +1499,8 @@
 	icon_state = "omelette"
 	trash = /obj/item/trash/plate
 	filling_color = "#FFF9A8"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	bitesize = 1
 
 /obj/item/reagent_containers/food/snacks/omelette/Initialize()
@@ -1512,8 +1512,8 @@
 	desc = "A delicious and spongy little cake"
 	icon_state = "muffin"
 	filling_color = "#E0CF9B"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 4 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 4
 	nutriment_amt = 6
 	nutriment_desc = list("sweetness" = 3, "muffin" = 3)
 	bitesize = 2
@@ -1525,8 +1525,8 @@
 	icon_state = "pie"
 	trash = /obj/item/trash/plate
 	filling_color = "#FBFFB8"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	nutriment_amt = 4
 	nutriment_desc = list("pie" = 3, REAGENT_ID_CREAM = 2)
 	bitesize = 3
@@ -1546,8 +1546,8 @@
 	desc = "No black birds, this is a good sign."
 	icon_state = "berryclafoutis"
 	trash = /obj/item/trash/plate
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	nutriment_amt = 4
 	nutriment_desc = list("sweetness" = 2, "pie" = 3)
 	bitesize = 3
@@ -1566,8 +1566,8 @@
 	icon_state = "waffles"
 	trash = /obj/item/trash/waffles
 	filling_color = "#E6DEB5"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 11
 	nutriment_amt = 8
 	nutriment_desc = list("waffle" = 8)
 	bitesize = 2
@@ -1578,8 +1578,8 @@
 	icon_state = "eggplantparm"
 	trash = /obj/item/trash/plate
 	filling_color = "#4D2F5E"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_amt = 6
 	nutriment_desc = list(REAGENT_ID_CHEESE = 3, PLANT_EGGPLANT = 3)
 	bitesize = 2
@@ -1590,8 +1590,8 @@
 	icon_state = "soylent_green"
 	trash = /obj/item/trash/waffles
 	filling_color = "#B8E6B5"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 11
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/soylentgreen/Initialize()
@@ -1604,8 +1604,8 @@
 	icon_state = "soylent_yellow"
 	trash = /obj/item/trash/waffles
 	filling_color = "#E6FA61"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 11
 	nutriment_amt = 10
 	nutriment_desc = list("some sort of protein" = 10)  //seasoned VERY well.
 	bitesize = 2
@@ -1616,8 +1616,8 @@
 	desc = "An old barber recipe, very delicious!"
 	trash = /obj/item/trash/plate
 	filling_color = "#948051"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/meatpie/Initialize()
@@ -1630,8 +1630,8 @@
 	desc = "A delicious tofu pie."
 	trash = /obj/item/trash/plate
 	filling_color = "#FFFEE0"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	nutriment_amt = 10
 	nutriment_desc = list(REAGENT_ID_TOFU = 2, "pie" = 8)
 	bitesize = 2
@@ -1641,8 +1641,8 @@
 	desc = "Sweet and tasty poison pie."
 	icon_state = "amanita_pie"
 	filling_color = "#FFCCCC"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 9
 	nutriment_amt = 5
 	nutriment_desc = list("sweetness" = 3, PLANT_MUSHROOMS = 3, "pie" = 2)
 	bitesize = 3
@@ -1657,8 +1657,8 @@
 	desc = "I bet you love stuff made out of plump helmets!"
 	icon_state = "plump_pie"
 	filling_color = "#B8279B"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 9
 	nutriment_amt = 8
 	nutriment_desc = list("heartiness" = 2, PLANT_MUSHROOMS = 3, "pie" = 3)
 	bitesize = 2
@@ -1677,8 +1677,8 @@
 	desc = "A delicious meatpie. Probably heretical."
 	trash = /obj/item/trash/plate
 	filling_color = "#43DE18"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/xemeatpie/Initialize()
@@ -1691,8 +1691,8 @@
 	icon_state = "wingfangchu"
 	trash = /obj/item/trash/small_bowl
 	filling_color = "#43DE18"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 9
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/wingfangchu/Initialize()
@@ -1705,8 +1705,8 @@
 	desc = "A human meat, on a stick."
 	trash = /obj/item/stack/rods
 	filling_color = "#A85340"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 15 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 15
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/human/kabob/Initialize()
@@ -1719,8 +1719,8 @@
 	desc = "Delicious meat, on a stick."
 	trash = /obj/item/stack/rods
 	filling_color = "#A85340"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 15 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 15
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/monkeykabob/Initialize()
@@ -1734,8 +1734,8 @@
 	trash = /obj/item/stack/rods
 	filling_color = "#FFFEE0"
 	bitesize = 2
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 15 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 15
 	nutriment_amt = 8
 	nutriment_desc = list(REAGENT_ID_TOFU = 3, "metal" = 1)
 
@@ -1745,8 +1745,8 @@
 	icon_state = "cubancarp"
 	trash = /obj/item/trash/plate
 	filling_color = "#E9ADFF"
-	center_of_mass_x = 12 //CHOMPEdit
-	center_of_mass_y= 5 //CHOMPEdit
+	center_of_mass_x = 12
+	center_of_mass_y = 5
 	nutriment_amt = 3
 	nutriment_desc = list("toasted bread" = 3)
 	bitesize = 3
@@ -1764,8 +1764,8 @@
 	trash = /obj/item/trash/popcorn
 	var/unpopped = 0
 	filling_color = "#FFFAD4"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	nutriment_amt = 2
 	nutriment_desc = list("popcorn" = 3)
 	bitesize = 0.1 //This snack is supposed to be eaten for a long time.
@@ -1787,8 +1787,8 @@
 	icon_state = "fries"
 	trash = /obj/item/trash/plate
 	filling_color = "#EDDD00"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_amt = 4
 	nutriment_desc = list("fresh fries" = 4)
 	bitesize = 2
@@ -1808,8 +1808,8 @@
 	icon_state = "onionrings"
 	trash = /obj/item/trash/plate
 	filling_color = "#eddd00"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_desc = list("fried onions" = 5)
 	nutriment_amt = 5
 	bitesize = 2
@@ -1822,8 +1822,8 @@
 	filling_color = "#EDDD00"
 	nutriment_amt = 4
 	nutriment_desc = list("soggy fries" = 4)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/ovenfries
@@ -1833,8 +1833,8 @@
 	filling_color = "#EDDD00"
 	nutriment_amt = 4
 	nutriment_desc = list("crisp, dry fries" = 4)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/carrotfries
@@ -1843,8 +1843,8 @@
 	icon_state = "carrotfries"
 	trash = /obj/item/trash/plate
 	filling_color = "#FAA005"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_amt = 3
 	nutriment_desc = list(PLANT_CARROT = 3, "salt" = 1)
 	bitesize = 2
@@ -1860,8 +1860,8 @@
 	icon_state = "cheesyfries"
 	trash = /obj/item/trash/plate
 	filling_color = "#EDDD00"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_amt = 4
 	nutriment_desc = list("fresh fries" = 3, REAGENT_ID_CHEESE = 3)
 	bitesize = 2
@@ -1879,8 +1879,8 @@
 	filling_color = "#EDDD00"
 	nutriment_amt = 8
 	nutriment_desc = list("hearty, cheesy fries" = 8)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	bitesize = 4
 
 /obj/item/reagent_containers/food/snacks/chilicheesefries/Initialize()
@@ -1893,8 +1893,8 @@
 	desc = "This doesn't seem like a pudding at all."
 	icon_state = "blackpudding"
 	filling_color = "#FF0000"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 7 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 7
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/blackpudding/Initialize()
@@ -1908,8 +1908,8 @@
 	icon_state = "soydope"
 	trash = /obj/item/trash/plate
 	filling_color = "#C4BF76"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_amt = 2
 	nutriment_desc = list("slime" = 2, "soy" = 2)
 	bitesize = 2
@@ -1919,8 +1919,8 @@
 	desc = "A bundle of raw spaghetti."
 	icon_state = "spagetti"
 	filling_color = "#EDDD00"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_amt = 1
 	nutriment_desc = list("noodles" = 2)
 	bitesize = 1
@@ -1930,8 +1930,8 @@
 	desc = "Someone should be demoted from chef for this."
 	icon_state = "badrecipe"
 	filling_color = "#211F02"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 12
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/badrecipe/Initialize()
@@ -1945,8 +1945,8 @@
 	icon_state = "meatstake"
 	trash = /obj/item/trash/plate
 	filling_color = "#7A3D11"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/meatsteak/Initialize()
@@ -1961,8 +1961,8 @@
 	icon_state = "spacylibertyduff"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#42B873"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	nutriment_amt = 6
 	nutriment_desc = list(PLANT_MUSHROOMS = 6)
 	bitesize = 3
@@ -1977,8 +1977,8 @@
 	icon_state = "amanitajelly"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#ED0758"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 5 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 5
 	nutriment_amt = 6
 	nutriment_desc = list("jelly" = 3, PLANT_MUSHROOMS = 3)
 	bitesize = 3
@@ -1994,8 +1994,8 @@
 	icon_state = "poppypretzel"
 	bitesize = 2
 	filling_color = "#916E36"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_amt = 5
 	nutriment_desc = list("poppy seeds" = 2, "pretzel" = 3)
 	bitesize = 2
@@ -2007,8 +2007,8 @@
 	icon_state = "monkeycube"
 	bitesize = 12
 	filling_color = "#ADAC7F"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 
 	var/wrapped = 0
 	var/monkey_type = "Monkey"
@@ -2116,8 +2116,8 @@
 	desc = "Forget the Big Mac. THIS is the future!"
 	icon_state = "bigbiteburger"
 	filling_color = "#E3D681"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_amt = 4
 	nutriment_desc = list("buns" = 4)
 	bitesize = 3
@@ -2132,8 +2132,8 @@
 	icon_state = "enchiladas"
 	trash = /obj/item/trash/tray
 	filling_color = "#A36A1F"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	nutriment_amt = 2
 	nutriment_desc = list("tortilla" = 3, PLANT_CORN = 3)
 	bitesize = 4
@@ -2149,8 +2149,8 @@
 	icon_state = "monkeysdelight"
 	trash = /obj/item/trash/tray
 	filling_color = "#5C3C11"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	bitesize = 6
 
 /obj/item/reagent_containers/food/snacks/monkeysdelight/Initialize()
@@ -2165,8 +2165,8 @@
 	desc = "Bon appetit!"
 	icon_state = "baguette"
 	filling_color = "#E3D796"
-	center_of_mass_x = 18 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 18
+	center_of_mass_y = 12
 	nutriment_amt = 6
 	nutriment_desc = list("french bread" = 6)
 	bitesize = 3
@@ -2181,8 +2181,8 @@
 	desc = "I do say so myself chap."
 	icon_state = "fishandchips"
 	filling_color = "#E3D796"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_amt = 3
 	nutriment_desc = list("salt" = 1, "chips" = 3)
 	bitesize = 3
@@ -2197,8 +2197,8 @@
 	icon_state = "rofflewaffles"
 	trash = /obj/item/trash/waffles
 	filling_color = "#FF00F7"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 11
 	nutriment_amt = 8
 	nutriment_desc = list("waffle" = 7, "sweetness" = 1)
 	bitesize = 4
@@ -2212,8 +2212,8 @@
 	desc = "A slice of bread covered with delicious jam."
 	icon_state = "jellytoast"
 	filling_color = "#B572AB"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	nutriment_amt = 1
 	nutriment_desc = list("toasted bread" = 2)
 	bitesize = 3
@@ -2233,8 +2233,8 @@
 	filling_color = "#FFC02D"
 	nutriment_amt = 1
 	nutriment_desc = list("sweet, crunchy bread" = 1)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 9
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/cheesetoast
@@ -2244,8 +2244,8 @@
 	filling_color = "#F9A617"
 	nutriment_amt = 1
 	nutriment_desc = list("cheese toast" = 8)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 9
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/jellyburger
@@ -2253,8 +2253,8 @@
 	desc = "Culinary delight..?"
 	icon_state = "jellyburger"
 	filling_color = "#B572AB"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_amt = 5
 	nutriment_desc = list("buns" = 5)
 	bitesize = 2
@@ -2272,8 +2272,8 @@
 	desc = "Even non-vegetarians will LOVE this!"
 	icon_state = "stewedsoymeat"
 	trash = /obj/item/trash/plate
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_amt = 8
 	nutriment_desc = list("soy" = 4, PLANT_TOMATO = 4)
 	bitesize = 2
@@ -2284,8 +2284,8 @@
 	icon_state = "spagettiboiled"
 	trash = /obj/item/trash/plate
 	filling_color = "#FCEE81"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_amt = 2
 	nutriment_desc = list("noodles" = 2)
 	bitesize = 2
@@ -2296,8 +2296,8 @@
 	icon_state = "boiledrice"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#FFFBDB"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 11
 	nutriment_amt = 2
 	nutriment_desc = list(REAGENT_ID_RICE = 2)
 	bitesize = 2
@@ -2308,8 +2308,8 @@
 	icon_state = "rpudding"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#FFFBDB"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 11
 	nutriment_amt = 4
 	nutriment_desc = list(REAGENT_ID_RICE = 2)
 	bitesize = 2
@@ -2320,8 +2320,8 @@
 	icon_state = "kudzudonburi"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#FFFBDB"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 11
 	nutriment_amt = 16
 	nutriment_desc = list(REAGENT_ID_RICE = 2, "gauze" = 4, "fish" = 10)
 	bitesize = 2
@@ -2336,8 +2336,8 @@
 	icon_state = "pastatomato"
 	trash = /obj/item/trash/plate
 	filling_color = "#DE4545"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_amt = 6
 	nutriment_desc = list(PLANT_TOMATO = 3, "noodles" = 3)
 	bitesize = 4
@@ -2352,8 +2352,8 @@
 	icon_state = "meatballspagetti"
 	trash = /obj/item/trash/plate
 	filling_color = "#DE4545"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_amt = 4
 	nutriment_desc = list("noodles" = 4)
 	bitesize = 2
@@ -2367,8 +2367,8 @@
 	desc = "A lawyer's favourite"
 	icon_state = "spesslaw"
 	filling_color = "#DE4545"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_amt = 4
 	nutriment_desc = list("noodles" = 4)
 	bitesize = 2
@@ -2382,8 +2382,8 @@
 	desc = "This is a mountain of a burger. FOOD!"
 	icon_state = "superbiteburger"
 	filling_color = "#CCA26A"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 3 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 3
 	nutriment_amt = 25
 	nutriment_desc = list("buns" = 25)
 	bitesize = 10
@@ -2398,8 +2398,8 @@
 	icon_state = "candiedapple1"
 	trash = /obj/item/trash/stick
 	filling_color = "#F21873"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 13
 	nutriment_amt = 3
 	nutriment_desc = list(PLANT_APPLE = 3, "caramel" = 3, "sweetness" = 2)
 	bitesize = 3
@@ -2410,8 +2410,8 @@
 	icon_state = "candiedapple2"
 	trash = /obj/item/trash/stick
 	filling_color = "#F21873"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 13
 	nutriment_amt = 3
 	nutriment_desc = list(PLANT_APPLE = 3, "sweetness" = 2)
 	bitesize = 3
@@ -2421,8 +2421,8 @@
 	desc = "A pie containing sweet sweet love... or apple."
 	icon_state = "applepie"
 	filling_color = "#E0EDC5"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	nutriment_amt = 4
 	nutriment_desc = list("sweetness" = 2, PLANT_APPLE = 2, "pie" = 2)
 	bitesize = 3
@@ -2432,8 +2432,8 @@
 	desc = "Taste so good, make a grown man cry."
 	icon_state = "cherrypie"
 	filling_color = "#FF525A"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_amt = 4
 	nutriment_desc = list("sweetness" = 2, PLANT_CHERRY = 2, "pie" = 2)
 	bitesize = 3
@@ -2444,8 +2444,8 @@
 	description_fluff = "The most popular recipe from the Morpheus Cyberkinetics cookbook 'Calories for Organics'"
 	icon_state = "twobread"
 	filling_color = "#DBCC9A"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 12
 	nutriment_amt = 2
 	nutriment_desc = list("sourness" = 2, "bread" = 2)
 	bitesize = 3
@@ -2457,8 +2457,8 @@
 	desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud."
 	icon_state = "sandwich"
 	filling_color = "#D9BE29"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 4 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 4
 	nutriment_amt = 3
 	nutriment_desc = list("bread" = 3, REAGENT_ID_CHEESE = 3)
 	bitesize = 2
@@ -2481,8 +2481,8 @@
 	desc = "Now if you only had a pepper bar."
 	icon_state = "toastedsandwich"
 	filling_color = "#D9BE29"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 4 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 4
 	nutriment_amt = 3
 	nutriment_desc = list("toasted bread" = 3, REAGENT_ID_CHEESE = 3)
 	bitesize = 2
@@ -2510,8 +2510,8 @@
 	desc = "You wish you had some peanut butter to go with this..."
 	icon_state = "jellysandwich"
 	filling_color = "#9E3A78"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	nutriment_amt = 2
 	nutriment_desc = list("bread" = 2)
 	bitesize = 3
@@ -2549,8 +2549,8 @@
 	desc = "This is a finely-prepared plump helmet biscuit. The ingredients are exceptionally minced plump helmet, and well-minced dwarven wheat flour."
 	icon_state = "phelmbiscuit"
 	filling_color = "#CFB4C4"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	nutriment_amt = 5
 	nutriment_desc = list(PLANT_MUSHROOMS = 4)
 	bitesize = 2
@@ -2568,8 +2568,8 @@
 	icon_state = "chawanmushi"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#F0F2E4"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 10
 	bitesize = 1
 
 /obj/item/reagent_containers/food/snacks/chawanmushi/Initialize()
@@ -2582,8 +2582,8 @@
 	icon_state = "herbsalad"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#76B87F"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 11
 	nutriment_amt = 8
 	nutriment_desc = list("salad" = 2, PLANT_TOMATO = 2, PLANT_CARROT = 2, PLANT_APPLE = 2)
 	bitesize = 3
@@ -2594,8 +2594,8 @@
 	icon_state = "validsalad"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#76B87F"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 11
 	nutriment_amt = 6
 	nutriment_desc = list("100% real salad")
 	bitesize = 3
@@ -2610,8 +2610,8 @@
 	icon_state = "gappletart"
 	trash = /obj/item/trash/plate
 	filling_color = "#FFFF00"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 18 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 18
 	nutriment_amt = 8
 	nutriment_desc = list(PLANT_APPLE = 8)
 	bitesize = 3
@@ -2630,8 +2630,8 @@
 	icon_state = "meatballsoup"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#785210"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	bitesize = 5
 	eating_sound = 'sound/items/drink.ogg'
 
@@ -2658,8 +2658,8 @@
 	desc = "Smells like copper."
 	icon_state = "tomatosoup"
 	filling_color = "#FF0000"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 7 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 7
 	bitesize = 5
 	eating_sound = 'sound/items/drink.ogg'
 
@@ -2674,8 +2674,8 @@
 	desc = "Not very funny."
 	icon_state = "clownstears"
 	filling_color = "#C4FBFF"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 7 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 7
 	nutriment_amt = 4
 	nutriment_desc = list("salt" = 1, "the worst joke" = 3)
 	bitesize = 5
@@ -2692,8 +2692,8 @@
 	icon_state = "vegetablesoup"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#AFC4B5"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	nutriment_desc = list(PLANT_CARROT = 2, PLANT_CORN = 2, PLANT_EGGPLANT = 2, PLANT_POTATO = 2)
 	bitesize = 5
 	eating_sound = 'sound/items/drink.ogg'
@@ -2708,8 +2708,8 @@
 	icon_state = "nettlesoup"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#AFC4B5"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 7 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 7
 	nutriment_amt = 8
 	nutriment_desc = list("salad" = 4, REAGENT_ID_EGG = 2, PLANT_POTATO = 2)
 	bitesize = 5
@@ -2726,8 +2726,8 @@
 	icon_state = "mysterysoup"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#F082FF"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 	nutriment_amt = 1
 	nutriment_desc = list("backwash" = 1)
 	bitesize = 5
@@ -2778,8 +2778,8 @@
 	icon_state = "wishsoup"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#D1F4FF"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	bitesize = 5
 	eating_sound = 'sound/items/drink.ogg'
 
@@ -2796,8 +2796,8 @@
 	icon_state = "tomatosoup"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#D92929"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 7 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 7
 	bitesize = 3
 	eating_sound = 'sound/items/drink.ogg'
 
@@ -2811,8 +2811,8 @@
 	icon_state = "mushroomsoup"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#E386BF"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 10
 	bitesize = 3
 	eating_sound = 'sound/items/drink.ogg'
 
@@ -2826,8 +2826,8 @@
 	icon_state = "beetsoup"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#FAC9FF"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 8
 	bitesize = 3
 	eating_sound = 'sound/items/drink.ogg'
 
@@ -2842,8 +2842,8 @@
 	icon_state = "onionsoup"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#E0C367"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 7 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 7
 	bitesize = 3
 	eating_sound = 'sound/items/drink.ogg'
 
@@ -2868,8 +2868,8 @@
 	desc = "A nice and warm stew. Healthy and strong."
 	icon_state = "stew"
 	filling_color = "#9E673A"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 5 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 5
 	nutriment_amt = 6
 	nutriment_desc = list(PLANT_TOMATO = 2, PLANT_POTATO = 2, PLANT_CARROT = 2, PLANT_EGGPLANT = 2, PLANT_MUSHROOMS = 2)
 	drop_sound = 'sound/items/drop/shovel.ogg'
@@ -2892,8 +2892,8 @@
 	filling_color = "#9E673A"
 	nutriment_amt = 6
 	nutriment_desc = list("hearty stew" = 6)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 5 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 5
 	bitesize = 6
 	eating_sound = 'sound/items/drink.ogg'
 
@@ -2912,8 +2912,8 @@
 	icon_state = "hotchili"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#FF3C00"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_amt = 3
 	nutriment_desc = list("chilli peppers" = 3)
 	bitesize = 5
@@ -2930,8 +2930,8 @@
 	desc = "This slush is barely a liquid!"
 	icon_state = "coldchili"
 	filling_color = "#2B00FF"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	trash = /obj/item/trash/snack_bowl
 	nutriment_amt = 3
 	nutriment_desc = list("ice peppers" = 3)
@@ -2954,8 +2954,8 @@
 	filling_color = "#702708"
 	nutriment_amt = 3
 	nutriment_desc = list("dark, hearty chili" = 3)
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	bitesize = 6
 	eating_sound = 'sound/items/drink.ogg'
 
@@ -3013,8 +3013,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/meatbread
 	slices_num = 5
 	filling_color = "#FF7575"
-	center_of_mass_x = 19 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 19
+	center_of_mass_y = 9
 	nutriment_desc = list("bread" = 10)
 	nutriment_amt = 10
 	bitesize = 2
@@ -3030,8 +3030,8 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#FF7575"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/meatbread
 
 /obj/item/reagent_containers/food/snacks/slice/meatbread/filled
@@ -3044,8 +3044,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/xenomeatbread
 	slices_num = 5
 	filling_color = "#8AFF75"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 9
 	nutriment_desc = list("bread" = 10)
 	nutriment_amt = 10
 	bitesize = 2
@@ -3060,8 +3060,8 @@
 	icon_state = "xenobreadslice"
 	filling_color = "#8AFF75"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread
 
 
@@ -3075,8 +3075,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/bananabread
 	slices_num = 5
 	filling_color = "#EDE5AD"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 9
 	nutriment_desc = list("bread" = 10)
 	nutriment_amt = 10
 	bitesize = 2
@@ -3091,8 +3091,8 @@
 	icon_state = "bananabreadslice"
 	filling_color = "#EDE5AD"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/bananabread
 
 /obj/item/reagent_containers/food/snacks/slice/bananabread/filled
@@ -3105,8 +3105,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/tofubread
 	slices_num = 5
 	filling_color = "#F7FFE0"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 9
 	nutriment_desc = list(REAGENT_ID_TOFU = 10)
 	nutriment_amt = 10
 	bitesize = 2
@@ -3117,8 +3117,8 @@
 	icon_state = "tofubreadslice"
 	filling_color = "#F7FFE0"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/tofubread
 
 /obj/item/reagent_containers/food/snacks/slice/tofubread/filled
@@ -3131,8 +3131,8 @@
 	icon_state = "breadslice"
 	filling_color = "#D27332"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 4 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 4
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/bread
 
 /obj/item/reagent_containers/food/snacks/slice/bread/filled
@@ -3146,8 +3146,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/creamcheesebread
 	slices_num = 5
 	filling_color = "#FFF896"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 9
 	nutriment_desc = list("bread" = 6, REAGENT_ID_CREAM = 3, REAGENT_ID_CHEESE = 3)
 	nutriment_amt = 5
 	bitesize = 2
@@ -3162,8 +3162,8 @@
 	icon_state = "creamcheesebreadslice"
 	filling_color = "#FFF896"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread
 
 /obj/item/reagent_containers/food/snacks/slice/creamcheesebread/filled
@@ -3176,8 +3176,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/carrotcake
 	slices_num = 5
 	filling_color = "#FFD675"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_desc = list("cake" = 10, "sweetness" = 10, PLANT_CARROT = 15)
 	nutriment_amt = 25
 	bitesize = 2
@@ -3193,8 +3193,8 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#FFD675"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/carrotcake
 
 /obj/item/reagent_containers/food/snacks/slice/carrotcake/filled
@@ -3207,8 +3207,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/braincake
 	slices_num = 5
 	filling_color = "#E6AEDB"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_desc = list("cake" = 10, "sweetness" = 10, "slime" = 15)
 	nutriment_amt = 5
 	bitesize = 2
@@ -3225,8 +3225,8 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#E6AEDB"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 12
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/braincake
 
 /obj/item/reagent_containers/food/snacks/slice/braincake/filled
@@ -3239,8 +3239,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/cheesecake
 	slices_num = 5
 	filling_color = "#FAF7AF"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_desc = list("cake" = 10, REAGENT_ID_CREAM = 10, REAGENT_ID_CHEESE = 15)
 	nutriment_amt = 10
 	bitesize = 2
@@ -3256,8 +3256,8 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#FAF7AF"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/cheesecake
 
 /obj/item/reagent_containers/food/snacks/slice/cheesecake/filled
@@ -3270,8 +3270,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/peanutcake
 	slices_num = 5
 	filling_color = "#4F3500"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_desc = list("cake" = 10, "peanuts" = 15)
 	nutriment_amt = 10
 	bitesize = 2
@@ -3287,8 +3287,8 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#4F3500"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/peanutcake
 
 /obj/item/reagent_containers/food/snacks/slice/peanutcake/filled
@@ -3301,8 +3301,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/plaincake
 	slices_num = 5
 	filling_color = "#F7EDD5"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_desc = list("cake" = 10, "sweetness" = 10, REAGENT_ID_VANILLA = 15)
 	nutriment_amt = 20
 
@@ -3313,8 +3313,8 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#F7EDD5"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/plaincake
 
 /obj/item/reagent_containers/food/snacks/slice/plaincake/filled
@@ -3327,8 +3327,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/orangecake
 	slices_num = 5
 	filling_color = "#FADA8E"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_desc = list("cake" = 10, "sweetness" = 10, PLANT_ORANGE = 15)
 	nutriment_amt = 20
 
@@ -3339,8 +3339,8 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#FADA8E"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/orangecake
 
 /obj/item/reagent_containers/food/snacks/slice/orangecake/filled
@@ -3353,8 +3353,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/limecake
 	slices_num = 5
 	filling_color = "#CBFA8E"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_desc = list("cake" = 10, "sweetness" = 10, PLANT_LIME = 15)
 	nutriment_amt = 20
 
@@ -3365,8 +3365,8 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#CBFA8E"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/limecake
 
 /obj/item/reagent_containers/food/snacks/slice/limecake/filled
@@ -3379,8 +3379,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/lemoncake
 	slices_num = 5
 	filling_color = "#FAFA8E"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_desc = list("cake" = 10, "sweetness" = 10, PLANT_LEMON = 15)
 	nutriment_amt = 20
 
@@ -3392,8 +3392,8 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#FAFA8E"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/lemoncake
 
 /obj/item/reagent_containers/food/snacks/slice/lemoncake/filled
@@ -3406,8 +3406,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/chocolatecake
 	slices_num = 5
 	filling_color = "#805930"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_desc = list("cake" = 10, "sweetness" = 10, REAGENT_ID_CHOCOLATE = 15)
 	nutriment_amt = 20
 
@@ -3418,8 +3418,8 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#805930"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/chocolatecake
 
 /obj/item/reagent_containers/food/snacks/slice/chocolatecake/filled
@@ -3432,8 +3432,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/cheesewedge
 	slices_num = 5
 	filling_color = "#FFF700"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_desc = list(REAGENT_ID_CHEESE = 10)
 	nutriment_amt = 10
 	bitesize = 2
@@ -3448,8 +3448,8 @@
 	icon_state = "cheesewedge"
 	filling_color = "#FFF700"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/snacks/sliceable/birthdaycake
 	name = "Birthday Cake"
@@ -3458,8 +3458,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/birthdaycake
 	slices_num = 5
 	filling_color = "#FFD6D6"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_desc = list("cake" = 10, "sweetness" = 10)
 	nutriment_amt = 20
 	bitesize = 3
@@ -3475,8 +3475,8 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#FFD6D6"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/birthdaycake
 
 /obj/item/reagent_containers/food/snacks/slice/birthdaycake/filled
@@ -3489,8 +3489,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/bread
 	slices_num = 5
 	filling_color = "#FFE396"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 9
 	nutriment_desc = list("bread" = 6)
 	nutriment_amt = 6
 	bitesize = 2
@@ -3501,8 +3501,8 @@
 	icon_state = "watermelonslice"
 	filling_color = "#FF3867"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/snacks/sliceable/applecake
 	name = "Apple Cake"
@@ -3511,8 +3511,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/applecake
 	slices_num = 5
 	filling_color = "#EBF5B8"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_desc = list("cake" = 10, "sweetness" = 10, PLANT_APPLE = 15)
 	nutriment_amt = 15
 
@@ -3523,8 +3523,8 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#EBF5B8"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/applecake
 
 /obj/item/reagent_containers/food/snacks/slice/applecake/filled
@@ -3537,8 +3537,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/pumpkinpie
 	slices_num = 5
 	filling_color = "#F5B951"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_desc = list("pie" = 5, REAGENT_ID_CREAM = 5, PLANT_PUMPKIN = 5)
 	nutriment_amt = 15
 
@@ -3549,8 +3549,8 @@
 	trash = /obj/item/trash/plate
 	filling_color = "#F5B951"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 12
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie
 
 /obj/item/reagent_containers/food/snacks/slice/pumpkinpie/filled
@@ -3561,8 +3561,8 @@
 	desc = "It's a salted cracker."
 	icon_state = "cracker"
 	filling_color = "#F5DEB8"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 	nutriment_desc = list("salt" = 1, "cracker" = 2)
 	w_class = ITEMSIZE_TINY
 	nutriment_amt = 1
@@ -3594,8 +3594,8 @@
 	filling_color = "#F5B951"
 	nutriment_amt = 16
 	nutriment_desc = list(PLANT_LIME = 12, "graham crackers" = 4)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/snacks/sliceable/keylimepie/Initialize()
 	. = ..()
@@ -3609,8 +3609,8 @@
 	filling_color = "#F5B951"
 	bitesize = 3
 	nutriment_desc = list(PLANT_LIME = 1)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 12
 
 /obj/item/reagent_containers/food/snacks/keylimepieslice/filled
 	nutriment_amt = 1
@@ -3624,8 +3624,8 @@
 	filling_color = "#F5B951"
 	nutriment_amt = 10
 	nutriment_desc = list(REAGENT_ID_CHEESE = 5, REAGENT_ID_EGG = 5)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/snacks/sliceable/quiche/Initialize()
 	. = ..()
@@ -3639,8 +3639,8 @@
 	filling_color = "#F5B951"
 	bitesize = 3
 	nutriment_desc = list("cheesy eggs" = 1)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 12
 
 /obj/item/reagent_containers/food/snacks/quicheslice/filled
 	nutriment_amt = 1
@@ -3660,8 +3660,8 @@
 	filling_color = "#301301"
 	nutriment_amt = 8
 	nutriment_desc = list("fudge" = 8)
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/sliceable/brownies/Initialize()
@@ -3676,8 +3676,8 @@
 	filling_color = "#F5B951"
 	bitesize = 2
 	nutriment_desc = list("fudge" = 1)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 12
 
 /obj/item/reagent_containers/food/snacks/browniesslice/filled
 	nutriment_amt = 1
@@ -3697,8 +3697,8 @@
 	filling_color = "#301301"
 	nutriment_amt = 8
 	nutriment_desc = list("fudge" = 8)
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies/Initialize()
@@ -3717,8 +3717,8 @@
 	filling_color = "#F5B951"
 	bitesize = 3
 	nutriment_desc = list("fudge" = 1)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 12
 
 /obj/item/reagent_containers/food/snacks/cosmicbrowniesslice/filled
 	nutriment_amt = 1
@@ -3925,8 +3925,8 @@
 	icon_state = "pizzamargherita"
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/margherita
 	slices_num = 6
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_desc = list("pizza crust" = 10, PLANT_TOMATO = 10, REAGENT_ID_CHEESE = 15)
 	nutriment_amt = 35
 	bitesize = 2
@@ -3942,8 +3942,8 @@
 	icon_state = "pizzamargheritaslice"
 	filling_color = "#BAA14C"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita
 
 /obj/item/reagent_containers/food/snacks/slice/margherita/filled
@@ -3955,8 +3955,8 @@
 	icon_state = "pineapple_pizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/pineappleslice
 	slices_num = 6
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_desc = list("pizza crust" = 10, PLANT_TOMATO = 10, "ham" = 10)
 	nutriment_amt = 30
 	bitesize = 2
@@ -3973,8 +3973,8 @@
 	icon_state = "pineapple_pizza_slice"
 	filling_color = "#BAA14C"
 	bitesize = 2
-	center_of_mass_x = 18 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 18
+	center_of_mass_y = 13
 
 /obj/item/reagent_containers/food/snacks/pineappleslice/filled
 	nutriment_desc = list("pizza crust" = 5, PLANT_TOMATO = 5)
@@ -3986,8 +3986,8 @@
 	icon_state = "meatpizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/meatpizza
 	slices_num = 6
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_desc = list("pizza crust" = 10, PLANT_TOMATO = 10, REAGENT_ID_CHEESE = 15, "meat" = 10)
 	nutriment_amt = 10
 	bitesize = 2
@@ -4003,8 +4003,8 @@
 	icon_state = "meatpizzaslice"
 	filling_color = "#BAA14C"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza
 
 /obj/item/reagent_containers/food/snacks/slice/meatpizza/filled
@@ -4016,8 +4016,8 @@
 	icon_state = "mushroompizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/mushroompizza
 	slices_num = 6
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_desc = list("pizza crust" = 10, PLANT_TOMATO = 10, REAGENT_ID_CHEESE = 5, PLANT_MUSHROOMS = 10)
 	nutriment_amt = 35
 	bitesize = 2
@@ -4032,8 +4032,8 @@
 	icon_state = "mushroompizzaslice"
 	filling_color = "#BAA14C"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza
 
 /obj/item/reagent_containers/food/snacks/slice/mushroompizza/filled
@@ -4045,8 +4045,8 @@
 	icon_state = "vegetablepizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/vegetablepizza
 	slices_num = 6
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_desc = list("pizza crust" = 10, PLANT_TOMATO = 10, REAGENT_ID_CHEESE = 5, PLANT_EGGPLANT = 5, PLANT_CARROT = 5, PLANT_CORN = 5)
 	nutriment_amt = 25
 	bitesize = 2
@@ -4063,8 +4063,8 @@
 	icon_state = "vegetablepizzaslice"
 	filling_color = "#BAA14C"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza
 
 /obj/item/reagent_containers/food/snacks/slice/vegetablepizza/filled
@@ -4078,8 +4078,8 @@
 	slices_num = 6
 	nutriment_amt = 25
 	nutriment_desc = list("fried pizza" = 25)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/pizzacrunchslice
@@ -4088,8 +4088,8 @@
 	icon_state = "pizzacrunchslice"
 	filling_color = "#BAA14C"
 	bitesize = 2
-	center_of_mass_x = 18 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 18
+	center_of_mass_y = 13
 
 /obj/item/reagent_containers/food/snacks/sliceable/pizza/oldpizza
 	name = "moldy pizza"
@@ -4097,8 +4097,8 @@
 	icon_state = "oldpizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/slice/oldpizza
 	slices_num = 6
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_desc = list("stale pizza crust" = 10, "moldy tomato" = 10, "moldy cheese" = 5)
 	nutriment_amt = 10
 	bitesize = 2
@@ -4112,11 +4112,11 @@
 /obj/item/reagent_containers/food/snacks/slice/oldpizza
 	name = "moldy pizza slice"
 	desc = "This used to be pizza..."
-	icon_state = "oldpizzaslice"								// CHOMP EDIT For some reason this was set to old_pizza, which isn't a thing in the dmi (I guess nobody ever tried slicing it so nobody ever knew?)
+	icon_state = "oldpizzaslice"
 	filling_color = "#BAA14C"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	whole_path = /obj/item/reagent_containers/food/snacks/sliceable/pizza/oldpizza
 
 /obj/item/pizzabox
@@ -4124,8 +4124,8 @@
 	desc = "A box suited for pizzas."
 	icon = 'icons/obj/food.dmi'
 	icon_state = "pizzabox1"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 6
 
 	var/open = 0 // Is the box open?
 	var/ismessy = 0 // Fancy mess on the lid
@@ -4317,8 +4317,8 @@
 	icon_state = "dionaroast"
 	trash = /obj/item/trash/plate
 	filling_color = "#75754B"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 7 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 7
 	nutriment_amt = 6
 	nutriment_desc = list("a chorus of flavor" = 6)
 	bitesize = 2
@@ -4333,8 +4333,8 @@
 	icon = 'icons/obj/food_ingredients.dmi'
 	icon_state = "dough"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	nutriment_amt = 3
 	nutriment_desc = list("uncooked dough" = 3)
 
@@ -4359,8 +4359,8 @@
 	slices_num = 3
 	nutriment_amt = 3
 	nutriment_desc = list("raw dough" = 3)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 
 /obj/item/reagent_containers/food/snacks/sliceable/flatdough/Initialize()
 	. = ..()
@@ -4374,8 +4374,8 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/spagetti
 	slices_num = 1
 	bitesize = 2
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 19 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 19
 	nutriment_amt = 1
 	nutriment_desc = list("uncooked dough" = 1)
 
@@ -4385,8 +4385,8 @@
 	icon = 'icons/obj/food_ingredients.dmi'
 	icon_state = "bun"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 12
 	nutriment_amt = 4
 	nutriment_desc = list("bun" = 4)
 
@@ -4439,8 +4439,8 @@
 	desc = "A small bread monkey fashioned from two burger buns."
 	icon_state = "bunbun"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	nutriment_amt = 8
 	nutriment_desc = list("bun" = 8)
 
@@ -4449,8 +4449,8 @@
 	desc = "Take a bite!"
 	icon_state = "taco"
 	bitesize = 3
-	center_of_mass_x = 21 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 21
+	center_of_mass_y = 12
 	nutriment_amt = 4
 	nutriment_desc = list(REAGENT_ID_CHEESE = 2,"taco shell" = 2)
 
@@ -4464,8 +4464,8 @@
 	icon = 'icons/obj/food_ingredients.dmi'
 	icon_state = "rawcutlet"
 	bitesize = 1
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 20 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 20
 
 /obj/item/reagent_containers/food/snacks/rawcutlet/Initialize()
 	. = ..()
@@ -4477,8 +4477,8 @@
 	icon = 'icons/obj/food_ingredients.dmi'
 	icon_state = "cutlet"
 	bitesize = 2
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 20 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 20
 
 /obj/item/reagent_containers/food/snacks/cutlet/Initialize()
 	. = ..()
@@ -4490,8 +4490,8 @@
 	icon = 'icons/obj/food_ingredients.dmi'
 	icon_state = "rawmeatball"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 15 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 15
 
 /obj/item/reagent_containers/food/snacks/rawmeatball/Initialize()
 	. = ..()
@@ -4502,8 +4502,8 @@
 	desc = "Unrelated to dogs, maybe."
 	icon_state = "hotdog"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 17 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 17
 
 /obj/item/reagent_containers/food/snacks/hotdog/Initialize()
 	. = ..()
@@ -4523,8 +4523,8 @@
 	icon = 'icons/obj/food_ingredients.dmi'
 	icon_state = "flatbread"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_amt = 3
 	nutriment_desc = list("bread" = 3)
 
@@ -4547,8 +4547,8 @@
 	icon = 'icons/obj/food_ingredients.dmi'
 	icon_state = "rawsticks"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 12
 	nutriment_amt = 3
 	nutriment_desc = list("raw potato" = 3)
 
@@ -4558,8 +4558,8 @@
 	icon = 'icons/obj/food_ingredients.dmi'
 	icon_state = "sunflowerseed"
 	bitesize = 1
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 18 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 18
 	nutriment_amt = 1
 	nutriment_desc = list("starch" = 3)
 
@@ -4587,8 +4587,8 @@
 	desc = "Frostbelles, prepared traditionally."
 	icon_state = "bellefritter"
 	filling_color = "#5dadcf"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 12
 	do_coating_prefix = 0
 	bitesize = 2
 
@@ -4603,8 +4603,8 @@
 	icon = 'icons/obj/food.dmi'
 	icon_state = "sunflowerseed"
 	bitesize = 1
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 17 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 17
 	nutriment_amt = 2
 	nutriment_desc = list("salt" = 3)
 
@@ -4614,8 +4614,8 @@
 	icon = 'icons/obj/food.dmi'
 	icon_state = "roastnuts"
 	bitesize = 1
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 17 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 17
 	nutriment_amt = 2
 	nutriment_desc = list("salt" = 3)
 
@@ -4627,8 +4627,8 @@
 	trash = /obj/item/trash/liquidfood
 	filling_color = "#A8A8A8"
 	survivalfood = TRUE
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 15 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 15
 	nutriment_amt = 20
 	nutriment_desc = list("chalk" = 6)
 	bitesize = 4
@@ -4645,8 +4645,8 @@
 	trash = /obj/item/trash/liquidprotein
 	filling_color = "#A8A8A8"
 	survivalfood = TRUE
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 15 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 15
 	bitesize = 4
 	eating_sound = 'sound/items/drink.ogg'
 
@@ -4662,8 +4662,8 @@
 	trash = /obj/item/trash/liquidvitamin
 	filling_color = "#A8A8A8"
 	survivalfood = TRUE
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 15 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 15
 	bitesize = 4
 	eating_sound = 'sound/items/drink.ogg'
 
@@ -4680,8 +4680,8 @@
 	desc = "Fried, salted lean meat compressed into a cube. Not very appetizing."
 	icon_state = "meatcube"
 	filling_color = "#7a3d11"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/meatcube/Initialize()
@@ -4696,8 +4696,8 @@
 	icon_state = "tastybread"
 	trash = /obj/item/trash/tastybread
 	filling_color = "#A66829"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 16
 	nutriment_amt = 6
 	nutriment_desc = list("bread" = 2, "sweetness" = 3)
 	bitesize = 2
@@ -4710,8 +4710,8 @@
 	icon_state = "skrellsnacks"
 	trash = /obj/item/trash/skrellsnax
 	filling_color = "#A66829"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 12
 	nutriment_amt = 10
 	nutriment_desc = list(PLANT_MUSHROOMS = 5, "salt" = 5)
 	bitesize = 3
@@ -4724,8 +4724,8 @@
 	description_fluff = "The exact meat and spices used in the curing of Sissalik Jerky are a well-kept secret, and thought to not exist at all outside of Hegemony space. Many have tried to replicate the flavour, but none have come close, so the brand remains a highly prized import. "
 	trash = /obj/item/trash/unajerky
 	filling_color = "#631212"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	drop_sound = 'sound/items/drop/soda.ogg'
 	pickup_sound = 'sound/items/pickup/soda.ogg'
 	bitesize = 2
@@ -4794,8 +4794,8 @@
 	desc = "A true prophecy in each cookie!"
 	icon_state = "fortune_cookie"
 	filling_color = "#E8E79E"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 14
 	nutriment_amt = 3
 	nutriment_desc = list("fortune cookie" = 2)
 	bitesize = 2
@@ -4805,8 +4805,8 @@
 	desc = "A delicious and spongy little cake, with berries."
 	icon_state = "berrymuffin"
 	filling_color = "#E0CF9B"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 4 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 4
 	nutriment_amt = 6
 	nutriment_desc = list("sweetness" = 2, "muffin" = 2, PLANT_BERRIES = 2)
 	bitesize = 2
@@ -4824,8 +4824,8 @@
 	desc = "My stomach is a graveyard! No living being can quench my bloodthirst!"
 	icon_state = "berrymuffin"
 	filling_color = "#799ACE"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 4 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 4
 	nutriment_amt = 6
 	nutriment_desc = list("spookiness" = 4, "muffin" = 1, PLANT_BERRIES = 1)
 	bitesize = 2
@@ -4843,8 +4843,8 @@
 	desc = "Spicy homestyle favorite."
 	icon_state = "devilledegg"
 	filling_color = "#799ACE"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 16
 	nutriment_amt = 8
 	nutriment_desc = list(REAGENT_ID_EGG = 4, PLANT_CHILI = 4)
 	bitesize = 2
@@ -5088,8 +5088,8 @@
 	icon = 'icons/obj/food.dmi'
 	icon_state = "macncheese"
 	trash = /obj/item/trash/snack_bowl
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_amt = 9
 	nutriment_desc = list("Cheese" = 5, "pasta" = 4, "happiness" = 1)
 	bitesize = 3
@@ -5250,8 +5250,8 @@
 	desc = "A piece of mixed, long meat, battered and then deepfried."
 	icon_state = "batteredsausage"
 	filling_color = "#DB0000"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	do_coating_prefix = 0
 	bitesize = 2
 
@@ -5267,8 +5267,8 @@
 	desc = "A battered, deep-fried chilli pepper."
 	icon_state = "popper"
 	filling_color = "#00AA00"
-	center_of_mass_x = 10 //CHOMPEdit
-	center_of_mass_y= 6 //CHOMPEdit
+	center_of_mass_x = 10
+	center_of_mass_y = 6
 	do_coating_prefix = 0
 	nutriment_amt = 2
 	nutriment_desc = list("chilli pepper" = 2)
@@ -5283,8 +5283,8 @@
 	name = "mouse burger"
 	desc = "Squeaky and a little furry."
 	icon_state = "ratburger"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/mouseburger/Initialize()
@@ -5297,8 +5297,8 @@
 	icon_state = "katsu"
 	trash = /obj/item/trash/plate
 	filling_color = "#E9ADFF"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	do_coating_prefix = 0
 	bitesize = 1.5
 
@@ -5320,8 +5320,8 @@
 	desc = "A taste of the carnival. You can feel your blood pressure rising."
 	icon_state = "funnelcake"
 	filling_color = "#Ef1479"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 12
 	do_coating_prefix = 0
 	bitesize = 2
 
@@ -5335,8 +5335,8 @@
 	desc = "A stick of plant-based nutriments in a semi-solid form. I can't believe it's not margarine!"
 	icon_state = "marge"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_desc = list("margarine" = 1)
 	nutriment_amt = 20
 
@@ -5344,8 +5344,8 @@
 	name = "butter"
 	icon_state = "butter"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_desc = list("butter" = 1)
 	nutriment_amt = 0
 
@@ -5368,8 +5368,8 @@
 	desc = "A very thin piece of raw meat, cut from beef."
 	icon_state = "rawbacon"
 	bitesize = 1
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 
 /obj/item/reagent_containers/food/snacks/rawbacon/Initialize()
 	. = ..()
@@ -5380,24 +5380,24 @@
 	desc = "A tasty meat slice. You don't see any pigs on this station, do you?"
 	icon_state = "bacon"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 
 /obj/item/reagent_containers/food/snacks/bacon/microwave
 	name = "microwaved bacon"
 	desc = "A tasty meat slice. You don't see any pigs on this station, do you?"
 	icon_state = "bacon"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 
 /obj/item/reagent_containers/food/snacks/bacon/oven
 	name = "oven-cooked bacon"
 	desc = "A tasty meat slice. You don't see any pigs on this station, do you?"
 	icon_state = "bacon"
 	bitesize = 2
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 
 /obj/item/reagent_containers/food/snacks/bacon/Initialize()
 	. = ..()
@@ -5542,8 +5542,8 @@
 	desc = "The cornerstone of every nutritious breakfast, now with bacon!"
 	icon_state = "baconburger"
 	filling_color = "#D63C3C"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_desc = list("bun" = 2)
 	nutriment_amt = 3
 	bitesize = 2
@@ -5557,8 +5557,8 @@
 	desc = "Bacon, lettuce, tomatoes. The perfect lunch."
 	icon_state = "blt"
 	filling_color = "#D63C3C"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_desc = list("bread" = 4)
 	nutriment_amt = 4
 	bitesize = 2
@@ -5586,8 +5586,8 @@
 	icon_state = "mashedpotato"
 	trash = /obj/item/trash/plate
 	filling_color = "#EDDD00"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_amt = 4
 	nutriment_desc = list("mashed potatoes" = 4)
 	bitesize = 2
@@ -5597,8 +5597,8 @@
 	desc = "Totally baked."
 	icon_state = "loadedbakedpotato"
 	filling_color = "#9C7A68"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_amt = 3
 	nutriment_desc = list("baked potato" = 3)
 	bitesize = 2
@@ -5613,8 +5613,8 @@
 	icon_state = "bangersandmash"
 	trash = /obj/item/trash/plate
 	filling_color = "#EDDD00"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_amt = 4
 	nutriment_desc = list("fluffy potato" = 3, "sausage" = 2)
 	bitesize = 4
@@ -5629,8 +5629,8 @@
 	icon_state = "cheesymash"
 	trash = /obj/item/trash/plate
 	filling_color = "#EDDD00"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	nutriment_amt = 4
 	nutriment_desc = list("cheesy potato" = 4)
 	bitesize = 2
@@ -5653,8 +5653,8 @@
 	desc = "Pancakes, delicious."
 	icon_state = "pancakes"
 	trash = /obj/item/trash/plate
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 11
 	nutriment_desc = list("pancake" = 8)
 	nutriment_amt = 8
 	bitesize = 2
@@ -5664,8 +5664,8 @@
 	desc = "Pancakes with berries, delicious."
 	icon_state = "pancake_berry"
 	trash = /obj/item/trash/plate
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 11
 	nutriment_desc = list("pancake" = 4, "berry" = 4)
 	nutriment_amt = 10
 	bitesize = 2
@@ -5687,8 +5687,8 @@
 	desc = "Portable ice cream in its own packaging."
 	icon_state = "icecreamsandwich"
 	filling_color = "#343834"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 4 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 4
 	nutriment_desc = list("ice cream" = 4)
 	nutriment_amt = 4
 
@@ -5756,8 +5756,8 @@
 	icon_state = "tortilla"
 	bitesize = 3
 	nutriment_desc = list("tortilla" = 1)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_amt = 6
 
 //Old_Chips Guide//////////////////////////////////////
@@ -5770,8 +5770,8 @@
 //	icon_state = "chip"
 //	var/bitten_state = "chip_half"
 //	bitesize = 1
-//	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+//	center_of_mass_x = 16
+//	center_of_mass_y = 16
 //	nutriment_desc = list("chips" = 1)
 //	nutriment_amt = 2
 //	flags = OPENCONTAINER
@@ -5789,8 +5789,8 @@
 	icon_state = "chip"
 
 	bitesize = 1
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_desc = list("chips" = 1)
 	nutriment_amt = 2
 	flags = OPENCONTAINER
@@ -5800,8 +5800,8 @@
 	desc = "A portion sized chip good for dipping."
 	icon_state = "chip"
 	bitesize = 1
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_desc = list("nacho" = 1)
 	nutriment_amt = 2
 	flags = OPENCONTAINER
@@ -5896,8 +5896,8 @@
 	trash = /obj/item/trash/small_bowl
 	bitesize = 1
 	nutriment_desc = list("queso" = 20)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_amt = 20
 
 /obj/item/reagent_containers/food/snacks/dip/attackby(obj/item/reagent_containers/food/snacks/item as obj, mob/user as mob)
@@ -5997,8 +5997,8 @@
 	desc = "Free with orders over 10 thalers."
 	icon_state = "eggroll"
 	filling_color = "#799ACE"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 4 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 4
 	nutriment_amt = 4
 	nutriment_desc = list(REAGENT_ID_EGG = 4)
 	bitesize = 2
@@ -6012,8 +6012,8 @@
 	desc = "Minced meat wrapped in a flour tortilla. It's a burrito by definition."
 	icon_state = "burrito"
 	bitesize = 4
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_desc = list("tortilla" = 6)
 	nutriment_amt = 6
 
@@ -6026,8 +6026,8 @@
 	desc = "Spicy meat wrapped in a flour tortilla."
 	icon_state = "spicyburrito"
 	bitesize = 4
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_desc = list("tortilla" = 6)
 	nutriment_amt = 6
 
@@ -6040,8 +6040,8 @@
 	desc = "Meat and melted cheese wrapped in a flour tortilla."
 	icon_state = "cheesemeatburrito"
 	bitesize = 4
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_desc = list("tortilla" = 6)
 	nutriment_amt = 6
 
@@ -6054,8 +6054,8 @@
 	desc = "Melted cheese, beans and chillis wrapped in a flour tortilla."
 	icon_state = "spicycheesemeatburrito"
 	bitesize = 4
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_desc = list("tortilla" = 6)
 	nutriment_amt = 6
 
@@ -6068,8 +6068,8 @@
 	desc = "Tofu wrapped in a flour tortilla."
 	icon_state = "veganburrito"
 	bitesize = 4
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_desc = list("tortilla" = 6)
 	nutriment_amt = 6
 
@@ -6082,8 +6082,8 @@
 	desc = "Bacon, eggs, cheese, and tortilla grilled to perfection."
 	icon_state = "breakfastwrap"
 	bitesize = 4
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_desc = list("tortilla" = 6)
 	nutriment_amt = 6
 
@@ -6092,8 +6092,8 @@
 	desc = "The mystery is, why aren't you BSAing it?"
 	icon_state = "mysteryburrito"
 	bitesize = 5
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_desc = list("regret" = 6)
 	nutriment_amt = 6
 
@@ -6102,8 +6102,8 @@
 	desc = "Meat and an insane amount of chillis packed in a flour tortilla. The " + JOB_CHAPLAIN + " will see you now."
 	icon_state = "hellfireburrito"
 	bitesize = 4
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	nutriment_desc = list("hellfire" = 6)
 	nutriment_amt = 24// 10 Chilis is a lot.
 
@@ -6186,8 +6186,8 @@
 	filling_color = "#f73333"
 	nutriment_amt = 8
 	nutriment_desc = list("savory meat and rice" = 8)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/redcurry/Initialize()
@@ -6203,8 +6203,8 @@
 	filling_color = "#58b76c"
 	nutriment_amt = 12
 	nutriment_desc = list("tofu and rice" = 12)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/greencurry/Initialize()
@@ -6221,8 +6221,8 @@
 	filling_color = "#bc9509"
 	nutriment_amt = 13
 	nutriment_desc = list("rice and potatoes" = 13)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/yellowcurry/Initialize()
@@ -6234,8 +6234,8 @@
 	desc = "The solution to your unbearable hunger."
 	icon_state = "bearburger"
 	filling_color = "#5d5260"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 11
 	bitesize = 5
 
 /obj/item/reagent_containers/food/snacks/bearburger/Initialize()
@@ -6250,8 +6250,8 @@
 	filling_color = "#4f2100"
 	nutriment_amt = 10
 	nutriment_desc = list(REAGENT_ID_EGG = 5, "vegetables" = 5)
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	bitesize = 4
 
 /obj/item/reagent_containers/food/snacks/bibimbap/Initialize()
@@ -6267,8 +6267,8 @@
 	filling_color = "#FCEE81"
 	nutriment_amt = 8
 	nutriment_desc = list("noodles" = 6, "sesame sauce" = 2)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/lomein/Initialize()
@@ -6284,8 +6284,8 @@
 	filling_color = "#FFFBDB"
 	nutriment_amt = 7
 	nutriment_desc = list(REAGENT_ID_RICE = 7)
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 11
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/chickenfillet
@@ -6295,8 +6295,8 @@
 	filling_color = "#E9ADFF"
 	nutriment_amt = 4
 	nutriment_desc = list("breading" = 4)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/chickenfillet/Initialize()
@@ -6310,8 +6310,8 @@
 	filling_color = "#EDDD00"
 	nutriment_amt = 4
 	nutriment_desc = list("alcoholic mushrooms" = 4)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	bitesize = 5
 
 /obj/item/reagent_containers/food/snacks/friedmushroom/Initialize()
@@ -6327,8 +6327,8 @@
 	filling_color = "#301301"
 	nutriment_amt = 8
 	nutriment_desc = list("sweet bananas" = 8)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/pisanggoreng/Initialize()
@@ -6342,8 +6342,8 @@
 	icon_state = "meatbun"
 	nutriment_amt = 5
 	nutriment_desc = list("fried meat" = 5)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/meatbun/Initialize()
@@ -6357,8 +6357,8 @@
 	icon_state = "meatbun"
 	nutriment_amt = 5
 	nutriment_desc = list("char sui" = 5)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	bitesize = 5
 
 /obj/item/reagent_containers/food/snacks/spicedmeatbun/Initialize()
@@ -6372,8 +6372,8 @@
 	icon_state = "meatbun"
 	nutriment_amt = 6
 	nutriment_desc = list("egg custard" = 6)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	bitesize = 6
 
 /obj/item/reagent_containers/food/snacks/chickenmomo
@@ -6385,8 +6385,8 @@
 	filling_color = "#edd7d7"
 	nutriment_amt = 9
 	nutriment_desc = list("spiced chicken" = 9)
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/chickenmomo/Initialize()
@@ -6402,8 +6402,8 @@
 	filling_color = "#edd7d7"
 	nutriment_amt = 13
 	nutriment_desc = list("spiced vegetables" = 13)
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/veggiemomo/Initialize()
@@ -6419,8 +6419,8 @@
 	filling_color = "#edd7d7"
 	nutriment_amt = 9
 	nutriment_desc = list("savory rice" = 6, REAGENT_ID_CREAM = 3)
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/risotto/Initialize()
@@ -6436,8 +6436,8 @@
 	filling_color = "#edd7d7"
 	nutriment_amt = 1
 	nutriment_desc = list(REAGENT_ID_BATTER = 1)
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/poachedegg
@@ -6448,8 +6448,8 @@
 	filling_color = "#FFDF78"
 	nutriment_amt = 1
 	nutriment_desc = list(REAGENT_ID_EGG = 1)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/poachedegg/Initialize()
@@ -6465,8 +6465,8 @@
 	filling_color = "#7A3D11"
 	nutriment_amt = 6
 	nutriment_desc = list(REAGENT_ID_BARBECUE = 6)
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	bitesize = 4
 
 /obj/item/reagent_containers/food/snacks/ribplate/Initialize()
@@ -6513,8 +6513,8 @@
 	desc = "it is only wafer thin."
 	icon_state = "mint"
 	filling_color = "#F2F2F2"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	bitesize = 1
 
 /obj/item/reagent_containers/food/snacks/mint/Initialize()
@@ -6551,8 +6551,8 @@
 	icon_state = "candy"
 	trash = /obj/item/trash/candy
 	filling_color = "#7D5F46"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 15 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 15
 	nutriment_amt = 1
 	nutriment_desc = list("candy" = 1)
 	bitesize = 2
@@ -6568,8 +6568,8 @@
 	icon_state = "namagashi"
 	trash = /obj/item/trash/namagashi
 	filling_color = "#7D5F46"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 15 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 15
 	nutriment_amt = 1
 	nutriment_desc = list("candy" = 2, "sweetness" = 2)
 	bitesize = 2
@@ -6825,8 +6825,8 @@
 	icon_state = "chips"
 	trash = /obj/item/trash/chips
 	filling_color = "#E8C31E"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 15 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 15
 	nutriment_amt = 3
 	nutriment_desc = list("salt" = 1, "chips" = 2)
 	bitesize = 1
@@ -6859,8 +6859,8 @@
 	icon_state = "tastybread"
 	trash = /obj/item/trash/tastybread
 	filling_color = "#A66829"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 16
 	nutriment_amt = 6
 	nutriment_desc = list("bread" = 2, "sweetness" = 3)
 	bitesize = 2
@@ -6873,8 +6873,8 @@
 	icon_state = "skrellsnacks"
 	trash = /obj/item/trash/skrellsnax
 	filling_color = "#A66829"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 12 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 12
 	nutriment_amt = 10
 	nutriment_desc = list(PLANT_MUSHROOMS = 5, "salt" = 5)
 	bitesize = 3
@@ -6887,8 +6887,8 @@
 	description_fluff = "Raising cows in low-gravity environments has the natural result of particularly tender meat. The jerking process largely undoes this apparent benefit, but it's just too damn efficient to ship not to."
 	trash = /obj/item/trash/sosjerky
 	filling_color = "#631212"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/sosjerky/Initialize()
@@ -6903,8 +6903,8 @@
 	description_fluff = "The exact meat and spices used in the curing of Sissalik Jerky are a well-kept secret, and thought to not exist at all outside of Hegemony space. Many have tried to replicate the flavour, but none have come close, so the brand remains a highly prized import. "
 	trash = /obj/item/trash/unajerky
 	filling_color = "#631212"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	drop_sound = 'sound/items/drop/soda.ogg'
 	pickup_sound = 'sound/items/pickup/soda.ogg'
 	bitesize = 2
@@ -6922,8 +6922,8 @@
 	description_fluff = "Launched by Centuari Provisions to target the Tajaran immigrant market, Tuna Snax also found a surprising niche among Vir's sizable Scandinavian population. Elsewhere, the dried fish flakes are widely considered disgusting."
 	trash = /obj/item/trash/tuna
 	filling_color = "#FFDEFE"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 13
 	nutriment_amt = 3
 	nutriment_desc = list("smoked fish" = 5)
 	bitesize = 2
@@ -6939,8 +6939,8 @@
 	desc = "Pistachios. There is absolutely nothing remarkable about these."
 	trash = /obj/item/trash/pistachios
 	filling_color = "#825D26"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 13
 	nutriment_desc = list("nuts" = 1)
 	nutriment_amt = 3
 	bitesize = 1
@@ -6952,8 +6952,8 @@
 	desc = "Sunflower seeds. A favorite among both birds and gopniks."
 	trash = /obj/item/trash/semki
 	filling_color = "#68645D"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 13
 	nutriment_desc = list("sunflower seeds" = 1)
 	nutriment_amt = 6
 	bitesize = 1
@@ -6965,8 +6965,8 @@
 	desc = "Space squid tentacles, Carefully removed (from the squid) then dried into strips of delicious rubbery goodness!"
 	trash = /obj/item/trash/squid
 	filling_color = "#c0a9d7"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y = 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("fish" = 1, "salt" = 1)
 	nutriment_amt = 2
 	bitesize = 1
@@ -6982,8 +6982,8 @@
 	desc = "Fried bread cubes. Popular in some Solar territories."
 	trash = /obj/item/trash/croutons
 	filling_color = "#c6b17f"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y = 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("bread" = 1, "salt" = 1)
 	nutriment_amt = 3
 	bitesize = 1
@@ -6995,8 +6995,8 @@
 	desc = "Pig fat. Salted. Just as good as it sounds."
 	trash = /obj/item/trash/salo
 	filling_color = "#e0bcbc"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y = 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("fat" = 1, "salt" = 1)
 	nutriment_amt = 2
 	bitesize = 2
@@ -7012,8 +7012,8 @@
 	desc = "Dried salted beer snack fish."
 	trash = /obj/item/trash/driedfish
 	filling_color = "#c8a5bb"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y = 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("fish" = 1, "salt" = 1)
 	nutriment_amt = 2
 	bitesize = 1
@@ -7030,8 +7030,8 @@
 	description_fluff = "Originally Raisin Blend no. 4, 4noraisins obtained their current name in the Skadi Positronic Exclusion Crisis of 2442, where they were rebranded as part of the protests. The exclusion crisis, so the story goes, involved positronic immigration being banned for no raisin."
 	trash = /obj/item/trash/raisins
 	filling_color = "#343834"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 4 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 4
 	nutriment_desc = list("dried raisins" = 6)
 	nutriment_amt = 6
 
@@ -7042,8 +7042,8 @@
 //	desc = "Guaranteed to survive longer than you will."
 //	description_fluff = "Despite Spacer advertisements consistently portraying their snack cakes as life-saving, tear-jerking survival food for spacers in all kinds of dramatic scenarios, the Spacer Snack Cake has been statistically proven to lower survival rates on all missions where it is present."
 //	filling_color = "#FFE591"
-//	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+//	center_of_mass_x = 15
+//	center_of_mass_y = 11
 //	bitesize = 2
 //
 ///obj/item/reagent_containers/food/snacks/spacetwinkie/Initialize()
@@ -7058,8 +7058,8 @@
 	description_fluff = "The origins of the flourescent orange dust produced by Cheesie Honkers is considered a trade secret, despite having been leaked on the exonet decades ago. It's the cheese."
 	trash = /obj/item/trash/cheesie
 	filling_color = "#FFA305"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_amt = 4
 	nutriment_desc = list(REAGENT_ID_CHEESE = 5, "chips" = 2)
 	bitesize = 2
@@ -7072,8 +7072,8 @@
 	description_fluff = "Spacer Snack Cakes' meaner, tastier cousin. The Syndi-Cakes brand was at risk of dissolution in 2429 when it was revealed that the entire production chain was a Nos Amis joint. The brand was quickly aquired by Centauri Provisions and some mild hallucinogenic 'add-ins' were axed from the recipe."
 	trash = /obj/item/trash/syndi_cakes
 	filling_color = "#FF5D05"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_desc = list("sweetness" = 3, "cake" = 1)
 	nutriment_amt = 4
 	bitesize = 3
@@ -7091,8 +7091,8 @@
 	desc = "Contains over 9000% of your daily recommended intake of salt."
 	trash = /obj/item/trash/tidegobs
 	filling_color = "#2556b0"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("salt" = 4, "seagull?" = 1)
 	nutriment_amt = 5
 	bitesize = 2
@@ -7104,8 +7104,8 @@
 	desc = "A peanut flavored snack that looks like the rings of Saturn!"
 	trash = /obj/item/trash/saturno
 	filling_color = "#dca319"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("salt" = 4, PLANT_PEANUT = 2,  "wood?" = 1)
 	nutriment_amt = 5
 	bitesize = 2
@@ -7117,8 +7117,8 @@
 	desc = "By Joove! It's some kind of gel."
 	trash = /obj/item/trash/jupiter
 	filling_color = "#dc1919"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("sweetness" = 4, REAGENT_ID_VANILLA = 1)
 	nutriment_amt = 5
 	bitesize = 2
@@ -7130,8 +7130,8 @@
 	desc = "Baseless tasteless nutrithick rods to get you through the day. Now even less rash inducing!"
 	trash = /obj/item/trash/pluto
 	filling_color = "#ffffff"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("chalk" = 4, "sadness" = 1)
 	nutriment_amt = 5
 	bitesize = 2
@@ -7143,8 +7143,8 @@
 	desc = "A steaming self-heated bowl of sweet eggs and taters!"
 	trash = /obj/item/trash/mars
 	filling_color = "#d2c63f"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("eggs" = 4, PLANT_POTATO = 4, REAGENT_ID_MUSTARD = 2)
 	nutriment_amt = 8
 	bitesize = 2
@@ -7156,8 +7156,8 @@
 	desc = "Hot takes on hot cakes, a timeless classic now finally fit for human consumption!"
 	trash = /obj/item/trash/venus
 	filling_color = "#d2c63f"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("heat" = 4, "burning!" = 1)
 	nutriment_amt = 5
 	bitesize = 2
@@ -7173,8 +7173,8 @@
 	desc = "A Sol favorite, Sun Snax! Sun dried corn chips coated in a super spicy seasoning!"
 	trash = /obj/item/trash/sun_snax
 	filling_color = "#d2c63f"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("heat" = 3, "burning!" = 2)
 	nutriment_amt = 3
 	bitesize = 1
@@ -7190,8 +7190,8 @@
 	desc = "Pop rocks themed on the outermost reaches of the Sol system, new formula guarantees fewer shrapnel induced oral injuries."
 	trash = /obj/item/trash/oort
 	filling_color = "#3f7dd2"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("fizz" = 4, "sweetness" = 1)
 	nutriment_amt = 5
 	bitesize = 2
@@ -7207,8 +7207,8 @@
 	trash = /obj/item/trash/pretzel
 	desc = "A tasty bread like snack that is seasoned with what tastes like salt... but you're not so sure it's actually salt."
 	filling_color = "#916E36"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("salt" = 2, "pretzel" = 3)
 	nutriment_amt = 3
 	bitesize = 1
@@ -7221,8 +7221,8 @@
 	desc = "Fermented space shark, like chewing a urine soaked mattress."
 	description_fluff = "A form of fermented shark that originated on Earth as far back as the 17th century. Modern Hakarl is made from vat-made fermented shark and is distributed across the galaxy as a delicacy. However, few are able to stand the smell or taste of the meat."
 	filling_color = "#916E36"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("fish" = 2, "salt" = 2, REAGENT_ID_AMMONIA = 1)
 	nutriment_amt = 4
 	bitesize = 1
@@ -7324,8 +7324,8 @@
 /obj/item/reagent_containers/food/snacks/old
 	name = "master old-food"
 	desc = "they're all inedible and potentially dangerous items"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y = 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("rot" = 5, REAGENT_ID_MOLD = 5)
 	nutriment_amt = 10
 	bitesize = 3
@@ -7387,8 +7387,8 @@
 	trash = /obj/item/trash/beef
 	canned_open_state = "beef-open"
 	filling_color = "#663300"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("beef" = 1)
 	bitesize = 2
 
@@ -7404,8 +7404,8 @@
 	trash = /obj/item/trash/beans
 	canned_open_state = "beans-open"
 	filling_color = "#ff6633"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list(REAGENT_BEANPROTEIN = 1, "tomato sauce" = 1)
 	bitesize = 2
 
@@ -7421,8 +7421,8 @@
 	trash = /obj/item/trash/tomato
 	package_open_state = "tomato-open"
 	filling_color = "#ae0000"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/canned/tomato/Initialize()
@@ -7436,8 +7436,8 @@
 	trash = /obj/item/trash/spinach
 	canned_open_state = "spinach-open"
 	filling_color = "#003300"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("soggy" = 1, "vegetable" = 1)
 	bitesize = 3
 
@@ -7456,8 +7456,8 @@
 	trash = /obj/item/trash/fishegg
 	canned_open_state = "fisheggs-open"
 	filling_color = "#000000"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("salt" = 1)
 	bitesize = 1
 
@@ -7472,8 +7472,8 @@
 	trash = /obj/item/trash/carpegg
 	canned_open_state = "carpeggs-open"
 	filling_color = "#330066"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list("salt" = 1, "a numbing sensation" = 1)
 	bitesize = 1
 
@@ -7489,8 +7489,8 @@
 	trash = /obj/item/trash/maps
 	canned_open_state = "maps-open"
 	filling_color = "#330066"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/canned/maps/Initialize()
@@ -7505,8 +7505,8 @@
 	trash = /obj/item/trash/appleberry
 	canned_open_state = "appleberry-open"
 	filling_color = "#FFFFFF"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_desc = list(PLANT_APPLE = 1, "sweetness" = 1)
 	bitesize = 2
 
@@ -7522,8 +7522,8 @@
 	trash = /obj/item/trash/ntbeans
 	canned_open_state = "ntbeans-open"
 	filling_color = "#FC6F28"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	bitesize = 2
 
 /obj/item/reagent_containers/food/snacks/canned/ntbeans/Initialize()
@@ -7541,8 +7541,8 @@
 	trash = /obj/item/trash/brainzsnax
 	canned_open_state = "brainzsnax-open"
 	filling_color = "#caa3c9"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	bitesize = 2
 	var/brainmeat = REAGENT_ID_BRAINPROTEIN
 
@@ -7560,8 +7560,8 @@
 	trash = /obj/item/trash/brainzsnaxred
 	canned_open_state = "brainzsnaxred-open"
 	filling_color = "#a6898d"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	bitesize = 2
 	brainmeat = REAGENT_ID_REDBRAINPROTEIN
 
@@ -7581,8 +7581,8 @@
 	package_trash = /obj/item/trash/lunacakewrap
 	package_open_state = "lunacake_open"
 	filling_color = "#ffffff"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_amt = 6
 	nutriment_desc = list("sweetness" = 4, REAGENT_ID_VANILLA = 1)
 	bitesize = 2
@@ -7594,8 +7594,8 @@
 	package_trash = /obj/item/trash/mooncakewrap
 	package_open_state = "lunacake_open"
 	filling_color = "#ffffff"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_amt = 6
 	nutriment_desc = list("sweetness" = 4, REAGENT_ID_CHOCOLATE = 1)
 	bitesize = 2
@@ -7607,8 +7607,8 @@
 	package_trash = /obj/item/trash/mochicakewrap
 	package_open_state = "lunacake_open"
 	filling_color = "#ffffff"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	nutriment_amt = 6
 	nutriment_desc = list("sweetness" = 4, REAGENT_ID_RICE = 1)
 	bitesize = 2
@@ -7625,8 +7625,8 @@
 	package_trash = /obj/item/trash/spacer_cake_wrap
 	package_open_state = "spacercake_open"
 	filling_color = "#FFE591"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 11
 	nutriment_amt = 4
 	nutriment_desc = list("sweetness" = 4, "cake" = 2)
 	bitesize = 2
@@ -7642,8 +7642,8 @@
 	trash = /obj/item/trash/genration
 	package_open_state = "genration_open"
 	filling_color = "#FFFFFF"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 11
 	nutriment_amt = 4
 	nutriment_desc = list("chalk" = 6)
 	bitesize = 2
@@ -7655,8 +7655,8 @@
 	trash = /obj/item/trash/meatration
 	package_open_state = "meatration_open"
 	filling_color = "#FFFFFF"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 11
 	nutriment_amt = 4
 	nutriment_desc = list("chalk" = 3, "meat" = 3)
 	bitesize = 2
@@ -7672,8 +7672,8 @@
 	trash = /obj/item/trash/vegration
 	package_open_state = "vegration_open"
 	filling_color = "#FFFFFF"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 11
 	nutriment_amt = 4
 	nutriment_desc = list("sadness" = 3, "veggie" = 3)
 	bitesize = 2
@@ -7685,8 +7685,8 @@
 	trash = /obj/item/trash/sweetration
 	package_open_state = "baseration_open"
 	filling_color = "#FFFFFF"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 11
 	nutriment_amt = 4
 	nutriment_desc = list("sweetness" = 5, "cake" = 1)
 	bitesize = 2
diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm
index b0acb2732c..8ea9b08e84 100644
--- a/code/modules/food/food/snacks/meat.dm
+++ b/code/modules/food/food/snacks/meat.dm
@@ -4,8 +4,8 @@
 	icon_state = "meat"
 	health = 180
 	filling_color = "#FF1C1C"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 
 /obj/item/reagent_containers/food/snacks/meat/Initialize()
 	. = ..()
@@ -74,8 +74,8 @@
 	desc = "A slice from a huge mushroom."
 	icon_state = "hugemushroomslice"
 	filling_color = "#E0D7C5"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 16
 	nutriment_amt = 3
 	nutriment_desc = list("raw" = 2, PLANT_MUSHROOMS = 2)
 	bitesize = 6
@@ -89,8 +89,8 @@
 	desc = "A slice from a huge tomato"
 	icon_state = "tomatomeat"
 	filling_color = "#DB0000"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 16
 	nutriment_amt = 3
 	nutriment_desc = list("raw" = 2, PLANT_TOMATO = 3)
 	bitesize = 6
@@ -100,8 +100,8 @@
 	desc = "A very manly slab of meat."
 	icon_state = "bearmeat"
 	filling_color = "#DB0000"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	bitesize = 3
 
 /obj/item/reagent_containers/food/snacks/bearmeat/Initialize()
@@ -114,8 +114,8 @@
 	desc = "A slab of green meat. Smells like acid."
 	icon_state = "xenomeat"
 	filling_color = "#43DE18"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	bitesize = 6
 
 /obj/item/reagent_containers/food/snacks/xenomeat/Initialize()
@@ -128,8 +128,8 @@
 	desc = "A slab of green meat."
 	icon_state = "xenomeat"
 	filling_color = "#43DE18"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	bitesize = 6
 
 /obj/item/reagent_containers/food/snacks/xenomeat/spidermeat/Initialize()
@@ -156,8 +156,8 @@
 	desc = "A slab of grub meat, it gives a gentle shock if you touch it"
 	icon = 'icons/obj/food.dmi'
 	icon_state = "grubmeat"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 /obj/item/reagent_containers/food/snacks/meat/grubmeat/Initialize()
 	. = ..()
@@ -171,8 +171,8 @@
 	icon_state = "wormmeat"
 	health = 180
 	filling_color = "#551A8B"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 
 /obj/item/reagent_containers/food/snacks/meat/worm/Initialize()
 	. = ..()
diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm
index 2e954c2f94..c4d361c0b8 100644
--- a/code/modules/food/food/snacks_vr.dm
+++ b/code/modules/food/food/snacks_vr.dm
@@ -459,8 +459,8 @@
 	flags = OPENCONTAINER
 	bitesize = 12
 	filling_color = "#ADAC7F"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 
 	var/food_type = "/obj/item/reagent_containers/food/snacks/proteinslab"
 
@@ -583,8 +583,8 @@
 	desc = "The universes best soup! Yum!!!"
 	icon_state = "milosoup"
 	trash = /obj/item/trash/snack_bowl
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 7 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 7
 	nutriment_amt = 8
 	nutriment_desc = list("soy" = 8)
 	bitesize = 4
@@ -600,8 +600,8 @@
 	icon_state = "onionsoup"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#E0C367"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 7 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 7
 	bitesize = 3
 	eating_sound = 'sound/items/drink.ogg'
 
diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm
index 965fcea302..d0dd4f096b 100644
--- a/code/modules/food/food/superfoods.dm
+++ b/code/modules/food/food/superfoods.dm
@@ -176,8 +176,8 @@
 	desc = "A slice from The Chaos Cake, it pulses weirdly, as if angry to be separated from the whole"
 	icon_state = "chaoscake_slice-1"
 
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	nutriment_desc = list()
 	nutriment_amt = 4
 	volume = 80
diff --git a/code/modules/materials/sheets/_sheets.dm b/code/modules/materials/sheets/_sheets.dm
index 99352b79ab..0c7386bc32 100644
--- a/code/modules/materials/sheets/_sheets.dm
+++ b/code/modules/materials/sheets/_sheets.dm
@@ -6,8 +6,8 @@
 	w_class = ITEMSIZE_NORMAL
 	throw_speed = 3
 	throw_range = 3
-	center_of_mass_x = 0 //CHOMPEdit
-	center_of_mass_y = 0 //CHOMPEdit
+	center_of_mass_x = 0
+	center_of_mass_y = 0
 	max_amount = 50
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_material.dmi',
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index e5960f142a..20067a64e9 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -6,8 +6,8 @@ var/list/holder_mob_icon_cache = list()
 	desc = "You shouldn't ever see this."
 	icon = 'icons/obj/objects.dmi'
 	randpixel = 0
-	center_of_mass_x = 0 //CHOMPEdit
-	center_of_mass_y = 0 //CHOMPEdit
+	center_of_mass_x = 0
+	center_of_mass_y = 0
 	slot_flags = SLOT_HEAD | SLOT_HOLSTER
 	show_messages = 1
 
diff --git a/code/modules/modular_computers/computers/modular_computer/variables.dm b/code/modules/modular_computers/computers/modular_computer/variables.dm
index 4fd76ce0a7..2aa4eda0e8 100644
--- a/code/modules/modular_computers/computers/modular_computer/variables.dm
+++ b/code/modules/modular_computers/computers/modular_computer/variables.dm
@@ -27,8 +27,8 @@
 	blocks_emissive = FALSE
 	var/overlay_icon = null									// Icon file used for overlays
 	icon_state = null
-	center_of_mass_x = 0 //CHOMPEdit
-	center_of_mass_y = 0 //CHOMPEdit									// No pixelshifting by placing on tables, etc.
+	center_of_mass_x = 0
+	center_of_mass_y = 0									// No pixelshifting by placing on tables, etc.
 	randpixel = 0											// And no random pixelshifting on-creation either.
 	var/icon_state_unpowered = null							// Icon state when the computer is turned off
 	var/icon_state_menu = "menu"							// Icon state overlay when the computer is turned on, but no program is loaded that would override the screen.
diff --git a/code/modules/reagents/readme.md b/code/modules/reagents/readme.md
index f9dac66b08..ef274b6f9e 100644
--- a/code/modules/reagents/readme.md
+++ b/code/modules/reagents/readme.md
@@ -191,7 +191,8 @@ About Reagents:
 		glass_desc
 			Ditto for glass desciption.
 
-		glass_center_of_mass
+		glass_center_of_mass_x
+		glass_center_of_mass_y
 			Used for glass placement on tables.
 
 		color
@@ -302,4 +303,4 @@ About the Tools:
 			transfer code since you will not be able to use the standard
 			tools to manipulate it.
 
-*/
\ No newline at end of file
+*/
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index ebdce79918..dd7ab49d40 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -193,8 +193,8 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "beaker"
 	item_state = "beaker"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 11
 	matter = list(MAT_GLASS = 500)
 	drop_sound = 'sound/items/drop/glass.ogg'
 	pickup_sound = 'sound/items/pickup/glass.ogg'
@@ -250,8 +250,8 @@
 	name = "large beaker"
 	desc = "A large beaker."
 	icon_state = "beakerlarge"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	matter = list(MAT_GLASS = 5000)
 	volume = 120
 	amount_per_transfer_from_this = 10
@@ -263,8 +263,8 @@
 	name = "cryostasis beaker"
 	desc = "A cryostasis beaker that allows for chemical storage without reactions."
 	icon_state = "beakernoreact"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	matter = list(MAT_GLASS = 500)
 	volume = 60
 	amount_per_transfer_from_this = 10
@@ -274,8 +274,8 @@
 	name = "bluespace beaker"
 	desc = "A bluespace beaker, powered by experimental bluespace technology."
 	icon_state = "beakerbluespace"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 11 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	matter = list(MAT_GLASS = 5000)
 	volume = 300
 	amount_per_transfer_from_this = 10
@@ -287,8 +287,8 @@
 	name = "vial"
 	desc = "A small glass vial."
 	icon_state = "vial"
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 9 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	matter = list(MAT_GLASS = 250)
 	volume = 30
 	w_class = ITEMSIZE_TINY
@@ -307,8 +307,8 @@
 	name = "stoppered bottle"
 	desc = "A stoppered bottle for keeping beverages fresh."
 	icon_state = "stopperedbottle"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 13 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	volume = 120
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25,30,60,120)
@@ -320,8 +320,8 @@
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "bucket"
 	item_state = "bucket"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	matter = list(MAT_STEEL = 200)
 	w_class = ITEMSIZE_NORMAL
 	amount_per_transfer_from_this = 20
@@ -383,8 +383,8 @@
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "woodbucket"
 	item_state = "woodbucket"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 8 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 8
 	matter = list(MAT_WOOD = 50)
 	w_class = ITEMSIZE_LARGE
 	amount_per_transfer_from_this = 20
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 13415f71af..230e2f6c72 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -4,8 +4,8 @@
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "cleaner"
 	item_state = "cleaner"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 	flags = OPENCONTAINER|NOBLUDGEON
 	matter = list(MAT_GLASS = 300, MAT_STEEL = 300)
 	slot_flags = SLOT_BELT
@@ -126,8 +126,8 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "pepperspray"
 	item_state = "pepperspray"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	possible_transfer_amounts = null
 	volume = 40
 	var/safety = TRUE
@@ -175,8 +175,8 @@
 	icon_state = "chemsprayer"
 	item_state = "chemsprayer"
 	item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi')
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 16 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	throwforce = 3
 	w_class = ITEMSIZE_NORMAL
 	possible_transfer_amounts = null
@@ -222,8 +222,8 @@
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "cleaner-industrial"
 	item_state = "cleaner"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 	possible_transfer_amounts = list(5,10,20)
 
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 44fc6ec78c..dc3b18f4ee 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -16,8 +16,8 @@
 	icon = 'icons/goonstation/objects/syringe_vr.dmi'
 	item_state = "syringe_0"
 	icon_state = "0"
-	center_of_mass_x = 16 //CHOMPEdit
-	center_of_mass_y= 14 //CHOMPEdit
+	center_of_mass_x = 16
+	center_of_mass_y = 14
 	matter = list(MAT_GLASS = 150)
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = null
diff --git a/code/modules/reagents/reagents/_reagents.dm b/code/modules/reagents/reagents/_reagents.dm
index feac59b59d..a77a41bda6 100644
--- a/code/modules/reagents/reagents/_reagents.dm
+++ b/code/modules/reagents/reagents/_reagents.dm
@@ -32,7 +32,8 @@
 	var/cup_icon_state = null
 	var/cup_name = null
 	var/cup_desc = null
-	var/cup_center_of_mass = null
+	var/cup_center_of_mass_x = 0
+	var/cup_center_of_mass_y = 0
 	var/cup_prefix = null
 
 	var/color = "#000000"
diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm
index 38620b8e8a..c9ed09d6c8 100644
--- a/code/modules/vore/fluffstuff/custom_items_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_items_vr.dm
@@ -1266,8 +1266,8 @@
 	base_name = "Clara's Vacuum Flask"
 	base_icon = "claraflask"
 	icon = 'icons/vore/custom_items_vr.dmi'
-	center_of_mass_x = 15 //CHOMPEdit
-	center_of_mass_y= 4 //CHOMPEdit
+	center_of_mass_x = 15
+	center_of_mass_y = 4
 	filling_states = list(15, 30, 50, 60, 80, 100)
 	volume = 60
 
diff --git a/code/modules/xenobio/items/slime_objects.dm b/code/modules/xenobio/items/slime_objects.dm
index 8e90bde98e..609b32705d 100644
--- a/code/modules/xenobio/items/slime_objects.dm
+++ b/code/modules/xenobio/items/slime_objects.dm
@@ -118,8 +118,8 @@
 	desc = "A glob of slime that is thick as honey.  For the brave " + JOB_XENOBIOLOGIST + "."
 	icon_state = "honeycomb"
 	filling_color = "#FFBB00"
-	center_of_mass_x = 17 //CHOMPEdit
-	center_of_mass_y= 10 //CHOMPEdit
+	center_of_mass_x = 17
+	center_of_mass_y = 10
 	nutriment_amt = 25 // Very filling.
 	nutriment_desc = list("slime" = 10, "sweetness" = 10, REAGENT_ID_BLISS = 5)
 
diff --git a/modular_chomp/code/modules/food/drinkgglass/metaglass.dm b/modular_chomp/code/modules/food/drinkgglass/metaglass.dm
index 849245462d..1460fc82f1 100644
--- a/modular_chomp/code/modules/food/drinkgglass/metaglass.dm
+++ b/modular_chomp/code/modules/food/drinkgglass/metaglass.dm
@@ -3,7 +3,8 @@
 /datum/reagent/ethanol/cloverclub
 	glass_icon_state = "cloverclub"
 	glass_icon_source = 'modular_chomp/icons/obj/drinks.dmi'
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/ethanol/spiderdrink
 	glass_icon_state = "glassofspiders"
@@ -33,27 +34,32 @@
 /datum/reagent/drink/bubbleteawatermelon
 	glass_icon_state = "bubbleteawatermelonglass"
 	glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi'
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 
 /datum/reagent/drink/bubbleteastrawberry
 	glass_icon_state = "bubbleteastrawberryglass"
 	glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi'
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 
 /datum/reagent/drink/bubbleteacherry
 	glass_icon_state = "bubbleteacherryglass"
 	glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi'
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 
 /datum/reagent/drink/bubbleteacoffee
 	glass_icon_state = "bubbleteacoffeeglass"
 	glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi'
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 
 /datum/reagent/drink/bubbleteabanana
 	glass_icon_state = "bubbleteabananaglass"
 	glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi'
-	glass_center_of_mass = list("x"=16, "y"=9)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 9
 
 /datum/reagent/drink/tea/matcha_latte
 	glass_icon_state = "bigteacup"
@@ -61,12 +67,14 @@
 /datum/reagent/drink/horchata
 	glass_icon_state = "horchata"
 	glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi'
-	glass_center_of_mass = list("x"=16, "y"=7)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 7
 
 /datum/reagent/toxin/bluetrain
 	glass_icon_state = "bluetrain"
 	glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi'
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 
 /datum/reagent/drink/lovepotion
 	glass_icon_state = "lovepotion"
diff --git a/modular_chomp/code/modules/reagents/reagents/food_drinks.dm b/modular_chomp/code/modules/reagents/reagents/food_drinks.dm
index c11b24cf65..8a81a7c503 100644
--- a/modular_chomp/code/modules/reagents/reagents/food_drinks.dm
+++ b/modular_chomp/code/modules/reagents/reagents/food_drinks.dm
@@ -714,7 +714,8 @@
 	glass_name = "Worm blood"
 	glass_desc = "Who had the grand idea to bottle THE BLOOD OF A WORM."
 	glass_icon_state = "wormblood"
-	glass_center_of_mass = list("x"=16, "y"=8)
+	glass_center_of_mass_x = 16
+	glass_center_of_mass_y = 8
 	glass_icon_file = 'icons/obj/drinks_yw.dmi'
 
 /datum/reagent/blondiemix