diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm
index 69c8b45c800..08a1192c051 100644
--- a/code/__defines/misc.dm
+++ b/code/__defines/misc.dm
@@ -341,6 +341,7 @@
 #define ITEMSIZE_NORMAL 3
 #define ITEMSIZE_LARGE  4
 #define ITEMSIZE_HUGE   5
+#define ITEMSIZE_IMMENSE 6
 
 // getFlatIcon function altering defines
 #define GFI_ROTATION_DEFAULT 0 //Don't do anything special
diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index 9fc018f0986..4f2332760b5 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -71,7 +71,7 @@
 	item_state = "beachball"
 	density = 0
 	anchored = 0
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 0.0
 	throwforce = 0.0
 	throw_speed = 1
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 8444ce01de9..30495cd75d1 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -8,7 +8,7 @@
 	throwforce = 2.0
 	throw_speed = 1
 	throw_range = 4
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	attack_verb = list("called", "rang")
 	hitsound = 'sound/weapons/ring.ogg'
 
@@ -22,7 +22,7 @@
 	anchored = 0.0
 	var/stored_matter = 0
 	var/mode = 1
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/bikehorn
 	name = "bike horn"
@@ -31,7 +31,7 @@
 	icon_state = "bike_horn"
 	item_state = "bike_horn"
 	throwforce = 3
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 3
 	throw_range = 15
 	attack_verb = list("HONKED")
@@ -53,7 +53,7 @@
 	flags = CONDUCT
 	force = 10
 	throwforce = 7.0
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	matter = list(DEFAULT_WALL_MATERIAL = 50)
 	attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
 
@@ -299,7 +299,7 @@
 	var/size = 3.0
 	var/obj/item/gift = null
 	item_state = "gift"
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 
 /obj/item/gift/random_pixel/Initialize()
 	pixel_x = rand(-16,16)
@@ -313,7 +313,7 @@
 	icon_state = "handcuff"
 	flags = CONDUCT
 	throwforce = 0
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_MATERIAL = 1)
 	var/breakouttime = 300	//Deciseconds = 30s = 0.5 minute
 
@@ -331,7 +331,7 @@
 	slot_flags = SLOT_BELT
 	item_state = "radio"
 	throwforce = 5
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 4
 	throw_range = 20
 	matter = list(DEFAULT_WALL_MATERIAL = 100)
@@ -346,7 +346,7 @@
 	throwforce = 5.0
 	throw_speed = 1
 	throw_range = 5
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	attack_verb = list("bludgeoned", "whacked", "disciplined")
 
 /obj/item/staff/broom
@@ -372,12 +372,12 @@
 	throwforce = 5.0
 	throw_speed = 1
 	throw_range = 5
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 
 /obj/item/module
 	icon = 'icons/obj/module.dmi'
 	icon_state = "std_mod"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	item_state = "electronic"
 	flags = CONDUCT
 	var/mtype = 1						// 1=electronic 2=hardware
@@ -419,7 +419,7 @@
 	name = "camera bug"
 	icon = 'icons/obj/device.dmi'
 	icon_state = "flash"
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 	item_state = "electronic"
 	throw_speed = 4
 	throw_range = 20
@@ -480,7 +480,7 @@
 		slot_l_hand_str = 'icons/mob/items/lefthand_device.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_device.dmi'
 		)
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	can_hold = list(/obj/item/stock_parts,/obj/item/reagent_containers/glass/beaker)
 	storage_slots = 50
 	use_to_pickup = 1
@@ -488,7 +488,7 @@
 	allow_quick_empty = 1
 	collection_mode = 1
 	display_contents_with_number = 1
-	max_w_class = 3
+	max_w_class = ITEMSIZE_NORMAL
 	max_storage_space = 100
 
 /obj/item/ectoplasm
diff --git a/code/game/gamemodes/antagspawner.dm b/code/game/gamemodes/antagspawner.dm
index a62fda5eecf..391a0ed3f41 100644
--- a/code/game/gamemodes/antagspawner.dm
+++ b/code/game/gamemodes/antagspawner.dm
@@ -9,7 +9,7 @@
 /obj/item/antag_spawner
 	throw_speed = 1
 	throw_range = 5
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 	var/uses = 1
 
 /obj/item/antag_spawner/proc/equip_antag(mob/target as mob)
@@ -39,4 +39,4 @@
 	SSghostroles.add_spawn_atom("syndiborg", F)
 	var/area/A = get_area(src)
 	if(A)
-		say_dead_direct("A syndicate cyborg has started its boot process in [A.name]! Spawn in as it by using the ghost spawner menu in the ghost tab, and try to be good!")
\ No newline at end of file
+		say_dead_direct("A syndicate cyborg has started its boot process in [A.name]! Spawn in as it by using the ghost spawner menu in the ghost tab, and try to be good!")
diff --git a/code/game/gamemodes/changeling/implements/items.dm b/code/game/gamemodes/changeling/implements/items.dm
index 3572bbe8aa8..bcf1b271f06 100644
--- a/code/game/gamemodes/changeling/implements/items.dm
+++ b/code/game/gamemodes/changeling/implements/items.dm
@@ -5,7 +5,7 @@
 	icon_state = "arm_blade"
 	item_state = "arm_blade"
 	contained_sprite = TRUE
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 30
 	sharp = TRUE
 	edge = TRUE
@@ -103,7 +103,7 @@
 			host.embedded -= src
 			host.drop_from_inventory(src)
 		QDEL_IN(src, 1)
-		
+
 /obj/item/shield/riot/changeling/get_block_chance(mob/user, var/damage, atom/damage_source = null, mob/attacker = null)
 	if(istype(damage_source, /obj/item/projectile))
 		var/obj/item/projectile/P = damage_source
@@ -120,4 +120,4 @@
 	sharp = TRUE
 	edge = FALSE
 	throwforce = 5
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
diff --git a/code/game/gamemodes/cult/items/sword.dm b/code/game/gamemodes/cult/items/sword.dm
index b6360fd2b33..1e097de516c 100644
--- a/code/game/gamemodes/cult/items/sword.dm
+++ b/code/game/gamemodes/cult/items/sword.dm
@@ -6,8 +6,8 @@
 	icon_state = "cultblade"
 	item_state = "cultblade"
 	contained_sprite = TRUE
-	w_class = 4
 	force = 25
+	w_class = ITEMSIZE_LARGE
 	throwforce = 10
 	slot_flags = SLOT_BELT
 	edge = TRUE
diff --git a/code/game/gamemodes/cult/items/tome.dm b/code/game/gamemodes/cult/items/tome.dm
index 68ab2a92fea..b87328ef519 100644
--- a/code/game/gamemodes/cult/items/tome.dm
+++ b/code/game/gamemodes/cult/items/tome.dm
@@ -5,7 +5,7 @@
 	item_state = "tome"
 	throw_speed = 1
 	throw_range = 5
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	unique = TRUE
 	slot_flags = SLOT_BELT
 
@@ -98,7 +98,7 @@
 			var/area/A = get_area(scribe)
 			if(use_check_and_message(scribe))
 				return
-			
+
 			//prevents using multiple dialogs to layer runes.
 			if(locate(/obj/effect/rune) in get_turf(scribe)) //This is check is done twice. once when choosing to scribe a rune, once here
 				to_chat(scribe, SPAN_WARNING("There is already a rune in this location."))
@@ -123,4 +123,4 @@
 		to_chat(user, "The scriptures of Nar-Sie, The One Who Sees, The Geometer of Blood. Contains the details of every ritual his followers could think of. Most of these are useless, though.")
 
 /obj/item/book/tome/cultify()
-	return
\ No newline at end of file
+	return
diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm
index 99d83d98284..5ce4656e487 100644
--- a/code/game/gamemodes/nuclear/pinpointer.dm
+++ b/code/game/gamemodes/nuclear/pinpointer.dm
@@ -4,7 +4,7 @@
 	icon_state = "pinoff"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	item_state = "electronic"
 	throw_speed = 4
 	throw_range = 20
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index 7f196ce3eef..1df2ac4fc51 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -839,7 +839,7 @@ Just a object used in constructing air alarms
 	icon = 'icons/obj/doors/door_assembly.dmi'
 	icon_state = "door_electronics"
 	desc = "Looks like a circuit. Probably is."
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 50)
 
 // Fire Alarms moved to firealarm.dm
diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index a1edd75c913..7ee5ae75ea1 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -11,7 +11,7 @@
 	density = 1
 	var/health = 100.0
 	flags = CONDUCT
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 
 	var/valve_open = 0
 	var/release_pressure = ONE_ATMOSPHERE
diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm
index 98f230c10e1..e267b682ccd 100644
--- a/code/game/machinery/atmoalter/pump.dm
+++ b/code/game/machinery/atmoalter/pump.dm
@@ -8,7 +8,7 @@
 	icon = 'icons/obj/atmos.dmi'
 	icon_state = "psiphon:0"
 	density = 1
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 	var/on = 0
 	var/direction_out = 0 //0 = siphoning, 1 = releasing
diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm
index a186d99b7a3..3a8d5d85c7c 100644
--- a/code/game/machinery/atmoalter/scrubber.dm
+++ b/code/game/machinery/atmoalter/scrubber.dm
@@ -8,7 +8,7 @@
 	icon = 'icons/obj/atmos.dmi'
 	icon_state = "pscrubber:0"
 	density = 1
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 	var/on = 0
 	var/volume_rate = 800
diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
index 93a04c66a6b..1628c1afd5b 100644
--- a/code/game/machinery/camera/camera_assembly.dm
+++ b/code/game/machinery/camera/camera_assembly.dm
@@ -3,7 +3,7 @@
 	desc = "A pre-fabricated security camera kit, ready to be assembled and mounted to a surface."
 	icon = 'icons/obj/monitors.dmi'
 	icon_state = "cameracase"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	anchored = 0
 
 	matter = list(DEFAULT_WALL_MATERIAL = 700, MATERIAL_GLASS = 300)
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index e8271c5b5e1..aaf591c302e 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -400,7 +400,7 @@
 	icon = 'icons/obj/cloning.dmi'
 	icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk.
 	item_state = "card-id"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	var/datum/dna2/record/buf = null
 	var/read_only = 0 //Well,it's still a floppy disk
 
diff --git a/code/game/machinery/computer/arcade_orion.dm b/code/game/machinery/computer/arcade_orion.dm
index dce16f0ca15..7063aef15dc 100644
--- a/code/game/machinery/computer/arcade_orion.dm
+++ b/code/game/machinery/computer/arcade_orion.dm
@@ -487,7 +487,7 @@
 	desc = "A model spaceship, it looks like those used back in the day when travelling to Orion! It even has a miniature FX-293 reactor, which was renowned for its instability and tendency to explode..."
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "ship"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	var/active = 0 //if the ship is on
 /obj/item/orion_ship/examine(mob/user)
 	..()
@@ -534,4 +534,4 @@
 
 #undef ORION_VIEW_MAIN
 #undef ORION_VIEW_SUPPLIES
-#undef ORION_VIEW_CREW
\ No newline at end of file
+#undef ORION_VIEW_CREW
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index 657886583ef..6682cca4dae 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -291,7 +291,7 @@ for reference:
 	name = "legion barrier kit"
 	desc = "A quick assembly kit for deploying id-lockable barriers in the field. Most commonly seen used for crowd control by corporate security."
 	icon_state = "barrier_kit"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	kit_product = /obj/machinery/deployable/barrier/legion
 
 /obj/item/deployable_kit/surgery_table
@@ -300,7 +300,7 @@ for reference:
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "table_deployable"
 	item_state = "table_parts"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	kit_product = /obj/machinery/optable
 	assembly_time = 20 SECONDS
 
@@ -325,7 +325,7 @@ for reference:
 	item_state = "table_parts"
 	drop_sound = 'sound/items/drop/axe.ogg'
 	pickup_sound = 'sound/items/pickup/axe.ogg'
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	kit_product = /obj/machinery/porta_turret/legion
 	assembly_time = 15 SECONDS
 
@@ -335,7 +335,7 @@ for reference:
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "inf_box"
 	item_state = "syringe_kit"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	kit_product = /obj/machinery/iv_drip
 	assembly_time = 4 SECONDS
 
diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
index 1423d1ed54b..cf4d33714bd 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -285,7 +285,7 @@ Just a object used in constructing fire alarms
 	icon = 'icons/obj/doors/door_assembly.dmi'
 	icon_state = "door_electronics"
 	desc = "A circuit. It has a label on it, it says \"Can handle heat levels up to 40 degrees celsius!\""
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 50)
 
 
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 7213ddaa9b7..3246c42faf1 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -96,7 +96,7 @@ Class Procs:
 /obj/machinery
 	name = "machinery"
 	icon = 'icons/obj/stationobjs.dmi'
-	w_class = 10
+	w_class = ITEMSIZE_IMMENSE
 	layer = OBJ_LAYER - 0.01
 
 	var/stat = 0
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index a5e1c4ee333..4856af19fe3 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -811,7 +811,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 	desc = "An issue of The Griffon, the newspaper circulating aboard most stations."
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "newspaper"
-	w_class = 2	//Let's make it fit in trashbags!
+	w_class = ITEMSIZE_SMALL	//Let's make it fit in trashbags!
 	attack_verb = list("bapped")
 	var/screen = 0
 	var/pages = 0
@@ -988,7 +988,7 @@ obj/item/newspaper/attackby(obj/item/W as obj, mob/user as mob)
 	if(news_call)
 		for(var/mob/O in hearers(world.view-1, T))
 			O.show_message("<span class='newscaster'><EM>[src.name]</EM> beeps, \"[news_call]\"</span>",2)
-		
+
 		if (!alert)
 			alert = 1
 			update_icon()
diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm
index 09f7a28b4fa..30c28f7c44a 100644
--- a/code/game/machinery/nuclear_bomb.dm
+++ b/code/game/machinery/nuclear_bomb.dm
@@ -396,7 +396,7 @@ var/bomb_set
 	desc = "Better keep this safe."
 	icon_state = "nucleardisk"
 	item_state = "card-id"
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 
 /obj/item/disk/nuclear/Initialize()
 	. = ..()
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index b4a0debf1fb..f4c86b9461f 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -63,7 +63,7 @@ Buildable meters
 	icon_state = "simple"
 	item_state = "buildpipe"
 	randpixel = 5
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	level = 2
 	obj_flags = OBJ_FLAG_ROTATABLE
 
@@ -1194,7 +1194,7 @@ Buildable meters
 	icon = 'icons/obj/pipe-item.dmi'
 	icon_state = "meter"
 	item_state = "buildpipe"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 
 /obj/item/pipe_meter/attackby(var/obj/item/W as obj, var/mob/user as mob)
 	..()
diff --git a/code/game/machinery/vending_items.dm b/code/game/machinery/vending_items.dm
index 715d78caabd..ab888d3b5d2 100644
--- a/code/game/machinery/vending_items.dm
+++ b/code/game/machinery/vending_items.dm
@@ -14,7 +14,7 @@
 	throwforce = 10
 	throw_speed = 1
 	throw_range = 7
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	var/charges = 0
 
 /obj/item/vending_refill/examine(mob/user)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index f26976f4218..21dcef56429 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -1,7 +1,7 @@
 /obj/item
 	name = "item"
 	icon = 'icons/obj/items.dmi'
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 
 	var/image/blood_overlay //this saves our blood splatter overlay, which will be processed not to go over the edges of the sprite
 	var/randpixel = 6
diff --git a/code/game/objects/items/bees_items.dm b/code/game/objects/items/bees_items.dm
index fc22d9c9ebe..adbcc3e18f4 100644
--- a/code/game/objects/items/bees_items.dm
+++ b/code/game/objects/items/bees_items.dm
@@ -4,7 +4,7 @@
 	desc = "Place her into an apiary so she can get busy."
 	icon = 'icons/obj/seeds.dmi'
 	icon_state = "vine2"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 
 
@@ -13,7 +13,7 @@
 	icon = 'icons/obj/apiary_bees_etc.dmi'
 	icon_state = "apiary_item"
 	item_state = "giftbag"
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 
 /obj/item/beezeez
 	name = "bottle of BeezEez"
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index 52c18c9e810..316bec686ef 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -5,7 +5,7 @@
 	desc = "A folded bag designed for the storage and transportation of cadavers."
 	icon = 'icons/obj/bodybag.dmi'
 	icon_state = "bodybag_folded"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	drop_sound = 'sound/items/drop/cloth.ogg'
 	pickup_sound = 'sound/items/pickup/cloth.ogg'
 
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 2db6952a2ec..006d6d7f5a4 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -10,7 +10,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	icon = 'icons/obj/pda.dmi'
 	icon_state = "pda"
 	item_state = "electronic"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	slot_flags = SLOT_ID | SLOT_BELT
 	uv_intensity = 15
 	drop_sound = 'sound/items/drop/disk.ogg'
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index 4b968ae24bc..dcdffecb091 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/cartridge.dmi'
 	icon_state = "cart"
 	item_state = "electronic"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	drop_sound = 'sound/items/drop/component.ogg'
 	pickup_sound = 'sound/items/pickup/component.ogg'
 
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index ed6006f5f3b..330a5896e82 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -3,7 +3,7 @@
 	icon = 'icons/obj/pai.dmi'
 	icon_state = "aicard" // aicard-full
 	item_state = "electronic"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	slot_flags = SLOT_BELT
 	var/flush = null
 	origin_tech = list(TECH_DATA = 4, TECH_MATERIAL = 4)
diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm
index 73c8fa4d36c..c6b5389002c 100644
--- a/code/game/objects/items/devices/binoculars.dm
+++ b/code/game/objects/items/devices/binoculars.dm
@@ -6,7 +6,7 @@
 
 	flags = CONDUCT
 	force = 5.0
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throwforce = 5.0
 	throw_range = 15
 	throw_speed = 3
diff --git a/code/game/objects/items/devices/dociler.dm b/code/game/objects/items/devices/dociler.dm
index b4e4908dec4..b8b8a4ff50e 100644
--- a/code/game/objects/items/devices/dociler.dm
+++ b/code/game/objects/items/devices/dociler.dm
@@ -1,7 +1,7 @@
 /obj/item/device/dociler
 	name = "dociler"
 	desc = "A complex single use recharging injector that spreads a complex neurological serum that makes animals docile and friendly. Somewhat."
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_BIO = 5, TECH_MATERIAL = 2)
 	// To-do track down where the hell this sprite went?
 	icon = 'icons/obj/guns/decloner.dmi'
@@ -65,4 +65,4 @@
 /obj/item/device/dociler/proc/do_recharge()
 	loaded = 1
 	icon_state = "animal_tagger1"
-	src.visible_message("\The [src] beeps, refilling itself.")
\ No newline at end of file
+	src.visible_message("\The [src] beeps, refilling itself.")
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index 7014edcefa7..998b3b8849d 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -4,7 +4,7 @@
 	icon_state = "flash"
 	item_state = "flash"
 	throwforce = 5
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 4
 	throw_range = 10
 	flags = CONDUCT
diff --git a/code/game/objects/items/devices/holowarrant.dm b/code/game/objects/items/devices/holowarrant.dm
index d7fc88aafb2..4ad1e41836e 100644
--- a/code/game/objects/items/devices/holowarrant.dm
+++ b/code/game/objects/items/devices/holowarrant.dm
@@ -3,7 +3,7 @@
 	desc = "The practical paperwork replacement for the officer on the go."
 	icon_state = "holowarrant"
 	throwforce = 5
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 4
 	throw_range = 10
 	flags = CONDUCT
diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index 6b4a5d9dcc0..5d0b8e7db70 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -8,7 +8,7 @@
 	item_state = "pen"
 	var/pointer_icon_state
 	slot_flags = SLOT_BELT
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	var/turf/pointer_loc
 	var/obj/item/stock_parts/micro_laser/diode //cant use the laser without it
 
@@ -101,7 +101,7 @@
 				C.eye_blind = 3
 			else
 				outmsg = "<span class='notice'>You fail to blind [C] with [src]</span>"
-	
+
 	//laser pointer image
 	icon_state = "pointer_[pointer_icon_state]"
 	var/list/showto = list()
@@ -125,4 +125,4 @@
 	if (diode)
 		QDEL_NULL(diode)
 
-	. = ..()
\ No newline at end of file
+	. = ..()
diff --git a/code/game/objects/items/devices/lighting/flashlight.dm b/code/game/objects/items/devices/lighting/flashlight.dm
index 20967cfd4c1..5646b0daefa 100644
--- a/code/game/objects/items/devices/lighting/flashlight.dm
+++ b/code/game/objects/items/devices/lighting/flashlight.dm
@@ -134,7 +134,7 @@
 	flags = CONDUCT
 	slot_flags = SLOT_EARS
 	brightness_on = 2
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	light_wedge = LIGHT_OMNI
 
 /obj/item/device/flashlight/drone
@@ -144,7 +144,7 @@
 	item_state = ""
 	flags = CONDUCT
 	brightness_on = 2
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/device/flashlight/heavy
 	name = "heavy duty flashlight"
@@ -152,7 +152,7 @@
 	icon_state = "heavyflashlight"
 	item_state = "heavyflashlight"
 	brightness_on = 4
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	uv_intensity = 60
 	matter = list(DEFAULT_WALL_MATERIAL = 100, MATERIAL_GLASS = 70)
 	light_wedge = LIGHT_SEMI
@@ -164,7 +164,7 @@
 	item_state = "maglight"
 	force = 10
 	brightness_on = 5
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	uv_intensity = 70
 	attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
 	matter = list(DEFAULT_WALL_MATERIAL = 200, MATERIAL_GLASS = 100)
@@ -178,7 +178,7 @@
 	icon = 'icons/obj/lighting.dmi'
 	icon_state = "floor1" //not a slime extract sprite but... something close enough!
 	item_state = "slime"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	brightness_on = 6
 	uv_intensity = 200
 	on = 1 //Bio-luminesence has one setting, on.
@@ -199,6 +199,6 @@
 	flags = CONDUCT
 	slot_flags = SLOT_HEAD | SLOT_EARS
 	brightness_on = 2
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	light_wedge = LIGHT_WIDE
 	body_parts_covered = 0
diff --git a/code/game/objects/items/devices/lightmeter.dm b/code/game/objects/items/devices/lightmeter.dm
index 87c5abd1cba..ac5e21d999d 100644
--- a/code/game/objects/items/devices/lightmeter.dm
+++ b/code/game/objects/items/devices/lightmeter.dm
@@ -9,7 +9,7 @@
 	// Copied from debugger.dm
 	flags = CONDUCT
 	force = 5.0
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throwforce = 5.0
 	throw_range = 15
 	throw_speed = 3
diff --git a/code/game/objects/items/devices/magnetic_lock.dm b/code/game/objects/items/devices/magnetic_lock.dm
index 207b31fa51a..b1db32013af 100644
--- a/code/game/objects/items/devices/magnetic_lock.dm
+++ b/code/game/objects/items/devices/magnetic_lock.dm
@@ -11,7 +11,7 @@
 	icon = 'icons/obj/magnetic_locks.dmi'
 	icon_state = "inactive_CENTCOM"
 	//icon_state = "inactive"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	req_access = list(access_cent_specops)
 	health = 150
 
@@ -44,7 +44,7 @@
 /obj/item/device/magnetic_lock/security/legion
 	name = "legion magnetic door lock"
 	req_access = (access_legion)
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 /obj/item/device/magnetic_lock/security/legion/Initialize()
 	..()
diff --git a/code/game/objects/items/devices/medicaltools.dm b/code/game/objects/items/devices/medicaltools.dm
index 5454995bbec..f058a6b55b8 100644
--- a/code/game/objects/items/devices/medicaltools.dm
+++ b/code/game/objects/items/devices/medicaltools.dm
@@ -3,7 +3,7 @@
 	desc = "A miniature machine that tracks suit sensors across the station."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "scanner"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	slot_flags = SLOT_BELT
 	var/datum/nano_module/crew_monitor/crew_monitor
 
@@ -17,4 +17,4 @@
 	return ..()
 
 /obj/item/device/handheld_medical/attack_self(mob/user)
-	crew_monitor.ui_interact(user)
\ No newline at end of file
+	crew_monitor.ui_interact(user)
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index 48baf7186d9..74e9b327f2c 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -3,7 +3,7 @@
 	desc = "A device used to project your voice. Loudly."
 	icon_state = "megaphone"
 	item_state = "megaphone"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	flags = CONDUCT
 
 	var/spamcheck = 0
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index d24cce6f80e..210aedc63f1 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -16,7 +16,7 @@
 		)
 	flags = CONDUCT
 	force = 5.0
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throwforce = 5.0
 	throw_range = 15
 	throw_speed = 3
diff --git a/code/game/objects/items/devices/pin_extractor.dm b/code/game/objects/items/devices/pin_extractor.dm
index 984eeee1d6f..87fb6f65946 100644
--- a/code/game/objects/items/devices/pin_extractor.dm
+++ b/code/game/objects/items/devices/pin_extractor.dm
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/device.dmi'
 	icon_state = "pin_extractor"
 	item_state = "pin_extractor"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	flags = CONDUCT
 	action_button_name = "Toggle extractor"
 	var/on = 0
diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm
index 4d67cf39032..df8fc6e4b23 100644
--- a/code/game/objects/items/devices/powersink.dm
+++ b/code/game/objects/items/devices/powersink.dm
@@ -5,7 +5,7 @@
 	desc = "A nulling power sink which drains energy from electrical systems."
 	icon_state = "powersink0"
 	item_state = "powersink0"
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	flags = CONDUCT
 	throwforce = 5
 	throw_speed = 1
diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index f97fad9757d..3d254cb59ee 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -6,7 +6,7 @@
 	frequency = 1449
 	flags = CONDUCT
 	slot_flags = SLOT_BACK
-	w_class = 5.0
+	w_class = ITEMSIZE_HUGE
 
 	matter = list(DEFAULT_WALL_MATERIAL = 10000, MATERIAL_GLASS = 2500)
 
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index ba1ee6bc4e8..b7eba37d9b2 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -3,7 +3,7 @@
 	desc = "Talk through this."
 	icon_state = "intercom"
 	anchored = 1
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	canhear_range = 2
 	flags = CONDUCT | NOBLOODY
 	var/number = 0
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index ae2a1830045..6ebed0a65ee 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -45,7 +45,7 @@ var/global/list/default_medbay_channels = list(
 	slot_flags = SLOT_BELT
 	throw_speed = 2
 	throw_range = 9
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	matter = list(DEFAULT_WALL_MATERIAL = 75, MATERIAL_GLASS = 25)
 	var/const/FREQ_LISTENING = TRUE
 	var/list/internal_channels
diff --git a/code/game/objects/items/devices/radio_jammer.dm b/code/game/objects/items/devices/radio_jammer.dm
index 362f702f5bb..a62a6bb0143 100644
--- a/code/game/objects/items/devices/radio_jammer.dm
+++ b/code/game/objects/items/devices/radio_jammer.dm
@@ -14,7 +14,7 @@ proc/within_jamming_range(var/atom/test) // tests if an object is near a radio j
 	desc = "A small, inconspicious looking item with an 'ON/OFF' toggle."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "shield0"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 	var/active = 0
 	var/radius = 7
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 03828c28330..6a95380db4c 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -15,7 +15,7 @@ BREATH ANALYZER
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 3
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 5
 	throw_range = 10
 	matter = list(DEFAULT_WALL_MATERIAL = 200)
@@ -302,7 +302,7 @@ BREATH ANALYZER
 	desc = "A hand-held environmental scanner which reports current gas levels."
 	icon_state = "atmos"
 	item_state = "analyzer"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 5
@@ -336,7 +336,7 @@ BREATH ANALYZER
 	desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample."
 	icon_state = "spectrometer"
 	item_state = "analyzer"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	flags = CONDUCT | OPENCONTAINER
 	slot_flags = SLOT_BELT
 	throwforce = 5
@@ -398,7 +398,7 @@ BREATH ANALYZER
 	desc = "A hand-held reagent scanner which identifies chemical agents."
 	icon_state = "spectrometer"
 	item_state = "analyzer"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 5
@@ -447,7 +447,7 @@ BREATH ANALYZER
 	icon_state = "adv_spectrometer"
 	item_state = "analyzer"
 	origin_tech = list(TECH_BIO = 1)
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	flags = CONDUCT
 	throwforce = 0
 	throw_speed = 3
@@ -490,7 +490,7 @@ BREATH ANALYZER
 	desc = "Using an up-to-date database of various costs and prices, this device estimates the market price of an item up to 0.001% accuracy."
 	icon_state = "price_scanner"
 	slot_flags = SLOT_BELT
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	throwforce = 0
 	throw_speed = 3
 	throw_range = 3
@@ -509,7 +509,7 @@ BREATH ANALYZER
 	desc = "A hand-held breath analyzer that provides a robust amount of information about the subject's repository system."
 	icon_state = "breath_analyzer"
 	item_state = "analyzer"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 0
diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm
index 1153f0cb78b..49336593069 100644
--- a/code/game/objects/items/devices/spy_bug.dm
+++ b/code/game/objects/items/devices/spy_bug.dm
@@ -8,7 +8,7 @@
 
 	flags = CONDUCT
 	force = 5.0
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
 	throwforce = 5.0
 	throw_range = 15
@@ -56,7 +56,7 @@
 	icon_state = "pda"
 	item_state = "electronic"
 
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 
 	origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1, TECH_ILLEGAL = 3)
 
diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm
index bd0d0c74930..22974f42fae 100644
--- a/code/game/objects/items/devices/suit_cooling.dm
+++ b/code/game/objects/items/devices/suit_cooling.dm
@@ -1,7 +1,7 @@
 /obj/item/device/suit_cooling_unit
 	name = "portable suit cooling unit"
 	desc = "A portable heat sink and liquid cooled radiator that can be hooked up to a space suit's existing temperature controls to provide industrial levels of cooling."
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	icon = 'icons/obj/suitcooler.dmi'
 	icon_state = "suitcooler0"
 	item_state = "coolingpack"
@@ -223,4 +223,4 @@
 		to_chat(user, SPAN_NOTICE("It doesn't have a power cell installed."))
 
 /obj/item/device/suit_cooling_unit/no_cell
-	celltype = null
\ No newline at end of file
+	celltype = null
diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm
index 9a73a8d72e1..faae6901159 100644
--- a/code/game/objects/items/devices/t_scanner.dm
+++ b/code/game/objects/items/devices/t_scanner.dm
@@ -5,7 +5,7 @@
 	desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
 	icon_state = "t-ray0"
 	slot_flags = SLOT_BELT
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	item_state = "electronic"
 	matter = list(DEFAULT_WALL_MATERIAL = 150)
 	origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1)
diff --git a/code/game/objects/items/devices/tagger.dm b/code/game/objects/items/devices/tagger.dm
index ccd80e545fe..28cf17f74e7 100644
--- a/code/game/objects/items/devices/tagger.dm
+++ b/code/game/objects/items/devices/tagger.dm
@@ -5,7 +5,7 @@
 	desc = "Used for tagging animals to be identified by a ear tag."
 	icon_state = "animal_tagger0"
 	force = 5.0
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throwforce = 5.0
 	throw_range = 15
 	throw_speed = 3
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index 4fe8a64f040..1e58472222a 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -19,7 +19,7 @@ effective or pretty fucking useless.
 	desc = "A strange device with twin antennas."
 	icon_state = "batterer"
 	throwforce = 5
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 	throw_speed = 4
 	throw_range = 10
 	flags = CONDUCT
diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm
index c66b0ba2ebb..be9db2a0f8b 100644
--- a/code/game/objects/items/devices/uplink.dm
+++ b/code/game/objects/items/devices/uplink.dm
@@ -350,7 +350,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	icon = 'icons/obj/radio.dmi'
 	icon_state = "radio"
 	flags = CONDUCT
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 /obj/item/device/contract_uplink/New(var/loc, var/mind)
 	..()
@@ -369,7 +369,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	icon = 'icons/obj/device.dmi'
 	icon_state = "locator"
 	desc_antag = "This device allows you to create a single central command report. It has only one use."
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 /obj/item/device/announcer/attack_self(mob/user as mob)
 	if(!player_is_antag(user.mind))
@@ -421,4 +421,4 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	name = "station bounced radio"
 	desc = null // SBRs have no desc
 	icon_state = "walkietalkie" // more incognito
-	starting_telecrystals = DEFAULT_TELECRYSTAL_AMOUNT * 2
\ No newline at end of file
+	starting_telecrystals = DEFAULT_TELECRYSTAL_AMOUNT * 2
diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm
index 3600a5e0444..d7d0a759e7a 100644
--- a/code/game/objects/items/devices/whistle.dm
+++ b/code/game/objects/items/devices/whistle.dm
@@ -3,7 +3,7 @@
 	desc = "Used by obese officers to save their breath for running."
 	icon_state = "voice0"
 	item_state = "flashbang"	//looks exactly like a flash (and nothing like a flashbang)
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 	flags = CONDUCT
 
 	var/use_message = "Halt! Security!"
diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm
index c5d92e6983b..9882cf464c5 100644
--- a/code/game/objects/items/eightball.dm
+++ b/code/game/objects/items/eightball.dm
@@ -5,7 +5,7 @@
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "eightball"
 
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 	var/shaking = FALSE
 	var/on_cooldown = FALSE
@@ -133,4 +133,4 @@
 	fixed_answer = pick(possible_answers)
 
 /obj/item/eightball/broken/get_answer()
-	return fixed_answer
\ No newline at end of file
+	return fixed_answer
diff --git a/code/game/objects/items/glassjar.dm b/code/game/objects/items/glassjar.dm
index c020f569b78..087866a9f62 100644
--- a/code/game/objects/items/glassjar.dm
+++ b/code/game/objects/items/glassjar.dm
@@ -3,7 +3,7 @@
 	desc = "A glass jar. You can remove the lid and use it as a reagent container."
 	icon = 'icons/obj/drinks.dmi'
 	icon_state = "jar_lid"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	matter = list(MATERIAL_GLASS = 200)
 	flags = NOBLUDGEON
 	var/list/accept_mobs = list(/mob/living/simple_animal/lizard, /mob/living/simple_animal/rat)
diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm
index 8e980ca7ac1..5e91667c233 100644
--- a/code/game/objects/items/latexballoon.dm
+++ b/code/game/objects/items/latexballoon.dm
@@ -5,7 +5,7 @@
 	item_state = "lgloves"
 	force = 0
 	throwforce = 0
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 1
 	throw_range = 15
 	var/state
diff --git a/code/game/objects/items/skrell.dm b/code/game/objects/items/skrell.dm
index 85f785e5f98..aff02e09347 100644
--- a/code/game/objects/items/skrell.dm
+++ b/code/game/objects/items/skrell.dm
@@ -3,7 +3,7 @@
 	desc = "An antique and delicate looking instrument used to study the stars."
 	icon = 'icons/obj/skrell_items.dmi'
 	icon_state = "starscope"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	matter = list(MATERIAL_GLASS = 200)
 	drop_sound = 'sound/items/drop/glass.ogg'
 	pickup_sound = 'sound/items/pickup/glass.ogg'
@@ -83,7 +83,7 @@
 	desc = "A projector meant to help Federation Skrell feel like theyre carrying home with them wherever they go. It looks very complex."
 	icon = 'icons/obj/skrell_items.dmi'
 	icon_state = "projector"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	matter = list(MATERIAL_GLASS = 200)
 	drop_sound = 'sound/items/drop/glass.ogg'
 	pickup_sound = 'sound/items/pickup/glass.ogg'
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 4677fb2a331..c8d3d52757f 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -19,7 +19,7 @@ Contains:
 	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 	amount = 5
 	max_amount = 5
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 4
 	throw_range = 20
 	var/heal_brute = 0
diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm
index 6d6de72bcc3..66bdc663d22 100644
--- a/code/game/objects/items/stacks/telecrystal.dm
+++ b/code/game/objects/items/stacks/telecrystal.dm
@@ -5,7 +5,7 @@
 	singular_name = "telecrystal"
 	icon = 'icons/obj/telescience.dmi'
 	icon_state = "telecrystal"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	max_amount = 50
 	flags = NOBLUDGEON
 	origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4)
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index b83e405a55f..08037a32805 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -10,7 +10,7 @@
 	name = "tile"
 	singular_name = "tile"
 	desc = "A non-descript floor tile"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	max_amount = 60
 	icon = 'icons/obj/stacks/tiles.dmi'
 	item_icons = list(
diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm
index f982f70562d..2b0ba8fffcb 100644
--- a/code/game/objects/items/stacks/wrap.dm
+++ b/code/game/objects/items/stacks/wrap.dm
@@ -17,7 +17,7 @@
 	if (!isturf(loc))
 		to_chat(user, SPAN_WARNING("The paper must be set down for you to wrap a gift!"))
 		return
-	if (W.w_class < 4)
+	if (W.w_class < ITEMSIZE_LARGE)
 		var/a_used = 2 * (src.w_class - 1)
 		if (src.amount < a_used)
 			to_chat(user, SPAN_WARNING("You need more paper!"))
@@ -81,7 +81,7 @@
 	icon = 'icons/obj/stacks/wrap.dmi'
 	icon_state = "deliveryPaper"
 	desc = "A roll of paper used to enclose an object for delivery."
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	amount = 25.0
 	var/wrapping_tag = "Sorting Office"
 	drop_sound = 'sound/items/drop/wrapper.ogg'
@@ -187,6 +187,6 @@
 	icon = 'icons/obj/stacks/wrap.dmi'
 	icon_state = "c_tube"
 	throwforce = 1
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 4
 	throw_range = 5
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index c137151d70b..667836f50ce 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -4,7 +4,7 @@
 //Added by Jack Rost
 /obj/item/trash
 	icon = 'icons/obj/trash.dmi'
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_food.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_food.dmi'
@@ -207,4 +207,4 @@
 
 /obj/item/trash/diona_bites
 	name = "dionae bites"
-	icon_state = "dionaebitesempty"
\ No newline at end of file
+	icon_state = "dionaebitesempty"
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index 7be17e70860..d3a70bb938a 100755
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -14,7 +14,7 @@ AI MODULES
 	desc = "An AI Module for transmitting encrypted instructions to the AI."
 	flags = CONDUCT
 	force = 5.0
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throwforce = 5.0
 	throw_speed = 3
 	throw_range = 15
diff --git a/code/game/objects/items/weapons/RFD.dm b/code/game/objects/items/weapons/RFD.dm
index c82e142b570..514889fd3b0 100644
--- a/code/game/objects/items/weapons/RFD.dm
+++ b/code/game/objects/items/weapons/RFD.dm
@@ -22,7 +22,7 @@
 	throwforce = 10.0
 	throw_speed = 1
 	throw_range = 5
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 2)
 	matter = list(DEFAULT_WALL_MATERIAL = 50000)
 	drop_sound = 'sound/items/drop/gun.ogg'
@@ -127,7 +127,7 @@
 	icon = 'icons/obj/ammo.dmi'
 	icon_state = "rfd"
 	item_state = "rfdammo"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	origin_tech = list(TECH_MATERIAL = 2)
 	matter = list(DEFAULT_WALL_MATERIAL = 30000, MATERIAL_GLASS = 15000)
 
diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/game/objects/items/weapons/autopsy.dm
index ada3e43b70b..223ad387b3d 100644
--- a/code/game/objects/items/weapons/autopsy.dm
+++ b/code/game/objects/items/weapons/autopsy.dm
@@ -8,7 +8,7 @@
 	icon = 'icons/obj/device.dmi'
 	icon_state = "autopsy"
 	flags = CONDUCT
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
 	var/list/datum/autopsy_data_scanner/wdata = list()
 	var/list/datum/autopsy_data_scanner/chemtraces = list()
diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm
index c825887c783..ab5db7d0e78 100644
--- a/code/game/objects/items/weapons/candle.dm
+++ b/code/game/objects/items/weapons/candle.dm
@@ -6,7 +6,7 @@
 	item_state = "candle1"
 	drop_sound = 'sound/items/drop/gloves.ogg'
 	pickup_sound = 'sound/items/pickup/gloves.ogg'
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	light_color = "#E09D37"
 	var/wax = 2000
 
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 74d8ee88303..f4d462ef2f1 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -20,7 +20,7 @@
 		slot_l_hand_str = 'icons/mob/items/lefthand_card.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_card.dmi',
 		)
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 	var/associated_account_number = 0
 
 	var/list/files = list(  )
diff --git a/code/game/objects/items/weapons/chaplain_items.dm b/code/game/objects/items/weapons/chaplain_items.dm
index c05ab3a86c7..10ebdb55941 100644
--- a/code/game/objects/items/weapons/chaplain_items.dm
+++ b/code/game/objects/items/weapons/chaplain_items.dm
@@ -11,7 +11,7 @@
 	throw_speed = 1
 	throw_range = 4
 	throwforce = 10
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	var/cooldown = 0 // floor tap cooldown
 	var/static/list/nullchoices = list("Null Rod" = /obj/item/nullrod/, "Null Staff" = /obj/item/nullrod/staff, "Null Orb" = /obj/item/nullrod/orb, "Null Athame" = /obj/item/nullrod/athame)
 
@@ -21,7 +21,7 @@
 	icon_state = "nullstaff"
 	item_state = "nullstaff"
 	slot_flags = SLOT_BELT | SLOT_BACK
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 
 /obj/item/nullrod/orb
 	name = "null sphere"
diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm
index fcb5eb31332..71c1002c216 100644
--- a/code/game/objects/items/weapons/chewables.dm
+++ b/code/game/objects/items/weapons/chewables.dm
@@ -73,7 +73,7 @@ obj/item/clothing/mask/chewable/Destroy()
 	throw_speed = 0.5
 	icon_state = "chew"
 	type_butt = /obj/item/trash/spitwad
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS | SLOT_MASK
 	chem_volume = 50
 	chewtime = 300
@@ -139,7 +139,7 @@ obj/item/clothing/mask/chewable/Destroy()
 	throw_speed = 0.5
 	icon_state = "chew"
 	type_butt = /obj/item/trash/spitgum
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS | SLOT_MASK
 	chem_volume = 50
 	chewtime = 300
@@ -176,7 +176,7 @@ obj/item/clothing/mask/chewable/Destroy()
 	icon_type = "gum stick"
 	storage_type = "packaging"
 	slot_flags = SLOT_EARS
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	starts_with = list(/obj/item/clothing/mask/chewable/candy/gum = 5)
 	can_hold = list(/obj/item/clothing/mask/chewable/candy/gum, /obj/item/trash/spitgum)
 	max_storage_space = 5
diff --git a/code/game/objects/items/weapons/cloaking_device.dm b/code/game/objects/items/weapons/cloaking_device.dm
index 663f29d6204..8f5744da92b 100644
--- a/code/game/objects/items/weapons/cloaking_device.dm
+++ b/code/game/objects/items/weapons/cloaking_device.dm
@@ -14,7 +14,7 @@
 	throwforce = 10.0
 	throw_speed = 2
 	throw_range = 10
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4)
 
 	var/power_usage = 35000//A high powered cell allows 5 minutes of continuous usage
diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm
index 2f5f9ba0ef9..4ab4be2dbee 100644
--- a/code/game/objects/items/weapons/cosmetics.dm
+++ b/code/game/objects/items/weapons/cosmetics.dm
@@ -4,7 +4,7 @@
 	desc = "A generic brand of lipstick."
 	icon = 'icons/obj/cosmetics.dmi'
 	icon_state = "lipstick"
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
 	var/colour = "red"
 	var/open = 0
@@ -75,7 +75,7 @@
 /obj/item/haircomb //sparklysheep's comb
 	name = "plastic comb"
 	desc = "A pristine comb made from flexible plastic."
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
 	icon = 'icons/obj/cosmetics.dmi'
 	icon_state = "comb"
@@ -93,7 +93,7 @@
 	desc = "The latest and greatest power razor born from the science of shaving."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "razor"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 /obj/item/razor/proc/shave(mob/living/carbon/human/H, location)
 	if(location == BP_HEAD)
diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm
index f5daa0d492a..88a0547f4d6 100644
--- a/code/game/objects/items/weapons/dice.dm
+++ b/code/game/objects/items/weapons/dice.dm
@@ -3,7 +3,7 @@
 	desc = "A dice with six sides."
 	icon = 'icons/obj/dice.dmi'
 	icon_state = "d66"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	var/base_icon = "d6"
 	var/side_mult = 1 // Used for d100s.
 	var/sides = 6
@@ -77,4 +77,4 @@
 	icon_state = "d10010"
 	sides = 10
 	side_mult = 10
-	base_icon = "d100"
\ No newline at end of file
+	base_icon = "d100"
diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm
index abce2e6f68f..c8d08b2e2d5 100644
--- a/code/game/objects/items/weapons/dna_injector.dm
+++ b/code/game/objects/items/weapons/dna_injector.dm
@@ -13,7 +13,7 @@
 	var/s_time = 10.0
 	throw_speed = 1
 	throw_range = 5
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
 	var/uses = 1
 	var/nofail
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index ac4799ce395..7283dd9b965 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -6,7 +6,7 @@
 	icon_state = "plastic-explosive0"
 	item_state = "plasticx"
 	flags = NOBLUDGEON
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	origin_tech = list(TECH_ILLEGAL = 2)
 	var/datum/wires/explosive/c4/wires = null
 	var/timer = 10
@@ -138,4 +138,4 @@
 		if(R?.cell)
 			R.cell.use(1000)
 	can_deploy = TRUE
-	maptext = "<span style=\"font-family: 'Small Fonts'; -dm-text-outline: 1 black; font-size: 7px;\">Ready</span>"
\ No newline at end of file
+	maptext = "<span style=\"font-family: 'Small Fonts'; -dm-text-outline: 1 black; font-size: 7px;\">Ready</span>"
diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index c8f625f9ef7..2c02d005e74 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -7,7 +7,7 @@
 	hitsound = 'sound/weapons/smash.ogg'
 	flags = CONDUCT | OPENCONTAINER
 	throwforce = 8
-	w_class = 4.0 // Don't want to give people free bluespace beakers.
+	w_class = ITEMSIZE_LARGE // Don't want to give people free bluespace beakers.
 	throw_speed = 2
 	throw_range = 10
 	force = 8
@@ -89,7 +89,7 @@
 	hitsound = 'sound/weapons/smash.ogg'
 	flags = CONDUCT
 	throwforce = 10
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	throw_speed = 2
 	throw_range = 10
 	force = 10.0
@@ -114,7 +114,7 @@
 	hitsound = null	//it is much lighter, after all.
 	flags = OPENCONTAINER
 	throwforce = 2
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	force = 2.0
 	max_water = 60
 	spray_amount = 10
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index 38fa093d2cd..7669c8d0624 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -10,7 +10,7 @@
 	throwforce = 10.0
 	throw_speed = 1
 	throw_range = 5
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_COMBAT = 1, TECH_PHORON = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 500)
 	var/status = 0
diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm
index 436f5108d93..bd8b55ea5b5 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -20,7 +20,7 @@
 	..()
 	pixel_x = rand(-10,10)
 	pixel_y = rand(-10,10)
-	if(w_class > 0 && w_class < 4)
+	if(w_class > 0 && w_class < ITEMSIZE_LARGE)
 		icon_state = "gift[w_class]"
 	else
 		icon_state = "gift[pick(1, 2, 3)]"
@@ -130,7 +130,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "gift1"
 	item_state = "gift1"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/xmasgift/Initialize()
 	..()
@@ -231,7 +231,7 @@
 /obj/item/xmasgift/medium
 	icon_state = "gift2"
 	item_state = "gift2"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 /obj/item/xmasgift/medium/attack_self(mob/user)
 	var/gift_type = pick(
@@ -301,7 +301,7 @@
 /obj/item/xmasgift/large
 	icon_state = "gift3"
 	item_state = "gift3"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/xmasgift/large/attack_self(mob/user)
 	var/gift_type = pick(
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index 513a7192e9b..101b106fa8d 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -3,7 +3,7 @@
 	icon_state = "chemg"
 	item_state = "chemg"
 	desc = "A hand made chemical grenade."
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	force = 2.0
 	det_time = null
 	unacidable = 1
@@ -367,4 +367,4 @@
 
 		beakers += B1
 		beakers += B2
-		icon_state = initial(icon_state) +"_locked"
\ No newline at end of file
+		icon_state = initial(icon_state) +"_locked"
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index 99ae9b783e9..7f740f9de09 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -1,7 +1,7 @@
 /obj/item/grenade
 	name = "grenade"
 	desc = "A hand held grenade, with an adjustable timer."
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	icon = 'icons/obj/grenade.dmi'
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/weapons/lefthand_grenade.dmi',
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index 3736374ba7d..09825a746ca 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -7,7 +7,7 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 5
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 2
 	throw_range = 5
 	origin_tech = list(TECH_MATERIAL = 1)
diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm
index ae33fb8a904..3605bf1cf8a 100644
--- a/code/game/objects/items/weapons/hydroponics.dm
+++ b/code/game/objects/items/weapons/hydroponics.dm
@@ -11,7 +11,7 @@
 	var/mode = 1;  //0 = pick one at a time, 1 = pick all on tile
 	var/capacity = 500; //the number of seeds it can carry.
 	slot_flags = SLOT_BELT
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	var/list/item_quants = list()
 
 /obj/item/seedbag/attack_self(mob/user as mob)
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index 14e9f2c6033..1f8c6a479cc 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -6,7 +6,7 @@
 	name = "implant"
 	icon = 'icons/obj/device.dmi'
 	icon_state = "implant"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	var/implanted = null
 	var/mob/imp_in = null
 	var/obj/item/organ/external/part = null
diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm
index 7d1cb492cb8..49b2f572cb4 100644
--- a/code/game/objects/items/weapons/implants/implantcase.dm
+++ b/code/game/objects/items/weapons/implants/implantcase.dm
@@ -8,7 +8,7 @@
 	item_state = "implantcase"
 	throw_speed = 1
 	throw_range = 5
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 	var/obj/item/implant/imp = null
 
 /obj/item/implantcase/proc/update()
diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm
index 5ad9dd3e5a2..6ff142c92a9 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -9,7 +9,7 @@
 	item_state = "syringe_0"
 	throw_speed = 1
 	throw_range = 5
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	matter = list(DEFAULT_WALL_MATERIAL = 320, MATERIAL_GLASS = 800)
 	var/obj/item/implant/imp = null
 
@@ -232,4 +232,4 @@
 		user.drop_from_inventory(I, src)
 		update()
 		return
-	..()
\ No newline at end of file
+	..()
diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm
index a595c38c7cb..bdc6e1f216c 100644
--- a/code/game/objects/items/weapons/implants/implantpad.dm
+++ b/code/game/objects/items/weapons/implants/implantpad.dm
@@ -8,7 +8,7 @@
 	item_state = "electronic"
 	throw_speed = 1
 	throw_range = 5
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	var/obj/item/implantcase/case = null
 	var/broadcasting = null
 	var/listening = TRUE
diff --git a/code/game/objects/items/weapons/improvised_components.dm b/code/game/objects/items/weapons/improvised_components.dm
index d0231294967..50ab1c935fb 100644
--- a/code/game/objects/items/weapons/improvised_components.dm
+++ b/code/game/objects/items/weapons/improvised_components.dm
@@ -47,7 +47,7 @@
 	flags = CONDUCT
 	force = 8
 	throwforce = 10
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	attack_verb = list("hit", "bludgeoned", "whacked", "bonked")
 	force_divisor = 0.1
 	thrown_force_divisor = 0.1
@@ -79,7 +79,7 @@
 	item_state = "rods"
 	force = 5
 	throwforce = 3
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	attack_verb = list("hit", "bludgeoned", "whacked", "bonked")
 	force_divisor = 0.1
 	thrown_force_divisor = 0.1
@@ -108,7 +108,7 @@
 	icon_state = "spearhead"
 	force = 5
 	throwforce = 5
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	attack_verb = list("attacked", "poked")
 	force_divisor = 0.1
 	thrown_force_divisor = 0.1
@@ -174,4 +174,4 @@
 			qdel(W)
 			qdel(src)
 			user.put_in_hands(complete)
-			return
\ No newline at end of file
+			return
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index 8e571d28bd2..b32794072d3 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -1459,7 +1459,7 @@
 	item_state = "book4"
 	title = "hadiist manifesto"
 	author = "Al'Mari Hadii"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	dat = {"<html>
 				<head>
 					<style>
@@ -1499,7 +1499,7 @@
 	item_state = "book1"
 	title = "dominian honor codex"
 	author = "Zalze Han'San"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	dat = {"<html>
 				<head>
 				<style>
@@ -1600,7 +1600,7 @@
 	item_state = "book13"
 	title = "Tau Ceti foreign legion pamphlet"
 	author = "Tau Ceti foreign legion recruitment center"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	dat = {"<html>
 				<head>
 					<style>
diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm
index 24b29441d66..b613159c68d 100644
--- a/code/game/objects/items/weapons/material/kitchen.dm
+++ b/code/game/objects/items/weapons/material/kitchen.dm
@@ -12,7 +12,7 @@
 	drop_sound = 'sound/items/drop/knife.ogg'
 	pickup_sound = 'sound/items/pickup/knife.ogg'
 	hitsound = 'sound/weapons/bladeslice.ogg'
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	thrown_force_divisor = 1
 	origin_tech = list(TECH_MATERIAL = 1)
 	attack_verb = list("attacked", "stabbed", "poked")
diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm
index 506be538036..32b33153e6c 100644
--- a/code/game/objects/items/weapons/material/knives.dm
+++ b/code/game/objects/items/weapons/material/knives.dm
@@ -72,7 +72,7 @@
 	applies_material_colour = 0
 	force_divisor = 0.35
 	can_embed = 0
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/material/knife/tacknife
 	name = "tactical knife"
@@ -91,7 +91,7 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "trench"
 	item_state = "knife"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	applies_material_colour = 0
 	slot_flags = SLOT_BELT
 
@@ -109,7 +109,7 @@
 		)
 	hitsound = null
 	active = 0
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	attack_verb = list("patted", "tapped")
 	force_divisor = 0.25 // 15 when wielded with hardness 60 (steel)
 	thrown_force_divisor = 0.25 // 5 when thrown with weight 20 (steel)
@@ -123,7 +123,7 @@
 		icon_state += "_open"
 		item_state = icon_state
 		hitsound = 'sound/weapons/bladeslice.ogg'
-		w_class = 3
+		w_class = ITEMSIZE_NORMAL
 		attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	else
 		force = 3
diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm
index 5f581679356..f33926f68aa 100644
--- a/code/game/objects/items/weapons/material/material_weapons.dm
+++ b/code/game/objects/items/weapons/material/material_weapons.dm
@@ -6,7 +6,7 @@
 	gender = NEUTER
 	throw_speed = 3
 	throw_range = 7
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	sharp = 0
 	edge = 0
 	icon = 'icons/obj/weapons.dmi'
diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm
index 24cd5e70626..4d560dd94ab 100644
--- a/code/game/objects/items/weapons/material/misc.dm
+++ b/code/game/objects/items/weapons/material/misc.dm
@@ -36,7 +36,7 @@
 	item_state = "hatchet"
 	force_divisor = 0.2 // 12 with hardness 60 (steel)
 	thrown_force_divisor = 0.75 // 15 with weight 20 (steel)
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	sharp = 1
 	edge = 1
 	origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1)
@@ -95,7 +95,7 @@
 	item_state = "hoe"
 	force_divisor = 0.25 // 5 with weight 20 (steel)
 	thrown_force_divisor = 0.25 // as above
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	attack_verb = list("slashed", "sliced", "cut", "clawed")
 
 /obj/item/material/scythe
@@ -112,7 +112,7 @@
 	edge = 1
 	throw_speed = 1
 	throw_range = 3
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
 	origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 2)
 	attack_verb = list("chopped", "sliced", "cut", "reaped")
@@ -125,4 +125,4 @@
 	thrown_force_divisor = 0.04 // 5 with weight 20 (steel)
 	throw_speed = 2
 	throw_range = 3
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm
index 8f1920d98c9..e034b528047 100644
--- a/code/game/objects/items/weapons/material/shards.dm
+++ b/code/game/objects/items/weapons/material/shards.dm
@@ -8,7 +8,7 @@
 	randpixel = 8
 	sharp = 1
 	edge = 1
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	force_divisor = 0.2 // 6 with hardness 30 (glass)
 	thrown_force_divisor = 0.4 // 4 with weight 15 (glass)
 	item_state = "shard-glass"
diff --git a/code/game/objects/items/weapons/material/swords.dm b/code/game/objects/items/weapons/material/swords.dm
index 322ca433e66..c113a3952fe 100644
--- a/code/game/objects/items/weapons/material/swords.dm
+++ b/code/game/objects/items/weapons/material/swords.dm
@@ -7,7 +7,7 @@
 	item_state = "claymore"
 	contained_sprite = TRUE
 	slot_flags = SLOT_BELT|SLOT_BACK
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force_divisor = 0.7 // 42 when wielded with hardnes 60 (steel)
 	thrown_force_divisor = 0.5 // 10 when thrown with weight 20 (steel)
 	sharp = 1
diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm
index 505e840b3fb..0042ada9706 100644
--- a/code/game/objects/items/weapons/material/twohanded.dm
+++ b/code/game/objects/items/weapons/material/twohanded.dm
@@ -17,7 +17,7 @@
  * Twohanded
  */
 /obj/item/material/twohanded
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	var/wielded = 0
 	var/force_wielded = 0
 	var/force_unwielded
@@ -157,7 +157,7 @@
 
 ///////////OFFHAND///////////////
 /obj/item/material/twohanded/offhand
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	icon_state = "offhand"
 	name = "offhand"
 	default_material = "placeholder"
@@ -195,7 +195,7 @@
 	force_divisor = 0.7 // 10/42 with hardness 60 (steel) and 0.25 unwielded divisor
 	sharp = 1
 	edge = 1
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
 	force_wielded = 30
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
@@ -231,7 +231,7 @@
 	name = "spear"
 	desc = "A haphazardly-constructed yet still deadly weapon of ancient design."
 	force = 10
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
 	force_divisor = 0.35 // 21 damage for steel (hardness 60)
 	unwielded_force_divisor = 0.2 // 12 damage for steel (hardness 60)
@@ -541,7 +541,7 @@
 	unwielded_force_divisor = 0.2
 	force_divisor = 0.3
 	edge = 1
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
 	attack_verb = list("attacked", "poked", "jabbed", "gored", "stabbed")
 	default_material = "steel"
@@ -618,7 +618,7 @@
 	name = "zweihander"
 	desc = "A german upgrade to the einhander models of ancient times."
 	force = 20
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
 	force_wielded = 30
 	unwielded_force_divisor = 1
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index 6dcafa334b8..c4c014cdd5b 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -128,12 +128,12 @@
 	icon_state = "eglaive0"
 	active_force = 40
 	active_throwforce = 60
-	active_w_class = 5
+	active_w_class = ITEMSIZE_HUGE
 	force = 20
 	throwforce = 30
 	throw_speed = 5
 	throw_range = 10
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	flags = CONDUCT | NOBLOODY
 	origin_tech = list(TECH_COMBAT = 6, TECH_PHORON = 4, TECH_MATERIAL = 7, TECH_ILLEGAL = 4)
 	attack_verb = list("stabbed", "chopped", "sliced", "cleaved", "slashed", "cut")
@@ -175,14 +175,14 @@
 	//active_force = 150 //holy...
 	active_force = 60
 	active_throwforce = 35
-	active_w_class = 5
+	active_w_class = ITEMSIZE_HUGE
 	//force = 40
 	//throwforce = 25
 	force = 20
 	throwforce = 10
 	throw_speed = 1
 	throw_range = 5
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	flags = CONDUCT | NOBLOODY
 	origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 4)
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
@@ -217,12 +217,12 @@
 	icon_state = "sword0"
 	active_force = 30
 	active_throwforce = 20
-	active_w_class = 4
+	active_w_class = ITEMSIZE_LARGE
 	force = 3
 	throwforce = 5
 	throw_speed = 1
 	throw_range = 5
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	flags = NOBLOODY
 	origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4)
 	sharp = 1
@@ -321,8 +321,8 @@
 	base_reflectchance = 65
 	active_force = 40
 	base_block_chance = 65
-	active_w_class = 3
-	w_class = 3
+	active_w_class = ITEMSIZE_NORMAL
+	w_class = ITEMSIZE_NORMAL
 	drop_sound = 'sound/items/drop/sword.ogg'
 	pickup_sound = /decl/sound_category/sword_pickup_sound
 	equip_sound = /decl/sound_category/sword_equip_sound
@@ -359,7 +359,7 @@
 	throwforce = 1  //Throwing or dropping the item deletes it.
 	throw_speed = 1
 	throw_range = 1
-	w_class = 4.0//So you can't hide it in your pocket or some such.
+	w_class = ITEMSIZE_LARGE//So you can't hide it in your pocket or some such.
 	flags = NOBLOODY
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	var/mob/living/creator
diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm
index 56e5255ee24..85626b31267 100644
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/code/game/objects/items/weapons/melee/misc.dm
@@ -14,7 +14,7 @@
 	slot_flags = SLOT_BELT
 	force = 10
 	throwforce = 7
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_COMBAT = 4)
 	attack_verb = list("flogged", "whipped", "lashed", "disciplined")
 	hitsound = 'sound/weapons/chainhit.ogg'
@@ -28,7 +28,7 @@
 	slot_flags = SLOT_BELT
 	force = 15
 	throwforce = 7
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	sharp = 1
 	edge = 1
 	origin_tech = list(TECH_COMBAT = 5)
@@ -73,7 +73,7 @@
 	throw_speed = 5
 	throw_range = 7
 	attack_verb = list("smashed", "beaten", "slammed", "smacked", "struck", "battered", "bonked")
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_MATERIAL = 3, TECH_ILLEGAL = 2)
 
 /obj/item/melee/hammer/powered
@@ -144,7 +144,7 @@
 	item_state = "chain"
 	slot_flags = SLOT_BELT
 	force = 10
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	reach = 2
 	attack_verb = list("flogged", "whipped", "lashed", "disciplined")
 	hitsound = 'sound/weapons/whip.ogg'
@@ -173,7 +173,7 @@
 	slot_flags = SLOT_BELT
 	force = 15
 	throwforce = 5
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	sharp = 1
 	edge = 1
 	can_embed = 0
diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index 1f6c7ab1dff..139f51264cf 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -12,7 +12,7 @@
 	throwforce = 10.0
 	throw_speed = 3
 	throw_range = 7
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
 	drop_sound = 'sound/items/drop/woodweapon.ogg'
 	pickup_sound = 'sound/items/pickup/woodweapon.ogg'
diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm
index 216e2a593d5..318d0982793 100644
--- a/code/game/objects/items/weapons/paint.dm
+++ b/code/game/objects/items/weapons/paint.dm
@@ -8,7 +8,7 @@
 	icon_state = "paint_empty"
 	item_state = "paintcan"
 	matter = list(DEFAULT_WALL_MATERIAL = 200)
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(10,20,30,60)
 	volume = 60
diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm
index 31a28cd5dea..fcfdb6ca0de 100644
--- a/code/game/objects/items/weapons/policetape.dm
+++ b/code/game/objects/items/weapons/policetape.dm
@@ -3,7 +3,7 @@
 	name = "tape roll"
 	icon = 'icons/policetape.dmi'
 	icon_state = "tape"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	var/turf/start
 	var/turf/end
 	var/tape_type = /obj/item/tape
diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm
index b8d4dfeac97..8432056462a 100644
--- a/code/game/objects/items/weapons/power_cells.dm
+++ b/code/game/objects/items/weapons/power_cells.dm
@@ -9,7 +9,7 @@
 	throwforce = 5.0
 	throw_speed = 3
 	throw_range = 5
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	var/charge = 0	// note %age conveted to actual charge in New
 	var/maxcharge = 1000
 	var/rigged = 0		// true if rigged to explode
@@ -21,7 +21,7 @@
 	name = "device power cell"
 	desc = "A small power cell designed to power handheld devices."
 	icon_state = "cell" //placeholder
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	force = 0
 	throw_speed = 5
 	throw_range = 7
diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm
index d14e2bb9baa..4cfe6555ee1 100644
--- a/code/game/objects/items/weapons/scrolls.dm
+++ b/code/game/objects/items/weapons/scrolls.dm
@@ -9,7 +9,7 @@
 		slot_r_hand_str = 'icons/mob/items/righthand_books.dmi'
 		)
 	var/uses = 4.0
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	item_state = "paper"
 	throw_speed = 4
 	throw_range = 20
diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
index aac4cfc149d..97b84612fc4 100644
--- a/code/game/objects/items/weapons/shields.dm
+++ b/code/game/objects/items/weapons/shields.dm
@@ -70,7 +70,7 @@
 	throwforce = 5.0
 	throw_speed = 1
 	throw_range = 4
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	origin_tech = list(TECH_MATERIAL = 2)
 	matter = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 7500)
 	attack_verb = list("shoved", "bashed")
@@ -139,7 +139,7 @@
 	throwforce = 5.0
 	throw_speed = 1
 	throw_range = 4
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	origin_tech = list(TECH_MATERIAL = 4, TECH_MAGNET = 3, TECH_ILLEGAL = 4)
 	attack_verb = list("shoved", "bashed")
 	var/shield_power = 150
@@ -174,7 +174,7 @@
 				active = 0
 				force = 3
 				update_icon()
-				w_class = 1
+				w_class = ITEMSIZE_TINY
 				playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
 				shield_power = initial(shield_power)
 				return 0
@@ -217,14 +217,14 @@
 	if (active)
 		force = 10
 		update_icon()
-		w_class = 4
+		w_class = ITEMSIZE_LARGE
 		playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
 		to_chat(user, "<span class='notice'>\The [src] is now active.</span>")
 
 	else
 		force = 3
 		update_icon()
-		w_class = 1
+		w_class = ITEMSIZE_TINY
 		playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
 		to_chat(user, "<span class='notice'>\The [src] can now be concealed.</span>")
 
@@ -291,7 +291,7 @@
 	throwforce = 3.0
 	throw_speed = 3
 	throw_range = 4
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	attack_verb = list("shoved", "bashed")
 	var/active = 0
 
@@ -319,7 +319,7 @@
 		force = 5
 		throwforce = 5
 		throw_speed = 2
-		w_class = 4
+		w_class = ITEMSIZE_LARGE
 		slot_flags = SLOT_BACK
 		to_chat(user, SPAN_NOTICE("You extend \the [src] downward with a sharp snap of your wrist."))
 	else
@@ -328,7 +328,7 @@
 		force = 3
 		throwforce = 3
 		throw_speed = 3
-		w_class = 3
+		w_class = ITEMSIZE_NORMAL
 		slot_flags = 0
 		to_chat(user, SPAN_NOTICE("\The [src] folds inwards neatly as you snap your wrist upwards and push it back into the frame."))
 
diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm
index 48dd235bc12..b970d36e985 100644
--- a/code/game/objects/items/weapons/soap.dm
+++ b/code/game/objects/items/weapons/soap.dm
@@ -11,7 +11,7 @@
 		)
 	icon_state = "soap"
 	item_state = "soap"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throwforce = 0
 	throw_speed = 4
 	throw_range = 20
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 159a44b782a..fc6ef02a400 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -18,9 +18,9 @@
 		slot_l_hand_str = "backpack",
 		slot_r_hand_str = "backpack"
 		)
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
-	max_w_class = 3
+	max_w_class = ITEMSIZE_NORMAL
 	max_storage_space = 28
 	var/species_restricted = list("exclude",BODYTYPE_VAURCA_BREEDER,BODYTYPE_VAURCA_WARFORM)
 	drop_sound = 'sound/items/drop/backpack.ogg'
@@ -71,7 +71,7 @@
 	desc = "A backpack that opens into a localized pocket of Blue Space."
 	origin_tech = list(TECH_BLUESPACE = 4)
 	icon_state = "holdingpack"
-	max_w_class = 4
+	max_w_class = ITEMSIZE_LARGE
 	max_storage_space = 56
 	storage_cost = 29
 	item_state_slots = list(
@@ -98,7 +98,7 @@
 	desc = "Space Santa uses this to deliver toys to all the nice children in space in Christmas! Wow, it's pretty big!"
 	icon_state = "giftbag0"
 	item_state = "giftbag"
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	max_storage_space = 400 // can store a ton of shit!
 	item_state_slots = null
 	empty_delay = 1 SECOND
@@ -507,7 +507,7 @@
 	desc = "The wings of a CB Caste Vaurca. They are far too small at this stage to permit sustained periods of flight in most situations."
 	icon_state = "wings"
 	item_state = "wings"
-	w_class = 5.0
+	w_class = ITEMSIZE_HUGE
 	slot_flags = SLOT_BACK
 	max_storage_space = 12
 	canremove = 0
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index 8a8f538061a..2b353f08392 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -41,8 +41,8 @@
 	icon_state = "trashbag0"
 	item_state = "trashbag"
 
-	w_class = 4
-	max_w_class = 2
+	w_class = ITEMSIZE_LARGE
+	max_w_class = ITEMSIZE_SMALL
 	max_storage_space = 56
 	can_hold = null // any
 	cant_hold = list(/obj/item/disk/nuclear)
@@ -111,8 +111,8 @@
 	icon_state = "plasticbag"
 	item_state = "plasticbag"
 
-	w_class = 4
-	max_w_class = 2
+	w_class = ITEMSIZE_LARGE
+	max_w_class = ITEMSIZE_SMALL
 	can_hold = null // any
 	cant_hold = list(/obj/item/disk/nuclear)
 	drop_sound = 'sound/items/drop/wrapper.ogg'
@@ -131,8 +131,8 @@
 		slot_r_hand_str = 'icons/mob/items/righthand_hydro.dmi',
 		)
 	max_storage_space = 100
-	max_w_class = 3
-	w_class = 2
+	max_w_class = ITEMSIZE_NORMAL
+	w_class = ITEMSIZE_SMALL
 	can_hold = list(/obj/item/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/grown)
 
 // -----------------------------
@@ -145,8 +145,8 @@
 	icon_state = "slimebag"
 	desc = "A pressurized and thermoregulated bag for the storage and transport of slime cores."
 	max_storage_space = 100
-	max_w_class = 3
-	w_class = 2
+	max_w_class = ITEMSIZE_NORMAL
+	w_class = ITEMSIZE_SMALL
 	can_hold = list(/obj/item/slime_extract)
 
 // -----------------------------
@@ -162,7 +162,7 @@
 	desc = "A patented storage system designed for any kind of mineral sheet."
 
 	var/capacity = 300; //the number of sheets it can carry.
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	storage_slots = 7
 
 	allow_quick_empty = 1 // this function is superceded
@@ -300,7 +300,7 @@
 	icon_state = "moneybag"
 	flags = CONDUCT
 	max_storage_space = 100
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	can_hold = list(/obj/item/coin,/obj/item/spacecash)
 
 /obj/item/storage/bag/money/vault
@@ -326,7 +326,7 @@
 	icon_state = "bookbag"
 	storage_slots = 7
 	max_storage_space = 200
-	max_w_class = 3
-	w_class = 3
+	max_w_class = ITEMSIZE_NORMAL
+	w_class = ITEMSIZE_NORMAL
 	can_hold = list(/obj/item/book, /obj/item/spellbook)
 
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index fb76c9675f7..83427d2dd7d 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -6,7 +6,7 @@
 	item_state = "utility"
 	force = 2
 	storage_slots = 7
-	max_w_class = 3
+	max_w_class = ITEMSIZE_NORMAL
 	max_storage_space = 28
 	slot_flags = SLOT_BELT
 	attack_verb = list("whipped", "lashed", "disciplined")
@@ -202,7 +202,7 @@
 	icon_state = "swatbelt"
 	item_state = "swatbelt"
 	storage_slots = 9
-	max_w_class = 3
+	max_w_class = ITEMSIZE_NORMAL
 	max_storage_space = 28
 
 /obj/item/storage/belt/military
@@ -211,7 +211,7 @@
 	icon_state = "militarybelt"
 	item_state = "militarybelt"
 	storage_slots = 9 //same as a combat belt now
