removes center of mass list (#17064)

* removes center of mass list

* .

* .

* fix that icon

* .

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.
 
-*/
+*/

code/modules/reagents/reagent_containers/glass.dm

@@ -182,7 +182,8 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "beaker"
 	item_state = "beaker"
-	center_of_mass = list("x" = 15,"y" = 11)
+	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'
@@ -238,7 +239,8 @@
 	name = "large beaker"
 	desc = "A large beaker."
 	icon_state = "beakerlarge"
-	center_of_mass = list("x" = 16,"y" = 11)
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	matter = list(MAT_GLASS = 5000)
 	volume = 120
 	amount_per_transfer_from_this = 10
@@ -250,7 +252,8 @@
 	name = "cryostasis beaker"
 	desc = "A cryostasis beaker that allows for chemical storage without reactions."
 	icon_state = "beakernoreact"
-	center_of_mass = list("x" = 16,"y" = 13)
+	center_of_mass_x = 16
+	center_of_mass_y = 13
 	matter = list(MAT_GLASS = 500)
 	volume = 60
 	amount_per_transfer_from_this = 10
@@ -260,7 +263,8 @@
 	name = "bluespace beaker"
 	desc = "A bluespace beaker, powered by experimental bluespace technology."
 	icon_state = "beakerbluespace"
-	center_of_mass = list("x" = 16,"y" = 11)
+	center_of_mass_x = 16
+	center_of_mass_y = 11
 	matter = list(MAT_GLASS = 5000)
 	volume = 300
 	amount_per_transfer_from_this = 10
@@ -272,7 +276,8 @@
 	name = "vial"
 	desc = "A small glass vial."
 	icon_state = "vial"
-	center_of_mass = list("x" = 15,"y" = 9)
+	center_of_mass_x = 15
+	center_of_mass_y = 9
 	matter = list(MAT_GLASS = 250)
 	volume = 30
 	w_class = ITEMSIZE_TINY
@@ -291,7 +296,8 @@
 	name = "stoppered bottle"
 	desc = "A stoppered bottle for keeping beverages fresh."
 	icon_state = "stopperedbottle"
-	center_of_mass = list("x" = 16,"y" = 13)
+	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)
@@ -303,7 +309,8 @@
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "bucket"
 	item_state = "bucket"
-	center_of_mass = list("x" = 16,"y" = 10)
+	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
@@ -361,7 +368,8 @@
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "woodbucket"
 	item_state = "woodbucket"
-	center_of_mass = list("x" = 16,"y" = 8)
+	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

code/modules/reagents/reagent_containers/spray.dm

@@ -4,7 +4,8 @@
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "cleaner"
 	item_state = "cleaner"
-	center_of_mass = list("x" = 16,"y" = 10)
+	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
@@ -122,7 +123,8 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "pepperspray"
 	item_state = "pepperspray"
-	center_of_mass = list("x" = 16,"y" = 16)
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	possible_transfer_amounts = null
 	volume = 40
 	var/safety = TRUE
@@ -169,7 +171,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 = list("x" = 16,"y" = 16)
+	center_of_mass_x = 16
+	center_of_mass_y = 16
 	throwforce = 3
 	w_class = ITEMSIZE_NORMAL
 	possible_transfer_amounts = null
@@ -215,7 +218,8 @@
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "cleaner-industrial"
 	item_state = "cleaner"
-	center_of_mass = list("x" = 16,"y" = 10)
+	center_of_mass_x = 16
+	center_of_mass_y = 10
 
 	possible_transfer_amounts = list(5,10,20)
 

code/modules/reagents/reagent_containers/syringes.dm

@@ -15,7 +15,8 @@
 	icon = 'icons/goonstation/objects/syringe_vr.dmi'
 	item_state = "syringe_0"
 	icon_state = "0"
-	center_of_mass = list("x" = 16,"y" = 14)
+	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

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"