Using Weight Defines

2026-08-25 21:19:00 +01:00 · 2017-05-27 16:34:49 +01:00
parent 7ecaabe492
commit 07e0f768d6
149 changed files with 430 additions and 436 deletions
@@ -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
+	w_class = WEIGHT_CLASS_SMALL
 	throwforce = 5.0
 	throw_speed = 3
 	throw_range = 15
@@ -397,4 +397,4 @@ AI MODULES
 	laws[1] = generate_ion_law()
 	to_chat(user, "<span class='notice'>You press the button on [src].</span>")
 	playsound(user, 'sound/machines/click.ogg', 20, 1)
-	src.loc.visible_message("<span class='warning'>[bicon(src)] [laws[1]]</span>")
+	src.loc.visible_message("<span class='warning'>[bicon(src)] [laws[1]]</span>")
@@ -17,7 +17,7 @@ RCD
 	throwforce = 10.0
 	throw_speed = 3
 	throw_range = 5
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	materials = list(MAT_METAL = 30000)
 	origin_tech = "engineering=4;materials=2"
 	toolspeed = 1
@@ -13,7 +13,7 @@ RSF
 	anchored = 0.0
 	var/matter = 0
 	var/mode = 1
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL

 /obj/item/weapon/rsf/New()
 	desc = "A RSF. It currently holds [matter]/30 fabrication-units."
@@ -231,4 +231,4 @@ RSF
 				matter--
 				to_chat(user, "The RSF now holds [matter]/30 fabrication-units.")
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
-		return
+		return
@@ -12,8 +12,8 @@
 	throwforce_on = 5
 	throw_speed = 1
 	throw_range = 5
-	w_class = 2
-	w_class_on = 2
+	w_class = WEIGHT_CLASS_SMALL
+	w_class_on = WEIGHT_CLASS_SMALL
 	attack_verb = list("attacked", "slashed", "gored", "sliced", "torn", "ripped", "butchered", "cut")
 	attack_verb_on = list()

@@ -11,7 +11,7 @@
 	force = 10
 	throw_speed = 2
 	throw_range = 4
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
 	var/bees_left = 10
 	var/list/blood_list = list()
@@ -15,7 +15,7 @@
 	name = "card"
 	desc = "A card."
 	icon = 'icons/obj/card.dmi'
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	var/associated_account_number = 0

 	var/list/files = list(  )
@@ -7,7 +7,7 @@
 	throwforce = 3.0
 	throw_speed = 1
 	throw_range = 5
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	attack_verb = list("warned", "cautioned", "smashed")

 	proximity_sign
@@ -6,7 +6,7 @@
 	icon = 'icons/obj/chronos.dmi'
 	icon_state = "chronobackpack"
 	item_state = "backpack"
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = SLOT_BACK
 	slowdown = 1
 	actions_types = list(/datum/action/item_action/equip_unequip_TED_Gun)
@@ -46,7 +46,7 @@
 	icon = 'icons/obj/chronos.dmi'
 	icon_state = "chronogun"
 	item_state = "chronogun"
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	flags = NODROP
 	ammo_type = list(/obj/item/ammo_casing/energy/chrono_beam)
 	can_charge = 0
@@ -20,7 +20,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 	throw_speed = 0.5
 	item_state = "cigoff"
 	slot_flags = SLOT_EARS|SLOT_MASK
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	body_parts_covered = null
 	attack_verb = list("burnt", "singed")
 	var/lit = 0
@@ -285,7 +285,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 	desc = "A manky old cigarette butt."
 	icon = 'icons/obj/clothing/masks.dmi'
 	icon_state = "cigbutt"
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	throwforce = 1

 /obj/item/weapon/cigbutt/New()
@@ -389,7 +389,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 	desc = "A thin piece of paper used to make fine smokeables."
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "cig_paper"
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY

 /obj/item/weapon/rollingpaper/afterattack(atom/target, mob/user, proximity)
 	if(!proximity)
@@ -410,4 +410,4 @@ LIGHTERS ARE IN LIGHTERS.DM
 		else
 			to_chat(user, "<span class='warning'>You need to dry this first!</span>")
 	else
-		..()
+		..()
@@ -60,7 +60,7 @@
 	item_state = "bike_horn"
 	hitsound = null
 	throwforce = 3
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	throw_speed = 3
 	throw_range = 15
 	attack_verb = list("HONKED")
@@ -112,4 +112,4 @@
 				var/mob/living/carbon/human/H = M
 				if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs) || H.ear_deaf)
 					continue
-			M.emote("flip")
+			M.emote("flip")
@@ -3,7 +3,7 @@
 	desc = "A generic brand of lipstick."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "lipstick"
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	var/colour = "red"
 	var/open = 0

@@ -86,7 +86,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "razor"
 	flags = CONDUCT
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	usesound = 'sound/items/Welder2.ogg'
 	toolspeed = 1

@@ -9,7 +9,7 @@
 	icon_state = "gavelhammer"
 	force = 5.0
 	throwforce = 6.0
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	attack_verb = list("bashed", "battered", "judged", "whacked")
 	burn_state = FLAMMABLE

@@ -25,7 +25,7 @@
 	icon_state = "gavelblock"
 	force = 2.0
 	throwforce = 2.0
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	burn_state = FLAMMABLE

 /obj/item/weapon/gavelblock/attackby(obj/item/I, mob/user, params)
@@ -33,4 +33,4 @@
 		playsound(loc, 'sound/items/gavel.ogg', 100, 1)
 		user.visible_message("<span class='warning'>[user] strikes \the [src] with \the [I].</span>")
 	else
-		return
+		return
@@ -9,7 +9,7 @@
 	slot_flags = SLOT_BACK
 	force = 5
 	throwforce = 6
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	origin_tech = "biotech=4"
 	actions_types = list(/datum/action/item_action/toggle_paddles)
 	species_fit = list("Vox")
@@ -206,7 +206,7 @@
 	desc = "A belt-equipped defibrillator that can be rapidly deployed."
 	icon_state = "defibcompact"
 	item_state = "defibcompact"
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	slot_flags = SLOT_BELT
 	origin_tech = "biotech=4"

@@ -251,7 +251,7 @@
 	item_state = "defibpaddles"
 	force = 0
 	throwforce = 6
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	toolspeed = 1

 	var/revivecost = 1000
@@ -446,7 +446,7 @@
 	icon_state = "defibpaddles0"
 	item_state = "defibpaddles0"
 	force = 0
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	var/revivecost = 1000
 	var/cooldown = 0
 	var/busy = 0
@@ -29,7 +29,7 @@
 	desc = "A die with six sides. Basic and servicable."
 	icon = 'icons/obj/dice.dmi'
 	icon_state = "d6"
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	var/sides = 6
 	var/result = null
 	var/list/special_faces = list() //entries should match up to sides var if used
@@ -1,5 +1,5 @@
 /obj/item/weapon/disk
 	icon = 'icons/obj/module.dmi'
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	item_state = "card-id"
 	icon_state = "datadisk0"
@@ -8,7 +8,7 @@
 	var/datum/dna2/record/buf = null
 	throw_speed = 3
 	throw_range = 5
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	origin_tech = "biotech=1"

 	var/damage_coeff = 1
@@ -7,7 +7,7 @@
 	hitsound = 'sound/weapons/smash.ogg'
 	flags = CONDUCT
 	throwforce = 10
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	throw_speed = 2
 	throw_range = 7
 	force = 10
@@ -29,7 +29,7 @@
 	hitsound = null	//it is much lighter, after all.
 	flags = null //doesn't CONDUCT
 	throwforce = 2
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	force = 3.0
 	materials = list()
 	max_water = 30