-	max_w_class = 3
+	max_w_class = ITEMSIZE_NORMAL
 	max_storage_space  = 28
 	can_hold = list(
 		/obj/item/grenade,
@@ -253,8 +253,8 @@
 	icon_state = "janibelt"
 	item_state = "janibelt"
 	storage_slots = 6
-	w_class = 3
-	max_w_class = 3
+	w_class = ITEMSIZE_NORMAL
+	max_w_class = ITEMSIZE_NORMAL
 	can_hold = list(
 		/obj/item/crowbar,
 		/obj/item/screwdriver,
@@ -279,7 +279,7 @@
 	icon_state = "soulstonebelt"
 	item_state = "soulstonebelt"
 	storage_slots = 5
-	max_w_class = 3
+	max_w_class = ITEMSIZE_NORMAL
 	max_storage_space  = 28
 	can_hold = list(
 		/obj/item/gun/energy/wand
@@ -300,8 +300,8 @@
 	icon_state = "explorer"
 	item_state = "explorer"
 	storage_slots = 9
-	w_class = 4
-	max_w_class = 4 //Pickaxes are big.
+	w_class = ITEMSIZE_LARGE
+	max_w_class = ITEMSIZE_LARGE //Pickaxes are big.
 	can_hold = list(
 		/obj/item/crowbar,
 		/obj/item/screwdriver,
@@ -351,8 +351,8 @@
 	icon_state = "growbelt"
 	item_state = "growbelt"
 	storage_slots = 9
-	w_class = 3
-	max_w_class = 4
+	w_class = ITEMSIZE_NORMAL
+	max_w_class = ITEMSIZE_LARGE
 	can_hold = list(
 		/obj/item/reagent_containers/glass,
 		/obj/item/grenade/chem_grenade, //weed killer grenades mostly, or water-pottassium if you grow the bannanas!
@@ -377,7 +377,7 @@
 	icon_state = "securitybelt"
 	item_state = "security"
 	storage_slots = 9
-	max_w_class = 4
+	max_w_class = ITEMSIZE_LARGE
 	max_storage_space = 28
 
 	can_hold = list(
@@ -416,7 +416,7 @@
 	desc = "A dorky fannypack for keeping small items in."
 	icon_state = "fannypack_leather"
 	item_state = "fannypack_leather"
-	max_w_class = 2
+	max_w_class = ITEMSIZE_SMALL
 	storage_slots = null
 	max_storage_space = 8
 
@@ -473,7 +473,7 @@
 	item_state = "hammerbelt"
 	contained_sprite = TRUE
 	storage_slots = 1
-	max_w_class = 2
+	max_w_class = ITEMSIZE_SMALL
 	desc_fluff = "Shumaila is the sister of Mata'ke and the goddess of fortification, chastity, and building. She is the head of the town watch and the architect for all of the \
 	Holy Village's most important buildings. When Mata'ke's original hunting party had done battle with the King of Rraknarr, her beloved was killed in the fighting. Ever since then \
 	she has resolved to be eternally chaste in dedication to him. She is an M'sai who is depicted wearing modest dresses and carrying a hammer on a belt. She is not known for having \
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index c73c1cfbe31..1477011a1d6 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -598,7 +598,7 @@
 		)
 	icon_state = "portafreezer"
 	item_state = "medicalpack"
-	max_w_class = 3
+	max_w_class = ITEMSIZE_NORMAL
 	max_storage_space = 21
 	use_to_pickup = FALSE // for picking up broken bulbs, not that most people will try
 	chewable = FALSE
diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm
index 3a6f40ae997..0be7913a160 100644
--- a/code/game/objects/items/weapons/storage/briefcase.dm
+++ b/code/game/objects/items/weapons/storage/briefcase.dm
@@ -11,8 +11,8 @@
 	force = 8.0
 	throw_speed = 1
 	throw_range = 4
-	w_class = 4
-	max_w_class = 3
+	w_class = ITEMSIZE_LARGE
+	max_w_class = ITEMSIZE_NORMAL
 	max_storage_space = 16
 	use_sound = 'sound/items/storage/briefcase.ogg'
 	drop_sound = 'sound/items/drop/backpack.ogg'
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index fe5f633998e..a36804d25cd 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -155,7 +155,7 @@
 		)
 	item_state = "pill_canister"
 	center_of_mass = list("x" = 16,"y" = 12)
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	can_hold = list(/obj/item/reagent_containers/pill,/obj/item/dice,/obj/item/paper)
 	allow_quick_gather = 1
 	use_to_pickup = 1
diff --git a/code/game/objects/items/weapons/storage/laundry_basket.dm b/code/game/objects/items/weapons/storage/laundry_basket.dm
index 016f35bd63a..6a768216fa1 100644
--- a/code/game/objects/items/weapons/storage/laundry_basket.dm
+++ b/code/game/objects/items/weapons/storage/laundry_basket.dm
@@ -10,8 +10,8 @@
 	item_state = "laundry"
 	desc = "The peak of thousands of years of laundry evolution."
 
-	w_class = 5
-	max_w_class = 4
+	w_class = ITEMSIZE_HUGE
+	max_w_class = ITEMSIZE_LARGE
 	max_storage_space = 25 //20 for clothes + a bit of additional space for non-clothing items that were worn on body
 	storage_slots = 14
 	use_to_pickup = 1
diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm
index 922ab81974e..443a3a37d9f 100644
--- a/code/game/objects/items/weapons/storage/lockbox.dm
+++ b/code/game/objects/items/weapons/storage/lockbox.dm
@@ -9,8 +9,8 @@
 		slot_l_hand_str = 'icons/mob/items/storage/lefthand_briefcase.dmi',
 		slot_r_hand_str = 'icons/mob/items/storage/righthand_briefcase.dmi'
 		)
-	w_class = 4
-	max_w_class = 3
+	w_class = ITEMSIZE_LARGE
+	max_w_class = ITEMSIZE_NORMAL
 	max_storage_space = 14 //The sum of the w_classes of all the items in this storage item.
 	req_access = list(access_armory)
 	var/locked = 1
@@ -108,8 +108,8 @@
 	desc = "A locked box used to store medals."
 	icon_state = "medalbox+l"
 	item_state = "box"
-	w_class = 3
-	max_w_class = 2
+	w_class = ITEMSIZE_NORMAL
+	max_w_class = ITEMSIZE_SMALL
 	req_access = list(access_captain)
 	icon_locked = "medalbox+l"
 	icon_closed = "medalbox"
diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm
index 0871b981875..b8184c3ed32 100644
--- a/code/game/objects/items/weapons/storage/misc.dm
+++ b/code/game/objects/items/weapons/storage/misc.dm
@@ -64,7 +64,7 @@
 		slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi',
 		)
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	max_storage_space = 10
 	throwforce = 2
 	slot_flags = SLOT_BELT
@@ -88,7 +88,7 @@
 		slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi',
 		)
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	starts_with = list(/obj/item/paper/cig/filter = 10)
 	make_exact_fit()
 	drop_sound = 'sound/items/drop/gloves.ogg'
@@ -117,7 +117,7 @@
 	drop_sound = 'sound/items/drop/shovel.ogg'
 	pickup_sound = 'sound/items/pickup/shovel.ogg'
 	use_sound = 'sound/items/storage/pillbottle.ogg'
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	throwforce = 2
 	slot_flags = SLOT_BELT
 	starts_with = list(/obj/item/clothing/mask/chewable/tobacco = 6)
diff --git a/code/game/objects/items/weapons/storage/nitrilebox.dm b/code/game/objects/items/weapons/storage/nitrilebox.dm
index bb53af51675..23d1a13a08f 100644
--- a/code/game/objects/items/weapons/storage/nitrilebox.dm
+++ b/code/game/objects/items/weapons/storage/nitrilebox.dm
@@ -7,7 +7,7 @@
 	drop_sound = 'sound/items/drop/cardboardbox.ogg'
 	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 	throwforce = 1
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	throw_speed = 3
 	throw_range = 7
 	layer = OBJ_LAYER - 0.1
diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm
index 3e04a77ce36..d136d2dca49 100644
--- a/code/game/objects/items/weapons/storage/secure.dm
+++ b/code/game/objects/items/weapons/storage/secure.dm
@@ -23,8 +23,8 @@
 	var/l_hacking = 0
 	var/emagged = 0
 	var/open = 0
-	w_class = 3
-	max_w_class = 2
+	w_class = ITEMSIZE_NORMAL
+	max_w_class = ITEMSIZE_SMALL
 	max_storage_space = 14
 	use_sound = 'sound/items/storage/briefcase.ogg'
 
@@ -154,7 +154,7 @@
 	force = 8.0
 	throw_speed = 1
 	throw_range = 4
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 
 	attack_hand(mob/user as mob)
 		if ((src.loc == user) && (src.locked == 1))
@@ -181,8 +181,8 @@
 	icon_locking = "safeb"
 	icon_sparking = "safespark"
 	force = 8.0
-	w_class = 8.0
-	max_w_class = 8
+	w_class = ITEMSIZE_IMMENSE
+	max_w_class = ITEMSIZE_IMMENSE
 	anchored = 1.0
 	density = 0
 	cant_hold = list(/obj/item/storage/secure/briefcase)
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 0ae5fcedd32..e7c6f9af5a5 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -15,11 +15,11 @@
 /obj/item/storage
 	name = "storage"
 	icon = 'icons/obj/storage.dmi'
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	var/list/can_hold  //List of objects which this item can store (if set, it can't store anything else)
 	var/list/cant_hold //List of objects which this item can't store (in effect only if can_hold isn't set)
 	var/list/is_seeing //List of mobs which are currently seeing the contents of this item's storage
-	var/max_w_class = 3 //Max size of objects that this object can store (in effect only if can_hold isn't set)
+	var/max_w_class = ITEMSIZE_NORMAL //Max size of objects that this object can store (in effect only if can_hold isn't set)
 	var/max_storage_space = 8 //The sum of the storage costs of all the items in this storage item.
 	var/storage_slots //The number of storage slots in this container.
 	var/obj/screen/storage/boxes
@@ -375,7 +375,7 @@
 					to_chat(usr, "<span class='notice'>You put \the [W] into [src].</span>")
 				else if (M in range(1)) //If someone is standing close enough, they can tell what it is...
 					M.show_message("<span class='notice'>\The [user] puts [W] into [src].</span>")
-				else if (W && W.w_class >= 3) //Otherwise they can only see large or normal items from a distance...
+				else if (W && W.w_class >= ITEMSIZE_NORMAL) //Otherwise they can only see large or normal items from a distance...
 					M.show_message("<span class='notice'>\The [user] puts [W] into [src].</span>")
 
 		orient2hud(user)
@@ -735,15 +735,15 @@
 	if (storage_cost)
 		return storage_cost
 	else
-		if(w_class == 1)
+		if(w_class == ITEMSIZE_TINY)
 			return 1
-		if(w_class == 2)
+		if(w_class == ITEMSIZE_SMALL)
 			return 2
-		if(w_class == 3)
+		if(w_class == ITEMSIZE_NORMAL)
 			return 4
-		if(w_class == 4)
+		if(w_class == ITEMSIZE_LARGE)
 			return 8
-		if(w_class == 5)
+		if(w_class == ITEMSIZE_HUGE)
 			return 16
 		else
 			return 1000
diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm
index 3834e9e477a..7ba2bab370e 100644
--- a/code/game/objects/items/weapons/storage/toolbox.dm
+++ b/code/game/objects/items/weapons/storage/toolbox.dm
@@ -14,8 +14,8 @@
 	throwforce = 10
 	throw_speed = 1
 	throw_range = 7
-	w_class = 4
-	max_w_class = 3
+	w_class = ITEMSIZE_LARGE
+	max_w_class = ITEMSIZE_NORMAL
 	max_storage_space = 14 //enough to hold all starting contents
 	origin_tech = list(TECH_COMBAT = 1)
 	attack_verb = list("robusted")
@@ -156,7 +156,7 @@
 	item_state = "lunchbox_rainbow"
 	desc = "A little lunchbox. This one is the colors of the rainbow."
 	attack_verb = list("lunched")
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	max_storage_space = 8
 	var/filled = FALSE
 
diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm
index 8b7b645aac1..345d3bbd062 100644
--- a/code/game/objects/items/weapons/storage/wallets.dm
+++ b/code/game/objects/items/weapons/storage/wallets.dm
@@ -3,8 +3,8 @@
 	desc = "It can hold a few small and personal things."
 	storage_slots = 10
 	icon_state = "wallet"
-	w_class = 2
-	max_w_class = 2
+	w_class = ITEMSIZE_SMALL
+	max_w_class = ITEMSIZE_SMALL
 	can_hold = list(
 		/obj/item/spacecash,
 		/obj/item/card,
@@ -172,8 +172,8 @@
 	item_state = "lanyard"
 	overlay_state = "lanyard"
 	attack_verb = list("whipped", "lashed", "lightly garroted")
-	w_class = 1
-	max_w_class = 1
+	w_class = ITEMSIZE_TINY
+	max_w_class = ITEMSIZE_TINY
 	can_hold = list(
 		/obj/item/card,
 		/obj/item/clothing/accessory/badge,
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index baa7abc46b2..b9895184a2a 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -12,7 +12,7 @@
 	sharp = 0
 	edge = 0
 	throwforce = 7
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	drop_sound = 'sound/items/drop/metalweapon.ogg'
 	pickup_sound = 'sound/items/pickup/metalweapon.ogg'
 	origin_tech = list(TECH_COMBAT = 2)
diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm
index a05dd5be731..66aa870428b 100644
--- a/code/game/objects/items/weapons/surgery_tools.dm
+++ b/code/game/objects/items/weapons/surgery_tools.dm
@@ -12,7 +12,7 @@
 	name = "surgery tool"
 	desc = "hey, you aren't supposed to have this"
 	icon = 'icons/obj/surgery.dmi'
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	drop_sound = 'sound/items/drop/weldingtool.ogg'
 	pickup_sound = 'sound/items/pickup/weldingtool.ogg'
 	item_icons = list(
@@ -70,7 +70,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 15000, MATERIAL_GLASS = 10000)
 	flags = CONDUCT
 	force = 15.0
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
 	attack_verb = list("drilled")
 	drop_sound = 'sound/items/drop/accessory.ogg'
@@ -88,7 +88,7 @@
 	force = 10.0
 	sharp = 1
 	edge = 1
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
 	throwforce = 5.0
 	throw_speed = 3
@@ -139,7 +139,7 @@
 	hitsound = 'sound/weapons/saw/circsawhit.ogg'
 	flags = CONDUCT
 	force = 15.0
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	throwforce = 9.0
 	throw_speed = 3
 	throw_range = 5
@@ -191,7 +191,7 @@
 	drop_sound = 'sound/items/drop/axe.ogg'
 	pickup_sound = 'sound/items/pickup/axe.ogg'
 	force = 2
-	w_class = 5.0
+	w_class = ITEMSIZE_HUGE
 	storage_slots = 10
 	attack_verb = list("slammed")
 	icon_type = "surgery tool"
diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm
index 2724722bb7a..fdaab3ed4ce 100644
--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -40,7 +40,7 @@
 	icon_state = "telebaton_0"
 	item_state = "telebaton_0"
 	slot_flags = SLOT_BELT
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	force = 3
 	drop_sound = 'sound/items/drop/crowbar.ogg'
 	pickup_sound = 'sound/items/pickup/crowbar.ogg'
@@ -54,7 +54,7 @@
 		"You hear an ominous click.")
 		icon_state = "telebaton_1"
 		item_state = "telebaton_1"
-		w_class = 3
+		w_class = ITEMSIZE_NORMAL
 		force = 15//quite robust
 		attack_verb = list("smacked", "struck", "slapped")
 	else
@@ -63,7 +63,7 @@
 		"You hear a click.")
 		icon_state = "telebaton_0"
 		item_state = "telebaton_0"
-		w_class = 2
+		w_class = ITEMSIZE_SMALL
 		force = 3//not so robust now
 		attack_verb = list("hit", "punched")
 
diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm
index 625590864a0..14cc47d182b 100644
--- a/code/game/objects/items/weapons/syndie.dm
+++ b/code/game/objects/items/weapons/syndie.dm
@@ -11,7 +11,7 @@
 	item_state = "c-4small"
 	name = "normal-sized package"
 	desc = "A small wrapped package."
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 	var/power = 1  /*Size of the explosion.*/
 	var/size = "small"  /*Used for the icon, this one will make c-4small_0 for the off state.*/
@@ -55,7 +55,7 @@
 	item_state = "c-4detonator"
 	name = "\improper Zippo lighter"  /*Sneaky, thanks Dreyfus.*/
 	desc = "The zippo."
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 	var/obj/item/syndie/c4explosive/bomb
 	var/pr_open = 0  /*Is the "What do you want to do?" prompt open?*/
@@ -164,4 +164,4 @@
 
 /obj/item/syndie/teleporter/pickup()
 	..()
-	addtimer(CALLBACK(src, .proc/check_maptext), 1)
\ No newline at end of file
+	addtimer(CALLBACK(src, .proc/check_maptext), 1)
diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm
index abd84b1d21c..8649360136f 100644
--- a/code/game/objects/items/weapons/tanks/jetpack.dm
+++ b/code/game/objects/items/weapons/tanks/jetpack.dm
@@ -36,7 +36,7 @@
 	icon_state = "jetpack"
 	item_state = "jetpack"
 	gauge_icon = null
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
 	var/datum/effect_system/ion_trail/ion_trail
 	var/on = 0.0
diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm
index 232090a198a..bc529088c66 100644
--- a/code/game/objects/items/weapons/tanks/tank_types.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types.dm
@@ -114,7 +114,7 @@
 	gauge_cap = 4
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	force = 4.0
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
 	volume = 2 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
@@ -151,7 +151,7 @@
 	gauge_cap = 4
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	force = 4.0
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
 	volume = 2
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 2cf75d9ff4b..f3c4ae204bb 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -18,7 +18,7 @@
 
 	flags = CONDUCT
 	slot_flags = SLOT_BACK
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 	force = 5.0
 	throwforce = 10.0
@@ -309,4 +309,4 @@
 
 /obj/item/tank/proc/remove_air_by_flag(flag, amount)
 	. = air_contents.remove_by_flag(flag, amount)
-	update_icon()
\ No newline at end of file
+	update_icon()
diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm
index 2a136a1b6c5..f7341f547db 100644
--- a/code/game/objects/items/weapons/tanks/watertank.dm
+++ b/code/game/objects/items/weapons/tanks/watertank.dm
@@ -5,7 +5,7 @@
 	icon_state = "waterpack"
 	item_state = "waterpack"
 	contained_sprite = 1
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	slot_flags = SLOT_BACK
 
 	var/obj/item/reagent_containers/spray/chemsprayer/mister/noz
@@ -95,7 +95,7 @@
 	icon_state = "mister"
 	item_state = "mister"
 	contained_sprite = 1
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	amount_per_transfer_from_this = 50
 	volume = 500
 	slot_flags = 0
diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm
index b7a9bb30f67..f7af01a8601 100644
--- a/code/game/objects/items/weapons/tape.dm
+++ b/code/game/objects/items/weapons/tape.dm
@@ -3,7 +3,7 @@
 	desc = "A roll of sticky tape. Possibly for taping ducks... or was that ducts?"
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "taperoll"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	drop_sound = 'sound/items/drop/cardboardbox.ogg'
 	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 
@@ -91,7 +91,7 @@
 	desc = "A piece of sticky tape."
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "tape"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	layer = 4
 	anchored = 1 //it's sticky, no you cant move it
 	drop_sound = null
diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm
index 74101d16299..8256fab1306 100644
--- a/code/game/objects/items/weapons/teleportation.dm
+++ b/code/game/objects/items/weapons/teleportation.dm
@@ -18,7 +18,7 @@
 	var/broadcasting = null
 	var/listening = TRUE
 	flags = CONDUCT
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	item_state = "electronic"
 	throw_speed = 4
 	throw_range = 20
@@ -130,7 +130,7 @@ Frequency:
 	icon_state = "hand_tele"
 	item_state = "electronic"
 	throwforce = 5
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 3
 	throw_range = 5
 	origin_tech = list(TECH_MAGNET = 1, TECH_BLUESPACE = 3)
diff --git a/code/game/objects/items/weapons/towel.dm b/code/game/objects/items/weapons/towel.dm
index 5f6a0811bf4..f20fb981687 100644
--- a/code/game/objects/items/weapons/towel.dm
+++ b/code/game/objects/items/weapons/towel.dm
@@ -5,7 +5,7 @@
 	icon_state = "towel"
 	slot_flags = SLOT_HEAD | SLOT_BELT | SLOT_OCLOTHING
 	force = 1
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	attack_verb = list("whipped")
 	hitsound = 'sound/weapons/towelwhip.ogg'
 	drop_sound = 'sound/items/drop/cloth.ogg'
diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm
index ef31dcf7d35..076073bf1b2 100644
--- a/code/game/objects/items/weapons/traps.dm
+++ b/code/game/objects/items/weapons/traps.dm
@@ -117,7 +117,7 @@
 		var/obj/item/organ/external/limb = H.get_organ(check_zone(target_zone))
 		if(!limb || limb.is_stump()) // oops, we took the limb clean off
 			did_trap = FALSE
-	
+
 	if(did_trap)
 		//trap the victim in place
 		can_buckle = TRUE
@@ -169,7 +169,7 @@
 	desc = "A small mechanical trap that's used to catch small animals like rats, lizards, and chicks."
 	throwforce = 2
 	force = 1
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	origin_tech = list(TECH_ENGINEERING = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 1750)
 	deployed = FALSE
@@ -533,7 +533,7 @@
 	icon_state = "medium0"
 	throwforce = 4
 	force = 5
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	origin_tech = list(TECH_ENGINEERING = 3)
 	matter = list(DEFAULT_WALL_MATERIAL = 5750)
 	deployed = FALSE
@@ -637,7 +637,7 @@
 	icon = 'icons/obj/items.dmi'
 	throwforce = 4
 	force = 5
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 
 /obj/item/large_trap_foundation/attackby(obj/item/W, mob/user)
 	if(istype(W, /obj/item/stack/rods))
diff --git a/code/game/objects/items/weapons/vaurca_items.dm b/code/game/objects/items/weapons/vaurca_items.dm
index a8998e72a2f..50843fff901 100644
--- a/code/game/objects/items/weapons/vaurca_items.dm
+++ b/code/game/objects/items/weapons/vaurca_items.dm
@@ -81,12 +81,12 @@
 	item_state = "eknife0"
 	active_force = 20
 	active_throwforce = 20
-	active_w_class = 5
+	active_w_class = ITEMSIZE_HUGE
 	force = 5
 	throwforce = 5
 	throw_speed = 5
 	throw_range = 10
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	flags = CONDUCT | NOBLOODY
 	attack_verb = list("stabbed", "chopped", "sliced", "cleaved", "slashed", "cut")
 	sharp = 1
@@ -174,7 +174,7 @@
 	icon_state = "harddisk"
 	force = 10
 	throwforce = 5
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	contained_sprite = 1
 
 /obj/item/melee/vaurca/rock
@@ -184,7 +184,7 @@
 	icon = 'icons/obj/vaurca_items.dmi'
 	force = 15
 	throwforce = 30
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	contained_sprite = 1
 
 /obj/item/grenade/spawnergrenade/vaurca
@@ -197,7 +197,7 @@
 	icon_state = "beacon"
 	force = 15
 	throwforce = 30
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 
 /obj/item/grenade/spawnergrenade/vaurca/prime()
 
@@ -315,7 +315,7 @@
 	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
 	body_parts_covered = FACE|EYES
 	gas_filter_strength = 3
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	filtered_gases = list(GAS_NITROGEN, GAS_N2O)
 	armor = list(melee = 25, bullet = 10, laser = 25, energy = 25, bomb = 0, bio = 50, rad = 15)
 	icon = 'icons/obj/vaurca_items.dmi'
@@ -332,12 +332,12 @@
 	active_force = 30
 	armor_penetration = 30
 	active_throwforce = 20
-	active_w_class = 5
+	active_w_class = ITEMSIZE_HUGE
 	force = 10
 	throwforce = 10
 	throw_speed = 5
 	throw_range = 10
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	flags = CONDUCT | NOBLOODY
 	attack_verb = list("stabbed", "chopped", "sliced", "cleaved", "slashed", "cut")
 	sharp = 1
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index d8aff1b6f89..0a781515a81 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -156,7 +156,7 @@
 	item_state = "canesword"
 	force = 20
 	throwforce = 5
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	sharp = 1
 	edge = 1
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -177,7 +177,7 @@
 	throwforce = 1
 	sharp = 1
 	edge = 1
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	contained_sprite = TRUE
@@ -191,7 +191,7 @@
 	icon_state = "toyhammer"
 	slot_flags = SLOT_BELT
 	throwforce = 0
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 7
 	throw_range = 15
 	attack_verb = list("banned")
diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/game/objects/items/weapons/weldbackpack.dm
index b8628408310..03075033a2d 100644
--- a/code/game/objects/items/weapons/weldbackpack.dm
+++ b/code/game/objects/items/weapons/weldbackpack.dm
@@ -4,7 +4,7 @@
 	slot_flags = SLOT_BACK
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "welderpack"
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	var/max_fuel = 350
 	drop_sound = 'sound/items/drop/backpack.ogg'
 	pickup_sound = 'sound/items/pickup/backpack.ogg'
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 1545ca5e4a3..683dedd763d 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -1,6 +1,6 @@
 /obj/structure
 	icon = 'icons/obj/structures.dmi'
-	w_class = 10
+	w_class = ITEMSIZE_IMMENSE
 	layer = OBJ_LAYER - 0.01
 
 	var/climbable
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index 7af61ff4c4b..bc9ab89d5ec 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -20,7 +20,7 @@ LINEN BINS
 	throwforce = 1
 	throw_speed = 1
 	throw_range = 2
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	drop_sound = 'sound/items/drop/cloth.ogg'
 	pickup_sound = 'sound/items/pickup/cloth.ogg'
 	randpixel = 0
@@ -124,12 +124,12 @@ LINEN BINS
 		if(!fold)
 			fold = TRUE
 			slot_flags = null
-			w_class = 2.0
+			w_class = ITEMSIZE_SMALL
 			layer = initial(layer)
 		else
 			fold = FALSE
 			slot_flags = SLOT_BACK
-			w_class = 4.0
+			w_class = ITEMSIZE_LARGE
 		update_icon()
 		inuse = FALSE
 		return TRUE
@@ -153,19 +153,19 @@ LINEN BINS
 			user.do_attack_animation(src)
 		playsound(get_turf(loc), /decl/sound_category/rustle_sound, 15, 1, -5)
 		var/rolls = roll
-		user.visible_message(SPAN_NOTICE("\The [user] [rolls ? "unrolls" : "rolls"] \the [src]."), 
+		user.visible_message(SPAN_NOTICE("\The [user] [rolls ? "unrolls" : "rolls"] \the [src]."),
 							SPAN_NOTICE("You [roll ? "unroll" : "roll"] \the [src]."))
 		if(!roll)
 			roll = TRUE
 			slot_flags = null
-			w_class = 3.0
+			w_class = ITEMSIZE_NORMAL
 			layer = initial(layer)
 			if(user.resting && get_turf(src) == get_turf(user)) // Make them rest
 				user.lay_down()
 		else
 			roll = FALSE
 			slot_flags = SLOT_BACK
-			w_class = 4.0
+			w_class = ITEMSIZE_LARGE
 			if(layer == initial(layer))
 				layer = ABOVE_MOB_LAYER
 			if(!user.resting && get_turf(src) == get_turf(user)) // Make them get up
@@ -178,7 +178,7 @@ LINEN BINS
 
 /obj/item/bedsheet/attackby(obj/item/I, mob/user)
 	if(I.isscrewdriver())
-		user.visible_message(SPAN_NOTICE("\The [user] begins poking eyeholes in \the [src] with \the [I]."), 
+		user.visible_message(SPAN_NOTICE("\The [user] begins poking eyeholes in \the [src] with \the [I]."),
 						SPAN_NOTICE("You begin poking eyeholes in \the [src] with \the [I]."))
 		if(do_after(user, 50/I.toolspeed))
 			to_chat(user, SPAN_NOTICE("You poke eyeholes in \the [src]!"))
@@ -186,7 +186,7 @@ LINEN BINS
 			qdel(src)
 		return
 	else if(is_sharp(I))
-		user.visible_message(SPAN_NOTICE("\The [user] begins cutting up [src] with [I]."), 
+		user.visible_message(SPAN_NOTICE("\The [user] begins cutting up [src] with [I]."),
 							SPAN_NOTICE("You begin cutting up [src] with [I]."))
 		if(do_after(user, 50/I.toolspeed))
 			to_chat(user, SPAN_NOTICE("You cut [src] into pieces!"))
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index c784ad92540..942e29988d1 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/closet.dmi'
 	icon_state = "closed"
 	density = 1
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	layer = OBJ_LAYER - 0.01
 	build_amt = 2
 	var/icon_closed = "closed"
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 08961448c98..4088dd3a8ec 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -4,7 +4,7 @@
 	icon_state = "door_as_0"
 	anchored = 0
 	density = 1
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	build_amt = 4
 	var/state = 0
 	var/base_icon_state = ""
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index e2c67ffc5d7..0977753126a 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -7,7 +7,7 @@
 	anchored = 1
 	density = 1
 	layer = ABOVE_CABLE_LAYER
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	var/state = 0
 	var/health = 200
 	var/cover = 50 //how much cover the girder provides against projectiles.
diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm
index 61fc7c2ff2f..a1466b7c458 100644
--- a/code/game/objects/structures/inflatable.dm
+++ b/code/game/objects/structures/inflatable.dm
@@ -262,7 +262,7 @@
 	desc = "Contains inflatable walls and doors."
 	icon_state = "inf_box"
 	item_state = "box"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	max_storage_space = 28
 	can_hold = list(/obj/item/inflatable)
 
diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm
index 3e83b25a75d..fce21914902 100644
--- a/code/game/objects/structures/mop_bucket.dm
+++ b/code/game/objects/structures/mop_bucket.dm
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "mopbucket"
 	density = 1
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	flags = OPENCONTAINER
 	var/amount_per_transfer_from_this = 5	//shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
 	var/bucketsize = 360 //about 3x the size relative to a regular bucket.
@@ -44,4 +44,4 @@
 		var/obj/structure/janitorialcart/cart = loc
 		cart.update_icon()
 	else
-		update_icon()
\ No newline at end of file
+		update_icon()
diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm
index 5a6da39e0f4..4c4eb46036d 100644
--- a/code/game/objects/structures/musician.dm
+++ b/code/game/objects/structures/musician.dm
@@ -11,7 +11,7 @@
 	icon_state = "minimoog"
 	anchored = 1
 	density = 1
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	var/datum/song/song
 	var/playing = 0
 	var/help = 0
diff --git a/code/game/objects/structures/sarcophagus.dm b/code/game/objects/structures/sarcophagus.dm
index 3f9d261d140..8e0ea3c3fc9 100644
--- a/code/game/objects/structures/sarcophagus.dm
+++ b/code/game/objects/structures/sarcophagus.dm
@@ -75,4 +75,4 @@
 	desc = "An archaic key, probably not used to open any airlock on station."
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "unknown1"
-	w_class = 2
\ No newline at end of file
+	w_class = ITEMSIZE_SMALL
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index cd93dce47bf..1f7c74538d3 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -4,7 +4,7 @@
 	opacity = 0
 	density = 0
 	layer = 3.5
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 /obj/structure/sign/ex_act(severity)
 	switch(severity)
@@ -40,7 +40,7 @@
 	name = "sign"
 	desc = ""
 	icon = 'icons/obj/decals.dmi'
-	w_class = 5		//big
+	w_class = ITEMSIZE_HUGE		//big
 	var/sign_state = ""
 
 /obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob)	//construction
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 997353e71b3..57d9b1e97c4 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -359,7 +359,7 @@
 	pickup_sound = 'sound/items/pickup/axe.ogg'
 	center_of_mass = list("x" = 17,"y" = 7)
 	var/bedpath = /obj/structure/bed/roller
-	w_class = 4.0 // Can't be put in backpacks. Oh well.
+	w_class = ITEMSIZE_LARGE // Can't be put in backpacks. Oh well.
 
 /obj/item/roller/hover
 	name = "medical hoverbed"
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 218d925805f..18372c7f59f 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
@@ -9,7 +9,7 @@
 	center_of_mass = null
 	force = 10
 	throwforce = 10
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	item_state_slots = list(
 		slot_l_hand_str = "stool",
 		slot_r_hand_str = "stool"
diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm
index 9e351b9f2d4..07d8f7fbab1 100644
--- a/code/game/objects/structures/tank_dispenser.dm
+++ b/code/game/objects/structures/tank_dispenser.dm
@@ -5,7 +5,7 @@
 	icon_state = "dispenser"
 	density = 1
 	anchored = 1.0
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	var/oxygentanks = 10
 	var/phorontanks = 10
 	var/list/oxytanks = list()	//sorry for the similar var names
diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm
index b022905d617..f9bcd547088 100644
--- a/code/game/objects/structures/target_stake.dm
+++ b/code/game/objects/structures/target_stake.dm
@@ -5,7 +5,7 @@
 	icon = 'icons/obj/target_stake.dmi'
 	icon_state = "target_stake"
 	density = 1
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	flags = CONDUCT
 	var/obj/item/target/pinned_target // the current pinned target
 
diff --git a/code/game/objects/structures/therapy.dm b/code/game/objects/structures/therapy.dm
index 341cc501c7c..0f13ee5bdf7 100644
--- a/code/game/objects/structures/therapy.dm
+++ b/code/game/objects/structures/therapy.dm
@@ -81,7 +81,7 @@
 	drop_sound = 'sound/items/drop/accessory.ogg'
 	pickup_sound = 'sound/items/pickup/accessory.ogg'
 	matter = list(MATERIAL_GLASS = 150, MATERIAL_GOLD = 50)
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	var/closed = FALSE
 
 /obj/item/pocketwatch/AltClick(mob/user)
@@ -128,7 +128,7 @@
 	drop_sound = 'sound/items/drop/accessory.ogg'
 	pickup_sound = 'sound/items/pickup/accessory.ogg'
 	matter = list(MATERIAL_GLASS = 150, MATERIAL_GOLD = 50)
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	var/datum/weakref/thrall = null
 	var/time_counter = 0
 	var/closed = FALSE
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index 4fdf6caf95b..7613382dfb3 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -17,7 +17,7 @@ obj/structure/windoor_assembly
 	anchored = 0
 	density = 0
 	dir = NORTH
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	flags = ON_BORDER
 
 	var/obj/item/airlock_electronics/electronics = null
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index fcc163333d5..5a5efa01697 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -3,7 +3,7 @@
 	desc = "A window."
 	icon = 'icons/obj/structures.dmi'
 	density = 1
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	layer = 3.2//Just above doors
 	anchored = 1.0
 	flags = ON_BORDER
diff --git a/code/modules/admin/verbs/bluespacetech.dm b/code/modules/admin/verbs/bluespacetech.dm
index 9012e394202..63ce3944a00 100644
--- a/code/modules/admin/verbs/bluespacetech.dm
+++ b/code/modules/admin/verbs/bluespacetech.dm
@@ -361,7 +361,7 @@
 /obj/item/storage/backpack/holding/bst
 	canremove = 0
 	storage_slots = 56
-	max_w_class = 400
+	max_w_class = ITEMSIZE_IMMENSE
 
 /obj/item/device/radio/headset/ert/bst/attack_hand()
 	if(!usr)
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index 7f0c12374ec..0bb42ead3fb 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/assemblies/new_assemblies.dmi'
 	icon_state = ""
 	flags = CONDUCT
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	matter = list(DEFAULT_WALL_MATERIAL = 100)
 	throwforce = 2
 	throw_speed = 3
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index 60909b95ea6..a04acd70ae4 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -3,7 +3,7 @@
 	icon = 'icons/obj/tank.dmi'
 	item_state = "assembly"
 	throwforce = 5
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	throw_speed = 2
 	throw_range = 4
 	flags = CONDUCT | PROXMOVE
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index db109302030..8e19f97e205 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -5,7 +5,7 @@
 	item_state = "assembly"
 	flags = CONDUCT | PROXMOVE
 	throwforce = 5
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 3
 	throw_range = 10
 
diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm
index 08f4f6fc2df..64a2ae1dc03 100644
--- a/code/modules/assembly/shock_kit.dm
+++ b/code/modules/assembly/shock_kit.dm
@@ -5,7 +5,7 @@
 	var/obj/item/clothing/head/helmet/part1 = null
 	var/obj/item/device/radio/electropack/part2 = null
 	var/status = 0
-	w_class = 5.0
+	w_class = ITEMSIZE_HUGE
 	flags = CONDUCT
 
 /obj/item/assembly/shock_kit/Destroy()
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index 55cecae3018..989ef46fdf5 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -454,7 +454,7 @@
 	Projecting these holograms over distance uses a little bit of charge."
 	icon = 'icons/obj/guns/deagle.dmi'
 	icon_state = "deagle"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
 	matter = list()
 
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 0198b89d3e4..522237be9ca 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -265,7 +265,7 @@
 // Ears: headsets, earmuffs and tiny objects
 /obj/item/clothing/ears
 	name = "ears"
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 	throwforce = 2
 	slot_flags = SLOT_EARS
 
@@ -310,7 +310,7 @@
 
 /obj/item/clothing/ears/offear
 	name = "Other ear"
-	w_class = 5.0
+	w_class = ITEMSIZE_HUGE
 	icon = 'icons/mob/screen/midnight.dmi'
 	icon_state = "blocked"
 	slot_flags = SLOT_EARS | SLOT_TWOEARS
@@ -327,7 +327,7 @@
 /obj/item/clothing/gloves
 	name = "gloves"
 	gender = PLURAL //Carn: for grammarically correct text-parsing
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	icon = 'icons/obj/clothing/gloves.dmi'
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/clothing/lefthand_gloves.dmi',
@@ -445,7 +445,7 @@
 		)
 	body_parts_covered = HEAD
 	slot_flags = SLOT_HEAD
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	uv_intensity = 50 //Light emitted by this object or creature has limited interaction with diona
 	species_restricted = list("exclude",BODYTYPE_VAURCA_BREEDER,BODYTYPE_VAURCA_WARFORM)
 
@@ -776,7 +776,7 @@
 	slot_flags = SLOT_OCLOTHING
 	var/blood_overlay_type = "suit"
 	siemens_coefficient = 0.9
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	species_restricted = list("exclude",BODYTYPE_VAURCA_BREEDER,BODYTYPE_VAURCA_WARFORM)
 
 	sprite_sheets = list(
@@ -818,7 +818,7 @@
 	permeability_coefficient = 0.90
 	slot_flags = SLOT_ICLOTHING
 	armor = null
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	equip_sound = 'sound/items/equip/jumpsuit.ogg'
 	var/has_sensor = 1 //For the crew computer 2 = unable to change mode
 	var/sensor_mode = 0
@@ -1064,7 +1064,7 @@
 
 /obj/item/clothing/ring
 	name = "ring"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	icon = 'icons/obj/clothing/rings.dmi'
 	slot_flags = SLOT_GLOVES
 	gender = NEUTER
diff --git a/code/modules/clothing/ears/bandanna.dm b/code/modules/clothing/ears/bandanna.dm
index dfa669e9ff0..c8b2025f163 100644
--- a/code/modules/clothing/ears/bandanna.dm
+++ b/code/modules/clothing/ears/bandanna.dm
@@ -8,7 +8,7 @@
 	icon = 'icons/obj/clothing/ears.dmi'
 	icon_state = "band_r"
 	item_state = "band_r"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
 
 /obj/item/clothing/ears/bandanna/blue
@@ -21,4 +21,4 @@
 	name = "black bandanna"
 	desc = "A plain black bandanna."
 	icon_state = "band_bk"
-	item_state = "band_bk"
\ No newline at end of file
+	item_state = "band_bk"
diff --git a/code/modules/clothing/ears/skrell.dm b/code/modules/clothing/ears/skrell.dm
index e9cb879a6ba..4e22a7b82c0 100644
--- a/code/modules/clothing/ears/skrell.dm
+++ b/code/modules/clothing/ears/skrell.dm
@@ -3,7 +3,7 @@
 	desc = "Some stuff worn by skrell to adorn their head tentacles."
 	icon = 'icons/obj/skrell_items.dmi'
 	contained_sprite = TRUE
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_HEAD | SLOT_EARS
 	species_restricted = list(SPECIES_SKRELL)
 
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index df520139fbf..21c3b6d7477 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -16,7 +16,7 @@ BLIND     // can't see anything
 		slot_l_hand_str = 'icons/mob/items/clothing/lefthand_glasses.dmi',
 		slot_r_hand_str = 'icons/mob/items/clothing/righthand_glasses.dmi'
 		)
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	slot_flags = SLOT_EYES
 	body_parts_covered = EYES
 	var/vision_flags = 0
@@ -440,7 +440,7 @@ BLIND     // can't see anything
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "tape_cross"
 	item_state = null
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/clothing/glasses/sunglasses/prescription
 	name = "prescription sunglasses"
diff --git a/code/modules/clothing/gloves/arm_guard.dm b/code/modules/clothing/gloves/arm_guard.dm
index 675f69e5711..aefc5442be8 100644
--- a/code/modules/clothing/gloves/arm_guard.dm
+++ b/code/modules/clothing/gloves/arm_guard.dm
@@ -5,7 +5,7 @@
 	body_parts_covered = HANDS|ARMS
 	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
 	punch_force = 3
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	siemens_coefficient = 0.35
 	drop_sound = 'sound/items/drop/axe.ogg'
 	pickup_sound = 'sound/items/pickup/axe.ogg'
@@ -44,4 +44,4 @@
 	icon_state = "armguards"
 	contained_sprite = TRUE
 	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)
-	species_restricted = null
\ No newline at end of file
+	species_restricted = null
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index 4bd27987d85..960542cccb6 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -125,7 +125,7 @@
 	desc_fluff = "For those who want too much time on their wrists instead."
 	icon_state = "watch"
 	item_state = "watch"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	wired = 1
 	species_restricted = null
 	gender = NEUTER
diff --git a/code/modules/clothing/gloves/stungloves.dm b/code/modules/clothing/gloves/stungloves.dm
index af06df380ac..489f6dbc3ef 100644
--- a/code/modules/clothing/gloves/stungloves.dm
+++ b/code/modules/clothing/gloves/stungloves.dm
@@ -37,7 +37,7 @@
 			return
 		user.drop_from_inventory(W,src)
 		cell = W
-		w_class = 3.0
+		w_class = ITEMSIZE_NORMAL
 		to_chat(user, "<span class='notice'>You attach the [cell] to the [src].</span>")
 		update_icon()
 		return
@@ -50,7 +50,7 @@
 			to_chat(user, "<span class='notice'>You cut the [cell] away from the [src].</span>")
 			cell.forceMove(get_turf(src.loc))
 			cell = null
-			w_class = 2.0
+			w_class = ITEMSIZE_SMALL
 			update_icon()
 			return
 		if(wired) //wires disappear into the void because fuck that shit
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 90c88bdccaa..de43f4c4029 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -14,7 +14,7 @@
 	heat_protection = HEAD
 	max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
 	siemens_coefficient = 0.5
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	var/allow_hair_covering = TRUE //in case if you want to allow someone to switch the BLOCKHEADHAIR var from the helmet or not
 	drop_sound = 'sound/items/drop/helm.ogg'
 	pickup_sound = 'sound/items/pickup/helm.ogg'
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 65ce9f1bf87..0767bd92d5c 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -27,7 +27,7 @@
 	body_parts_covered = HEAD|FACE|EYES
 	action_button_name = "Flip Welding Mask"
 	siemens_coefficient = 0.75 // what? it's steel.
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	var/base_state
 	flash_protection = FLASH_PROTECTION_MAJOR
 	tint = TINT_HEAVY
@@ -155,7 +155,7 @@
 	body_parts_covered = HEAD|FACE|EYES
 	drop_sound = 'sound/items/drop/herb.ogg'
 	pickup_sound = 'sound/items/pickup/herb.ogg'
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	throwforce = 1
 	throw_speed = 0.5
 
@@ -268,7 +268,7 @@
 	throwforce = 3
 	throw_speed = 2
 	throw_range = 5
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	body_parts_covered = HEAD
 	attack_verb = list("warned", "cautioned", "smashed")
 	armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index c2677b9612b..e82325aaef0 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -5,7 +5,7 @@
 	item_state = "balaclava_black"
 	flags_inv = HIDEFACE|BLOCKHAIR
 	body_parts_covered = FACE|HEAD
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	action_button_name = "Toggle Face Concealing"
 
 /obj/item/clothing/mask/balaclava/attack_self(mob/user as mob)
@@ -64,7 +64,7 @@
 	item_state = "luchag"
 	flags_inv = HIDEFACE|BLOCKHAIR
 	body_parts_covered = HEAD|FACE
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	siemens_coefficient = 0.9
 
 /obj/item/clothing/mask/luchador/tecnicos
@@ -77,4 +77,4 @@
 	name = "rudos mask"
 	desc = "Worn by robust fighters who are willing to do anything to win."
 	icon_state = "luchar"
-	item_state = "luchar"
\ No newline at end of file
+	item_state = "luchar"
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index f3c9efd294c..901181f19d5 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -5,7 +5,7 @@
 	item_state = "breath"
 	item_flags = AIRTIGHT|FLEXIBLEMATERIAL
 	body_parts_covered = FACE
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	gas_transfer_coefficient = 0.10
 	permeability_coefficient = 0.50
 	down_gas_transfer_coefficient = 1
@@ -40,4 +40,4 @@
 	item_state = "gillcover"
 	contained_sprite = TRUE
 	species_restricted = list(BODYTYPE_SKRELL)
-	adjustable = FALSE
\ No newline at end of file
+	adjustable = FALSE
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 21475af814e..7725e580f90 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -5,7 +5,7 @@
 	item_flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
 	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
 	body_parts_covered = FACE|EYES
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	item_state = "gas_alt"
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
@@ -117,5 +117,5 @@
 	desc = "A compact carbon-fiber respirator covering the mouth and nose to protect against the inhalation of smoke and other harmful gasses. "
 	icon_state = "fullgas"
 	item_state = "fullgas"
-	w_class = 2.0
-	armor = list(melee = 25, bullet = 10, laser = 25, energy = 25, bomb = 0, bio = 50, rad = 15)
\ No newline at end of file
+	w_class = ITEMSIZE_SMALL
+	armor = list(melee = 25, bullet = 10, laser = 25, energy = 25, bomb = 0, bio = 50, rad = 15)
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index ad7ea6dfb3c..62d38b6ca95 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -4,7 +4,7 @@
 	icon_state = "muzzle"
 	item_state = "muzzle"
 	body_parts_covered = FACE
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	gas_transfer_coefficient = 0.90
 	voicechange = 1
 
@@ -14,7 +14,7 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "tape_cross"
 	item_state = null
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/clothing/mask/muzzle/Initialize()
 	. = ..()
@@ -32,7 +32,7 @@
 	desc = "A surgical mask designed to help prevent the spread of diseases."
 	icon_state = "surgical"
 	item_state = "surgical"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	body_parts_covered = FACE
 	item_flags = FLEXIBLEMATERIAL
 	gas_transfer_coefficient = 0.90
@@ -52,7 +52,7 @@
 	desc = "A colorable cloth mask designed to protect the wearer against allergens, illnesses, and social interaction."
 	icon_state = "cloth"
 	item_state = "cloth"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	body_parts_covered = FACE
 	item_flags = FLEXIBLEMATERIAL
 	gas_transfer_coefficient = 0.90
@@ -67,7 +67,7 @@
 	desc = "A dust mask designed to protect the wearer against construction and/or custodial particulate."
 	icon_state = "dust"
 	item_state = "dust"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	body_parts_covered = FACE
 	item_flags = FLEXIBLEMATERIAL
 	gas_transfer_coefficient = 0.90
@@ -109,7 +109,7 @@
 	icon_state = "pig"
 	item_state = "pig"
 	flags_inv = HIDEFACE|BLOCKHAIR
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	siemens_coefficient = 0.9
 	body_parts_covered = HEAD|FACE|EYES
 
@@ -120,7 +120,7 @@
 	item_state = "horsehead"
 	flags_inv = HIDEFACE|BLOCKHAIR
 	body_parts_covered = HEAD|FACE|EYES
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	siemens_coefficient = 0.9
 
 /obj/item/clothing/mask/horsehead/Initialize()
@@ -195,7 +195,7 @@
 	icon_state = "pioneer_scarf"
 	item_flags = FLEXIBLEMATERIAL
 	item_state = "pioneer_scarf"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	body_parts_covered = FACE
 
 /obj/item/clothing/mask/offworlder/veil
diff --git a/code/modules/clothing/shoes/leg_guard.dm b/code/modules/clothing/shoes/leg_guard.dm
index 9a127f5772f..faf513b0efa 100644
--- a/code/modules/clothing/shoes/leg_guard.dm
+++ b/code/modules/clothing/shoes/leg_guard.dm
@@ -4,7 +4,7 @@
 	icon_state = "leg_guards_riot"
 	item_state = "jackboots"
 	body_parts_covered = LEGS|FEET
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
 	siemens_coefficient = 0.35
 	force = 3
@@ -45,4 +45,4 @@
 	icon_state = "legguards"
 	contained_sprite = TRUE
 	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)
-	species_restricted = null
\ No newline at end of file
+	species_restricted = null
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 958bb30c54d..b30135df142 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -105,7 +105,7 @@ obj/item/clothing/shoes/sandal/clogs
 	item_state = "slippers"
 	force = 0
 	species_restricted = null
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	silent = 1
 	drop_sound = 'sound/items/drop/cloth.ogg'
 	pickup_sound = 'sound/items/pickup/cloth.ogg'
@@ -116,7 +116,7 @@ obj/item/clothing/shoes/sandal/clogs
 	icon_state = "slippers_worn"
 	item_state = "slippers_worn"
 	force = 0
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	silent = 1
 
 /obj/item/clothing/shoes/laceup
@@ -154,7 +154,7 @@ obj/item/clothing/shoes/sandal/clogs
 	desc = "A roll of treated cloth used for wrapping clawed feet."
 	icon_state = "clothwrap"
 	item_state = "white"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	species_restricted = null
 	silent = 1
 	drop_sound = 'sound/items/drop/cloth.ogg'
diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm
index 73f707d2339..53e86465464 100644
--- a/code/modules/clothing/spacesuits/alien.dm
+++ b/code/modules/clothing/spacesuits/alien.dm
@@ -1,7 +1,7 @@
 // Vox space gear (vaccuum suit, low pressure armor)
 // Can't be equipped by any other species due to bone structure and vox cybernetics.
 /obj/item/clothing/suit/space/vox
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/tank)
 	slowdown = 2
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 11a4e9cf0f3..9b578a2854b 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -59,7 +59,7 @@
 	desc = "Yarr."
 	icon_state = "pirate"
 	item_state = "pirate"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank/emergency_oxygen)
 	slowdown = 0
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index b3a35e0dbcf..f3a03d8121b 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -14,7 +14,7 @@
 	slot_flags = SLOT_BACK
 	req_one_access = list()
 	req_access = list()
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 
 	// These values are passed on to all component pieces.
 	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20)
diff --git a/code/modules/clothing/spacesuits/rig/rig_construction.dm b/code/modules/clothing/spacesuits/rig/rig_construction.dm
index 222e622c9dc..c106daf2df2 100644
--- a/code/modules/clothing/spacesuits/rig/rig_construction.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_construction.dm
@@ -3,7 +3,7 @@
 	icon = 'icons/obj/rig_modules.dmi'
 	desc = "An assembly frame of back-mounted hardsuit deployment and control mechanism."
 	var/icon_base = null
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	var/obj/item/circuitboard/board_type = null
 	var/obj/item/circuitboard/target_board_type = null
 	var/obj/item/rig/rig_type = /obj/item/rig
diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm
index 083398727e1..5b873f00950 100644
--- a/code/modules/clothing/spacesuits/spacesuits.dm
+++ b/code/modules/clothing/spacesuits/spacesuits.dm
@@ -63,7 +63,7 @@
 	item_state = "s_suit"
 	randpixel = 0
 	center_of_mass = null
-	w_class = 4//bulky item
+	w_class = ITEMSIZE_LARGE//bulky item
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.02
 	item_flags = STOPPRESSUREDAMAGE | THICKMATERIAL
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index 8e42edd3da4..f5b4c15f7e0 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -13,7 +13,7 @@
 	icon_state = "syndicate"
 	item_state = "space_suit_syndicate"
 	desc = "A crimson spacesuit sporting clean lines and durable plating. Robust, reliable, and slightly suspicious."
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/tank/emergency_oxygen)
 	slowdown = 1
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
diff --git a/code/modules/clothing/spacesuits/void/captain.dm b/code/modules/clothing/spacesuits/void/captain.dm
index 34d120397b3..75663d952c0 100644
--- a/code/modules/clothing/spacesuits/void/captain.dm
+++ b/code/modules/clothing/spacesuits/void/captain.dm
@@ -16,7 +16,7 @@
 		slot_l_hand_str = "capspacesuit",
 		slot_r_hand_str = "capspacesuit"
 	)
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	allowed = list(/obj/item/tank, /obj/item/device/flashlight,/obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton,/obj/item/handcuffs)
 	slowdown = 1.5
 	armor = list(melee = 65, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
diff --git a/code/modules/clothing/spacesuits/void/merc.dm b/code/modules/clothing/spacesuits/void/merc.dm
index d288be3cdff..cfd66662ca5 100644
--- a/code/modules/clothing/spacesuits/void/merc.dm
+++ b/code/modules/clothing/spacesuits/void/merc.dm
@@ -26,8 +26,8 @@
 		slot_r_hand_str = "syndie_hardsuit"
 	)
 	slowdown = 1
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60)
 	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
 	siemens_coefficient = 0.35
