makes w_class use defines (#9848)

2026-07-16 02:17:06 +01:00 · 2020-09-07 04:37:56 +08:00
parent d90e7f199b
commit 307c214541
304 changed files with 807 additions and 765 deletions
@@ -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
@@ -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"
@@ -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'

@@ -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'
@@ -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'

@@ -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)
@@ -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
@@ -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.")
+	src.visible_message("\The [src] beeps, refilling itself.")
@@ -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
@@ -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
@@ -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)

-	. = ..()
+	. = ..()
@@ -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
@@ -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
@@ -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()
 	..()
@@ -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)
+	crew_monitor.ui_interact(user)
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)

@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)

@@ -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
+	celltype = null
@@ -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)
@@ -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
@@ -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
@@ -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
+	starting_telecrystals = DEFAULT_TELECRYSTAL_AMOUNT * 2
@@ -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!"
@@ -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
+	return fixed_answer
@@ -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)
@@ -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
@@ -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'
@@ -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
@@ -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)
@@ -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(
@@ -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
@@ -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"
+	icon_state = "dionaebitesempty"
@@ -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
@@ -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)

@@ -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()
@@ -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

@@ -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(  )
@@ -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"
@@ -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
@@ -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
@@ -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)
@@ -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"
+	base_icon = "d100"
@@ -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
@@ -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>"
+	maptext = "<span style=\"font-family: 'Small Fonts'; -dm-text-outline: 1 black; font-size: 7px;\">Ready</span>"
@@ -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
@@ -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
@@ -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(
@@ -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"
+		icon_state = initial(icon_state) +"_locked"
@@ -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',
@@ -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)
@@ -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)
@@ -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
@@ -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()
@@ -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
-	..()
+	..()
@@ -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
@@ -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
+			return
@@ -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>
@@ -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")
@@ -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
@@ -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'
@@ -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
@@ -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"
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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."))

@@ -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
@@ -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
@@ -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)

@@ -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 \
@@ -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
@@ -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'
@@ -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
@@ -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
@@ -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"
@@ -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)
@@ -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
@@ -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)
@@ -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
@@ -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

@@ -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,
@@ -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)
@@ -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"
@@ -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")

@@ -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)
+	addtimer(CALLBACK(src, .proc/check_maptext), 1)
@@ -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
--- a/Show More
+++ b/Show More