@@ -11,7 +11,7 @@
 	throwforce = 10.0
 	throw_speed = 1
 	throw_range = 5
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	materials = list(MAT_METAL=500)
 	origin_tech = "combat=1;plasmatech=1"
 	var/status = 0
@@ -8,7 +8,7 @@
 	name = "fiber wire"
 	desc = "A length of razor-thin wire with an elegant wooden handle on either end.<br>You suspect you'd have to be behind the target to use this weapon effectively."
 	icon_state = "garrot_wrap"
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	var/mob/living/carbon/human/strangling
 	var/improvised = 0
 	var/garrote_time
@@ -4,7 +4,7 @@ var/turf/T
 /obj/item/weapon/grenade/bananade
 	name = "bananade"
 	desc = "A yellow grenade."
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	icon = 'icons/obj/grenade.dmi'
 	icon_state = "banana"
 	item_state = "flashbang"
@@ -9,7 +9,7 @@
 	item_state = "flashbang"
 	var/bomb_state = "chembomb"
 	var/payload_name = null // used for spawned grenades
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	force = 2
 	var/prime_sound = 'sound/items/Screwdriver2.ogg'
 	var/stage = EMPTY
@@ -539,4 +539,4 @@

 #undef EMPTY
 #undef WIRED
-#undef READY
+#undef READY
@@ -3,7 +3,7 @@
 	desc = "HONK! brand Bananas. In a special applicator for rapid slipping of wide areas."
 	icon_state = "banana"
 	item_state = "flashbang"
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	force = 2.0
 	var/stage = 0
 	var/state = 0
@@ -74,4 +74,4 @@
 	if(istype(hit_atom ,/mob/living))
 		var/mob/living/M = hit_atom
 		M.take_organ_damage(0, burned)
-	return ..()
+	return ..()
@@ -17,7 +17,7 @@
 /obj/item/weapon/grenade/iedcasing
 	name = "improvised explosive assembly"
 	desc = "An igniter stuffed into an aluminum shell."
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	icon = 'icons/obj/grenade.dmi'
 	icon_state = "improvised_grenade"
 	item_state = "flashbang"
@@ -67,7 +67,7 @@
 /obj/item/weapon/grenade/iedcasing/filled
 	name = "improvised firebomb"
 	desc = "A weak, improvised incendiary device."
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	icon = 'icons/obj/grenade.dmi'
 	icon_state = "improvised_grenade"
 	item_state = "flashbang"
@@ -1,7 +1,7 @@
 /obj/item/weapon/grenade
 	name = "grenade"
 	desc = "A hand held grenade, with an adjustable timer."
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	icon = 'icons/obj/grenade.dmi'
 	icon_state = "grenade"
 	item_state = "flashbang"
@@ -7,7 +7,7 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 5
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	throw_speed = 2
 	throw_range = 5
 	materials = list(MAT_METAL=500)
@@ -5,7 +5,7 @@
 	icon_state = "signmaker"
 	item_state = "electronic"
 	force = 5
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	throwforce = 0
 	throw_speed = 3
 	throw_range = 7
@@ -7,7 +7,7 @@
 	throw_speed = 3
 	throw_range = 4
 	throwforce = 10
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	var/reskinned = FALSE
 	var/reskin_selectable = TRUE			//set to FALSE if a subtype is meant to not normally be available as a reskin option (fluff ones will get re-added through their list)
 	var/list/fluff_transformations = list() //does it have any special transformations only accessible to it? Should only be subtypes of /obj/item/weapon/nullrod
@@ -71,7 +71,7 @@
 	item_state = "disintegrate"
 	desc = "This hand of yours glows with an awesome power!"
 	flags = ABSTRACT | NODROP
-	w_class = 5
+	w_class = WEIGHT_CLASS_HUGE
 	hitsound = 'sound/weapons/sear.ogg'
 	damtype = BURN
 	attack_verb = list("punched", "cross countered", "pummeled")
@@ -81,7 +81,7 @@
 	icon_state = "godstaff-red"
 	item_state = "godstaff-red"
 	desc = "It has a mysterious, protective aura."
-	w_class = 5
+	w_class = WEIGHT_CLASS_HUGE
 	force = 5
 	slot_flags = SLOT_BACK
 	block_chance = 50
@@ -96,7 +96,7 @@
 	icon_state = "claymore"
 	item_state = "claymore"
 	desc = "A weapon fit for a crusade!"
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = SLOT_BACK|SLOT_BELT
 	block_chance = 30
 	sharp = 1
@@ -183,7 +183,7 @@
 	icon_state = "scythe0"
 	item_state = "scythe0"
 	desc = "Ask not for whom the bell tolls..."
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	armour_penetration = 35
 	slot_flags = SLOT_BACK
 	sharp = 1
@@ -255,7 +255,7 @@
 	item_state = "hammeron"
 	desc = "This war hammer cost the chaplain fourty thousand space dollars."
 	slot_flags = SLOT_BELT
-	w_class = 5
+	w_class = WEIGHT_CLASS_HUGE
 	attack_verb = list("smashed", "bashed", "hammered", "crunched")

 /obj/item/weapon/nullrod/chainsaw
@@ -263,7 +263,7 @@
 	desc = "Good? Bad? You're the guy with the chainsaw hand."
 	icon_state = "chainsaw1"
 	item_state = "mounted_chainsaw"
-	w_class = 5
+	w_class = WEIGHT_CLASS_HUGE
 	flags = NODROP | ABSTRACT
 	sharp = 1
 	edge = 1
@@ -322,7 +322,7 @@
 	icon_state = "arm_blade"
 	item_state = "arm_blade"
 	flags = ABSTRACT | NODROP
-	w_class = 5
+	w_class = WEIGHT_CLASS_HUGE
 	sharp = 1
 	edge = 1

@@ -349,7 +349,7 @@
 /obj/item/weapon/nullrod/claymore/bostaff //May as well make it a "claymore" and inherit the blocking
 	name = "monk's staff"
 	desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts, now used to harass the clown."
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	force = 13
 	block_chance = 40
 	slot_flags = SLOT_BACK
@@ -365,7 +365,7 @@
 	name = "arrhythmic knife"
 	icon_state = "crysknife"
 	item_state = "crysknife"
-	w_class = 5
+	w_class = WEIGHT_CLASS_HUGE
 	desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn."
 	sharp = 1
 	edge = 1
@@ -389,7 +389,7 @@
 	name = "unholy pitchfork"
 	icon_state = "pitchfork0"
 	item_state = "pitchfork0"
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	desc = "Holding this makes you look absolutely devilish."
 	attack_verb = list("poked", "impaled", "pierced", "jabbed")
 	hitsound = 'sound/weapons/bladeslice.ogg'
@@ -518,7 +518,7 @@
 	reskin_selectable = FALSE
 	icon_state = "godstaff-red"
 	item_state = "godstaff-red"
-	w_class = 5
+	w_class = WEIGHT_CLASS_HUGE
 	force = 5
 	slot_flags = SLOT_BACK
 	block_chance = 50
@@ -1,9 +1,9 @@
 /obj/item/weapon/storage/hidden/implant
 	name = "bluespace pocket"
 	storage_slots = 2
-	max_w_class = 3
-	max_combined_w_class = 6
-	w_class = 4
+	max_w_class = WEIGHT_CLASS_NORMAL
+	max_combined_w_class = WEIGHT_CLASS_GIGANTIC
+	w_class = WEIGHT_CLASS_BULKY
 	cant_hold = list(/obj/item/weapon/disk/nuclear)
 	silent = 1

@@ -58,4 +58,4 @@

 /obj/item/weapon/implanter/storage/New()
 	imp = new /obj/item/weapon/implant/storage(src)