-	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP)
\ No newline at end of file
+	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP)
diff --git a/code/modules/clothing/spacesuits/void/misc.dm b/code/modules/clothing/spacesuits/void/misc.dm
index c7819602aa1..2e0676a1a30 100644
--- a/code/modules/clothing/spacesuits/void/misc.dm
+++ b/code/modules/clothing/spacesuits/void/misc.dm
@@ -55,7 +55,7 @@
 	armor = list(melee = 50, bullet = 50, laser = 40, energy = 50, bomb = 50, bio = 100, rad = 30)
 	siemens_coefficient = 0.35
 	species_restricted = list(BODYTYPE_HUMAN)
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	brightness_on = 6
 	refittable = FALSE
 
@@ -110,7 +110,7 @@
 	icon_state = "lancer_suit"
 	item_state = "lancer_suit"
 	slowdown = 1
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60)
 	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
 	siemens_coefficient = 0.35
@@ -244,7 +244,7 @@
 	item_state = "revenant"
 	contained_sprite = 1
 
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	armor = list(melee = 25, bullet = 65, laser = 35,energy = 25, bomb = 15, bio = 100, rad = 15)
 	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
 	siemens_coefficient = 0.35
@@ -271,7 +271,7 @@
 	item_state = "freelancer"
 
 	slowdown = 1
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	armor = list(melee = 65, bullet = 55, laser = 20, energy = 15, bomb = 35, bio = 100, rad = 60)
 	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
 	siemens_coefficient = 0.35
@@ -297,7 +297,7 @@
 	icon_state = "rig-kataphract"
 	item_state = "rig-kataphract"
 	slowdown = 1
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	armor = list(melee = 75, bullet = 45, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 80)
 	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
 	siemens_coefficient = 0.35
@@ -349,7 +349,7 @@
 	item_state = "prejoroub"
 	contained_sprite = 1
 
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	armor = list(melee = 65, bullet = 55, laser = 25,energy = 25, bomb = 15, bio = 100, rad = 15)
 	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
 	siemens_coefficient = 0.35
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 2d60b079911..84efb6c0987 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -578,7 +578,7 @@
 	. = ..()
 	pockets = new/obj/item/storage/internal(src)
 	pockets.storage_slots = 4
-	pockets.max_w_class = 2
+	pockets.max_w_class = ITEMSIZE_SMALL
 	pockets.max_storage_space = 8
 
 /obj/item/clothing/suit/armor/vest/idris
@@ -637,7 +637,7 @@
 	desc = "A suit that protects against some damage."
 	icon_state = "centcom"
 	item_state = "centcom"
-	w_class = 4//bulky item
+	w_class = ITEMSIZE_LARGE//bulky item
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	allowed = list(/obj/item/gun/energy,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank/emergency_oxygen)
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
@@ -650,7 +650,7 @@
 	desc = "A heavily armored suit that protects against moderate damage."
 	icon_state = "heavy"
 	item_state = "swat_suit"
-	w_class = 4//bulky item
+	w_class = ITEMSIZE_LARGE//bulky item
 	gas_transfer_coefficient = 0.90
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	slowdown = 3
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index f47718dd9ae..ad4dbee72d1 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -20,7 +20,7 @@
 	item_state = "bio_suit"
 	randpixel = 0
 	center_of_mass = null
-	w_class = 4//bulky item
+	w_class = ITEMSIZE_LARGE//bulky item
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 5fce01f3963..3b535b72178 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -94,7 +94,7 @@
 	icon_state = "syndicate"
 	item_state = "space_suit_syndicate"
 	desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	allowed = list(/obj/item/device/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/toy)
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
@@ -676,7 +676,7 @@
 	throwforce = 3
 	throw_speed = 2
 	throw_range = 5
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 	attack_verb = list("warned", "cautioned", "smashed")
 	armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm
index cf230353339..81f4b82067e 100644
--- a/code/modules/clothing/suits/storage.dm
+++ b/code/modules/clothing/suits/storage.dm
@@ -5,7 +5,7 @@
 	. = ..()
 	pockets = new/obj/item/storage/internal(src)
 	pockets.storage_slots = 2	//two slots
-	pockets.max_w_class = 2		//fit only pocket sized items
+	pockets.max_w_class = ITEMSIZE_SMALL		//fit only pocket sized items
 	pockets.max_storage_space = 4
 
 /obj/item/clothing/suit/storage/Destroy()
@@ -65,14 +65,14 @@
 	. = ..()
 	pockets = new/obj/item/storage/internal(src)
 	pockets.storage_slots = 4
-	pockets.max_w_class = 2
+	pockets.max_w_class = ITEMSIZE_SMALL
 	pockets.max_storage_space = 8
 
 /obj/item/clothing/suit/storage/vest/hos/Initialize()
 	. = ..()
 	pockets = new/obj/item/storage/internal(src)
 	pockets.storage_slots = 4
-	pockets.max_w_class = 2
+	pockets.max_w_class = ITEMSIZE_SMALL
 	pockets.max_storage_space = 8
 
 /obj/item/clothing/suit/storage/vest
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 41588961aba..82e51fb4b50 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -14,7 +14,7 @@
 	desc = "A suit that protects against fire and heat."
 	icon_state = "firesuit"
 	item_state = "firesuit"
-	w_class = 4//bulky item
+	w_class = ITEMSIZE_LARGE//bulky item
 	gas_transfer_coefficient = 0.90
 	permeability_coefficient = 0.50
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
@@ -38,7 +38,7 @@
 	//icon_state = "thermal"
 	siemens_coefficient = 0.35
 	item_state = "ro_suit"
-	w_class = 4//bulky item
+	w_class = ITEMSIZE_LARGE//bulky item
 	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE + 25000
 	slowdown = 1.5
 
@@ -57,7 +57,7 @@
 	name = "bomb hood"
 	desc = "Use in case of bomb."
 	icon_state = "bombsuit"
-	w_class = 5//Too large to fit in a backpack
+	w_class = ITEMSIZE_HUGE//Too large to fit in a backpack
 	item_flags = STOPPRESSUREDAMAGE|THICKMATERIAL|BLOCK_GAS_SMOKE_EFFECT
 	armor = list(melee = 30, bullet = 20, laser = 25,energy = 30, bomb = 100, bio = 60, rad = 60)
 	siemens_coefficient = 0.1
@@ -77,7 +77,7 @@
 	desc = "A suit designed for safety when handling explosives. It looks heavy and uncomfortable to wear for even a short time."
 	icon_state = "bombsuit"
 	item_state = "bombsuit"
-	w_class = 7//bulky item
+	w_class = ITEMSIZE_HUGE //bulky item
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
 	slowdown = 8
@@ -186,7 +186,7 @@
 	desc = "A suit that protects against radiation. Label: Made with lead, do not eat insulation."
 	icon_state = "rad"
 	item_state = "rad_suit"
-	w_class = 4//bulky item
+	w_class = ITEMSIZE_LARGE//bulky item
 	gas_transfer_coefficient = 0.90
 	permeability_coefficient = 0.50
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 4d318dac9f0..8d8dcc72439 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -6,7 +6,7 @@
 	item_state = ""	//no inhands
 	overlay_state = null
 	slot_flags = SLOT_TIE
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	var/slot = "decor"
 	var/obj/item/clothing/has_suit = null		//the suit the tie may be attached to
 	var/image/inv_overlay = null	//overlay used when attached to clothing.
@@ -404,7 +404,7 @@
 	slot_flags = SLOT_OCLOTHING | SLOT_TIE
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
 	siemens_coefficient = 0.9
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	slot = "over"
 	var/allow_tail_hiding = TRUE //in case if you want to allow someone to switch the HIDETAIL var or not
 
@@ -468,7 +468,7 @@
 	name = "IAC poncho"
 	desc = "A simple, comfortable cloak without sleeves. This one is white with a blue tint, standard IAC colors."
 	icon_state = "IACponcho"
-	item_state = "IACponcho"	
+	item_state = "IACponcho"
 
 /obj/item/clothing/accessory/poncho/roles/engineering
 	name = "engineering poncho"
@@ -704,17 +704,17 @@
 	overlay_state = null
 	badge_string = null
 	slot_flags = SLOT_TIE
-	w_class = 1
-	
+	w_class = ITEMSIZE_TINY
+
 /obj/item/clothing/accessory/bracelet
 	name = "bracelet"
 	desc = "A simple bracelet with a clasp."
 	icon_state = "bracelet"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	drop_sound = 'sound/items/drop/ring.ogg'
 	pickup_sound = 'sound/items/pickup/ring.ogg'
 	flippable = 1
-	
+
 /obj/item/clothing/accessory/sleevepatch
 	name = "sleeve patch"
 	desc = "An embroidered patch which can be attached to the shoulder sleeve of clothing."
diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm
index 3b7e79cc07f..630fb875673 100644
--- a/code/modules/clothing/under/accessories/badges.dm
+++ b/code/modules/clothing/under/accessories/badges.dm
@@ -26,7 +26,7 @@
 	item_state = "pbadge"
 	overlay_state = "pbadge"
 	badge_string = "Corporate Reporter"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 	drop_sound = 'sound/items/drop/rubber.ogg'
 	pickup_sound = 'sound/items/pickup/rubber.ogg'
@@ -42,7 +42,7 @@
 	desc = "A journalist's 'pass' shaped, for whatever reason, like a security badge. It is made of plastic."
 	icon_state = "pbadge"
 	badge_string = "Sicurity Journelist"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 /obj/item/clothing/accessory/badge/old
 	name = "faded badge"
@@ -218,7 +218,7 @@
 	icon_state = "solbadge"
 	overlay_state = "solbadge"
 	badge_string = null
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/clothing/accessory/badge/idbadge/nt
 	name = "\improper NT ID badge"
diff --git a/code/modules/clothing/under/accessories/lockets.dm b/code/modules/clothing/under/accessories/lockets.dm
index 44f133c12d9..8a8ac8b8dec 100644
--- a/code/modules/clothing/under/accessories/lockets.dm
+++ b/code/modules/clothing/under/accessories/lockets.dm
@@ -4,7 +4,7 @@
 	icon_state = "locket"
 	item_state = "locket"
 	slot_flags = 0
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	slot_flags = SLOT_MASK | SLOT_TIE
 	var/base_icon
 	var/open
diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm
index c4be383e33c..baaa2033ef8 100644
--- a/code/modules/clothing/under/accessories/storage.dm
+++ b/code/modules/clothing/under/accessories/storage.dm
@@ -5,14 +5,14 @@
 	slot = "utility"
 	var/slots = 3
 	var/obj/item/storage/internal/hold
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/clothing/accessory/storage/Initialize()
 	. = ..()
 	hold = new/obj/item/storage/internal(src)
 	hold.storage_slots = slots
 	hold.max_storage_space = 12
-	hold.max_w_class = 2
+	hold.max_w_class = ITEMSIZE_SMALL
 
 /obj/item/clothing/accessory/storage/attack_hand(mob/user as mob)
 	if (has_suit)	//if we are part of a suit
@@ -179,7 +179,7 @@
 /obj/item/clothing/accessory/storage/bayonet/Initialize()
 	. = ..()
 	hold.max_storage_space = 4
-	hold.max_w_class = 3
+	hold.max_w_class = ITEMSIZE_NORMAL
 	hold.can_hold = list(
 		/obj/item/material/knife/bayonet
 	)
@@ -198,4 +198,4 @@
 	hold.max_storage_space = 16
 	hold.can_hold = list(
 		/obj/item/ammo_casing/shotgun
-	)
\ No newline at end of file
+	)
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index d88709ed3f2..34717f8b76a 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -111,7 +111,7 @@
 	icon_state = "black"
 	item_state = "bl_suit"
 	worn_state = "black"
-	w_class = 4//bulky item
+	w_class = ITEMSIZE_LARGE//bulky item
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.02
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
diff --git a/code/modules/cooking/machinery/cooking_machines/_cooker_output.dm b/code/modules/cooking/machinery/cooking_machines/_cooker_output.dm
index 00e322bf751..5618fb266f0 100644
--- a/code/modules/cooking/machinery/cooking_machines/_cooker_output.dm
+++ b/code/modules/cooking/machinery/cooking_machines/_cooker_output.dm
@@ -11,7 +11,7 @@
 	var/max_scale = 2
 	var/scale = 1
 
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	var/prefix
 
 /obj/item/reagent_containers/food/snacks/variable/Initialize()
@@ -59,14 +59,14 @@
 	desc = "A personalized pan pizza meant for only one person."
 	icon_state = "personal_pizza"
 	size = 20
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/reagent_containers/food/snacks/variable/bread
 	name = "bread"
 	desc = "Tasty bread."
 	icon_state = "breadcustom"
 	size = 40
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/reagent_containers/food/snacks/variable/pie
 	name = "pie"
@@ -79,14 +79,14 @@
 	desc = "A popular band."
 	icon_state = "cakecustom"
 	size = 40
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/reagent_containers/food/snacks/variable/pocket
 	name = "hot pocket"
 	desc = "You wanna put a bangin- oh, nevermind."
 	icon_state = "donk"
 	size = 8
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/reagent_containers/food/snacks/variable/kebab
 	name = "kebab"
@@ -105,35 +105,35 @@
 	desc = "Sugar snap!"
 	icon_state = "cookie"
 	size = 6
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/reagent_containers/food/snacks/variable/donut
 	name = "filled donut"
 	desc = "Donut eat this!" // kill me
 	icon_state = "donut"
 	size = 8
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/reagent_containers/food/snacks/variable/jawbreaker
 	name = "flavored jawbreaker"
 	desc = "It's like cracking a molar on a rainbow."
 	icon_state = "jawbreaker"
 	size = 4
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/reagent_containers/food/snacks/variable/candybar
 	name = "flavored chocolate bar"
 	desc = "Made in a factory downtown."
 	icon_state = "bar"
 	size = 6
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/reagent_containers/food/snacks/variable/sucker
 	name = "flavored sucker"
 	desc = "Suck, suck, suck."
 	icon_state = "sucker"
 	size = 4
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/reagent_containers/food/snacks/variable/jelly
 	name = "jelly"
@@ -146,7 +146,7 @@
 	desc = "Crispy and flaky"
 	icon_state = "cereal_box"
 	size = 30
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/reagent_containers/food/snacks/variable/cereal/Initialize()
 	. =..()
@@ -155,6 +155,6 @@
 /obj/item/reagent_containers/food/snacks/variable/mob
 	desc = "Poor little thing."
 	size = 5
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	var/kitchen_tag = "animal"
 
diff --git a/code/modules/custom_ka/core.dm b/code/modules/custom_ka/core.dm
index c43942f479b..44981d890d7 100644
--- a/code/modules/custom_ka/core.dm
+++ b/code/modules/custom_ka/core.dm
@@ -10,7 +10,7 @@
 	flags =  CONDUCT
 	slot_flags = SLOT_BELT
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_MATERIAL = 2,TECH_ENGINEERING = 2)
 
 	burst = 1
diff --git a/code/modules/custom_ka/frames.dm b/code/modules/custom_ka/frames.dm
index 8f53d1397a1..f19d7ba4bff 100644
--- a/code/modules/custom_ka/frames.dm
+++ b/code/modules/custom_ka/frames.dm
@@ -5,7 +5,7 @@
 	icon_state = "frame01"
 	item_state = "compact"
 	desc = "A very minimal kinetic accelerator frame that holds cheap and inexpensive parts."
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	capacity_increase = 3
 	mod_limit_increase = 2
 	origin_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1)
@@ -16,7 +16,7 @@
 	icon_state = "frame02"
 	item_state = "light"
 	desc = "A lightweight kinetic accelerator frame that holds standard issue parts."
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	recoil_increase = -1
 	capacity_increase = 5
 	mod_limit_increase = 3
@@ -28,7 +28,7 @@
 	icon_state = "frame03"
 	item_state = "medium"
 	desc = "A more durable and robust kinetic accelerator frame that allows the installation of advanced parts."
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	recoil_increase = -2
 	capacity_increase = 7
 	mod_limit_increase = 4
@@ -40,7 +40,7 @@
 	icon_state = "frame04"
 	item_state = "heavy"
 	desc = "A very high-tech kinetic accelerator frame that is compatable with the more experimental kinetic accelerator parts. Requires two hands to fire."
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	recoil_increase = -5
 	capacity_increase = 9
 	mod_limit_increase = 5
@@ -53,7 +53,7 @@
 	icon_state = "frame05"
 	item_state = "tactical"
 	desc = "An incredibly robust and experimental kinetic accelerator frame that has has the ability to hold top of the line kinetic accelerator parts and chips. Requires two hands to fire."
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	recoil_increase = -6
 	capacity_increase = 10
 	mod_limit_increase = 5
@@ -65,7 +65,7 @@
 	build_name = "cyborg compatible"
 	icon_state = "frame_cyborg"
 	desc = "A kinetic accelerator frame meant for cyborgs. Uses a cyborg's internal charge as power."
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	recoil_increase = -10 //Cyborgs are STRONG
 	capacity_increase = 100
 	mod_limit_increase = 100
@@ -82,7 +82,7 @@
 	build_name = "vented"
 	icon_state = "frameA"
 	item_state = "compact"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	desc = "A very specialized kinetic accelerator frame that can hold moderately powerful parts, however it contains special heat sink technology that allows the weapon to fire faster."
 	origin_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3)
 	damage_increase = 0
@@ -100,7 +100,7 @@
 	icon_state = "frameB"
 	item_state = "ultra"
 	desc = "A massive kinetic accelerator frame intended for unathi miners who don't mind carrying the extra weight. It's size and built in power core allows for a significant power and range increase. Requires two hands to fire."
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	damage_increase = 10
 	range_increase = 3
 	recoil_increase = -5
@@ -116,7 +116,7 @@
 	icon_state = "frameC"
 	item_state = "heavy"
 	desc = "An advanced kinetic accelerator frame designed for vaurca graspers. Boasts increased recoil reduction and a lightweight alloy."
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	recoil_increase = -10
 	capacity_increase = 9
 	mod_limit_increase = 5
@@ -129,7 +129,7 @@
 	item_state = "heavy"
 	desc = "A disgustingly bulky kinetic accelerator frame that supports a 3 round burstfire. You just can't seem to hold it right. Requires two hands to fire and pump."
 	firedelay_increase = (2*3)
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	recoil_increase = -3
 	capacity_increase = 10
 	mod_limit_increase = 5
@@ -143,7 +143,7 @@
 	icon_state = "frameE"
 	item_state = "tactical"
 	desc = "An incredibly large kinetic accelerator frame that's meant to absorb a ton of recoil per shot while carrying large additions. Requires two hands to fire."
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	recoil_increase = -20
 	capacity_increase = 100 //Fit anything
 	mod_limit_increase = 100 //Fit anything
@@ -156,7 +156,7 @@
 	icon_state = "frameF"
 	item_state = "tactical"
 	desc = "A lightweight long kinetic accelerator frame with increase stability and range support, at the cost of reduced firerate. Requires two hands to fire."
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	recoil_increase = -8
 	range_increase = 5
 	capacity_increase = 7
@@ -239,4 +239,4 @@
 /obj/item/gun/custom_ka/frameF/prebuilt02
 	installed_cell = /obj/item/custom_ka_upgrade/cells/loader/hydrogen
 	installed_barrel = /obj/item/custom_ka_upgrade/barrels/barrel04
-	installed_upgrade_chip = /obj/item/custom_ka_upgrade/upgrade_chips/capacity
\ No newline at end of file
+	installed_upgrade_chip = /obj/item/custom_ka_upgrade/upgrade_chips/capacity
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index b08c4b2fede..cb8d4355503 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -11,7 +11,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	icon_state = "pocket_watch_close"
 	item_state = "gold"
 	desc = "The design of this pocket watch signals its age, however it seems to retain its pristine quality. The cover is gold, and there appears to be an elegant crest on the outside of the lid."
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 /obj/item/clothing/accessory/fluff/antique_pocket_watch/attack_self(mob/user as mob)
 	switch(icon_state)
@@ -48,7 +48,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	desc = "A black tin box with a symbol painted over it. It shimmers in the light."
 	icon = 'icons/obj/custom_items/kiara_altar.dmi'
 	icon_state = "kiara_altar1"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 /obj/item/fluff/kiara_altar/attack_self(mob/user as mob)
 	if(src.icon_state == "kiara_altar1")
@@ -139,7 +139,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	desc = "You see on the photo a tajaran couple holding a small kit in their arms, while looking very happy. On the back it is written; \"Nasir, Akela and Ishka\", with a little gold mark that reads: \"Two months\"."
 	icon = 'icons/obj/custom_items/akela_photo.dmi'
 	icon_state = "akela_photo"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 
 /obj/item/implant/fluff/ziva_implant //Heart Condition - Ziva Ta'Kim - sierrakomodo
@@ -189,7 +189,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	desc = "It is a photo of a cyan IPC holding a thick fuzzy spider of the size of a football."
 	icon = 'icons/obj/custom_items/cac_picture.dmi'
 	icon_state = "cac_picture"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	slot_flags = SLOT_EARS
 
 
@@ -206,7 +206,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	desc = "A framed Zatimono, a Unathi standard worn into battle similar to an old-Earth Sashimono. This one seems well maintained and carries Sk'akh Warrior Priest markings and litanies."
 	icon_state = "iskanz_atimono"
 	sign_state = "iskanz_atimono"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 
 /obj/item/clothing/accessory/fluff/zahra_pin //Indigo Remembrance Pin -  Zahra Karimi - synnono
@@ -304,7 +304,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	an untidy scrawl. The letter is torn in some places and the is writing faded."
 	icon = 'icons/obj/custom_items/ikrad_beret.dmi'
 	icon_state = "ikrad_letter"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 /obj/item/clothing/suit/storage/toggle/fluff/ryan_jacket //Mars' Militia Leather Jacket - Ryan McLean - seniorscore
 	name = "mars militia leather jacket"