-	..()
+	..()
@@ -6,7 +6,7 @@
 	item_state = "implantcase"
 	throw_speed = 2
 	throw_range = 5
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	origin_tech = "materials=1;biotech=2"
 	materials = list(MAT_GLASS=500)
 	var/obj/item/weapon/implant/imp = null
@@ -98,4 +98,4 @@

 /obj/item/weapon/implantcase/death_alarm/New()
 	imp = new /obj/item/weapon/implant/death_alarm(src)
-	..()
+	..()
@@ -6,7 +6,7 @@
 	item_state = "syringe_0"
 	throw_speed = 3
 	throw_range = 5
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	origin_tech = "materials=1;biotech=3;programming=2"
 	materials = list(MAT_METAL=600, MAT_GLASS=200)
 	toolspeed = 1
@@ -86,4 +86,4 @@

 /obj/item/weapon/implanter/death_alarm/New()
 	imp = new /obj/item/weapon/implant/death_alarm(src)
-	..()
+	..()
@@ -8,7 +8,7 @@
 	item_state = "electronic"
 	throw_speed = 3
 	throw_range = 5
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	var/obj/item/weapon/implantcase/case = null

 /obj/item/weapon/implantpad/Destroy()
@@ -18,7 +18,7 @@
 */
 /obj/item/weapon/kitchen/utensil
 	force = 5.0
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	throwforce = 0.0
 	throw_speed = 3
 	throw_range = 5
@@ -91,7 +91,7 @@
 	desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
 	flags = CONDUCT
 	force = 10
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	throwforce = 10
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	throw_speed = 3
@@ -122,7 +122,7 @@
 	desc = "The unearthly energies that once powered this blade are now dormant."
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "render"
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL

 /obj/item/weapon/kitchen/knife/butcher
 	name = "butcher's cleaver"
@@ -132,7 +132,7 @@
 	force = 15
 	throwforce = 8
 	attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL

 /obj/item/weapon/kitchen/knife/butcher/meatcleaver
 	name = "Meat Cleaver"
@@ -175,7 +175,7 @@
 	throwforce = 10.0
 	throw_speed = 3
 	throw_range = 7
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")

 /* Trays moved to /obj/item/weapon/storage/bag */
@@ -192,7 +192,7 @@
 	throwforce = 5
 	throw_speed = 3
 	throw_range = 3
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")

 /obj/item/weapon/kitchen/mould/bear
@@ -6,7 +6,7 @@
 	icon_state = "handcuff"
 	flags = CONDUCT
 	throwforce = 0
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	origin_tech = "materials=1"
 	slowdown = 7
 	breakouttime = 300	//Deciseconds = 30s = 0.5 minute
@@ -196,7 +196,7 @@
 	desc = "A specialized hard-light bola designed to ensnare fleeing criminals and aid in arrests."
 	icon_state = "ebola"
 	hitsound = 'sound/weapons/tase.ogg'
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	breakouttime = 60

 /obj/item/weapon/restraints/legcuffs/bola/energy/throw_impact(atom/hit_atom)
@@ -204,4 +204,4 @@
 		var/obj/item/weapon/restraints/legcuffs/beartrap/B = new /obj/item/weapon/restraints/legcuffs/beartrap/energy/cyborg(get_turf(hit_atom))
 		B.Crossed(hit_atom)
 		qdel(src)
-	..()
+	..()
@@ -9,7 +9,7 @@
 	item_state = "lighter-g"
 	var/icon_on = "lighter-g-on"
 	var/icon_off = "lighter-g"
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	throwforce = 4
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
@@ -35,7 +35,7 @@
 	if(user.r_hand == src || user.l_hand == src || isrobot(user))
 		if(!lit)
 			lit = 1
-			w_class = 4
+			w_class = WEIGHT_CLASS_BULKY
 			icon_state = icon_on
 			item_state = icon_on
 			if(istype(src, /obj/item/weapon/lighter/zippo) )
@@ -59,7 +59,7 @@
 			processing_objects.Add(src)
 		else
 			lit = 0
-			w_class = 1
+			w_class = WEIGHT_CLASS_TINY
 			icon_state = icon_off
 			item_state = icon_off
 			if(istype(src, /obj/item/weapon/lighter/zippo) )
@@ -147,7 +147,7 @@
 	icon_state = "match_unlit"
 	var/lit = 0
 	var/smoketime = 5
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	origin_tech = "materials=1"
 	attack_verb = list("burnt", "singed")

@@ -2,8 +2,8 @@
 	var/active = 0
 	var/force_on = 30 //force when active
 	var/throwforce_on = 20
-	w_class = 2
-	var/w_class_on = 4
+	w_class = WEIGHT_CLASS_SMALL
+	var/w_class_on = WEIGHT_CLASS_BULKY
 	var/icon_state_on = "axe1"
 	var/list/attack_verb_on = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	no_embed = 1 // Physically impossible for energy weapons to embed themselves into people, this should fix that. -- Dave
@@ -61,8 +61,8 @@
 	throwforce_on = 30
 	throw_speed = 3
 	throw_range = 5
-	w_class = 3
-	w_class_on = 5
+	w_class = WEIGHT_CLASS_NORMAL
+	w_class_on = WEIGHT_CLASS_HUGE
 	hitsound = "swing_hit"
 	flags = CONDUCT
 	armour_penetration = 100
@@ -129,7 +129,7 @@
 	icon_state_on = "esaw_1"
 	hitcost = 75 //Costs more than a standard cyborg esword
 	item_color = null
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL

 /obj/item/weapon/melee/energy/sword/cyborg/saw/New()
 	..()
@@ -207,7 +207,7 @@
 	throwforce = 1//Throwing or dropping the item deletes it.
 	throw_speed = 3
 	throw_range = 1
-	w_class = 4//So you can't hide it in your pocket or some such.
+	w_class = WEIGHT_CLASS_BULKY //So you can't hide it in your pocket or some such.
 	armour_penetration = 50
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	var/datum/effect/system/spark_spread/spark_system
@@ -223,4 +223,4 @@
 	qdel(src)

 /obj/item/weapon/melee/energy/blade/attack_self(mob/user)
-	return
+	return
@@ -10,7 +10,7 @@
 	slot_flags = SLOT_BELT
 	force = 10
 	throwforce = 7
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	origin_tech = "combat=4"
 	attack_verb = list("flogged", "whipped", "lashed", "disciplined")
 	hitsound = 'sound/weapons/slash.ogg' //pls replace
@@ -28,7 +28,7 @@
 	flags = CONDUCT
 	force = 15
 	throwforce = 10
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	block_chance = 50
 	armour_penetration = 75
 	sharp = 1
@@ -50,7 +50,7 @@
 	item_state = "icepick"
 	force = 15
 	throwforce = 10
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	attack_verb = list("stabbed", "jabbed", "iced,")

 /obj/item/weapon/melee/candy_sword
@@ -60,5 +60,5 @@
 	item_state = "candy_sword"
 	force = 10
 	throwforce = 7
-	w_class = 3
-	attack_verb = list("slashed", "stabbed", "sliced", "caned")
+	w_class = WEIGHT_CLASS_NORMAL
+	attack_verb = list("slashed", "stabbed", "sliced", "caned")
@@ -30,7 +30,7 @@
 	flags = CONDUCT
 	force = 5.0
 	throwforce = 7.0
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	materials = list(MAT_METAL=50)
 	attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed", "Vaudevilled")

@@ -43,7 +43,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "c_tube"
 	throwforce = 1
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	throw_speed = 4
 	throw_range = 5

@@ -65,7 +65,7 @@
 	var/data = ""
 	var/base_url = "http://svn.slurm.us/public/spacestation13/misc/game_kit"
 	item_state = "sheet-metal"
-	w_class = 5
+	w_class = WEIGHT_CLASS_HUGE
 */

 /obj/item/weapon/gift
@@ -76,7 +76,7 @@
 	var/size = 3.0
 	var/obj/item/gift = null
 	item_state = "gift"
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY

 /obj/item/weapon/kidanglobe
 	name = "Kidan homeworld globe"
@@ -134,7 +134,7 @@
 	throwforce = 2
 	throw_speed = 1
 	throw_range = 4
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	attack_verb = list("called", "rang")
 	hitsound = 'sound/weapons/ring.ogg'
 	var/cooldown = 0
@@ -9,7 +9,7 @@
 	throwforce = 5.0
 	throw_speed = 3
 	throw_range = 7
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
 	burn_state = FLAMMABLE
 	var/mopping = 0
@@ -7,7 +7,7 @@
 	icon_state = "paint_neutral"
 	item_state = "paintcan"
 	materials = list(MAT_METAL=200)
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	burn_state = FLAMMABLE
 	burntime = 5
 	amount_per_transfer_from_this = 5
@@ -63,4 +63,4 @@

 /obj/item/weapon/reagent_containers/glass/paint/remover
 	name = "paint remover bucket"
-	list_reagents = list("paint_remover" = 70)
+	list_reagents = list("paint_remover" = 70)
@@ -1,7 +1,7 @@
 /obj/item/weapon/pneumatic_cannon
 	name = "pneumatic cannon"
 	desc = "A gas-powered cannon that can fire any object loaded into it."
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	force = 8 //Very heavy
 	attack_verb = list("bludgeoned", "smashed", "beaten")
 	icon = 'icons/obj/pneumaticCannon.dmi'
@@ -132,7 +132,7 @@
 	name = "improvised pneumatic cannon"
 	desc = "A gas-powered, object-firing cannon made out of common parts."
 	force = 5
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	maxWeightClass = 7
 	gasPerThrow = 5

@@ -8,7 +8,7 @@
 	force = 12
 	throwforce = 10
 	throw_range = 7
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	origin_tech = "combat=5;powerstorage=3;syndicate=3"
 	var/click_delay = 1.5
 	var/fisto_setting = 1
@@ -6,7 +6,7 @@
 	force = 5
 	sharp = 1
 	edge = 1
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("slices", "cuts", "stabs", "jabs")
 	toolspeed = 1
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "scroll"
 	var/uses = 4.0
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	item_state = "paper"
 	throw_speed = 4
 	throw_range = 20
@@ -96,4 +96,4 @@
 		user.loc = pick(L)

 	smoke.start()
-	src.uses -= 1
+	src.uses -= 1
@@ -7,7 +7,7 @@
 	sharp = 1
 	edge = 1
 	desc = "Could probably be used as ... a throwing weapon?"
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	force = 5.0
 	throwforce = 10.0
 	item_state = "shard-glass"
@@ -112,4 +112,4 @@
 			src.pixel_x = rand(-5, 5)
 			src.pixel_y = rand(-5, 5)
 		else
-	return
+	return
@@ -19,7 +19,7 @@
 	throwforce = 5
 	throw_speed = 2
 	throw_range = 3
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	materials = list(MAT_GLASS=7500, MAT_METAL=1000)
 	origin_tech = "materials=2"
 	attack_verb = list("shoved", "bashed")
@@ -58,7 +58,7 @@
 	throwforce = 3
 	throw_speed = 3
 	throw_range = 5
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	origin_tech = "materials=4;magnets=3;syndicate=4"
 	attack_verb = list("shoved", "bashed")
 	var/active = 0
@@ -80,14 +80,14 @@
 		force = 10
 		throwforce = 8
 		throw_speed = 2
-		w_class = 4
+		w_class = WEIGHT_CLASS_BULKY
 		playsound(user, 'sound/weapons/saberon.ogg', 35, 1)
 		to_chat(user, "<span class='notice'>[src] is now active.</span>")
 	else
 		force = 3
 		throwforce = 3
 		throw_speed = 3
-		w_class = 1
+		w_class = WEIGHT_CLASS_TINY
 		playsound(user, 'sound/weapons/saberoff.ogg', 35, 1)
 		to_chat(user, "<span class='notice'>[src] can now be concealed.</span>")
 	if(istype(user,/mob/living/carbon/human))
@@ -107,7 +107,7 @@
 	throwforce = 3
 	throw_speed = 3
 	throw_range = 4
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	var/active = 0

 /obj/item/weapon/shield/riot/tele/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance)
@@ -124,14 +124,14 @@
 		force = 8
 		throwforce = 5
 		throw_speed = 2
-		w_class = 4
+		w_class = WEIGHT_CLASS_BULKY
 		slot_flags = SLOT_BACK
 		to_chat(user, "<span class='notice'>You extend \the [src].</span>")
 	else
 		force = 3
 		throwforce = 3
 		throw_speed = 3
-		w_class = 3
+		w_class = WEIGHT_CLASS_NORMAL
 		slot_flags = null
 		to_chat(user, "<span class='notice'>[src] can now be concealed.</span>")
 	if(istype(user,/mob/living/carbon/human))
@@ -4,7 +4,7 @@
 	name = "blank picket sign"
 	desc = "It's blank"
 	force = 5
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	attack_verb = list("bashed","smacked")
 	burn_state = FLAMMABLE

@@ -42,4 +42,4 @@
 	reqs = list(/obj/item/stack/rods = 1,
 				/obj/item/stack/sheet/cardboard = 2)
 	time = 80
-	category = CAT_MISC
+	category = CAT_MISC
@@ -4,7 +4,7 @@
 	gender = PLURAL
 	icon = 'icons/obj/items.dmi'
 	icon_state = "soap"
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	throwforce = 0
 	throw_speed = 4
 	throw_range = 20
@@ -53,4 +53,4 @@
 /obj/item/weapon/soap/syndie
 	desc = "An untrustworthy bar of soap made of strong chemical agents that dissolve blood faster."
 	icon_state = "soapsyndie"
-	cleanspeed = 10 //much faster than mop so it is useful for traitors who want to clean crime scenes
+	cleanspeed = 10 //much faster than mop so it is useful for traitors who want to clean crime scenes
@@ -7,7 +7,7 @@
 	throwforce = 5.0
 	throw_speed = 1
 	throw_range = 5
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	armour_penetration = 100
 	attack_verb = list("bludgeoned", "whacked", "disciplined")
 	burn_state = FLAMMABLE
@@ -73,4 +73,4 @@
 	throwforce = 5.0
 	throw_speed = 1
 	throw_range = 5
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
@@ -5,7 +5,7 @@
 	desc = "Special mechanical module made to store, sort, and apply standard machine parts."
 	icon_state = "RPED"
 	item_state = "RPED"
-	w_class = 5
+	w_class = WEIGHT_CLASS_HUGE
 	can_hold = list(/obj/item/weapon/stock_parts)
 	storage_slots = 50
 	use_to_pickup = 1
@@ -13,7 +13,7 @@
 	allow_quick_empty = 1
 	collection_mode = 1
 	display_contents_with_number = 1
-	max_w_class = 3
+	max_w_class = WEIGHT_CLASS_NORMAL
 	max_combined_w_class = 100
 	var/works_from_distance = 0
 	var/primary_sound = 'sound/items/rped.ogg'
@@ -36,9 +36,9 @@
 	name = "bluespace rapid part exchange device"
 	desc = "A version of the RPED that allows for replacement of parts and scanning from a distance, along with higher capacity for parts."
 	icon_state = "BS_RPED"
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	storage_slots = 400
-	max_w_class = 3
+	max_w_class = WEIGHT_CLASS_NORMAL
 	max_combined_w_class = 800
 	works_from_distance = 1
 	primary_sound = 'sound/items/PSHOOM.ogg'