@@ -343,7 +343,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	desc = "A hefty dictionary with a simple design on the cover, it seems to be for translations. There's a label on the back denoting that it belongs to a \"Zhilin Vadim\"."
 	icon = 'icons/obj/custom_items/zhilin_book.dmi'
 	icon_state = "zhilin_book"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/fluff/zhilin_book/attack_self(mob/user as mob)
 	user.visible_message("<span class='notice'>[user] starts flipping through \the [src].</span>",
@@ -399,7 +399,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	item_state = "azaroz_staff"
 	contained_sprite = TRUE
 	slot_flags = SLOT_BACK
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 
 /obj/item/clothing/accessory/poncho/fluff/flaming_poncho //Stitched Heart White Poncho - Flaming Hearts Love Stars - sleepywolf
@@ -454,7 +454,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	icon_state = "corvo_cigarette"
 	item_state = "corvo_cigarette"
 	body_parts_covered = 0
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	slot_flags = SLOT_EARS | SLOT_MASK
 	contained_sprite = TRUE
 	var/active = FALSE
@@ -508,7 +508,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	contained_sprite = TRUE
 	flags_inv = HIDEEARS|HIDEFACE
 	body_parts_covered = FACE
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 
 
 /obj/item/clothing/under/fluff/ellie_uniform //Cheery Blazer - Ellie Shoshanna - resilynn
@@ -828,7 +828,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	desc = "A thin electronic device that projects holographic images stored on it."
 	icon = 'icons/obj/custom_items/raymond_items.dmi'
 	icon_state = "raymond_tablet"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	var/picture = null
 
 /obj/item/fluff/raymond_tablet/attack_self(mob/user as mob)
@@ -964,7 +964,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	desc = "A work visa authorizing the holder, Daliyah Veridan, to work within the Republic of Biesel. An Eridani and NanoTrasen logo are embossed on the back."
 	icon = 'icons/obj/custom_items/daliyah_visa.dmi'
 	icon_state = "daliyah_visa"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 
 /obj/item/clothing/mask/fluff/ird_mask //Titanium Faceplate - IRD - kyres1
@@ -977,7 +977,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	contained_sprite = TRUE
 	flags_inv = HIDEEARS|HIDEFACE
 	body_parts_covered = FACE
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 
 
 /obj/item/dice/fluff/baron_dice //BARON's Dice - BARON - iamcrystalclear
@@ -1075,7 +1075,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	icon = 'icons/obj/custom_items/fernando_knitting.dmi'
 	icon_state = "knittingneedles"
 	item_state = "knittingneedles"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	contained_sprite = TRUE
 	var/working = FALSE
 	var/obj/item/fluff/yarn/ball
@@ -1144,7 +1144,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	desc = "A ball of yarn, this one is white."
 	icon = 'icons/obj/custom_items/fernando_knitting.dmi'
 	icon_state = "white_ball"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/fluff/yarn/red
 	desc = "A ball of yarn, this one is red."
@@ -1196,7 +1196,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	icon_state = "sovno_carrier"
 	item_state = "sovno_carrier"
 	contained_sprite = TRUE
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	can_hold = list(/obj/item/holder/cat)
 	storage_slots = 4
 	max_storage_space = 16
@@ -1307,7 +1307,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	desc = "A pair of jaws from what must have been a large and impressive shark."
 	icon_state = "tokash_sign"
 	sign_state = "tokash_sign"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 
 /obj/item/spirit_board/fluff/klavdiya_board //Ghostly Board - Klavdiya Tikhomirov - alberyk
@@ -1478,7 +1478,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	icon_state = "qrqil_cane"
 	item_state = "qrqil_cane"
 	contained_sprite = TRUE
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	var/active = FALSE
 
 /obj/item/cane/fluff/qrqil_cane/attack_self(mob/user)
@@ -1487,7 +1487,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 		playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
 		to_chat(user, "<span class='notice'>\The [src] is now energised.</span>")
 		item_state = icon_state
-		w_class = 4
+		w_class = ITEMSIZE_LARGE
 	else
 		playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
 		to_chat(user, "<span class='notice'>\The [src] is now de-energised..</span>")
@@ -1599,7 +1599,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	desc = "A small plasteel display stand which uses magnetic fields to levitate an object."
 	icon = 'icons/obj/custom_items/tokash_spear.dmi'
 	icon_state = "stand-spear"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	var/has_spear = TRUE
 
 /obj/item/fluff/tokash_spear/examine(mob/user)
@@ -1635,7 +1635,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	desc = "An aged and worn spearhead. It seems to be made of bronze or composite metal."
 	icon = 'icons/obj/custom_items/tokash_spear.dmi'
 	icon_state = "spearhead"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 
 /obj/item/clothing/suit/storage/dominia/fluff/naxxir_cape //Caladius Cape - Nazret Naxxir - conspiir
@@ -1691,7 +1691,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	icon = 'icons/obj/custom_items/akinyi_symphette.dmi'
 	icon_state = "akinyi_symphette"
 	item_state = "akinyi_symphette"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	slot_flags = SLOT_BACK
 	contained_sprite = TRUE
 	var/deployed = FALSE
@@ -1744,7 +1744,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	desc = "An old, worn out journal made out of leather. It has a lot of lose pages stuck in it, it surely has seen better days. The front just says \"Fraseq\"."
 	icon = 'icons/obj/custom_items/fraseq_journal.dmi'
 	icon_state = "fraseq_journal"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 
 /obj/item/clothing/accessory/poncho/fluff/ioraks_cape //Iorakian Cape - Kuhserze Ioraks - geeves
@@ -1843,7 +1843,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	desc = "A portable bedroll, made of cloth and padding."
 	icon = 'icons/obj/custom_items/muhawir_items.dmi'
 	icon_state = "bedroll-rolled"
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	attack_verb = list("battered","whacked")
 	var/deployed = FALSE
 
@@ -1872,7 +1872,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	desc = "A roll of poles and ropes. Anybody knowledgeable would know they are designed for erecting a tent."
 	icon = 'icons/obj/custom_items/muhawir_items.dmi'
 	icon_state = "tent-tools"
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	attack_verb = list("battered","whacked")
 
 /obj/item/fluff/muhawir_tent //Tentroll - Muhawir Nawfal - menown
@@ -1880,7 +1880,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	desc = "A portable tent. All wrapped up with straps and buckles."
 	icon = 'icons/obj/custom_items/muhawir_items.dmi'
 	icon_state = "tent-rolled"
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	attack_verb = list("battered","whacked")
 
 /obj/item/fluff/muhawir_tent/attackby(var/obj/item/W, mob/user as mob)
@@ -2103,7 +2103,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	contained_sprite = TRUE
 	flags_inv = HIDEEARS|HIDEFACE
 	body_parts_covered = FACE
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 
 
 /obj/item/cane/fluff/suul_staff //Akhanzi Staff - Suul Akhandi - herpetophilia
@@ -2114,7 +2114,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	item_state = "suul_staff"
 	slot_flags = SLOT_BACK
 	contained_sprite = TRUE
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 
 /obj/item/cane/fluff/suul_staff/afterattack(atom/A, mob/user as mob, proximity)
 	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
@@ -2140,7 +2140,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	left and a cut on the bottom right. The lyrics inside have two copies each: one in Sol Common and one in Tau Ceti Basic. It generally looks to be hard rock."
 	icon = 'icons/obj/custom_items/cress_items.dmi'
 	icon_state = "cress_book"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	var/list/lyrics = list("Falling Down: A song about holding on to the last glimmer of hope. It's generally pretty motivational. The most recent song of the three.",
 							"Say Something New: A morose song about companionship, and being unable to continue without an undescribed dear friend. Morose, but overall motivational.",
 							"One By One: A song telling an undescribed person to 'give it another try'. It seems to mostly about reconciliation and accepting failure. More somber than the others, and the most dated.")
@@ -2356,7 +2356,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	w_class = ITEMSIZE_LARGE
 	contained_sprite = TRUE
 	storage_slots = 3
-	max_w_class = 3
+	max_w_class = ITEMSIZE_NORMAL
 	can_hold = list(
 		/obj/item/device/megaphone/fluff/akinyi_mic,
 		/obj/item/fluff/akinyi_stand,
diff --git a/code/modules/detectivework/forensics.dm b/code/modules/detectivework/forensics.dm
index 27a3b86d236..22a44f8e94c 100644
--- a/code/modules/detectivework/forensics.dm
+++ b/code/modules/detectivework/forensics.dm
@@ -1,6 +1,6 @@
 /obj/item/forensics
 	icon = 'icons/obj/forensics.dmi'
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 //This is the output of the stringpercent(print) proc, and means about 80% of
 //the print must be there for it to be complete.  (Prints are 32 digits)
@@ -38,4 +38,4 @@ atom/proc/add_fibers(mob/living/carbon/human/M)
 	if(M.gloves && (M.gloves.body_parts_covered & ~suit_coverage))
 		fibertext = "Material from a pair of [M.gloves.name]."
 		if(prob(20*item_multiplier) && !(fibertext in suit_fibers))
-			suit_fibers += "Material from a pair of [M.gloves.name]."
\ No newline at end of file
+			suit_fibers += "Material from a pair of [M.gloves.name]."
diff --git a/code/modules/detectivework/tools/evidencebag.dm b/code/modules/detectivework/tools/evidencebag.dm
index 56264cae53d..d6cd2daaab4 100644
--- a/code/modules/detectivework/tools/evidencebag.dm
+++ b/code/modules/detectivework/tools/evidencebag.dm
@@ -6,7 +6,7 @@
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "evidenceobj"
 	item_state = ""
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	var/obj/item/stored_item = null
 
 /obj/item/evidencebag/MouseDrop(var/obj/item/I as obj)
diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm
index 0c0626b7f4f..8ebdeafb99e 100644
--- a/code/modules/detectivework/tools/rag.dm
+++ b/code/modules/detectivework/tools/rag.dm
@@ -16,7 +16,7 @@
 /obj/item/reagent_containers/glass/rag
 	name = "rag"
 	desc = "For cleaning up messes, you suppose."
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "rag"
 	amount_per_transfer_from_this = 5
@@ -275,7 +275,7 @@
 /obj/item/reagent_containers/glass/rag/advanced
 	name = "microfiber cloth"
 	desc = "A synthetic fiber cloth; the split fibers and the size of the individual filaments make it more effective for cleaning purposes."
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "advrag"
 	amount_per_transfer_from_this = 10
diff --git a/code/modules/detectivework/tools/sample_kits.dm b/code/modules/detectivework/tools/sample_kits.dm
index 5f6e9aa910e..b842cc377f9 100644
--- a/code/modules/detectivework/tools/sample_kits.dm
+++ b/code/modules/detectivework/tools/sample_kits.dm
@@ -1,7 +1,7 @@
 /obj/item/sample
 	name = "forensic sample"
 	icon = 'icons/obj/forensics.dmi'
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	var/list/evidence = list()
 
 /obj/item/sample/New(var/newloc, var/atom/supplied)
@@ -125,7 +125,7 @@
 	name = "fiber collection kit"
 	desc = "A magnifying glass and tweezers. Used to lift suit fibers."
 	icon_state = "m_glass"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	var/evidence_type = "fiber"
 	var/evidence_path = /obj/item/sample/fibers
 
diff --git a/code/modules/detectivework/tools/scene_cards.dm b/code/modules/detectivework/tools/scene_cards.dm
index 1dc347d2f2e..c82a4657644 100644
--- a/code/modules/detectivework/tools/scene_cards.dm
+++ b/code/modules/detectivework/tools/scene_cards.dm
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/forensics.dmi'
 	icon_state = "markerbox"
 	icon_type = "marker"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	storage_slots = 7
 	can_hold = list(/obj/item/csi_marker)
 	starts_with = list(
@@ -24,7 +24,7 @@
 	icon_state = "card1"
 	drop_sound = 'sound/items/drop/card.ogg'
 	pickup_sound = 'sound/items/pickup/card.ogg'
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	randpixel = 1
 	layer = ABOVE_MOB_LAYER //so you can mark bodies
 	var/number = 1
diff --git a/code/modules/detectivework/tools/uvlight.dm b/code/modules/detectivework/tools/uvlight.dm
index f53569b38e3..a70a7cf56da 100644
--- a/code/modules/detectivework/tools/uvlight.dm
+++ b/code/modules/detectivework/tools/uvlight.dm
@@ -3,7 +3,7 @@
 	desc = "A small handheld black light."
 	icon_state = "uv_off"
 	slot_flags = SLOT_BELT
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	item_state = "electronic"
 	matter = list(DEFAULT_WALL_MATERIAL = 150)
 	origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1)
diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm
index 77ef65b600f..01866af9762 100644
--- a/code/modules/economy/cash.dm
+++ b/code/modules/economy/cash.dm
@@ -11,7 +11,7 @@
 	throwforce = 1.0
 	throw_speed = 1
 	throw_range = 2
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	var/access = list()
 	access = access_crate_cash
 	var/worth = 0
diff --git a/code/modules/games/boardgame.dm b/code/modules/games/boardgame.dm
index 6aa3d805872..6bfee62afac 100644
--- a/code/modules/games/boardgame.dm
+++ b/code/modules/games/boardgame.dm
@@ -192,7 +192,7 @@
 	desc = "It is plastic and shiny."
 	icon = 'icons/obj/pieces.dmi'
 	icon_state = "checker_black"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	var/piece_color ="black"
 
 /obj/item/checker/Initialize()
@@ -208,7 +208,7 @@
 	desc = "This box holds a nifty portion of checkers."
 	icon_state = "checkers"
 	max_storage_space = 24
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	can_hold = list(/obj/item/checker)
 
 /obj/item/storage/box/checkers/fill()
@@ -278,7 +278,7 @@
 	desc = "This box holds all the pieces needed for the black side of the chess board."
 	icon_state = "chess_b"
 	max_storage_space = 24
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	can_hold = list(/obj/item/checker)
 
 /obj/item/storage/box/chess/fill()
diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index 0a30b6441e3..6ad2209c6c9 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -4,7 +4,7 @@
 	var/back_icon = "card_back"
 
 /obj/item/deck
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	icon = 'icons/obj/playing_cards.dmi'
 	var/list/cards = list()
 
@@ -189,7 +189,7 @@
 	icon_state = "card_pack"
 	drop_sound = 'sound/items/drop/paper.ogg'
 	pickup_sound = 'sound/items/pickup/paper.ogg'
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	var/list/cards = list()
 
 
@@ -211,7 +211,7 @@
 	icon_state = null
 	drop_sound = 'sound/items/drop/paper.ogg'
 	pickup_sound = 'sound/items/pickup/paper.ogg'
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 	var/concealed = 0
 	var/list/cards = list()
diff --git a/code/modules/heavy_vehicle/components/_components.dm b/code/modules/heavy_vehicle/components/_components.dm
index db372b8c049..a807298384d 100644
--- a/code/modules/heavy_vehicle/components/_components.dm
+++ b/code/modules/heavy_vehicle/components/_components.dm
@@ -1,6 +1,6 @@
 /obj/item/mech_component
 	icon = 'icons/mecha/mech_parts.dmi'
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	pixel_x = -8
 	gender = PLURAL
 	var/on_mech_icon = 'icons/mecha/mech_parts.dmi'
diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm
index d8561c7a96d..ff89bef271b 100644
--- a/code/modules/holodeck/HolodeckObjects.dm
+++ b/code/modules/holodeck/HolodeckObjects.dm
@@ -251,7 +251,7 @@
 	throw_speed = 1
 	throw_range = 5
 	throwforce = 0
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	flags = NOBLOODY
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/weapons/lefthand_energy.dmi',
@@ -284,13 +284,13 @@
 	if (active)
 		force = 30
 		icon_state = "sword[item_color]"
-		w_class = 4
+		w_class = ITEMSIZE_LARGE
 		playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
 		to_chat(user, "<span class='notice'>[src] is now active.</span>")
 	else
 		force = 3
 		icon_state = "sword0"
-		w_class = 2
+		w_class = ITEMSIZE_SMALL
 		playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
 		to_chat(user, "<span class='notice'>[src] can now be concealed.</span>")
 
@@ -310,7 +310,7 @@
 	name = "basketball"
 	item_state = "basketball"
 	desc = "Here's your chance, do your dance at the Space Jam."
-	w_class = 4 //Stops people from hiding it in their bags/pockets
+	w_class = ITEMSIZE_LARGE //Stops people from hiding it in their bags/pockets
 	drop_sound = 'sound/items/drop/basketball.ogg'
 	pickup_sound = 'sound/items/pickup/basketball.ogg'
 
diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm
index 2ee4df75ecc..f11d960b309 100644
--- a/code/modules/hydroponics/grown_inedible.dm
+++ b/code/modules/hydroponics/grown_inedible.dm
@@ -41,7 +41,7 @@
 	icon = 'icons/obj/trash.dmi'
 	icon_state = "corncob"
 	item_state = "corncob"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throwforce = 0
 	throw_speed = 4
 	throw_range = 20
@@ -64,7 +64,7 @@
 		)
 	icon_state = "banana_peel"
 	item_state = "banana_peel"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throwforce = 0
 	throw_speed = 4
 	throw_range = 20
diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm
index d7917ed7f11..df73bcedc8a 100644
--- a/code/modules/hydroponics/seed_machines.dm
+++ b/code/modules/hydroponics/seed_machines.dm
@@ -3,7 +3,7 @@
 	desc = "A small disk used for carrying data on plant genetics."
 	icon = 'icons/obj/hydroponics_machines.dmi'
 	icon_state = "disk"
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 
 	var/list/genes = list()
 	var/genesource = "unknown"
diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm
index 9762b9fdb9f..ab3aa4ac008 100644
--- a/code/modules/hydroponics/seed_packets.dm
+++ b/code/modules/hydroponics/seed_packets.dm
@@ -5,7 +5,7 @@ var/global/list/plant_seed_sprites = list()
 	name = "packet of seeds"
 	icon = 'icons/obj/seeds.dmi'
 	icon_state = "blank"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 
 	var/seed_type
 	var/datum/seed/seed
diff --git a/code/modules/hydroponics/trays/tray_reagents.dm b/code/modules/hydroponics/trays/tray_reagents.dm
index 219c9e4487b..6cd624f8575 100644
--- a/code/modules/hydroponics/trays/tray_reagents.dm
+++ b/code/modules/hydroponics/trays/tray_reagents.dm
@@ -5,7 +5,7 @@
 	flags = NOBLUDGEON
 	slot_flags = SLOT_BELT
 	throwforce = 4
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 2
 	throw_range = 10
 	var/toxicity = 4
@@ -91,7 +91,7 @@
 	icon_state = "bottle16"
 	flags = OPENCONTAINER
 	possible_transfer_amounts = null
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 
 	//Like a shot glass!
 	amount_per_transfer_from_this = 10
diff --git a/code/modules/integrated_electronics/core/tools.dm b/code/modules/integrated_electronics/core/tools.dm
index 4eda935c508..cb82d8ac7a1 100644
--- a/code/modules/integrated_electronics/core/tools.dm
+++ b/code/modules/integrated_electronics/core/tools.dm
@@ -12,7 +12,7 @@
 	icon_state = "wirer-wire"
 	item_state = "wirer"
 	flags = CONDUCT
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	var/datum/integrated_io/selected_io
 	var/mode = WIRE
 
@@ -110,7 +110,7 @@
 	icon = 'icons/obj/assemblies/electronic_tools.dmi'
 	icon_state = "debugger"
 	flags = CONDUCT
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	var/data_to_write = null
 	var/accepting_refs = 0
 
@@ -285,7 +285,7 @@
 	desc = "This kit is essential for any circuitry projects."
 	icon = 'icons/obj/assemblies/electronic_tools.dmi'
 	icon_state = "circuit_kit"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	display_contents_with_number = 0
 	can_hold = list(
 		/obj/item/integrated_circuit,
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index 3f8b5fe90e9..057e4642231 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -200,7 +200,7 @@
 	description_cult = "This can be reforged to become a cult tome."
 	throw_speed = 1
 	throw_range = 5
-	w_class = 3		 //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever)
+	w_class = ITEMSIZE_NORMAL		 //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever)
 	attack_verb = list("bashed", "whacked", "educated")
 	var/dat			 // Actual page content
 	var/due_date = 0 // Game time in 1/10th seconds
@@ -333,7 +333,7 @@
 	icon_state ="scanner"
 	throw_speed = 1
 	throw_range = 5
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	var/obj/machinery/librarycomp/computer // Associated computer - Modes 1 to 3 use this
 	var/obj/item/book/book	 //  Currently scanned book
 	var/mode = 0 					// 0 - Scan only, 1 - Scan and Set Buffer, 2 - Scan and Attempt to Check In, 3 - Scan and Attempt to Add to Inventory
diff --git a/code/modules/lock/key.dm b/code/modules/lock/key.dm
index 240edfdc4a1..227b3fc4b11 100644
--- a/code/modules/lock/key.dm
+++ b/code/modules/lock/key.dm
@@ -3,7 +3,7 @@
 	desc = "Used to unlock things."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "keys"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	var/key_data = ""
 
 /obj/item/key/New(var/newloc,var/data)
@@ -25,4 +25,4 @@
 		user.drop_from_inventory(src,user)
 		to_chat(user, "<span class='warning'>\The [src] crumbles in your hands!</span>")
 		qdel(src)
-	return ..()
\ No newline at end of file
+	return ..()
diff --git a/code/modules/lock/lock_construct.dm b/code/modules/lock/lock_construct.dm
index 7d21fee35f3..07a42eee87e 100644
--- a/code/modules/lock/lock_construct.dm
+++ b/code/modules/lock/lock_construct.dm
@@ -3,7 +3,7 @@
 	desc = "A crude but useful lock and bolt."
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "largebinemag"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	var/lock_data
 
 /obj/item/material/lock_construct/New()
diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm
index 47b7267cd8f..426586c0d50 100644
--- a/code/modules/mining/coins.dm
+++ b/code/modules/mining/coins.dm
@@ -9,7 +9,7 @@
 	flags = CONDUCT
 	force = 0.0
 	throwforce = 0.0
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
 	var/string_attached
 	var/sides = 2
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 09028917de6..592867316d4 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -63,7 +63,7 @@
 	slot_flags = SLOT_BELT
 	throwforce = 4.0
 	force = 10.0
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	matter = list(DEFAULT_WALL_MATERIAL = 3750)
 	var/digspeed //moving the delay to an item var so R&D can make improved picks. --NEO
 	origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
@@ -191,7 +191,7 @@
 		attack_self(usr)
 
 /obj/item/pickaxe/offhand
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "offhand"
 	item_state = null
@@ -369,7 +369,7 @@
 	slot_flags = SLOT_BELT
 	force = 8.0
 	throwforce = 4.0
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 50)
 	attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
@@ -387,7 +387,7 @@
 	item_state = "spade"
 	force = 5.0
 	throwforce = 7.0
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 
 // Flags.
 
@@ -397,7 +397,7 @@
 	singular_name = "flag"
 	amount = 25
 	max_amount = 25
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	icon = 'icons/obj/mining.dmi'
 	var/upright = FALSE
 	var/base_state
@@ -501,7 +501,7 @@
 	icon_state = "track15"
 	density = FALSE
 	anchored = TRUE
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	layer = 2.44
 
 /obj/structure/track/Initialize()
@@ -637,7 +637,7 @@
 	icon_state = "pinoff"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	item_state = "electronic"
 	throw_speed = 4
 	throw_range = 20
@@ -704,7 +704,7 @@
 	icon_state = "jaunter"
 	item_state = "jaunter"
 	throwforce = 0
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 3
 	throw_range = 5
 	slot_flags = SLOT_BELT
@@ -788,7 +788,7 @@
 	icon_state = "borghypo"
 	item_state = "hypo"
 	throwforce = 0
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 3
 	throw_range = 5
 	var/loaded = TRUE
@@ -874,7 +874,7 @@ var/list/total_extraction_beacons = list()
 	contained_sprite = TRUE
 	icon = 'icons/obj/mining_contained.dmi'
 	icon_state = "fulton"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	var/obj/structure/extraction_point/beacon
 	var/list/beacon_networks = list("station")
 	var/uses_left = 3
@@ -1077,7 +1077,7 @@ var/list/total_extraction_beacons = list()
 	icon_state = "magneto"
 	item_state = "magneto"
 	desc = "A handheld device that creates a well of negative force that attracts minerals of a very specific type, size, and state to its user."
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	force = 10
 	throwforce = 5
 	origin_tech = list(TECH_MAGNET = 4, TECH_ENGINEERING = 3)
@@ -1115,7 +1115,7 @@ var/list/total_extraction_beacons = list()
 	icon_state = "supermagneto"
 	item_state = "jaunter"
 	desc = "A handheld device that creates a well of warp energy that teleports minerals of a very specific type, size, and state to its user."
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	force = 15
 	throwforce = 5
 	origin_tech = list(TECH_BLUESPACE = 4, TECH_ENGINEERING = 3)
diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm
index 6503635f30a..9f41a95c1eb 100644
--- a/code/modules/mining/ore.dm
+++ b/code/modules/mining/ore.dm
@@ -3,7 +3,7 @@
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "ore1"
 	randpixel = 8
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	throwforce = 10
 	var/datum/geosample/geologic_data
 	var/material
@@ -94,4 +94,4 @@
 		var/obj/item/device/core_sampler/C = W
 		C.sample_item(src, user)
 	else
-		return ..()
\ No newline at end of file
+		return ..()
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 22d71926b0f..cacf97404a6 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -350,7 +350,7 @@ var/list/holder_mob_icon_cache = list()
 	icon_state_dead = "nymph_dead"
 	origin_tech = list(TECH_MAGNET = 3, TECH_BIO = 5)
 	slot_flags = SLOT_HEAD | SLOT_EARS | SLOT_HOLSTER
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 /obj/item/holder/drone
 	name = "maintenance drone"
@@ -359,14 +359,14 @@ var/list/holder_mob_icon_cache = list()
 	item_state = "drone"
 	origin_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 5)
 	slot_flags = SLOT_HEAD
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 
 /obj/item/holder/drone/heavy
 	name = "construction drone"
 	desc = "It's a really big maintenance robot."
 	icon_state = "constructiondrone"
 	item_state = "constructiondrone"
-	w_class = 6//You're not fitting this thing in a backpack
+	w_class = ITEMSIZE_IMMENSE //You're not fitting this thing in a backpack
 
 /obj/item/holder/drone/mining
 	name = "mining drone"
@@ -385,7 +385,7 @@ var/list/holder_mob_icon_cache = list()
 //Setting item state to cat saves on some duplication for the in-hand versions, but we cant use it for head.
 //Instead, the head versions are done by duplicating the cat
 	slot_flags = SLOT_HEAD
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/holder/cat/black
 	icon_state = "cat"
@@ -403,7 +403,7 @@ var/list/holder_mob_icon_cache = list()
 	icon_state = "kitten"
 	icon_state_dead = "cat_kitten_dead"
 	slot_flags = SLOT_HEAD
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	item_state = "kitten"
 
 /obj/item/holder/cat/penny
@@ -412,7 +412,7 @@ var/list/holder_mob_icon_cache = list()
 	icon_state = "penny"
 	icon_state_dead = "penny_dead"
 	slot_flags = SLOT_HEAD
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	item_state = "penny"
 
 /obj/item/holder/carp/baby
@@ -423,7 +423,7 @@ var/list/holder_mob_icon_cache = list()
 	item_state = "babycarp"
 	slot_flags = SLOT_HEAD
 	flags_inv = HIDEEARS
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/holder/carp/baby/verb/toggle_block_hair()
 	set name = "Toggle Hair Coverage"
@@ -437,7 +437,7 @@ var/list/holder_mob_icon_cache = list()
 	desc = "It's a slimy brain slug. Gross."
 	icon_state = "brainslug"
 	origin_tech = list(TECH_BIO = 6)
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/holder/monkey
 	name = "monkey"
@@ -445,7 +445,7 @@ var/list/holder_mob_icon_cache = list()
 	icon_state = "monkey"
 	item_state = "monkey"
 	slot_flags = SLOT_HEAD
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/holder/monkey/farwa
 	name = "farwa"
@@ -453,7 +453,7 @@ var/list/holder_mob_icon_cache = list()
 	icon_state = "farwa"
 	item_state = "farwa"
 	slot_flags = SLOT_HEAD
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/holder/monkey/stok
 	name = "stok"
@@ -461,7 +461,7 @@ var/list/holder_mob_icon_cache = list()
 	icon_state = "stok"
 	item_state = "stok"
 	slot_flags = SLOT_HEAD
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/holder/monkey/neaera
 	name = "neaera"
@@ -469,7 +469,7 @@ var/list/holder_mob_icon_cache = list()
 	icon_state = "neaera"
 	item_state = "neaera"
 	slot_flags = SLOT_HEAD
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 //Holders for rats
 /obj/item/holder/rat
@@ -482,7 +482,7 @@ var/list/holder_mob_icon_cache = list()
 	icon_state_dead = "rat_brown_dead"
 	slot_flags = SLOT_EARS
 	origin_tech = list(TECH_BIO = 2)
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/holder/rat/white
 	icon_state = "rat_white_sleep"
@@ -519,7 +519,7 @@ var/list/holder_mob_icon_cache = list()
 	icon_state = "lizard"
 
 	slot_flags = 0
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 //Chicks and chickens
 /obj/item/holder/chick
@@ -530,7 +530,7 @@ var/list/holder_mob_icon_cache = list()
 	icon_state_dead = "chick_dead"
 	slot_flags = 0
 	icon_state = "chick"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 
 /obj/item/holder/chicken
@@ -541,7 +541,7 @@ var/list/holder_mob_icon_cache = list()
 	icon_state = "chicken_brown"
 	icon_state_dead = "chicken_brown_dead"
 	slot_flags = 0
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 /obj/item/holder/chicken/brown
 	icon_state = "chicken_brown"
@@ -566,7 +566,7 @@ var/list/holder_mob_icon_cache = list()
 	icon_state = "mushroom"
 	icon_state_dead = "mushroom_dead"
 	slot_flags = SLOT_HEAD
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 
 
@@ -617,18 +617,18 @@ var/list/holder_mob_icon_cache = list()
 	icon = 'icons/mob/npc/pets.dmi'
 	icon_state = "corgi"
 	item_state = "corgi"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/holder/fox
 	name = "fox"
 	icon = 'icons/mob/npc/pets.dmi'
 	icon_state = "fox"
 	item_state = "fox"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/holder/schlorrgo
 	name = "schlorrgo"
 	icon = 'icons/mob/npc/livestock.dmi'
 	icon_state = "schlorgo"
 	item_state = "schlorgo"
-	w_class = ITEMSIZE_NORMAL
\ No newline at end of file
+	w_class = ITEMSIZE_NORMAL
diff --git a/code/modules/mob/living/bot/floorbot.dm b/code/modules/mob/living/bot/floorbot.dm
index e0ae75e5e15..410499d816f 100644
--- a/code/modules/mob/living/bot/floorbot.dm
+++ b/code/modules/mob/living/bot/floorbot.dm
@@ -329,7 +329,7 @@
 	throwforce = 10.0
 	throw_speed = 2
 	throw_range = 5
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	var/created_name = "Floorbot"
 
 /obj/item/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob)
@@ -359,7 +359,7 @@
 	throwforce = 10.0
 	throw_speed = 2
 	throw_range = 5
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	var/created_name = "Floorbot"
 
 /obj/item/toolbox_tiles_sensor/attackby(var/obj/item/W, mob/user as mob)
diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm
index 85d16c5052d..7a45b8aa635 100644
--- a/code/modules/mob/living/bot/medbot.dm
+++ b/code/modules/mob/living/bot/medbot.dm
@@ -337,7 +337,7 @@
 	var/build_step = 0
 	var/created_name = "Medibot" //To preserve the name if it's a unique medbot I guess
 	var/skin = null //Same as medbot, set to tox or ointment for the respective kits.
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/firstaid_arm_assembly/Initialize()
 	. = ..()
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index 3563e925627..d38b5e0cd74 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -20,7 +20,7 @@
 	desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity."
 	icon = 'icons/obj/assemblies.dmi'
 	icon_state = "mmi_empty"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_BIO = 3)
 
 	req_access = list(access_robotics)
diff --git a/code/modules/mob/living/carbon/brain/robot.dm b/code/modules/mob/living/carbon/brain/robot.dm
index 12be0182032..a99039684fa 100644
--- a/code/modules/mob/living/carbon/brain/robot.dm
+++ b/code/modules/mob/living/carbon/brain/robot.dm
@@ -3,7 +3,7 @@
 	desc = "The pinnacle of artifical intelligence which can be achieved using classical computer science."
 	icon = 'icons/obj/module.dmi'
 	icon_state = "mainboard"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 3, TECH_DATA = 4)
 
 /obj/item/device/mmi/digital/robot/New()
@@ -20,4 +20,4 @@
 	return
 
 /obj/item/device/mmi/digital/robot/attack_self(mob/user as mob)
-	return
\ No newline at end of file
+	return
diff --git a/code/modules/mob/living/carbon/slime/items.dm b/code/modules/mob/living/carbon/slime/items.dm
index e4053154ffa..c50abb0348c 100644
--- a/code/modules/mob/living/carbon/slime/items.dm
+++ b/code/modules/mob/living/carbon/slime/items.dm
@@ -4,7 +4,7 @@
 	icon = 'icons/mob/npc/slimes.dmi'
 	icon_state = "grey slime extract"
 	force = 1.0
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 	throwforce = 0
 	throw_speed = 3
 	throw_range = 6
@@ -282,4 +282,4 @@
 	wizardy = TRUE
 
 /mob/living/carbon/slime/has_eyes()