@@ -63,11 +63,11 @@
 	desc = "What?"
 	gender = PLURAL
 	icon = 'icons/obj/stock_parts.dmi'
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	var/rating = 1
 	toolspeed = 1
 	usesound = 'sound/items/Deconstruct.ogg'
-	
+
 /obj/item/weapon/stock_parts/New()
 	src.pixel_x = rand(-5.0, 5)
 	src.pixel_y = rand(-5.0, 5)
@@ -10,9 +10,9 @@
 	item_state = "backpack"
 	lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = SLOT_BACK	//ERROOOOO
-	max_w_class = 3
+	max_w_class = WEIGHT_CLASS_NORMAL
 	max_combined_w_class = 21
 	storage_slots = 21
 	burn_state = FLAMMABLE
@@ -35,7 +35,7 @@
 	desc = "A backpack that opens into a localized pocket of Blue Space."
 	origin_tech = "bluespace=4"
 	icon_state = "holdingpack"
-	max_w_class = 5
+	max_w_class = WEIGHT_CLASS_HUGE
 	max_combined_w_class = 35
 	burn_state = FIRE_PROOF

@@ -88,8 +88,8 @@
 	desc = "Space Santa uses this to deliver toys to all the nice children in space on Christmas! Wow, it's pretty big!"
 	icon_state = "giftbag0"
 	item_state = "giftbag"
-	w_class = 4
-	max_w_class = 3
+	w_class = WEIGHT_CLASS_BULKY
+	max_w_class = WEIGHT_CLASS_NORMAL
 	max_combined_w_class = 400 // can store a ton of shit!

 /obj/item/weapon/storage/backpack/cultpack
@@ -243,7 +243,7 @@
 	name = "smuggler's satchel"
 	desc = "A very slim satchel that can easily fit into tight spaces."
 	icon_state = "satchel-flat"
-	w_class = 3 //Can fit in backpacks itself.
+	w_class = WEIGHT_CLASS_NORMAL //Can fit in backpacks itself.
 	max_combined_w_class = 15
 	level = 1
 	cant_hold = list(/obj/item/weapon/storage/backpack/satchel_flat) //muh recursive backpacks
@@ -33,8 +33,8 @@
 	icon_state = "trashbag"
 	item_state = "trashbag"

-	w_class = 1
-	max_w_class = 2
+	w_class = WEIGHT_CLASS_TINY
+	max_w_class = WEIGHT_CLASS_SMALL
 	storage_slots = 30
 	can_hold = list() // any
 	cant_hold = list(/obj/item/weapon/disk/nuclear)
@@ -46,16 +46,16 @@

 /obj/item/weapon/storage/bag/trash/update_icon()
 	if(contents.len == 0)
-		w_class = 1
+		w_class = WEIGHT_CLASS_TINY
 		icon_state = "[initial(icon_state)]"
 	else if(contents.len < 12)
-		w_class = 4
+		w_class = WEIGHT_CLASS_BULKY
 		icon_state = "[initial(icon_state)]1"
 	else if(contents.len < 21)
-		w_class = 4
+		w_class = WEIGHT_CLASS_BULKY
 		icon_state = "[initial(icon_state)]2"
 	else
-		w_class = 4
+		w_class = WEIGHT_CLASS_BULKY
 		icon_state = "[initial(icon_state)]3"

 /obj/item/weapon/storage/bag/trash/cyborg
@@ -88,8 +88,8 @@
 	item_state = "plasticbag"
 	slot_flags = SLOT_HEAD|SLOT_BELT
 	throwforce = 0
-	w_class = 4
-	max_w_class = 2
+	w_class = WEIGHT_CLASS_BULKY
+	max_w_class = WEIGHT_CLASS_SMALL
 	storage_slots = 7
 	display_contents_with_number = 0 //or else this will lead to stupid behavior.
 	can_hold = list() // any
@@ -132,10 +132,10 @@
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "satchel"
 	slot_flags = SLOT_BELT | SLOT_POCKET
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	storage_slots = 50
 	max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * ore.w_class
-	max_w_class = 3
+	max_w_class = WEIGHT_CLASS_NORMAL
 	can_hold = list(/obj/item/weapon/ore)

 /obj/item/weapon/storage/bag/ore/cyborg
@@ -164,8 +164,8 @@
 	icon_state = "plantbag"
 	storage_slots = 100 //the number of plant pieces it can carry.
 	max_combined_w_class = 100 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
-	max_w_class = 3
-	w_class = 1
+	max_w_class = WEIGHT_CLASS_NORMAL
+	w_class = WEIGHT_CLASS_TINY
 	can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/weapon/grown,/obj/item/weapon/reagent_containers/food/snacks/ash_flora)
 	burn_state = FLAMMABLE

@@ -202,7 +202,7 @@
 	desc = "A patented Nanotrasen storage system designed for any kind of mineral sheet."

 	var/capacity = 300; //the number of sheets it can carry.
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL

 	allow_quick_empty = 1 // this function is superceded
 	New()
@@ -343,8 +343,8 @@
 	desc = "A bag for carrying lots of cash. It's got a big dollar sign printed on the front."
 	storage_slots = 50; //the number of cash pieces it can carry.
 	max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * cash.w_class
-	max_w_class = 3
-	w_class = 1
+	max_w_class = WEIGHT_CLASS_NORMAL
+	w_class = WEIGHT_CLASS_TINY
 	can_hold = list(/obj/item/weapon/coin,/obj/item/stack/spacecash)

 // -----------------------------
@@ -359,8 +359,8 @@
 	display_contents_with_number = 0 //This would look really stupid otherwise
 	storage_slots = 7
 	max_combined_w_class = 21
-	max_w_class = 3
-	w_class = 4 //Bigger than a book because physics
+	max_w_class = WEIGHT_CLASS_NORMAL
+	w_class = WEIGHT_CLASS_BULKY //Bigger than a book because physics
 	can_hold = list(/obj/item/weapon/book, /obj/item/weapon/storage/bible, /obj/item/weapon/tome, /obj/item/weapon/spellbook)
 	burn_state = FLAMMABLE

@@ -376,7 +376,7 @@
 	throwforce = 10.0
 	throw_speed = 3
 	throw_range = 5
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	flags = CONDUCT
 	materials = list(MAT_METAL=3000)

@@ -469,7 +469,7 @@
 	desc = "A bag for storing pills, patches, and bottles."
 	storage_slots = 50
 	max_combined_w_class = 200
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	can_hold = list(/obj/item/weapon/reagent_containers/food/pill,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/glass/bottle)
 	burn_state = FLAMMABLE
 /*
@@ -483,6 +483,6 @@
 	desc = "A bag for the safe transportation and disposal of biowaste and other biological materials."
 	storage_slots = 25
 	max_combined_w_class = 200
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	can_hold = list(/obj/item/slime_extract,/obj/item/weapon/reagent_containers/food/snacks/monkeycube,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/blood,/obj/item/weapon/reagent_containers/hypospray/autoinjector)
 	burn_state = FLAMMABLE
@@ -176,7 +176,7 @@
 	icon_state = "securitybelt"
 	item_state = "security"//Could likely use a better one.
 	storage_slots = 5
-	max_w_class = 3
+	max_w_class = WEIGHT_CLASS_NORMAL
 	use_item_overlays = 1
 	can_hold = list(
 		/obj/item/weapon/grenade/flashbang,
@@ -249,7 +249,7 @@
 	icon_state = "militarybelt"
 	item_state = "military"
 	max_w_class = WEIGHT_CLASS_SMALL
-	
+
 /obj/item/weapon/storage/belt/military/abductor
 	name = "agent belt"
 	desc = "A belt used by abductor agents."
@@ -280,7 +280,7 @@
 	icon_state = "janibelt"
 	item_state = "janibelt"
 	storage_slots = 6
-	max_w_class = 4 // Set to this so the  light replacer can fit.
+	max_w_class = WEIGHT_CLASS_BULKY // Set to this so the  light replacer can fit.
 	use_item_overlays = 1
 	can_hold = list(
 		/obj/item/weapon/grenade/chem_grenade/cleaner,
@@ -306,8 +306,8 @@
 	desc = "For the mining master, holds your lazarus capsules."
 	icon_state = "lazarusbelt"
 	item_state = "lazbelt"
-	w_class = 4
-	max_w_class = 1
+	w_class = WEIGHT_CLASS_BULKY
+	max_w_class = WEIGHT_CLASS_TINY
 	max_combined_w_class = 6
 	storage_slots = 6
 	can_hold = list(/obj/item/device/mobcapsule)
@@ -379,7 +379,7 @@
 	icon_state = "holster"
 	item_state = "holster"
 	storage_slots = 1
-	max_w_class = 3
+	max_w_class = WEIGHT_CLASS_NORMAL
 	can_hold = list(
 		/obj/item/weapon/gun/projectile/automatic/pistol,
 		/obj/item/weapon/gun/projectile/revolver/detective
@@ -417,7 +417,7 @@
 	icon_state = "fannypack_leather"
 	item_state = "fannypack_leather"
 	storage_slots = 3
-	max_w_class = 2
+	max_w_class = WEIGHT_CLASS_SMALL

 /obj/item/weapon/storage/belt/fannypack/black
 	name = "black fannypack"
@@ -475,8 +475,8 @@
 	icon_state = "sheath"
 	item_state = "sheath"
 	storage_slots = 1
-	w_class = 4
-	max_w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
+	max_w_class = WEIGHT_CLASS_BULKY
 	can_hold = list(/obj/item/weapon/melee/rapier)

 /obj/item/weapon/storage/belt/rapier/update_icon()
@@ -506,8 +506,8 @@
 	icon_state = "holdingbelt"
 	item_state = "holdingbelt"
 	storage_slots = 14
-	w_class = 4
-	max_w_class = 2
+	w_class = WEIGHT_CLASS_BULKY
+	max_w_class = WEIGHT_CLASS_SMALL
 	max_combined_w_class = 21 // = 14 * 1.5, not 14 * 2.  This is deliberate
 	origin_tech = "bluespace=4"
 	can_hold = list()
@@ -530,7 +530,7 @@
 	icon_state = "securitybelt"
 	item_state = "security"
 	storage_slots = 6
-	max_w_class = 3
+	max_w_class = WEIGHT_CLASS_NORMAL
 	max_combined_w_class = 18
 	origin_tech = "bluespace=4;syndicate=2"
 	allow_quick_empty = 1
@@ -4,7 +4,7 @@
 	icon_state ="bible"
 	throw_speed = 1
 	throw_range = 5
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	burn_state = FLAMMABLE
 	var/mob/affecting = null
 	var/deity_name = "Christ"
@@ -634,8 +634,8 @@
 	icon_state = "matchbox"
 	item_state = "zippo"
 	storage_slots = 10
-	w_class = 1
-	max_w_class = 1
+	w_class = WEIGHT_CLASS_TINY
+	max_w_class = WEIGHT_CLASS_TINY
 	slot_flags = SLOT_BELT
 	can_hold = list(/obj/item/weapon/match)

@@ -810,4 +810,4 @@
 #undef NANOTRASEN
 #undef SYNDI
 #undef HEART
-#undef SMILE
+#undef SMILE
@@ -8,12 +8,12 @@
 	force = 8.0
 	throw_speed = 2
 	throw_range = 4
-	w_class = 4
-	max_w_class = 3
+	w_class = WEIGHT_CLASS_BULKY
+	max_w_class = WEIGHT_CLASS_NORMAL
 	max_combined_w_class = 21
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
 	burn_state = FLAMMABLE
 	burntime = 20

 /obj/item/weapon/storage/briefcase/New()
-	..()
+	..()
@@ -115,7 +115,7 @@
 	desc = "A box of crayons for all your rune drawing needs."
 	icon = 'icons/obj/crayons.dmi'
 	icon_state = "crayonbox"
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	storage_slots = 6
 	icon_type = "crayon"
 	can_hold = list(
@@ -158,7 +158,7 @@
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "cigpacket"
 	item_state = "cigpacket"
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	throwforce = 2
 	slot_flags = SLOT_BELT
 	storage_slots = 6
@@ -318,7 +318,7 @@
 /obj/item/weapon/storage/fancy/rollingpapers
 	name = "rolling paper pack"
 	desc = "A pack of NanoTrasen brand rolling papers."
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "cig_paper_pack"
 	storage_slots = 10
@@ -360,7 +360,7 @@
 	icon = 'icons/obj/vialbox.dmi'
 	icon_state = "vialbox0"
 	item_state = "syringe_kit"
-	max_w_class = 3
+	max_w_class = WEIGHT_CLASS_NORMAL
 	can_hold = list(/obj/item/weapon/reagent_containers/glass/beaker/vial)
 	max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
 	storage_slots = 6
@@ -155,7 +155,7 @@
 	name = "first-aid kit"
 	icon_state = "bezerk"
 	desc = "I hope you've got insurance."
-	max_w_class = 3
+	max_w_class = WEIGHT_CLASS_NORMAL
 	treatment_oxy = "perfluorodecalin"
 	treatment_brute = "styptic_powder"
 	treatment_fire = "silver_sulfadiazine"
@@ -181,7 +181,7 @@
 	name = "field surgery kit"
 	icon_state = "duffel-med"
 	desc = "A kit for surgery in the field."
-	max_w_class = 4
+	max_w_class = WEIGHT_CLASS_BULKY
 	max_combined_w_class = 21
 	storage_slots = 10
 	can_hold = list(/obj/item/roller,/obj/item/weapon/bonesetter,/obj/item/weapon/bonegel, /obj/item/weapon/scalpel, /obj/item/weapon/hemostat,
@@ -209,7 +209,7 @@
 	icon_state = "pill_canister"
 	icon = 'icons/obj/chemical.dmi'
 	item_state = "contsolid"
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	can_hold = list(/obj/item/weapon/reagent_containers/food/pill, /obj/item/weapon/dice, /obj/item/weapon/paper)
 	allow_quick_gather = 1
 	use_to_pickup = 1
@@ -5,8 +5,8 @@
 	desc = "A locked box."
 	icon_state = "lockbox+l"
 	item_state = "syringe_kit"
-	w_class = 4
-	max_w_class = 3
+	w_class = WEIGHT_CLASS_BULKY
+	max_w_class = WEIGHT_CLASS_NORMAL
 	max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
 	storage_slots = 4
 	req_access = list(access_armory)
@@ -76,7 +76,7 @@
 /obj/item/weapon/storage/lockbox/large
 	name = "Large lockbox"
 	desc = "A large lockbox"
-	max_w_class = 4
+	max_w_class = WEIGHT_CLASS_BULKY
 	max_combined_w_class = 4 //The sum of the w_classes of all the items in this storage item.
 	storage_slots = 1

@@ -105,8 +105,8 @@
 	desc = "A locked box used to store medals of honor."
 	icon_state = "medalbox+l"
 	item_state = "syringe_kit"
-	w_class = 3
-	max_w_class = 2
+	w_class = WEIGHT_CLASS_NORMAL
+	max_w_class = WEIGHT_CLASS_SMALL
 	max_combined_w_class = 20
 	storage_slots = 12
 	req_access = list(access_captain)
@@ -23,8 +23,8 @@
 	var/l_hacking = 0
 	var/emagged = 0
 	var/open = 0
-	w_class = 3
-	max_w_class = 2
+	w_class = WEIGHT_CLASS_NORMAL
+	max_w_class = WEIGHT_CLASS_SMALL
 	max_combined_w_class = 14

 /obj/item/weapon/storage/secure/examine(mob/user)
@@ -180,8 +180,8 @@
 	force = 8
 	throw_speed = 2
 	throw_range = 4
-	w_class = 4
-	max_w_class = 3
+	w_class = WEIGHT_CLASS_BULKY
+	max_w_class = WEIGHT_CLASS_NORMAL
 	max_combined_w_class = 21
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")

@@ -228,7 +228,7 @@
 	icon_locking = "safeb"
 	icon_sparking = "safespark"
 	force = 8
-	w_class = 5
+	w_class = WEIGHT_CLASS_HUGE
 	max_w_class = 8
 	anchored = 1
 	density = 0
@@ -8,11 +8,11 @@
 /obj/item/weapon/storage
 	name = "storage"
 	icon = 'icons/obj/storage.dmi'
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	var/silent = 0 // No message on putting items in
 	var/list/can_hold = new/list() //List of objects which this item can store (if set, it can't store anything else)
 	var/list/cant_hold = new/list() //List of objects which this item can't store (in effect only if can_hold isn't set)
-	var/max_w_class = 2 //Max size of objects that this object can store (in effect only if can_hold isn't set)
+	var/max_w_class = WEIGHT_CLASS_SMALL //Max size of objects that this object can store (in effect only if can_hold isn't set)
 	var/max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
 	var/storage_slots = 7 //The number of storage slots in this container.
 	var/obj/screen/storage/boxes = null
@@ -304,7 +304,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'>[usr] puts [W] into [src].</span>")
-				else if(W && W.w_class >= 3.0) //Otherwise they can only see large or normal items from a distance...
+				else if(W && W.w_class >= WEIGHT_CLASS_NORMAL) //Otherwise they can only see large or normal items from a distance...
 					M.show_message("<span class='notice'>[usr] puts [W] into [src].</span>")

 		src.orient2hud(usr)
@@ -9,7 +9,7 @@
 	throwforce = 10.0
 	throw_speed = 2
 	throw_range = 7
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	materials = list(MAT_METAL = 500)
 	origin_tech = "combat=1"
 	attack_verb = list("robusted")
@@ -85,7 +85,7 @@
 	new /obj/item/weapon/wirecutters(src, "red")
 	new /obj/item/device/multitool(src)
 	new /obj/item/clothing/gloves/combat(src)
-	
+
 /obj/item/weapon/storage/toolbox/drone
 	name = "mechanical toolbox"
 	icon_state = "blue"
@@ -119,4 +119,4 @@
 	new /obj/item/weapon/wirecutters/brass(src)
 	new /obj/item/weapon/wrench/brass(src)
 	new /obj/item/weapon/crowbar/brass(src)
-	new /obj/item/weapon/weldingtool/experimental/brass(src)
+	new /obj/item/weapon/weldingtool/experimental/brass(src)
@@ -69,7 +69,7 @@
 				new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
 				new /obj/item/weapon/card/id/syndicate(src)
 				return
-				
+
 			if("gadgets")
 				new /obj/item/clothing/gloves/color/yellow/power(src)
 				new /obj/item/weapon/pen/sleepy(src)
@@ -88,7 +88,7 @@
 /obj/item/weapon/storage/box/syndie_kit/space
 	name = "Boxed Space Suit and Helmet"
 	can_hold = list(/obj/item/clothing/suit/space/syndicate/black/red, /obj/item/clothing/head/helmet/space/syndicate/black/red)
-	max_w_class = 3
+	max_w_class = WEIGHT_CLASS_NORMAL

 /obj/item/weapon/storage/box/syndie_kit/space/New()
 	..()
@@ -99,7 +99,7 @@
 /obj/item/weapon/storage/box/syndie_kit/hardsuit
 	name = "Boxed Blood Red Suit and Helmet"
 	can_hold = list(/obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/clothing/head/helmet/space/hardsuit/syndi)
-	max_w_class = 3
+	max_w_class = WEIGHT_CLASS_NORMAL

 /obj/item/weapon/storage/box/syndie_kit/hardsuit/New()
 	..()
@@ -110,7 +110,7 @@
 /obj/item/weapon/storage/box/syndie_kit/elite_hardsuit
 	name = "Boxed Elite Syndicate Hardsuit and Helmet"
 	can_hold = list(/obj/item/clothing/suit/space/hardsuit/syndi/elite, /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite)
-	max_w_class = 3
+	max_w_class = WEIGHT_CLASS_NORMAL

 /obj/item/weapon/storage/box/syndie_kit/elite_hardsuit/New()
 	..()
@@ -120,7 +120,7 @@
 /obj/item/weapon/storage/box/syndie_kit/shielded_hardsuit
 	name = "Boxed Shielded Syndicate Hardsuit and Helmet"
 	can_hold = list(/obj/item/clothing/suit/space/hardsuit/shielded/syndi, /obj/item/clothing/head/helmet/space/hardsuit/shielded/syndi)
-	max_w_class = 4
+	max_w_class = WEIGHT_CLASS_BULKY

 /obj/item/weapon/storage/box/syndie_kit/shielded_hardsuit/New()
 	..()
@@ -4,7 +4,7 @@
 	storage_slots = 10
 	icon = 'icons/obj/wallets.dmi'
 	icon_state = "wallet"
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	burn_state = FLAMMABLE
 	can_hold = list(
 		/obj/item/stack/spacecash,
@@ -7,7 +7,7 @@
 	slot_flags = SLOT_BELT
 	force = 10
 	throwforce = 7
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	origin_tech = "combat=2"
 	attack_verb = list("beaten")
 	var/stunforce = 7
@@ -190,7 +190,7 @@
 	icon_state = "stunprod_nocell"
 	base_icon = "stunprod"
 	item_state = "prod"
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	force = 3
 	throwforce = 5
 	stunforce = 5
@@ -25,7 +25,7 @@
 	item_state = "classic_baton"
 	slot_flags = SLOT_BELT
 	force = 12 //9 hit crit
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	var/cooldown = 0
 	var/on = 1

@@ -90,7 +90,7 @@
 	icon_state = "telebaton_0"
 	item_state = null
 	slot_flags = SLOT_BELT
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	needs_permit = 0
 	force = 0
 	on = 0
@@ -101,7 +101,7 @@
 		to_chat(user, "<span class ='warning'>You extend the baton.</span>")
 		icon_state = "telebaton_1"
 		item_state = "nullrod"
-		w_class = 4 //doesnt fit in backpack when its on for balance
+		w_class = WEIGHT_CLASS_BULKY //doesnt fit in backpack when its on for balance
 		force = 10 //stunbaton damage
 		attack_verb = list("smacked", "struck", "cracked", "beaten")
 	else
@@ -109,7 +109,7 @@
 		icon_state = "telebaton_0"
 		item_state = null //no sprite for concealment even when in hand
 		slot_flags = SLOT_BELT
-		w_class = 2
+		w_class = WEIGHT_CLASS_SMALL
 		force = 0 //not so robust now
 		attack_verb = list("hit", "poked")
 	if(istype(user,/mob/living/carbon/human))
@@ -10,7 +10,7 @@
 	var/mob/currentUser = null
 	var/obj/item/device/radio/origradio = null
 	flags = CONDUCT | ONBELT
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	item_state = "radio"
 	throw_speed = 4
 	throw_range = 20
@@ -31,8 +31,8 @@
 	slot_flags = SLOT_BELT
 	item_state = "radio"
 	throwforce = 5
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	throw_speed = 4
 	throw_range = 20
 	materials = list(MAT_METAL=100)
-	origin_tech = "magnets=1"
+	origin_tech = "magnets=1"
@@ -4,7 +4,7 @@
 	name = "Jetpack (Empty)"
 	desc = "A tank of compressed gas for use as propulsion in zero-gravity areas. Use with caution."
 	icon_state = "jetpack"
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	item_state = "jetpack"
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
 	var/datum/effect/system/ion_trail_follow/ion_trail
@@ -116,7 +116,7 @@
 	item_state = "jetpack-mini"
 	volume = 40
 	throw_range = 8
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL

 /obj/item/weapon/tank/jetpack/oxygenblack
 	name = "Jetpack (Oxygen)"
@@ -174,4 +174,4 @@
 	var/turf/T = get_turf(user)
 	T.assume_air(removed)

-	return 1
+	return 1
@@ -126,7 +126,7 @@
 	icon_state = "emergency"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	force = 4.0
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
 	volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
@@ -7,7 +7,7 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BACK
 	hitsound = 'sound/weapons/smash.ogg'
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL

 	pressure_resistance = ONE_ATMOSPHERE*5

@@ -5,7 +5,7 @@
 	icon = 'icons/obj/watertank.dmi'
 	icon_state = "waterbackpack"
 	item_state = "waterbackpack"
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = SLOT_BACK
 	slowdown = 1
 	actions_types = list(/datum/action/item_action/toggle_mister)
@@ -112,7 +112,7 @@
 	icon = 'icons/obj/watertank.dmi'
 	icon_state = "mister"
 	item_state = "mister"
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	amount_per_transfer_from_this = 50
 	possible_transfer_amounts = list(25,50,100)
 	volume = 500
@@ -220,7 +220,7 @@
 	power = 8
 	precision = 1
 	cooling_power = 5
-	w_class = 5
+	w_class = WEIGHT_CLASS_HUGE
 	flags = NODROP //Necessary to ensure that the nozzle and tank never seperate
 	var/obj/item/weapon/watertank/tank
 	var/nozzle_mode = 0
@@ -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 = WEIGHT_CLASS_TINY
 	amount = 10
 	max_amount = 10

@@ -76,7 +76,7 @@
 	desc = "A piece of sticky tape."
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "tape"
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	layer = 4
 	anchored = 1 //it's sticky, no you cant move it

@@ -17,7 +17,7 @@
 	var/broadcasting = null
 	var/listening = 1.0
 	flags = CONDUCT
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	item_state = "electronic"
 	throw_speed = 4
 	throw_range = 20
@@ -98,7 +98,7 @@ Frequency:
 	icon_state = "hand_tele"
 	item_state = "electronic"
 	throwforce = 0
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	throw_speed = 3
 	throw_range = 5
 	materials = list(MAT_METAL=10000)
@@ -109,7 +109,7 @@

 ///////////OFFHAND///////////////
 /obj/item/weapon/twohanded/offhand
-	w_class = 5
+	w_class = WEIGHT_CLASS_HUGE
 	icon_state = "offhand"
 	name = "offhand"
 	flags = ABSTRACT
@@ -123,7 +123,7 @@
 ///////////Two hand required objects///////////////
 //This is for objects that require two hands to even pick up
 /obj/item/weapon/twohanded/required/
-	w_class = 5
+	w_class = WEIGHT_CLASS_HUGE

 /obj/item/weapon/twohanded/required/attack_self()
 	return
@@ -163,7 +163,7 @@
 	throwforce = 15
 	sharp = 1
 	edge = 1
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = SLOT_BACK
 	force_unwielded = 5
 	force_wielded = 24
@@ -199,7 +199,7 @@
 	throwforce = 5.0
 	throw_speed = 1
 	throw_range = 5
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	force_unwielded = 3
 	force_wielded = 34
 	wieldsound = 'sound/weapons/saberon.ogg'
@@ -286,7 +286,7 @@
 	name = "spear"
 	desc = "A haphazardly-constructed yet still deadly weapon of ancient design."
 	force = 10
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = SLOT_BACK
 	force_unwielded = 10
 	force_wielded = 18
@@ -433,7 +433,7 @@
 	flags = CONDUCT
 	force = 13
 	var/force_on = 21
-	w_class = 5
+	w_class = WEIGHT_CLASS_HUGE
 	throwforce = 13
 	throw_speed = 2
 	throw_range = 4
@@ -490,7 +490,7 @@
 	throwforce = 15
 	throw_speed = 1
 	throw_range = 5
-	w_class = 4 // can't fit in backpacks
+	w_class = WEIGHT_CLASS_BULKY // can't fit in backpacks
 	force_unwielded = 15 //still pretty robust
 	force_wielded = 40  //you'll gouge their eye out! Or a limb...maybe even their entire body!
 	wieldsound = 'sound/weapons/chainsawstart.ogg'
@@ -545,7 +545,7 @@
 	force_wielded = 20
 	throwforce = 15
 	throw_range = 1
-	w_class = 5
+	w_class = WEIGHT_CLASS_HUGE
 	var/charged = 5
 	origin_tech = "combat=5;bluespace=4"

@@ -610,7 +610,7 @@
 	force_wielded = 25
 	throwforce = 30
 	throw_range = 7
-	w_class = 5
+	w_class = WEIGHT_CLASS_HUGE
 	//var/charged = 5
 	origin_tech = "combat=5;powerstorage=5"

@@ -658,7 +658,7 @@
 	force_wielded = 30
 	throwforce = 15
 	throw_range = 1
-	w_class = 5
+	w_class = WEIGHT_CLASS_HUGE
 	var/charged = 5
 	origin_tech = "combat=5;bluespace=4"

@@ -719,7 +719,7 @@
 	throwforce = 15
 	sharp = 1
 	edge = 1
-	w_class = 5
+	w_class = WEIGHT_CLASS_HUGE
 	armour_penetration = 20
 	slot_flags = SLOT_BACK
 	force_unwielded  = 5
@@ -10,7 +10,7 @@
 	throwforce = 10.0
 	throw_speed = 1
 	throw_range = 7
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY

 	var/charges = 0		//how many restocking "charges" the refill has

@@ -86,4 +86,3 @@
 /obj/item/weapon/vending_refill/chinese
 	machine_name = "MrChangs"
 	charges = 8// of 24
-
@@ -5,7 +5,7 @@
 	icon_state = "toyhammer"
 	slot_flags = SLOT_BELT
 	throwforce = 0
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	throw_speed = 7
 	throw_range = 15
 	attack_verb = list("banned")
@@ -23,7 +23,7 @@
 	slot_flags = SLOT_BELT
 	force = 2
 	throwforce = 1
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")

@@ -44,7 +44,7 @@
 	throwforce = 10
 	sharp = 1
 	edge = 1
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	block_chance = 50

@@ -68,7 +68,7 @@
 	throwforce = 10
 	sharp = 1
 	edge = 1
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	block_chance = 50
@@ -89,7 +89,7 @@
 	item_state = "harpoon"
 	force = 20
 	throwforce = 15
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	attack_verb = list("jabbed","stabbed","ripped")

 obj/item/weapon/wirerod
@@ -100,7 +100,7 @@ obj/item/weapon/wirerod
 	flags = CONDUCT
 	force = 9
 	throwforce = 10
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	materials = list(MAT_METAL=1150, MAT_GLASS=75)
 	attack_verb = list("hit", "bludgeoned", "whacked", "bonked")

@@ -3,7 +3,7 @@
 	icon = 'icons/obj/kitchen.dmi'
 	icon_state = "whetstone"
 	desc = "A block of stone used to sharpen things."
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	usesound = 'sound/items/Screwdriver.ogg'
 	var/used = 0
 	var/increment = 4
@@ -63,4 +63,4 @@
 	increment = 200
 	max = 200
 	prefix = "super-sharpened"
-	requires_sharpness = 0
+	requires_sharpness = 0