-	return FALSE
\ No newline at end of file
+	return FALSE
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index a9ede17287a..0ec4338cea2 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -15,7 +15,7 @@ var/global/list/robot_modules = list(
 	name = "robot module"
 	icon = 'icons/obj/module.dmi'
 	icon_state = "std_mod"
-	w_class = 100.0
+	w_class = ITEMSIZE_IMMENSE
 	item_state = "electronic"
 	flags = CONDUCT
 	var/channels = list()
@@ -1138,4 +1138,4 @@ var/global/list/robot_modules = list(
 		S.reagents.clear_reagents()
 		S.mode = initial(S.mode)
 		S.desc = initial(S.desc)
-		S.update_icon()
\ No newline at end of file
+		S.update_icon()
diff --git a/code/modules/mob/living/simple_animal/constructs/soulstone.dm b/code/modules/mob/living/simple_animal/constructs/soulstone.dm
index cc1a17a01ff..f48d08dfc13 100644
--- a/code/modules/mob/living/simple_animal/constructs/soulstone.dm
+++ b/code/modules/mob/living/simple_animal/constructs/soulstone.dm
@@ -7,7 +7,7 @@
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "soulstone"
 	item_state = "electronic"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	slot_flags = SLOT_BELT
 	origin_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 4)
 	appearance_flags = NO_CLIENT_COLOR
@@ -47,7 +47,7 @@
 		dat += "<A href='byond://?src=\ref[src];choice=Summon'>Summon Shade</A><br>"
 		dat += "<i>This will summon the spirit of [A.name] in a pure energy form. Be cautious, for they will be weak without a protective construct to house them.</i><hr>"
 	dat += "<a href='byond://?src=\ref[src];choice=Close'>Close</a>"
-	
+
 	var/datum/browser/soulstone_win = new(user, "soulstone", capitalize_first_letters(name))
 	soulstone_win.set_content(dat)
 	soulstone_win.add_stylesheet("cult", 'html/browser/cult.css')
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 70c98b0520e..455a00211d9 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -45,7 +45,7 @@
 	layer = SCREEN_LAYER
 	abstract = 1
 	item_state = "nothing"
-	w_class = 5.0
+	w_class = ITEMSIZE_HUGE
 
 
 /obj/item/grab/New(mob/user, mob/victim)
diff --git a/code/modules/multiz/mobile_ladders.dm b/code/modules/multiz/mobile_ladders.dm
index 94e3c5e6276..cd1f798b15d 100644
--- a/code/modules/multiz/mobile_ladders.dm
+++ b/code/modules/multiz/mobile_ladders.dm
@@ -7,7 +7,7 @@
 	contained_sprite = TRUE
 	throw_range = 3
 	force = 10
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
 
 /obj/item/ladder_mobile/proc/place_ladder(atom/A, mob/user)
@@ -105,4 +105,4 @@
 		qdel(src)
 	else
 		QDEL_NULL(target_up)
-		qdel(src)
\ No newline at end of file
+		qdel(src)
diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm
index 24e90bd1539..198960bfb38 100644
--- a/code/modules/organs/internal/brain.dm
+++ b/code/modules/organs/internal/brain.dm
@@ -7,7 +7,7 @@
 	vital = 1
 	icon_state = "brain"
 	force = 1.0
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throwforce = 1.0
 	throw_speed = 3
 	throw_range = 5
@@ -312,4 +312,4 @@
 			lobotomize(user)
 		else
 			to_chat(user, "<span class='notice'>The brain has already been operated on!</span>")
-	..()
\ No newline at end of file
+	..()
diff --git a/code/modules/organs/subtypes/diona.dm b/code/modules/organs/subtypes/diona.dm
index 0eae6a238cd..f9e7f8b0fbf 100644
--- a/code/modules/organs/subtypes/diona.dm
+++ b/code/modules/organs/subtypes/diona.dm
@@ -34,7 +34,7 @@
 	icon_name = "torso"
 	max_damage = 200
 	min_broken_damage = 50
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	body_part = UPPER_TORSO
 	vital = 1
 	parent_organ = null
@@ -49,7 +49,7 @@
 	icon_name = "groin"
 	max_damage = 100
 	min_broken_damage = 50
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	body_part = LOWER_TORSO
 	parent_organ = BP_CHEST
 	limb_flags = ORGAN_CAN_MAIM | ORGAN_CAN_AMPUTATE
@@ -63,7 +63,7 @@
 	icon_name = "l_arm"
 	max_damage = 35
 	min_broken_damage = 20
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	body_part = ARM_LEFT
 	parent_organ = BP_CHEST
 	limb_flags = ORGAN_CAN_MAIM | ORGAN_CAN_AMPUTATE | ORGAN_CAN_GRASP
@@ -87,7 +87,7 @@
 	icon_name = "l_leg"
 	max_damage = 35
 	min_broken_damage = 20
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	body_part = LEG_LEFT
 	icon_position = LEFT
 	parent_organ = BP_GROIN
@@ -113,7 +113,7 @@
 	icon_name = "l_foot"
 	max_damage = 20
 	min_broken_damage = 10
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	body_part = FOOT_LEFT
 	icon_position = LEFT
 	parent_organ = BP_L_LEG
@@ -142,7 +142,7 @@
 	icon_name = "l_hand"
 	max_damage = 30
 	min_broken_damage = 15
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	body_part = HAND_LEFT
 	parent_organ = BP_L_ARM
 	limb_flags = ORGAN_CAN_MAIM | ORGAN_CAN_AMPUTATE | ORGAN_CAN_GRASP
@@ -167,7 +167,7 @@
 	name = BP_HEAD
 	max_damage = 50
 	min_broken_damage = 25
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	body_part = HEAD
 	parent_organ = BP_CHEST
 	limb_flags = ORGAN_CAN_MAIM | ORGAN_CAN_AMPUTATE
diff --git a/code/modules/organs/subtypes/standard.dm b/code/modules/organs/subtypes/standard.dm
index 695b4b3f61f..0ffa1af3a5b 100644
--- a/code/modules/organs/subtypes/standard.dm
+++ b/code/modules/organs/subtypes/standard.dm
@@ -8,7 +8,7 @@
 	icon_name = "torso"
 	max_damage = 100
 	min_broken_damage = 35
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	body_part = UPPER_TORSO
 	vital = 1
 	amputation_point = "spine"
@@ -27,7 +27,7 @@
 	icon_name = "groin"
 	max_damage = 100
 	min_broken_damage = 35
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	body_part = LOWER_TORSO
 	vital = 1
 	parent_organ = BP_CHEST
@@ -44,7 +44,7 @@
 	icon_name = "l_arm"
 	max_damage = 50
 	min_broken_damage = 30
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	body_part = ARM_LEFT
 	parent_organ = BP_CHEST
 	joint = "left elbow"
@@ -70,7 +70,7 @@
 	icon_name = "l_leg"
 	max_damage = 50
 	min_broken_damage = 30
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	body_part = LEG_LEFT
 	icon_position = LEFT
 	parent_organ = BP_GROIN
@@ -96,7 +96,7 @@
 	icon_name = "l_foot"
 	max_damage = 35
 	min_broken_damage = 15
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	body_part = FOOT_LEFT
 	icon_position = LEFT
 	parent_organ = BP_L_LEG
@@ -127,7 +127,7 @@
 	icon_name = "l_hand"
 	max_damage = 35
 	min_broken_damage = 15
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	body_part = HAND_LEFT
 	parent_organ = BP_L_ARM
 	joint = "left wrist"
@@ -169,7 +169,7 @@
 	name = BP_HEAD
 	max_damage = 75
 	min_broken_damage = 35
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	body_part = HEAD | FACE
 	vital = 1
 	parent_organ = BP_CHEST
diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
index d73420c7505..b443edad9e2 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -4,7 +4,7 @@
 	icon_state = "clipboard"
 	item_state = "clipboard"
 	throwforce = 0
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 3
 	throw_range = 10
 	var/obj/item/pen/haspen		//The stored pen.
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index 41429853c88..0b51c396bdb 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -3,7 +3,7 @@
 	desc = "A folder."
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "folder"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	drop_sound = 'sound/items/drop/paper.ogg'
 	pickup_sound = 'sound/items/pickup/paper.ogg'
 
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 3fc11e02bd4..6378df1f0f9 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -11,7 +11,7 @@
 	item_state = "paper"
 	contained_sprite = 1
 	throwforce = 0
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	throw_range = 1
 	throw_speed = 1
 	layer = 4
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index 22ce149df98..fa9b544f05f 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -5,7 +5,7 @@
 	icon_state = "paper"
 	item_state = "paper"
 	throwforce = 0
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	throw_range = 2
 	throw_speed = 1
 	layer = 4
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index bced98bb507..749d4c5c836 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -6,7 +6,7 @@
 	drop_sound = 'sound/items/drop/cardboardbox.ogg'
 	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 	throwforce = 1
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	throw_speed = 3
 	throw_range = 7
 	layer = OBJ_LAYER - 0.1
diff --git a/code/modules/paperwork/papershredder.dm b/code/modules/paperwork/papershredder.dm
index 55e199060b7..43f0ab84d34 100644
--- a/code/modules/paperwork/papershredder.dm
+++ b/code/modules/paperwork/papershredder.dm
@@ -177,6 +177,6 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "shredp"
 	throwforce = 0
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	throw_range = 3
 	throw_speed = 1
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 473913bbdb9..e6030cf08db 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -298,7 +298,7 @@ Pen exclusive commands
 	icon_state = "crayonred"
 	drop_sound = 'sound/items/drop/gloves.ogg'
 	pickup_sound = 'sound/items/pickup/gloves.ogg'
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 	attack_verb = list("attacked", "coloured")
 	colour = "#FF0000" //RGB
 	var/shadeColour = "#220000" //RGB
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 755fc6e8966..0b3bcf12c71 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -15,7 +15,7 @@
 	desc = "A camera film cartridge. Insert it into a camera to reload it."
 	icon_state = "film"
 	item_state = "electropack"
-	w_class = ITEMSIZE_SMALL
+	w_class = ITEMSIZE_TINY
 
 
 /********
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index 092242a95fc..ebe76d4eb0c 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -5,7 +5,7 @@
 	icon_state = "stamp-qm"
 	item_state = "stamp"
 	throwforce = 0
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 	throw_speed = 7
 	throw_range = 15
 	matter = list(DEFAULT_WALL_MATERIAL = 60)
@@ -110,4 +110,4 @@
 		n_name = replacetext(n_name," rubber stamp","")
 		n_name = replacetext(n_name," stamp","")
 		n_name = replacetext(n_name,"stamp","")
-		name = "[n_name] rubber stamp"
\ No newline at end of file
+		name = "[n_name] rubber stamp"
diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm
index 4e20a8dddc1..1db2c5ff6b4 100644
--- a/code/modules/power/smes_construction.dm
+++ b/code/modules/power/smes_construction.dm
@@ -11,7 +11,7 @@
 	desc = "Standard superconductive magnetic coil with average capacity and I/O rating."
 	icon = 'icons/obj/stock_parts.dmi'
 	icon_state = "smes_coil"			// Just few icons patched together. If someone wants to make better icon, feel free to do so!
-	w_class = 4.0 						// It's LARGE (backpack size)
+	w_class = ITEMSIZE_LARGE 						// It's LARGE (backpack size)
 	var/ChargeCapacity = 5000000
 	var/IOCapacity = 250000
 
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 3a3f1fe2051..03bdd478251 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -204,7 +204,7 @@
 	icon = 'icons/obj/power.dmi'
 	icon_state = "sp_base"
 	item_state = "electropack"
-	w_class = 4 // Pretty big!
+	w_class = ITEMSIZE_LARGE // Pretty big!
 	anchored = 0
 	var/tracker = 0
 	var/glass_type = null
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
index b90a26649dc..e89a0d1062e 100644
--- a/code/modules/power/tracker.dm
+++ b/code/modules/power/tracker.dm
@@ -80,4 +80,4 @@
 	name = "tracker electronics"
 	icon = 'icons/obj/doors/door_assembly.dmi'
 	icon_state = "door_electronics"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 09cc5dc9d3b..6ea14f299cd 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -7,7 +7,7 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BELT | SLOT_EARS
 	throwforce = 1
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 	var/leaves_residue = 1
 	var/caliber = ""					//Which kind of guns it can be loaded into
@@ -93,7 +93,7 @@
 	item_state = "box"
 	matter = list(DEFAULT_WALL_MATERIAL = 500)
 	throwforce = 5
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 4
 	throw_range = 10
 
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
index 99bcdee9bd0..19ab31f7ec5 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -316,7 +316,7 @@
 /obj/item/ammo_magazine/submachinedrum
 	name = "drum magazine (.45)"
 	icon_state = "tommy-drum"
-	w_class = 3 // Bulky ammo doesn't fit in your pockets!
+	w_class = ITEMSIZE_NORMAL // Bulky ammo doesn't fit in your pockets!
 	mag_type = MAGAZINE
 	ammo_type = /obj/item/ammo_casing/c45
 	matter = list(DEFAULT_WALL_MATERIAL = 3750)
@@ -447,7 +447,7 @@
 /obj/item/ammo_magazine/nuke
 	name = "nuclear launcher cartridge"
 	icon_state = "nukemag"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	mag_type = MAGAZINE
 	caliber = "nuke"
 	ammo_type = /obj/item/ammo_casing/nuke
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 58a28f21128..22caea3af53 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -53,7 +53,7 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	throwforce = 5
 	throw_speed = 4
 	throw_range = 5
@@ -778,7 +778,7 @@
 
 ///////////OFFHAND///////////////
 /obj/item/offhand
-	w_class = 5.0
+	w_class = ITEMSIZE_HUGE
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "offhand"
 	item_state = "nothing"
diff --git a/code/modules/projectiles/guns/energy/blaster.dm b/code/modules/projectiles/guns/energy/blaster.dm
index 24338c2b1f6..68c40c41733 100644
--- a/code/modules/projectiles/guns/energy/blaster.dm
+++ b/code/modules/projectiles/guns/energy/blaster.dm
@@ -7,7 +7,7 @@
 	has_item_ratio = FALSE
 	fire_sound = 'sound/weapons/laser1.ogg'
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	force = 5
 	origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 2)
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)
@@ -45,7 +45,7 @@
 	fire_sound = 'sound/weapons/laserstrong.ogg'
 	projectile_type = /obj/item/projectile/energy/blaster
 	max_shots = 8
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/gun/energy/blaster/revolver/verb/spin_cylinder()
 	set name = "Spin cylinder"
@@ -74,7 +74,7 @@
 	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
 	projectile_type = /obj/item/projectile/energy/blaster
 	slot_flags = SLOT_BELT
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/gun/energy/blaster/rifle
 	name = "bolt slinger"
@@ -87,10 +87,10 @@
 	projectile_type = /obj/item/projectile/energy/blaster/heavy
 
 	slot_flags = SLOT_BACK
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 
 	fire_delay = 25
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	accuracy = -3
 	scoped_accuracy = 4
 
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 40097754678..efca987483d 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -8,7 +8,7 @@
 	fire_sound = 'sound/weapons/laser1.ogg'
 	slot_flags = SLOT_BELT|SLOT_BACK
 	accuracy = 1
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	force = 10
 	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)
@@ -44,7 +44,7 @@ obj/item/gun/energy/retro
 	desc = "An older model of the basic lasergun. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws."
 	fire_sound = 'sound/weapons/laser1.ogg'
 	slot_flags = SLOT_BELT
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	projectile_type = /obj/item/projectile/beam
 	fire_delay = 10 //old technology
 	can_turret = 1
@@ -65,7 +65,7 @@ obj/item/gun/energy/retro
 	force = 5
 	fire_sound = 'sound/weapons/laser1.ogg'
 	slot_flags = SLOT_BELT
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	projectile_type = /obj/item/projectile/beam
 	origin_tech = null
 	max_shots = 5 //to compensate a bit for self-recharging
@@ -149,7 +149,7 @@ obj/item/gun/energy/retro
 	max_shots = 4
 	fire_delay = 45
 	force = 10
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	accuracy = -3 //shooting at the hip
 	scoped_accuracy = 4
 	can_turret = 1
diff --git a/code/modules/projectiles/guns/energy/magic.dm b/code/modules/projectiles/guns/energy/magic.dm
index ef61cda88c1..a177a0496f6 100644
--- a/code/modules/projectiles/guns/energy/magic.dm
+++ b/code/modules/projectiles/guns/energy/magic.dm
@@ -10,7 +10,7 @@
 	fire_sound = 'sound/magic/Staff_Change.ogg'
 	flags = CONDUCT
 	slot_flags = SLOT_BACK
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	max_shots = 1
 	projectile_type = /obj/item/projectile/change
 	origin_tech = list(TECH_COMBAT = 7, TECH_MAGNET = 5, TECH_BLUESPACE = 7)
@@ -151,7 +151,7 @@ obj/item/gun/energy/staff/focus/attack_self(mob/living/user as mob)
 	item_state = "staffofchaos"
 	fire_sound = 'sound/magic/Staff_Chaos.ogg'
 	flags = CONDUCT
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	max_shots = 5
 	projectile_type = /obj/item/projectile/magic
 	var/list/possible_projectiles = list(/obj/item/projectile/magic, /obj/item/projectile/change, /obj/item/projectile/forcebolt,
@@ -186,7 +186,7 @@ obj/item/gun/energy/staff/focus/attack_self(mob/living/user as mob)
 	has_item_ratio = FALSE
 	fire_sound = 'sound/magic/wand.ogg'
 	slot_flags = SLOT_BELT
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	max_shots = 20
 	projectile_type = /obj/item/projectile/magic
 	origin_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 5, TECH_BLUESPACE = 6)
diff --git a/code/modules/projectiles/guns/energy/modular.dm b/code/modules/projectiles/guns/energy/modular.dm
index b9fce6a7952..f9d0e301cad 100644
--- a/code/modules/projectiles/guns/energy/modular.dm
+++ b/code/modules/projectiles/guns/energy/modular.dm
@@ -9,7 +9,7 @@
 	has_item_ratio = FALSE
 	fire_sound = 'sound/weapons/laser1.ogg'
 	slot_flags = SLOT_BELT|SLOT_BACK
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	force = 10
 	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)
diff --git a/code/modules/projectiles/guns/energy/rifle.dm b/code/modules/projectiles/guns/energy/rifle.dm
index c3fafacffe9..2cfebfd0f76 100644
--- a/code/modules/projectiles/guns/energy/rifle.dm
+++ b/code/modules/projectiles/guns/energy/rifle.dm
@@ -7,7 +7,7 @@
 	icon_state = "eriflestun100"
 	fire_sound = 'sound/weapons/Taser.ogg'
 	slot_flags = SLOT_BACK
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	max_shots = 20
 	fire_delay = 6
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 5a2dde6919a..f9e11db03bd 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -8,7 +8,7 @@
 	projectile_type = /obj/item/projectile/ion/stun
 	fire_sound = 'sound/weapons/laser1.ogg'
 	origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 4)
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	accuracy = 1
 	force = 10
 	flags = CONDUCT
@@ -104,7 +104,7 @@
 	item_state = "meteor_gun"
 	has_item_ratio = FALSE
 	slot_flags = SLOT_BELT|SLOT_BACK
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	max_shots = 10
 	projectile_type = /obj/item/projectile/meteor
 	self_recharge = 1
@@ -120,7 +120,7 @@
 	contained_sprite = FALSE
 	icon_state = "pen"
 	item_state = "pen"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_BELT
 	can_turret = 0
 
@@ -145,7 +145,7 @@
 	item_state = "toxgun"
 	has_item_ratio = FALSE
 	fire_sound = 'sound/effects/stealthoff.ogg'
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_COMBAT = 5, TECH_PHORON = 4)
 	projectile_type = /obj/item/projectile/energy/phoron
 	can_turret = 1
@@ -160,7 +160,7 @@
 	item_state = "gyrorifle"
 	has_item_ratio = FALSE
 	charge_meter = 0
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	fire_sound = 'sound/effects/Buzz2.ogg'
 	force = 5
 	projectile_type = /obj/item/projectile/energy/bee
@@ -180,7 +180,7 @@
 	icon_state = "pestishock"
 	item_state = "pestishock"
 	has_item_ratio = FALSE
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	fire_sound = 'sound/weapons/taser2.ogg'
 	force = 5
 	projectile_type = /obj/item/projectile/beam/mousegun
@@ -212,7 +212,7 @@
 	projectile_type = /obj/item/projectile/beam/energy_net
 	fire_sound = 'sound/weapons/plasma_cutter.ogg'
 	slot_flags = SLOT_HOLSTER | SLOT_BELT
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	max_shots = 4
 	fire_delay = 25
 	can_turret = 1
@@ -242,7 +242,7 @@
 	item_state = "bfg"
 	has_item_ratio = FALSE
 	charge_meter = 0
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	fire_sound = 'sound/magic/LightningShock.ogg'
 	force = 30
 	projectile_type = /obj/item/projectile/energy/bfg
@@ -267,7 +267,7 @@
 	origin_tech = list(TECH_COMBAT = 6, TECH_PHORON = 5, TECH_MATERIAL = 6)
 	charge_meter = 0
 	slot_flags = SLOT_BACK
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	projectile_type = /obj/item/projectile/beam/gatlinglaser
 	max_shots = 80
@@ -320,7 +320,7 @@
 	origin_tech = list(TECH_COMBAT = 2, TECH_PHORON = 4)
 	fire_sound = 'sound/weapons/laser1.ogg'
 	slot_flags = SLOT_BACK | SLOT_HOLSTER | SLOT_BELT
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	accuracy = 1
 	force = 10
 	projectile_type = /obj/item/projectile/energy/blaster/incendiary
@@ -350,7 +350,7 @@
 	fire_sound = 'sound/magic/lightningbolt.ogg'
 	attack_verb = list("sundered", "annihilated", "sliced", "cleaved", "slashed", "pulverized")
 	slot_flags = SLOT_BACK
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	accuracy = 3 // It's a massive beam, okay.
 	force = 60
 	projectile_type = /obj/item/projectile/beam/megaglaive
@@ -438,7 +438,7 @@
 	origin_tech = list(TECH_COMBAT = 6, TECH_PHORON = 8)
 	fire_sound = 'sound/magic/lightningbolt.ogg'
 	slot_flags = SLOT_BACK
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	accuracy = 0 // Overwrite just in case.
 	force = 15
 	projectile_type = /obj/item/projectile/beam/thermaldrill
@@ -502,7 +502,7 @@
 	origin_tech = list(TECH_COMBAT = 6, TECH_PHORON = 8)
 	fire_sound = 'sound/magic/lightningbolt.ogg'
 	slot_flags = SLOT_BACK
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 15
 	projectile_type = /obj/item/projectile/beam/thermaldrill
 	max_shots = 90
@@ -557,7 +557,7 @@
 	item_state = "tesla"
 	has_item_ratio = FALSE
 	charge_meter = 0
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	fire_sound = 'sound/magic/LightningShock.ogg'
 	force = 30
 	projectile_type = /obj/item/projectile/energy/tesla
@@ -583,7 +583,7 @@
 	item_state = "gravity_gun"
 	has_item_ratio = FALSE
 	charge_meter = 0
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	fire_sound = 'sound/magic/Repulse.ogg'
 	force = 30
 	projectile_type = /obj/item/projectile/energy/gravitydisabler
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index c4127015960..477b02bded0 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -43,7 +43,7 @@
 	icon_state = "crossbow"
 	item_state = "crossbow"
 	has_item_ratio = FALSE
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 2, TECH_ILLEGAL = 5)
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)
 	slot_flags = SLOT_BELT
@@ -67,7 +67,7 @@
 /obj/item/gun/energy/crossbow/largecrossbow
 	name = "energy crossbow"
 	desc = "A weapon favored by mercenary infiltration teams."
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	icon_state = "crossbowlarge"
 	item_state = "crossbow"
diff --git a/code/modules/projectiles/guns/launcher.dm b/code/modules/projectiles/guns/launcher.dm
index a3adb129ebd..29071164a7c 100644
--- a/code/modules/projectiles/guns/launcher.dm
+++ b/code/modules/projectiles/guns/launcher.dm
@@ -1,7 +1,7 @@
 /obj/item/gun/launcher
 	name = "launcher"
 	desc = "A device that launches things."
-	w_class = 5.0
+	w_class = ITEMSIZE_HUGE
 	flags =  CONDUCT
 	slot_flags = SLOT_BACK
 
diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm
index e6cc42bc715..0e8bebceae2 100644
--- a/code/modules/projectiles/guns/launcher/crossbow.dm
+++ b/code/modules/projectiles/guns/launcher/crossbow.dm
@@ -7,7 +7,7 @@
 	icon_state = "bolt"
 	item_state = "bolt"
 	throwforce = 8
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	sharp = 1
 	edge = 0
 	drop_sound = 'sound/items/drop/sword.ogg'
@@ -22,7 +22,7 @@
 	sharp = 1
 	edge = 0
 	throwforce = 5
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "metal-rod"
 	item_state = "bolt"
diff --git a/code/modules/projectiles/guns/launcher/grenade_launcher.dm b/code/modules/projectiles/guns/launcher/grenade_launcher.dm
index c767af9d041..c9091605abc 100644
--- a/code/modules/projectiles/guns/launcher/grenade_launcher.dm
+++ b/code/modules/projectiles/guns/launcher/grenade_launcher.dm
@@ -112,7 +112,7 @@
 /obj/item/gun/launcher/grenade/underslung
 	name = "underslung grenade launcher"
 	desc = "Not much more than a tube and a firing mechanism, this grenade launcher is designed to be fitted to a rifle."
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	force = 5
 	max_grenades = 0
 
diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm
index da7d079475d..489be91a0f0 100644
--- a/code/modules/projectiles/guns/launcher/pneumatic.dm
+++ b/code/modules/projectiles/guns/launcher/pneumatic.dm
@@ -5,7 +5,7 @@
 	icon_state = "pneumatic"
 	item_state = "pneumatic"
 	slot_flags = SLOT_BELT
-	w_class = 5.0
+	w_class = ITEMSIZE_HUGE
 	flags = CONDUCT
 	fire_sound_text = "a loud whoosh of moving air"
 	fire_delay = 50
@@ -13,7 +13,7 @@
 	needspin = FALSE
 
 	var/fire_pressure                                   // Used in fire checks/pressure checks.
-	var/max_w_class = 3                                 // Hopper intake size.
+	var/max_w_class = ITEMSIZE_NORMAL                                 // Hopper intake size.
 	var/max_storage_space = 20                       // Total internal storage size.
 	var/obj/item/tank/tank = null                // Tank of gas for use in firing the cannon.
 
@@ -217,5 +217,5 @@
 /obj/item/gun/launcher/pneumatic/small
 	name = "small pneumatic cannon"
 	desc = "It looks smaller than your garden variety cannon"
-	max_w_class = 1
-	w_class = 3
+	max_w_class = ITEMSIZE_TINY
+	w_class = ITEMSIZE_NORMAL
diff --git a/code/modules/projectiles/guns/launcher/rocket.dm b/code/modules/projectiles/guns/launcher/rocket.dm
index cc53ecd3f4f..e442d8b00fe 100644
--- a/code/modules/projectiles/guns/launcher/rocket.dm
+++ b/code/modules/projectiles/guns/launcher/rocket.dm
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/guns/rocket.dmi'
 	icon_state = "rocket"
 	item_state = "rocket"
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	throw_speed = 2
 	throw_range = 10
 	force = 5.0
diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm
index 2fa7e9bdaaf..438323f5d69 100644
--- a/code/modules/projectiles/guns/launcher/syringe_gun.dm
+++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm
@@ -9,7 +9,7 @@
 	slot_flags = SLOT_BELT | SLOT_EARS
 	throwforce = 3
 	force = 3
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	var/obj/item/reagent_containers/syringe/syringe
 
 /obj/item/syringe_cartridge/update_icon()
@@ -67,7 +67,7 @@
 	icon = 'icons/obj/guns/syringegun.dmi'
 	icon_state = "syringegun"
 	item_state = "syringegun"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	force = 7
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)
 	slot_flags = SLOT_BELT
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 6287c6c1317..24ae3031592 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -10,7 +10,7 @@
 	then click where you want to fire.  To reload, click the weapon in your hand to unload (if needed), then add the appropiate ammo.  The description \
 	will tell you what caliber you need."
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	matter = list(DEFAULT_WALL_MATERIAL = 1000)
 	recoil = 1
 
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index f42589d60c8..7086eba4117 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/guns/saber.dmi'
 	icon_state = "saber"	//ugly //yup
 	item_state = "saber"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	load_method = SPEEDLOADER //yup. until someone sprites a magazine for it.
 	max_shells = 22
 	caliber = "9mm"
@@ -31,7 +31,7 @@
 	icon = 'icons/obj/guns/mini-uzi.dmi'
 	icon_state = "mini-uzi"
 	item_state = "mini-uzi"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	load_method = MAGAZINE
 	magazine_type = /obj/item/ammo_magazine/c45uzi
 	allowed_magazines = list(/obj/item/ammo_magazine/c45uzi)
@@ -50,7 +50,7 @@
 	icon = 'icons/obj/guns/c20r.dmi'
 	icon_state = "c20r"
 	item_state = "c20r"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	force = 10
 	caliber = "10mm"
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
@@ -76,7 +76,7 @@
 	icon = 'icons/obj/guns/wt550.dmi'
 	icon_state = "wt550"
 	item_state = "wt550"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	caliber = "9mm"
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)
 	slot_flags = SLOT_BELT
@@ -105,7 +105,7 @@
 	icon = 'icons/obj/guns/arifle.dmi'
 	icon_state = "arifle"
 	item_state = "arifle"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	caliber = "a762"
 	origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4)
@@ -183,7 +183,7 @@
 	icon = 'icons/obj/guns/carbine.dmi'
 	icon_state = "carbine"
 	item_state = "carbine"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	caliber = "a556"
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 3)
@@ -260,7 +260,7 @@
 	icon = 'icons/obj/guns/l6.dmi'
 	icon_state = "l6closed100"
 	item_state = "l6closedmag"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	slot_flags = 0
 	max_shells = 50
@@ -369,7 +369,7 @@
 	icon = 'icons/obj/guns/tommygun.dmi'
 	icon_state = "tommygun"
 	item_state = "tommygun"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	max_shells = 50
 	caliber = ".45"
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
@@ -390,7 +390,7 @@
 	icon = 'icons/obj/guns/railgun.dmi'
 	icon_state = "railgun"
 	item_state = "railgun"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	caliber = "trod"
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 7)
@@ -414,7 +414,7 @@
 	icon = 'icons/obj/guns/flechette.dmi'
 	icon_state = "flechetterifle"
 	item_state = "flechetterifle"
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	force = 30
 	caliber = "flechette"
 	slot_flags = SLOT_BELT|SLOT_BACK
@@ -458,7 +458,7 @@
 	icon = 'icons/obj/guns/assaultshotgun.dmi'
 	icon_state = "assaultshotgun"
 	item_state = "assaultshotgun"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	load_method = MAGAZINE
 	max_shells = 8
 	caliber = "shotgun"
diff --git a/code/modules/projectiles/guns/projectile/improvised.dm b/code/modules/projectiles/guns/projectile/improvised.dm
index 84f91475d9d..2d381c0a264 100644
--- a/code/modules/projectiles/guns/projectile/improvised.dm
+++ b/code/modules/projectiles/guns/projectile/improvised.dm
@@ -7,7 +7,7 @@
 	icon_state = "ishotgun"
 	item_state = "ishotgun"
 	max_shells = 2
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	force = 5
 	recoil = 2
 	accuracy = -1
@@ -43,7 +43,7 @@
 		if(do_after(user, 30))
 			icon_state = "ishotgunsawn"
 			item_state = "ishotgunsawn"
-			w_class = 3
+			w_class = ITEMSIZE_NORMAL
 			force = 5
 			slot_flags &= ~SLOT_BACK
 			slot_flags |= (SLOT_BELT|SLOT_HOLSTER)
@@ -68,7 +68,7 @@
 	icon_state = "ishotgunsawn"
 	item_state = "ishotgunsawn"
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	force = 5
 
 // shotgun construction
diff --git a/code/modules/projectiles/guns/projectile/minigun.dm b/code/modules/projectiles/guns/projectile/minigun.dm
index c9e078a557e..49c1c09837e 100644
--- a/code/modules/projectiles/guns/projectile/minigun.dm
+++ b/code/modules/projectiles/guns/projectile/minigun.dm
@@ -5,7 +5,7 @@
 	icon_state = "holstered"
 	item_state = "holstered"
 	contained_sprite = 1
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 6, TECH_MAGNET = 4, TECH_ILLEGAL = 7)
 	action_button_name = "Deploy the Gatling Machine Gun"
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index ddb5e05ffd8..ac5ec3c954d 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -90,7 +90,7 @@
 	icon = 'icons/obj/guns/x9.dmi'
 	icon_state = "x9tactical"
 	item_state = "x9"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	accuracy = 1
 	load_method = MAGAZINE
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
@@ -139,7 +139,7 @@
 	icon_state = "silenced_pistol"
 	item_state = "silenced_pistol"
 	fire_sound = 'sound/weapons/gunshot/gunshot_suppressed.ogg'
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	accuracy = 1
 	caliber = ".45"
 	silenced = 1
@@ -223,7 +223,7 @@
 	icon = 'icons/obj/guns/pistol.dmi'
 	icon_state = "pistol"
 	item_state = "pistol"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	accuracy = 1
 	caliber = "9mm"
 	silenced = 0
@@ -276,7 +276,7 @@
 			to_chat(user, "<span class='notice'>You unscrew [silenced] from [src].</span>")
 			user.put_in_hands(silenced)
 			silenced = 0
-			w_class = 2
+			w_class = ITEMSIZE_SMALL
 			update_icon()
 			return
 	..()
@@ -289,7 +289,7 @@
 		user.drop_from_inventory(I,src)
 		to_chat(user, "<span class='notice'>You screw [I] onto [src].</span>")
 		silenced = I	//dodgy?
-		w_class = 3
+		w_class = ITEMSIZE_NORMAL
 		update_icon()
 		return
 	..()
@@ -315,7 +315,7 @@
 	desc = "A silencer"
 	icon = 'icons/obj/guns/pistol.dmi'
 	icon_state = "silencer"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 /obj/item/gun/projectile/pirate
 	name = "zip gun"
@@ -354,7 +354,7 @@
 	icon_state = "leyon"
 	item_state = "leyon"
 	caliber = "10mm"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	ammo_type = /obj/item/ammo_casing/c10mm
 	magazine_type = /obj/item/ammo_magazine/mc10mm/leyon
 	max_shells = 5
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 3717cd01789..0b5ab40dc97 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -118,7 +118,7 @@
 	icon_state = "derringer"
 	item_state = "derringer"
 	accuracy = -1
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 3)
 	handle_casings = CYCLE_CASINGS
 	load_method = SINGLE_CASING
diff --git a/code/modules/projectiles/guns/projectile/rifle.dm b/code/modules/projectiles/guns/projectile/rifle.dm
index 202ccd03036..69a397143f2 100644
--- a/code/modules/projectiles/guns/projectile/rifle.dm
+++ b/code/modules/projectiles/guns/projectile/rifle.dm
@@ -25,7 +25,7 @@
 	icon = 'icons/obj/guns/obrez.dmi'
 	icon_state = "obrez"
 	item_state = "obrez"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	recoil = 2
 	accuracy = -2
 	slot_flags &= ~SLOT_BACK
@@ -46,7 +46,7 @@
 	icon = 'icons/obj/guns/obrez.dmi'
 	icon_state = "obrez"
 	item_state = "obrez"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	recoil = 2
 	accuracy = -2
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
@@ -227,7 +227,7 @@
 /obj/item/gun/projectile/gauss
 	name = "gauss thumper"
 	desc = "An outdated gauss weapon which sees sparing use in modern times."
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	slot_flags = 0
 	magazine_type = /obj/item/ammo_magazine/gauss
 	allowed_magazines = list(/obj/item/ammo_magazine/gauss)
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 97849d6ff30..a1f60f7aedf 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -130,7 +130,7 @@
 	load_method = SINGLE_CASING|SPEEDLOADER
 	handle_casings = CYCLE_CASINGS
 	max_shells = 2
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	flags = CONDUCT
 	is_wieldable = TRUE
@@ -183,7 +183,7 @@
 	icon_state = "sawnshotgun"
 	item_state = "sawnshotgun"
 	is_wieldable = FALSE
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	force = 5
 	slot_flags &= ~SLOT_BACK	//you can't sling it on your back
 	slot_flags |= (SLOT_BELT|SLOT_HOLSTER) //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) - or in a holster, why not.
@@ -200,7 +200,7 @@
 	is_wieldable = FALSE
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
 	ammo_type = /obj/item/ammo_casing/shotgun/pellet
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	force = 5
 
 /obj/item/gun/projectile/shotgun/foldable
@@ -210,7 +210,7 @@
 	icon_state = "overunder"
 	item_state = "overunder"
 	slot_flags = SLOT_BELT
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	ammo_type = /obj/item/ammo_casing/shotgun/pellet
 	load_method = SINGLE_CASING|SPEEDLOADER
 	max_shells = 1
@@ -235,7 +235,7 @@
 		slot_flags = initial(slot_flags)
 		playsound(user, 'sound/weapons/sawclose.ogg', 60, 1)
 	else
-		w_class = 4
+		w_class = ITEMSIZE_LARGE
 		slot_flags &= ~SLOT_BELT
 		playsound(user, 'sound/weapons/sawopen.ogg', 60, 1)
 	to_chat(user, "You [folded ? "fold" : "unfold"] \the [src].")
diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm
index b84040aaaac..10eea71ede9 100644
--- a/code/modules/projectiles/guns/projectile/sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper.dm
@@ -7,7 +7,7 @@
 	icon = 'icons/obj/guns/heavysniper.dmi'
 	icon_state = "heavysniper"
 	item_state = "heavysniper"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	slot_flags = SLOT_BACK
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
@@ -149,7 +149,7 @@
 	icon = 'icons/obj/guns/tranqsniper.dmi'
 	icon_state = "tranqsniper"
 	item_state = "tranqsniper"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	slot_flags = SLOT_BACK
 	origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 2)
@@ -184,7 +184,7 @@
 	icon = 'icons/obj/guns/dragunov.dmi'
 	icon_state = "dragunov"
 	item_state = "dragunov"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	slot_flags = SLOT_BACK
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 3, TECH_MAGNET = 2, TECH_ILLEGAL = 5)
@@ -241,7 +241,7 @@
 	icon = 'icons/obj/guns/w556.dmi'
 	icon_state = "w556rifle"
 	item_state = "w556rifle"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	slot_flags = SLOT_BACK
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 3)
diff --git a/code/modules/projectiles/modular/laser_base.dm b/code/modules/projectiles/modular/laser_base.dm
index 97b199765d8..704f1f52ce6 100644
--- a/code/modules/projectiles/modular/laser_base.dm
+++ b/code/modules/projectiles/modular/laser_base.dm
@@ -139,7 +139,7 @@
 /obj/item/device/laser_assembly
 	name = "laser assembly (small)"
 	desc = "A case for shoving things into. Hopefully they work."
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	icon = 'icons/obj/guns/modular_laser.dmi'
 	var/base_icon_state = "small"
 	contained_sprite = TRUE
diff --git a/code/modules/projectiles/modular/laser_components.dm b/code/modules/projectiles/modular/laser_components.dm
index 781181eba03..24791af0e5b 100644
--- a/code/modules/projectiles/modular/laser_components.dm
+++ b/code/modules/projectiles/modular/laser_components.dm
@@ -3,21 +3,21 @@
 /obj/item/device/laser_assembly/medium
 	name = "laser assembly (medium)"
 	base_icon_state = "medium"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	size = CHASSIS_MEDIUM
 	modifier_cap = 4
 
 /obj/item/device/laser_assembly/large
 	name = "laser assembly (large)"
 	base_icon_state = "large"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	size = CHASSIS_LARGE
 	modifier_cap = 5
 
 /obj/item/device/laser_assembly/admin
 	name = "laser assembly (obscene)"
 	base_icon_state = "large"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	size = CHASSIS_LARGE
 	modifier_cap = 25
 
diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm
index bd6de434b9b..e2dec4f5051 100644
--- a/code/modules/projectiles/pins.dm
+++ b/code/modules/projectiles/pins.dm
@@ -13,7 +13,7 @@ Firing pins as a rule can't be removed without replacing them, blame a really sh
 	item_state = "pen"
 	origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 2)
 	flags = CONDUCT
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	attack_verb = list("poked")
 	var/emagged = FALSE
 	var/fail_message = "<span class='warning'>INVALID USER.</span>"
@@ -222,4 +222,4 @@ Pins Below.
 
 /obj/item/device/firing_pin/away_site/pin_auth(mob/living/user)
 	var/turf/T = get_turf(src)
-	return !isStationLevel(T.z)
\ No newline at end of file
+	return !isStationLevel(T.z)
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
index ef6d3f7fcb4..9edcd529456 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
@@ -762,7 +762,7 @@
 	name = "shapesand"
 	desc = "A strangely animate clump of sand which can shift its color and consistency."
 	icon = 'icons/obj/mining.dmi'
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 	icon_state = "ore_glass"
 
 /obj/item/shapesand/attack() //can't be used to actually bludgeon things
@@ -826,4 +826,4 @@
 	reagent_state = SOLID
 	color = "#464650"
 	taste_description = "salt"
-	fallback_specific_heat = 1
\ No newline at end of file
+	fallback_specific_heat = 1
diff --git a/code/modules/reagents/dispenser/cartridge.dm b/code/modules/reagents/dispenser/cartridge.dm
index 26c047e1d64..aa6c77913f0 100644
--- a/code/modules/reagents/dispenser/cartridge.dm
+++ b/code/modules/reagents/dispenser/cartridge.dm
@@ -3,7 +3,7 @@
 	desc = "This goes in a chemical dispenser."
 	icon_state = "cartridge"
 
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 	volume = CARTRIDGE_VOLUME_LARGE
 	amount_per_transfer_from_this = 50
diff --git a/code/modules/reagents/dispenser/coffeebeans.dm b/code/modules/reagents/dispenser/coffeebeans.dm
index 3953ff9614e..e4b91cc0b51 100644
--- a/code/modules/reagents/dispenser/coffeebeans.dm
+++ b/code/modules/reagents/dispenser/coffeebeans.dm
@@ -5,7 +5,7 @@
 	icon = 'icons/obj/drinks.dmi'
 	icon_state = "coffeejar"
 
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 	volume = CARTRIDGE_VOLUME_SMALL
 	amount_per_transfer_from_this = 20
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 544ef73d9f5..5c2ac499b85 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -3,7 +3,7 @@
 	desc = "..."
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = null
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	var/amount_per_transfer_from_this = 5
 	var/possible_transfer_amounts = list(5,10,15,25,30)
 	var/volume = 30
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index ad2f0e7d901..aef46d0737a 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -126,7 +126,7 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I
 	name = "golden cup"
 	icon_state = "golden_cup"
 	item_state = "" //nope :(
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 14
 	throwforce = 10
 	amount_per_transfer_from_this = 20
diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
index 6c87d155c5d..9c7a3a38063 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
@@ -180,7 +180,7 @@
 	edge = FALSE
 	hitsound = /decl/sound_category/bottle_hit_broken
 	var/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken")
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 #define DRINK_FLUFF_GETMORE  "This drink is made by Getmore Corporation, a subsidiary of NanoTrasen. It mostly specializes in fast food and consumer food products, \
 							   but also makes average quality alcohol. Many can find Getmore products in grocery stores, vending machines, \
@@ -218,7 +218,7 @@
 	desc_fluff = DRINK_FLUFF_GETMORE
 	icon_state = "whiskeybottle"
 	center_of_mass = list("x"=16, "y"=4)
-	
+
 /obj/item/reagent_containers/food/drinks/bottle/whiskey/Initialize()
 	. = ..()
 	reagents.add_reagent(/datum/reagent/alcohol/ethanol/whiskey, 100)
diff --git a/code/modules/reagents/reagent_containers/food/drinks/jar.dm b/code/modules/reagents/reagent_containers/food/drinks/jar.dm
index c0cccb1c7ea..b7a6c186e92 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/jar.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/jar.dm
@@ -7,7 +7,7 @@
 	icon_state = "jar"
 	matter = list(MATERIAL_GLASS = 5000)
 	center_of_mass = list("x"=15, "y"=8)
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	amount_per_transfer_from_this = 20
 	possible_transfer_amounts = list(10,20,30,60,120)
 	volume = 120
@@ -21,4 +21,4 @@
 		to_chat(user, "<span class='notice'>You put the lid on \the [src].</span>")
 		user.put_in_hands(new /obj/item/glass_jar) //found in glassjar.dm
 		qdel(src)
-	return
\ No newline at end of file
+	return
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index 2b4c2b420de..d9fa798ea24 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -5,7 +5,7 @@
 	icon = 'icons/obj/food.dmi'
 	icon_state = null
 	center_of_mass = list("x"=16, "y"=16)
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	is_liquid = FALSE
 	var/slice_path
 	var/slices_num
@@ -2479,7 +2479,7 @@
 // sliceable is just an organization type path, it doesn't have any additional code or variables tied to it.
 
 /obj/item/reagent_containers/food/snacks/sliceable
-	w_class = 3 //Whole pizzas and cakes shouldn't fit in a pocket, you can slice them if you want to do that.
+	w_class = ITEMSIZE_NORMAL //Whole pizzas and cakes shouldn't fit in a pocket, you can slice them if you want to do that.
 
 /obj/item/reagent_containers/food/snacks/sliceable/meatbread
 	name = "meatbread loaf"
@@ -4594,7 +4594,7 @@
 	reagents_to_add = list(/datum/reagent/nutriment/synthetic = 4, /datum/reagent/sugar = 1)
 	reagent_data = list(/datum/reagent/nutriment/synthetic = list("chocolate" = 2, "nougat" = 1, "caramel" = 1))
 	bitesize = 2
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/reagent_containers/food/snacks/cb02
 	name = "hundred thousand credit bar"
@@ -4605,7 +4605,7 @@
 	reagents_to_add = list(/datum/reagent/nutriment/synthetic = 4, /datum/reagent/sugar = 1)
 	reagent_data = list(/datum/reagent/nutriment/synthetic = list("chocolate" = 2, "caramel" = 1, "puffed rice" = 1))
 	bitesize = 2
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/reagent_containers/food/snacks/cb03
 	name = "spacewind bar"
@@ -4615,7 +4615,7 @@
 	reagents_to_add = list(/datum/reagent/nutriment/synthetic = 4, /datum/reagent/sugar = 1)
 	reagent_data = list(/datum/reagent/nutriment/synthetic = list("chocolate" = 4))
 	bitesize = 2
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/reagent_containers/food/snacks/cb04
 	name = "crunchy crisp"
@@ -4625,7 +4625,7 @@
 	reagents_to_add = list(/datum/reagent/nutriment/synthetic = 4, /datum/reagent/sugar = 1)
 	reagent_data = list(/datum/reagent/nutriment/synthetic = list("chocolate" = 3, "almonds" = 1))
 	bitesize = 2
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/reagent_containers/food/snacks/cb05
 	name = "hearsay bar"
@@ -4636,7 +4636,7 @@
 	reagents_to_add = list(/datum/reagent/nutriment/synthetic = 3, /datum/reagent/sugar = 3)
 	reagent_data = list(/datum/reagent/nutriment/synthetic = list("chocolate" = 2, "vomit" = 1))
 	bitesize = 3
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/reagent_containers/food/snacks/cb06
 	name = "latte crunch"
@@ -4646,7 +4646,7 @@
 	reagents_to_add = list(/datum/reagent/nutriment/synthetic = 4, /datum/reagent/sugar = 1)
 	reagent_data = list(/datum/reagent/nutriment/synthetic = list("chocolate" = 2, "coffee" = 1, "vanilla wafer" = 1))
 	bitesize = 3
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/reagent_containers/food/snacks/cb07
 	name = "martian bar"
@@ -4656,7 +4656,7 @@
 	reagents_to_add = list(/datum/reagent/nutriment/synthetic = 4, /datum/reagent/sugar = 1)
 	reagent_data = list(/datum/reagent/nutriment/synthetic = list("chocolate" = 2, "caramel" = 1, "nougat" = 1))
 	bitesize = 3
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/reagent_containers/food/snacks/cb08
 	name = "crisp bar"
@@ -4666,7 +4666,7 @@
 	reagents_to_add = list(/datum/reagent/nutriment/synthetic = 4, /datum/reagent/sugar = 1)
 	reagent_data = list(/datum/reagent/nutriment/synthetic = list("chocolate" = 2, "puffed rice" = 1))
 	bitesize = 3
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/reagent_containers/food/snacks/cb09
 	name = "oh daddy bar"
@@ -4677,7 +4677,7 @@
 	reagents_to_add = list(/datum/reagent/nutriment/synthetic = 6, /datum/reagent/sugar = 1)
 	reagent_data = list(/datum/reagent/nutriment = list("chocolate" = 3, "caramel" = 1, "peanuts" = 2))
 	bitesize = 3
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/reagent_containers/food/snacks/cb10
 	name = "laughter bar"
@@ -4688,7 +4688,7 @@
 	reagents_to_add = list(/datum/reagent/nutriment/synthetic = 5, /datum/reagent/sugar = 1)
 	reagent_data = list(/datum/reagent/nutriment = list("chocolate" = 2, "caramel" = 1, "peanuts" = 1, "nougat" = 1))
 	bitesize = 3
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/item/reagent_containers/food/snacks/hardbread
 	name = "adhomian hard bread"
@@ -4699,7 +4699,7 @@
 	reagent_data = list(/datum/reagent/nutriment = list("crusty bread" = 2))
 	throw_range = 5
 	throwforce = 10
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	desc_fluff = "The adhomian hard bread is type of tajaran bread, made from Blizzard Ears's flour, water and spice, usually basked in the shape of a loaf. \
 	It is known for its hard crust, bland taste and for being long lasting. The hard bread was usually prepared for long journeys, hard winters or military campaigns, \
 	due to its shelf life. Certain folk stories and jokes claim that such food could also be used as an artillery ammunition or thrown at besieging armies during sieges."
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index c924cab4284..1e0f8f9dbd9 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -13,7 +13,7 @@
 	possible_transfer_amounts = list(5,10,15,25,30,60)
 	volume = 60
 	accuracy = 0.1
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	flags = OPENCONTAINER
 	var/fragile = TRUE // most glassware is super fragile
 	var/no_shatter = FALSE //does this container shatter?
@@ -225,7 +225,7 @@
 	center_of_mass = list("x" = 16,"y" = 10)
 	accuracy = 1
 	matter = list(DEFAULT_WALL_MATERIAL = 200)
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	amount_per_transfer_from_this = 20
 	possible_transfer_amounts = list(10,20,30,60,120)
 	volume = 120
diff --git a/code/modules/reagents/reagent_containers/inhaler.dm b/code/modules/reagents/reagent_containers/inhaler.dm
index b1c7a84467c..7fc1728b313 100644
--- a/code/modules/reagents/reagent_containers/inhaler.dm
+++ b/code/modules/reagents/reagent_containers/inhaler.dm
@@ -11,7 +11,7 @@
 	unacidable = 1
 	amount_per_transfer_from_this = 5
 	volume = 5
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	possible_transfer_amounts = null
 	flags = OPENCONTAINER
 	slot_flags = SLOT_BELT
@@ -232,4 +232,4 @@
 		. =..()
 		reagents.add_reagent(/datum/reagent/pneumalin, volume)
 		update_icon()
-		return
\ No newline at end of file
+		return
diff --git a/code/modules/reagents/reagent_containers/inhaler_advanced.dm b/code/modules/reagents/reagent_containers/inhaler_advanced.dm
index 1303163a09f..224c095cfdc 100644
--- a/code/modules/reagents/reagent_containers/inhaler_advanced.dm
+++ b/code/modules/reagents/reagent_containers/inhaler_advanced.dm
@@ -8,7 +8,7 @@
 	item_state = "buildpipe"
 	icon_state = "pi_cart_small"
 	volume = 15
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	unacidable = 1
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list(5,10,15)
@@ -56,7 +56,7 @@
 	desc = "A large inhaler cartridge. It contains enough aerosol for 30 units of reagents. The container must be activated for aerosol to mix with reagents."
 	icon_state = "pi_cart_medium"
 	volume = 30
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,30)
 	origin_tech = list(TECH_BIO = 4, TECH_MATERIAL = 4)
@@ -66,7 +66,7 @@
 	desc = "An experimental bluespace inhaler cartridge. It has enough aerosol for 60 units of reagents. The container must be activated to mix aerosol with reagents inside."
 	icon_state = "pi_cart_large"
 	volume = 60
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,30,60)
 	origin_tech = list(TECH_BLUESPACE = 2, TECH_BIO = 6, TECH_MATERIAL = 6)
@@ -77,7 +77,7 @@
 	icon = 'icons/obj/syringe.dmi'
 	item_state = "buildpipe"
 	icon_state = "pi"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	slot_flags = SLOT_BELT
 	var/obj/item/reagent_containers/stored_cartridge
 	var/transfer_amount = 5
@@ -182,7 +182,7 @@
 	name = "combat inhaler"
 	desc = "A large, bulky inhaler design that injects the entire contents of the loaded cartridge via an aerosol system in a single button press."
 	icon_state = "pi_combat"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	transfer_amount = 60
 	origin_tech = list(TECH_BIO = 4, TECH_MATERIAL = 4, TECH_ENGINEERING = 4)
 	eject_when_empty = TRUE
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 9c8165c93dd..f8f322c4747 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -12,7 +12,7 @@
 	icon_state = null
 	item_state = "pill"
 	possible_transfer_amounts = null
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
 	volume = 60
 	drop_sound = 'sound/items/drop/food.ogg'
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 191753041fe..d956d6cf961 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -12,7 +12,7 @@
 	flags = OPENCONTAINER|NOBLUDGEON
 	slot_flags = SLOT_BELT
 	throwforce = 3
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 2
 	throw_range = 10
 	amount_per_transfer_from_this = 10
@@ -200,7 +200,7 @@
 	contained_sprite = TRUE
 	center_of_mass = list("x" = 16,"y" = 16)
 	throwforce = 3
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	possible_transfer_amounts = null
 	volume = 600
 	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_ENGINEERING = 3)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index ae47904d37f..1f660f32324 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -22,7 +22,7 @@
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = null
 	volume = 15
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
 	sharp = 1
 	noslice = 1
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 2fb0ed2b4d5..3f6f236468e 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -291,7 +291,7 @@
 	icon_state = "conveyor0"
 	name = "conveyor belt assembly"
 	desc = "A conveyor belt assembly."
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	var/id = "" //inherited by the belt
 
 /obj/item/conveyor_construct/attackby(obj/item/I, mob/user, params)
@@ -322,7 +322,7 @@
 	desc = "A conveyor control switch assembly."
 	icon = 'icons/obj/recycling.dmi'
 	icon_state = "switch-off"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	var/id = "" //inherited by the switch
 
 /obj/item/conveyor_switch_construct/New()
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index bb9c2b03417..e65e3bc91dd 100755
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -238,7 +238,7 @@
 	icon_state = "dest_tagger"
 	var/currTag = 0
 	matter = list(DEFAULT_WALL_MATERIAL = 250, MATERIAL_GLASS = 140)
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	item_state = "electronic"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm
index ee84ddfea2f..203caefad97 100644
--- a/code/modules/research/research.dm
+++ b/code/modules/research/research.dm
@@ -238,7 +238,7 @@ research holder datum.
 	icon = 'icons/obj/cloning.dmi'
 	icon_state = "datadisk2"
 	item_state = "card-id"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	matter = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 10)
 	var/datum/tech/stored
 
@@ -262,7 +262,7 @@ research holder datum.
 	icon = 'icons/obj/cloning.dmi'
 	icon_state = "datadisk2"
 	item_state = "card-id"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	matter = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 10)
 	var/datum/design/blueprint
 
@@ -278,4 +278,4 @@ research holder datum.
 			to_chat(user, FONT_SMALL("It is storing the following design:"))
 			to_chat(user, FONT_SMALL(" - [blueprint.name]"))
 		else
-			to_chat(user, FONT_SMALL("It doesn't have any blueprint stored."))
\ No newline at end of file
+			to_chat(user, FONT_SMALL("It doesn't have any blueprint stored."))
diff --git a/code/modules/research/xenoarchaeology/chemistry.dm b/code/modules/research/xenoarchaeology/chemistry.dm
index caf7c5c2bd9..ae4f16b4e26 100644
--- a/code/modules/research/xenoarchaeology/chemistry.dm
+++ b/code/modules/research/xenoarchaeology/chemistry.dm
@@ -7,7 +7,7 @@
 	icon = 'icons/obj/device.dmi'
 	icon_state = "solution_tray"
 	matter = list(MATERIAL_GLASS = 5)
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	amount_per_transfer_from_this = 1
 	possible_transfer_amounts = list(1, 2)
 	volume = 2
diff --git a/code/modules/research/xenoarchaeology/geosample.dm b/code/modules/research/xenoarchaeology/geosample.dm
index 3e1eb7a7904..d48d386c0ba 100644
--- a/code/modules/research/xenoarchaeology/geosample.dm
+++ b/code/modules/research/xenoarchaeology/geosample.dm
@@ -20,7 +20,7 @@
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "sliver1"	//0-4
 	randpixel = 8
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	sharp = 1
 	//item_state = "electronic"
 	var/source_rock = "/turf/simulated/mineral/"
diff --git a/code/modules/research/xenoarchaeology/tools/tools.dm b/code/modules/research/xenoarchaeology/tools/tools.dm
index 66526961937..9d4f482e577 100644
--- a/code/modules/research/xenoarchaeology/tools/tools.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools.dm
@@ -8,7 +8,7 @@
 	icon = 'icons/obj/device.dmi'
 	icon_state = "locator"
 	item_state = "locator"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 /obj/item/device/gps/attack_self(var/mob/user as mob)
 	var/turf/T = get_turf(src)
@@ -19,7 +19,7 @@
 	desc = "A coiled metallic tape used to check dimensions and lengths."
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "measuring"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 //todo: dig site tape
 
@@ -29,7 +29,7 @@
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "satchel"
 	slot_flags = SLOT_BELT | SLOT_POCKET
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	max_storage_space = 100
-	max_w_class = 3
+	max_w_class = ITEMSIZE_NORMAL
 	can_hold = list(/obj/item/fossil)
diff --git a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
index 6bc94613473..dfb62b4db0b 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
@@ -5,7 +5,7 @@
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "flashgun"
 	item_state = "lampgreen"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	slot_flags = SLOT_BELT
 	var/nearest_artifact_id = "unknown"
 	var/nearest_artifact_distance = -1
diff --git a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
index 09340fec420..e072710521a 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
@@ -19,7 +19,7 @@
 	icon = 'icons/obj/device.dmi'
 	icon_state = "sampler0"
 	item_state = "screwdriver_brown"
-	w_class = 1.0
+	w_class = ITEMSIZE_TINY
 	//slot_flags = SLOT_BELT
 	var/sampled_turf = ""
 	var/num_stored_bags = 10
@@ -74,7 +74,7 @@
 			var/image/I = image("icon"=R, "layer"=FLOAT_LAYER)
 			filled_bag.add_overlay(I)
 			filled_bag.add_overlay("evidence")
-			filled_bag.w_class = 1
+			filled_bag.w_class = ITEMSIZE_TINY
 
 			to_chat(user, "<span class='notice'>You take a core sample of the [item_to_sample].</span>")
 	else
diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
index 89f3b5d52a4..012ed94d887 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
@@ -8,7 +8,7 @@
 	desc = "Used to check spatial depth and density of rock outcroppings."
 	icon_state = "depthscanner"
 	item_state = "analyzer"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	slot_flags = SLOT_BELT
 	var/list/positive_locations = list()
 	var/datum/depth_scan/current
diff --git a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
index b407b9284c6..8cac8e34ee3 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
@@ -15,7 +15,7 @@
 	excavation_amount = 0.5
 	drill_sound = 'sound/weapons/thudswoosh.ogg'
 	drill_verb = "brushing"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	can_wield = 0
 
 	action_button_name = null
@@ -33,7 +33,7 @@
 	excavation_amount = 1
 	drill_sound = 'sound/items/screwdriver.ogg'
 	drill_verb = "delicately picking"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	can_wield = 0
 
 	action_button_name = null
@@ -51,7 +51,7 @@
 	excavation_amount = 2
 	drill_sound = 'sound/items/screwdriver.ogg'
 	drill_verb = "delicately picking"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	can_wield = 0
 
 	action_button_name = null
@@ -69,7 +69,7 @@
 	excavation_amount = 3
 	drill_sound = 'sound/items/screwdriver.ogg'
 	drill_verb = "delicately picking"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	can_wield = 0
 
 	action_button_name = null
@@ -87,7 +87,7 @@
 	excavation_amount = 4
 	drill_sound = 'sound/items/screwdriver.ogg'
 	drill_verb = "delicately picking"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	can_wield = 0
 
 	action_button_name = null
@@ -105,7 +105,7 @@
 	excavation_amount = 5
 	drill_sound = 'sound/items/screwdriver.ogg'
 	drill_verb = "delicately picking"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	can_wield = 0
 
 	action_button_name = null
@@ -123,7 +123,7 @@
 	excavation_amount = 6
 	drill_sound = 'sound/items/screwdriver.ogg'
 	drill_verb = "delicately picking"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	can_wield = 0
 
 	action_button_name = null
@@ -141,7 +141,7 @@
 	excavation_amount = 15
 	drill_sound = /decl/sound_category/pickaxe_sound
 	drill_verb = "clearing"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	can_wield = 0
 
 	action_button_name = null
@@ -157,7 +157,7 @@
 	item_state = "box"
 	foldable = /obj/item/stack/material/cardboard //BubbleWrap
 	storage_slots = 7
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	can_hold = list(/obj/item/pickaxe/brush,\
 	/obj/item/pickaxe/one_pick,\
 	/obj/item/pickaxe/two_pick,\
@@ -166,7 +166,7 @@
 	/obj/item/pickaxe/five_pick,\
 	/obj/item/pickaxe/six_pick)
 	max_storage_space = 18
-	max_w_class = 3
+	max_w_class = ITEMSIZE_NORMAL
 	use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
 
 /obj/item/storage/box/excavation/fill()
diff --git a/code/modules/spell_system/artifacts/armor/wizard_voidsuit.dm b/code/modules/spell_system/artifacts/armor/wizard_voidsuit.dm
index 69c2a56c0af..02b5712468d 100644
--- a/code/modules/spell_system/artifacts/armor/wizard_voidsuit.dm
+++ b/code/modules/spell_system/artifacts/armor/wizard_voidsuit.dm
@@ -39,7 +39,7 @@
 		slot_r_hand_str = "wiz_hardsuit"
 	)
 	slowdown = 1
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	unacidable = 1
 	armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60)
 	siemens_coefficient = 0.35
@@ -62,4 +62,4 @@
 			RH.droplimb(0,DROPLIMB_BURN)
 		return
 	else
-		..()
\ No newline at end of file
+		..()
diff --git a/code/modules/spell_system/artifacts/items/lich_phylactery.dm b/code/modules/spell_system/artifacts/items/lich_phylactery.dm
index 533886aa6b6..7f36b864b33 100644
--- a/code/modules/spell_system/artifacts/items/lich_phylactery.dm
+++ b/code/modules/spell_system/artifacts/items/lich_phylactery.dm
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "cursedheart-off"
 	origin_tech = list(TECH_BLUESPACE = 8, TECH_MATERIAL = 8, TECH_BIO = 8)
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	light_color = "#6633CC"
 	light_power = 3
 	light_range = 4
@@ -43,4 +43,4 @@
 	if(!user.is_wizard() && src.lich)
 		to_chat(user, "<span class='warning'>As you pick up \the [src], you feel a wave of dread wash over you.</span>")
 		for(var/obj/machinery/light/P in view(7, user))
-			P.flicker(1)
\ No newline at end of file
+			P.flicker(1)
diff --git a/code/modules/spell_system/artifacts/items/monster_manual.dm b/code/modules/spell_system/artifacts/items/monster_manual.dm
index 31799943de0..d18873ded39 100644
--- a/code/modules/spell_system/artifacts/items/monster_manual.dm
+++ b/code/modules/spell_system/artifacts/items/monster_manual.dm
@@ -5,7 +5,7 @@
 	icon_state = "bookHacking"
 	throw_speed = 1
 	throw_range = 5
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	var/uses = 1
 	var/temp = null
 	var/list/monster = list(/mob/living/simple_animal/familiar/pet/cat,
@@ -81,4 +81,4 @@
 		if(Adjacent(usr))
 			src.interact(usr)
 		else
-			usr << browse(null,"window=monstermanual")
\ No newline at end of file
+			usr << browse(null,"window=monstermanual")
diff --git a/code/modules/spell_system/artifacts/items/poppet.dm b/code/modules/spell_system/artifacts/items/poppet.dm
index 08c44ff06cd..a33a976a71f 100644
--- a/code/modules/spell_system/artifacts/items/poppet.dm
+++ b/code/modules/spell_system/artifacts/items/poppet.dm
@@ -4,7 +4,7 @@
 	desc = "A rustic doll with a vague humanoid shape."
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "poppet"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	var/datum/weakref/target = null
 	var/countenance = null //what species does it looks like?
 	var/cooldown_time = 120
@@ -153,4 +153,4 @@
 		to_chat(H, "<span class='danger'>You feel an outworldly force crushing you!</span>")
 		H.adjustBruteLoss(35)
 		H.apply_effect(6, WEAKEN)
-	qdel(src)
\ No newline at end of file
+	qdel(src)
diff --git a/code/modules/spell_system/artifacts/items/rune_sword.dm b/code/modules/spell_system/artifacts/items/rune_sword.dm
index 4db6000a2a9..ba6f142c16f 100644
--- a/code/modules/spell_system/artifacts/items/rune_sword.dm
+++ b/code/modules/spell_system/artifacts/items/rune_sword.dm
@@ -7,12 +7,12 @@
 	contained_sprite = TRUE
 	active_force = 40
 	active_throwforce = 40
-	active_w_class = 5
+	active_w_class = ITEMSIZE_HUGE
 	force = 20
 	throwforce = 30
 	throw_speed = 5
 	throw_range = 10
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	slot_flags = SLOT_BELT
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 8)
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
diff --git a/code/modules/spell_system/spells/hand/hand_item.dm b/code/modules/spell_system/spells/hand/hand_item.dm
index 974ff2d838d..e78c6966114 100644
--- a/code/modules/spell_system/spells/hand/hand_item.dm
+++ b/code/modules/spell_system/spells/hand/hand_item.dm
@@ -7,7 +7,7 @@ Basically: I can use it to target things where I click. I can then pass these ta
 	icon = 'icons/mob/screen/generic.dmi'
 	flags = 0
 	abstract = 1
-	w_class = 5.0
+	w_class = ITEMSIZE_HUGE
 	icon_state = "grabbed1"
 	var/next_spell_time = 0
 	var/spell/hand/hand_spell
diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm
index 27e0003d94d..3eee3836e64 100644
--- a/code/modules/telesci/bscrystal.dm
+++ b/code/modules/telesci/bscrystal.dm
@@ -5,7 +5,7 @@
 	desc = "A glowing bluespace crystal, not much is known about how they work. It looks very delicate."
 	icon = 'icons/obj/telescience.dmi'
 	icon_state = "bluespace_crystal"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	origin_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 3)
 	var/blink_range = 8 // The teleport range when crushed/thrown at someone.
 
diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm
index 6a678d7fe64..371d30825b1 100644
--- a/code/modules/telesci/gps.dm
+++ b/code/modules/telesci/gps.dm
@@ -5,7 +5,7 @@ var/list/GPS_list = list()
 	desc = "Helping lost spacemen find their way through the planets since 2016."
 	icon = 'icons/obj/telescience.dmi'
 	icon_state = "gps-c"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	slot_flags = SLOT_BELT
 	origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2)
 	var/gps_prefix = "COM"
diff --git a/code/modules/udp/ship_udp.dm b/code/modules/udp/ship_udp.dm
index 9f8d3caf3f8..858b0d19b6c 100644
--- a/code/modules/udp/ship_udp.dm
+++ b/code/modules/udp/ship_udp.dm
@@ -77,7 +77,7 @@
 	icon = 'icons/obj/hacktool.dmi'
 	icon_state = "hacktool-g"
 	force = 5.0
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	throwforce = 5.0
 	throw_range = 15
 	throw_speed = 3
diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm
index 3a750cfd6ec..81a2bc899bd 100644
--- a/code/modules/vehicles/cargo_train.dm
+++ b/code/modules/vehicles/cargo_train.dm
@@ -20,7 +20,7 @@
 	desc = "A keyring with a small steel key, and a yellow fob reading \"Choo Choo!\"."
 	icon = 'icons/obj/vehicles.dmi'
 	icon_state = "train_keys"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/vehicle/train/cargo/trolley
 	name = "cargo train trolley"
diff --git a/code/modules/vehicles/pussywagon.dm b/code/modules/vehicles/pussywagon.dm
index 86a4f7bcd45..58db1c1d5f5 100644
--- a/code/modules/vehicles/pussywagon.dm
+++ b/code/modules/vehicles/pussywagon.dm
@@ -15,7 +15,7 @@
 	desc = "A keyring with a small steel key, and a pink fob reading \"Pussy Wagon\"."
 	icon = 'icons/obj/vehicles.dmi'
 	icon_state = "keys"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 /obj/vehicle/train/cargo/engine/pussywagon/Initialize()
 	. = ..()
diff --git a/html/changelogs/wezzy_w_class.yml b/html/changelogs/wezzy_w_class.yml
new file mode 100644
index 00000000000..4b8c3e2ef23
--- /dev/null
+++ b/html/changelogs/wezzy_w_class.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Makes w_class use the defines instead."