makes w_class use defines (#9848)

code/modules/projectiles/ammunition.dm

@@ -7,7 +7,7 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BELT | SLOT_EARS
 	throwforce = 1
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 
 	var/leaves_residue = 1
 	var/caliber = ""					//Which kind of guns it can be loaded into
@@ -93,7 +93,7 @@
 	item_state = "box"
 	matter = list(DEFAULT_WALL_MATERIAL = 500)
 	throwforce = 5
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	throw_speed = 4
 	throw_range = 10
 

code/modules/projectiles/ammunition/boxes.dm

@@ -316,7 +316,7 @@
 /obj/item/ammo_magazine/submachinedrum
 	name = "drum magazine (.45)"
 	icon_state = "tommy-drum"
-	w_class = 3 // Bulky ammo doesn't fit in your pockets!
+	w_class = ITEMSIZE_NORMAL // Bulky ammo doesn't fit in your pockets!
 	mag_type = MAGAZINE
 	ammo_type = /obj/item/ammo_casing/c45
 	matter = list(DEFAULT_WALL_MATERIAL = 3750)
@@ -447,7 +447,7 @@
 /obj/item/ammo_magazine/nuke
 	name = "nuclear launcher cartridge"
 	icon_state = "nukemag"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	mag_type = MAGAZINE
 	caliber = "nuke"
 	ammo_type = /obj/item/ammo_casing/nuke

code/modules/projectiles/gun.dm

@@ -53,7 +53,7 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	throwforce = 5
 	throw_speed = 4
 	throw_range = 5
@@ -778,7 +778,7 @@
 
 ///////////OFFHAND///////////////
 /obj/item/offhand
-	w_class = 5.0
+	w_class = ITEMSIZE_HUGE
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "offhand"
 	item_state = "nothing"

code/modules/projectiles/guns/energy/blaster.dm

@@ -7,7 +7,7 @@
 	has_item_ratio = FALSE
 	fire_sound = 'sound/weapons/laser1.ogg'
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	force = 5
 	origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 2)
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)
@@ -45,7 +45,7 @@
 	fire_sound = 'sound/weapons/laserstrong.ogg'
 	projectile_type = /obj/item/projectile/energy/blaster
 	max_shots = 8
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/gun/energy/blaster/revolver/verb/spin_cylinder()
 	set name = "Spin cylinder"
@@ -74,7 +74,7 @@
 	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
 	projectile_type = /obj/item/projectile/energy/blaster
 	slot_flags = SLOT_BELT
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/gun/energy/blaster/rifle
 	name = "bolt slinger"
@@ -87,10 +87,10 @@
 	projectile_type = /obj/item/projectile/energy/blaster/heavy
 
 	slot_flags = SLOT_BACK
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 
 	fire_delay = 25
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	accuracy = -3
 	scoped_accuracy = 4
 

code/modules/projectiles/guns/energy/laser.dm

@@ -8,7 +8,7 @@
 	fire_sound = 'sound/weapons/laser1.ogg'
 	slot_flags = SLOT_BELT|SLOT_BACK
 	accuracy = 1
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	force = 10
 	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)
@@ -44,7 +44,7 @@ obj/item/gun/energy/retro
 	desc = "An older model of the basic lasergun. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws."
 	fire_sound = 'sound/weapons/laser1.ogg'
 	slot_flags = SLOT_BELT
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	projectile_type = /obj/item/projectile/beam
 	fire_delay = 10 //old technology
 	can_turret = 1
@@ -65,7 +65,7 @@ obj/item/gun/energy/retro
 	force = 5
 	fire_sound = 'sound/weapons/laser1.ogg'
 	slot_flags = SLOT_BELT
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	projectile_type = /obj/item/projectile/beam
 	origin_tech = null
 	max_shots = 5 //to compensate a bit for self-recharging
@@ -149,7 +149,7 @@ obj/item/gun/energy/retro
 	max_shots = 4
 	fire_delay = 45
 	force = 10
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	accuracy = -3 //shooting at the hip
 	scoped_accuracy = 4
 	can_turret = 1

code/modules/projectiles/guns/energy/magic.dm

@@ -10,7 +10,7 @@
 	fire_sound = 'sound/magic/Staff_Change.ogg'
 	flags = CONDUCT
 	slot_flags = SLOT_BACK
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	max_shots = 1
 	projectile_type = /obj/item/projectile/change
 	origin_tech = list(TECH_COMBAT = 7, TECH_MAGNET = 5, TECH_BLUESPACE = 7)
@@ -151,7 +151,7 @@ obj/item/gun/energy/staff/focus/attack_self(mob/living/user as mob)
 	item_state = "staffofchaos"
 	fire_sound = 'sound/magic/Staff_Chaos.ogg'
 	flags = CONDUCT
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	max_shots = 5
 	projectile_type = /obj/item/projectile/magic
 	var/list/possible_projectiles = list(/obj/item/projectile/magic, /obj/item/projectile/change, /obj/item/projectile/forcebolt,
@@ -186,7 +186,7 @@ obj/item/gun/energy/staff/focus/attack_self(mob/living/user as mob)
 	has_item_ratio = FALSE
 	fire_sound = 'sound/magic/wand.ogg'
 	slot_flags = SLOT_BELT
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	max_shots = 20
 	projectile_type = /obj/item/projectile/magic
 	origin_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 5, TECH_BLUESPACE = 6)

code/modules/projectiles/guns/energy/modular.dm

@@ -9,7 +9,7 @@
 	has_item_ratio = FALSE
 	fire_sound = 'sound/weapons/laser1.ogg'
 	slot_flags = SLOT_BELT|SLOT_BACK
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	force = 10
 	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)

code/modules/projectiles/guns/energy/rifle.dm

@@ -7,7 +7,7 @@
 	icon_state = "eriflestun100"
 	fire_sound = 'sound/weapons/Taser.ogg'
 	slot_flags = SLOT_BACK
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	max_shots = 20
 	fire_delay = 6

code/modules/projectiles/guns/energy/special.dm

@@ -8,7 +8,7 @@
 	projectile_type = /obj/item/projectile/ion/stun
 	fire_sound = 'sound/weapons/laser1.ogg'
 	origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 4)
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	accuracy = 1
 	force = 10
 	flags = CONDUCT
@@ -104,7 +104,7 @@
 	item_state = "meteor_gun"
 	has_item_ratio = FALSE
 	slot_flags = SLOT_BELT|SLOT_BACK
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	max_shots = 10
 	projectile_type = /obj/item/projectile/meteor
 	self_recharge = 1
@@ -120,7 +120,7 @@
 	contained_sprite = FALSE
 	icon_state = "pen"
 	item_state = "pen"
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_BELT
 	can_turret = 0
 
@@ -145,7 +145,7 @@
 	item_state = "toxgun"
 	has_item_ratio = FALSE
 	fire_sound = 'sound/effects/stealthoff.ogg'
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_COMBAT = 5, TECH_PHORON = 4)
 	projectile_type = /obj/item/projectile/energy/phoron
 	can_turret = 1
@@ -160,7 +160,7 @@
 	item_state = "gyrorifle"
 	has_item_ratio = FALSE
 	charge_meter = 0
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	fire_sound = 'sound/effects/Buzz2.ogg'
 	force = 5
 	projectile_type = /obj/item/projectile/energy/bee
@@ -180,7 +180,7 @@
 	icon_state = "pestishock"
 	item_state = "pestishock"
 	has_item_ratio = FALSE
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	fire_sound = 'sound/weapons/taser2.ogg'
 	force = 5
 	projectile_type = /obj/item/projectile/beam/mousegun
@@ -212,7 +212,7 @@
 	projectile_type = /obj/item/projectile/beam/energy_net
 	fire_sound = 'sound/weapons/plasma_cutter.ogg'
 	slot_flags = SLOT_HOLSTER | SLOT_BELT
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	max_shots = 4
 	fire_delay = 25
 	can_turret = 1
@@ -242,7 +242,7 @@
 	item_state = "bfg"
 	has_item_ratio = FALSE
 	charge_meter = 0
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	fire_sound = 'sound/magic/LightningShock.ogg'
 	force = 30
 	projectile_type = /obj/item/projectile/energy/bfg
@@ -267,7 +267,7 @@
 	origin_tech = list(TECH_COMBAT = 6, TECH_PHORON = 5, TECH_MATERIAL = 6)
 	charge_meter = 0
 	slot_flags = SLOT_BACK
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	projectile_type = /obj/item/projectile/beam/gatlinglaser
 	max_shots = 80
@@ -320,7 +320,7 @@
 	origin_tech = list(TECH_COMBAT = 2, TECH_PHORON = 4)
 	fire_sound = 'sound/weapons/laser1.ogg'
 	slot_flags = SLOT_BACK | SLOT_HOLSTER | SLOT_BELT
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	accuracy = 1
 	force = 10
 	projectile_type = /obj/item/projectile/energy/blaster/incendiary
@@ -350,7 +350,7 @@
 	fire_sound = 'sound/magic/lightningbolt.ogg'
 	attack_verb = list("sundered", "annihilated", "sliced", "cleaved", "slashed", "pulverized")
 	slot_flags = SLOT_BACK
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	accuracy = 3 // It's a massive beam, okay.
 	force = 60
 	projectile_type = /obj/item/projectile/beam/megaglaive
@@ -438,7 +438,7 @@
 	origin_tech = list(TECH_COMBAT = 6, TECH_PHORON = 8)
 	fire_sound = 'sound/magic/lightningbolt.ogg'
 	slot_flags = SLOT_BACK
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	accuracy = 0 // Overwrite just in case.
 	force = 15
 	projectile_type = /obj/item/projectile/beam/thermaldrill
@@ -502,7 +502,7 @@
 	origin_tech = list(TECH_COMBAT = 6, TECH_PHORON = 8)
 	fire_sound = 'sound/magic/lightningbolt.ogg'
 	slot_flags = SLOT_BACK
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 15
 	projectile_type = /obj/item/projectile/beam/thermaldrill
 	max_shots = 90
@@ -557,7 +557,7 @@
 	item_state = "tesla"
 	has_item_ratio = FALSE
 	charge_meter = 0
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	fire_sound = 'sound/magic/LightningShock.ogg'
 	force = 30
 	projectile_type = /obj/item/projectile/energy/tesla
@@ -583,7 +583,7 @@
 	item_state = "gravity_gun"
 	has_item_ratio = FALSE
 	charge_meter = 0
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	fire_sound = 'sound/magic/Repulse.ogg'
 	force = 30
 	projectile_type = /obj/item/projectile/energy/gravitydisabler

code/modules/projectiles/guns/energy/stun.dm

@@ -43,7 +43,7 @@
 	icon_state = "crossbow"
 	item_state = "crossbow"
 	has_item_ratio = FALSE
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 2, TECH_ILLEGAL = 5)
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)
 	slot_flags = SLOT_BELT
@@ -67,7 +67,7 @@
 /obj/item/gun/energy/crossbow/largecrossbow
 	name = "energy crossbow"
 	desc = "A weapon favored by mercenary infiltration teams."
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	icon_state = "crossbowlarge"
 	item_state = "crossbow"

code/modules/projectiles/guns/launcher.dm

@@ -1,7 +1,7 @@
 /obj/item/gun/launcher
 	name = "launcher"
 	desc = "A device that launches things."
-	w_class = 5.0
+	w_class = ITEMSIZE_HUGE
 	flags =  CONDUCT
 	slot_flags = SLOT_BACK
 

code/modules/projectiles/guns/launcher/crossbow.dm

@@ -7,7 +7,7 @@
 	icon_state = "bolt"
 	item_state = "bolt"
 	throwforce = 8
-	w_class = 3.0
+	w_class = ITEMSIZE_NORMAL
 	sharp = 1
 	edge = 0
 	drop_sound = 'sound/items/drop/sword.ogg'
@@ -22,7 +22,7 @@
 	sharp = 1
 	edge = 0
 	throwforce = 5
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "metal-rod"
 	item_state = "bolt"

code/modules/projectiles/guns/launcher/grenade_launcher.dm

@@ -112,7 +112,7 @@
 /obj/item/gun/launcher/grenade/underslung
 	name = "underslung grenade launcher"
 	desc = "Not much more than a tube and a firing mechanism, this grenade launcher is designed to be fitted to a rifle."
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	force = 5
 	max_grenades = 0
 

code/modules/projectiles/guns/launcher/pneumatic.dm

@@ -5,7 +5,7 @@
 	icon_state = "pneumatic"
 	item_state = "pneumatic"
 	slot_flags = SLOT_BELT
-	w_class = 5.0
+	w_class = ITEMSIZE_HUGE
 	flags = CONDUCT
 	fire_sound_text = "a loud whoosh of moving air"
 	fire_delay = 50
@@ -13,7 +13,7 @@
 	needspin = FALSE
 
 	var/fire_pressure                                   // Used in fire checks/pressure checks.
-	var/max_w_class = 3                                 // Hopper intake size.
+	var/max_w_class = ITEMSIZE_NORMAL                                 // Hopper intake size.
 	var/max_storage_space = 20                       // Total internal storage size.
 	var/obj/item/tank/tank = null                // Tank of gas for use in firing the cannon.
 
@@ -217,5 +217,5 @@
 /obj/item/gun/launcher/pneumatic/small
 	name = "small pneumatic cannon"
 	desc = "It looks smaller than your garden variety cannon"
-	max_w_class = 1
-	w_class = 3
+	max_w_class = ITEMSIZE_TINY
+	w_class = ITEMSIZE_NORMAL

code/modules/projectiles/guns/launcher/rocket.dm

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/guns/rocket.dmi'
 	icon_state = "rocket"
 	item_state = "rocket"
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	throw_speed = 2
 	throw_range = 10
 	force = 5.0

code/modules/projectiles/guns/launcher/syringe_gun.dm

@@ -9,7 +9,7 @@
 	slot_flags = SLOT_BELT | SLOT_EARS
 	throwforce = 3
 	force = 3
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	var/obj/item/reagent_containers/syringe/syringe
 
 /obj/item/syringe_cartridge/update_icon()
@@ -67,7 +67,7 @@
 	icon = 'icons/obj/guns/syringegun.dmi'
 	icon_state = "syringegun"
 	item_state = "syringegun"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	force = 7
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)
 	slot_flags = SLOT_BELT

code/modules/projectiles/guns/projectile.dm

@@ -10,7 +10,7 @@
 	then click where you want to fire.  To reload, click the weapon in your hand to unload (if needed), then add the appropiate ammo.  The description \
 	will tell you what caliber you need."
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	matter = list(DEFAULT_WALL_MATERIAL = 1000)
 	recoil = 1
 

code/modules/projectiles/guns/projectile/automatic.dm

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/guns/saber.dmi'
 	icon_state = "saber"	//ugly //yup
 	item_state = "saber"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	load_method = SPEEDLOADER //yup. until someone sprites a magazine for it.
 	max_shells = 22
 	caliber = "9mm"
@@ -31,7 +31,7 @@
 	icon = 'icons/obj/guns/mini-uzi.dmi'
 	icon_state = "mini-uzi"
 	item_state = "mini-uzi"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	load_method = MAGAZINE
 	magazine_type = /obj/item/ammo_magazine/c45uzi
 	allowed_magazines = list(/obj/item/ammo_magazine/c45uzi)
@@ -50,7 +50,7 @@
 	icon = 'icons/obj/guns/c20r.dmi'
 	icon_state = "c20r"
 	item_state = "c20r"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	force = 10
 	caliber = "10mm"
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
@@ -76,7 +76,7 @@
 	icon = 'icons/obj/guns/wt550.dmi'
 	icon_state = "wt550"
 	item_state = "wt550"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	caliber = "9mm"
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)
 	slot_flags = SLOT_BELT
@@ -105,7 +105,7 @@
 	icon = 'icons/obj/guns/arifle.dmi'
 	icon_state = "arifle"
 	item_state = "arifle"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	caliber = "a762"
 	origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4)
@@ -183,7 +183,7 @@
 	icon = 'icons/obj/guns/carbine.dmi'
 	icon_state = "carbine"
 	item_state = "carbine"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	caliber = "a556"
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 3)
@@ -260,7 +260,7 @@
 	icon = 'icons/obj/guns/l6.dmi'
 	icon_state = "l6closed100"
 	item_state = "l6closedmag"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	slot_flags = 0
 	max_shells = 50
@@ -369,7 +369,7 @@
 	icon = 'icons/obj/guns/tommygun.dmi'
 	icon_state = "tommygun"
 	item_state = "tommygun"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	max_shells = 50
 	caliber = ".45"
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
@@ -390,7 +390,7 @@
 	icon = 'icons/obj/guns/railgun.dmi'
 	icon_state = "railgun"
 	item_state = "railgun"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	caliber = "trod"
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 7)
@@ -414,7 +414,7 @@
 	icon = 'icons/obj/guns/flechette.dmi'
 	icon_state = "flechetterifle"
 	item_state = "flechetterifle"
-	w_class = 5
+	w_class = ITEMSIZE_HUGE
 	force = 30
 	caliber = "flechette"
 	slot_flags = SLOT_BELT|SLOT_BACK
@@ -458,7 +458,7 @@
 	icon = 'icons/obj/guns/assaultshotgun.dmi'
 	icon_state = "assaultshotgun"
 	item_state = "assaultshotgun"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	load_method = MAGAZINE
 	max_shells = 8
 	caliber = "shotgun"

code/modules/projectiles/guns/projectile/improvised.dm

@@ -7,7 +7,7 @@
 	icon_state = "ishotgun"
 	item_state = "ishotgun"
 	max_shells = 2
-	w_class = 4.0
+	w_class = ITEMSIZE_LARGE
 	force = 5
 	recoil = 2
 	accuracy = -1
@@ -43,7 +43,7 @@
 		if(do_after(user, 30))
 			icon_state = "ishotgunsawn"
 			item_state = "ishotgunsawn"
-			w_class = 3
+			w_class = ITEMSIZE_NORMAL
 			force = 5
 			slot_flags &= ~SLOT_BACK
 			slot_flags |= (SLOT_BELT|SLOT_HOLSTER)
@@ -68,7 +68,7 @@
 	icon_state = "ishotgunsawn"
 	item_state = "ishotgunsawn"
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	force = 5
 
 // shotgun construction

code/modules/projectiles/guns/projectile/minigun.dm

@@ -5,7 +5,7 @@
 	icon_state = "holstered"
 	item_state = "holstered"
 	contained_sprite = 1
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 6, TECH_MAGNET = 4, TECH_ILLEGAL = 7)
 	action_button_name = "Deploy the Gatling Machine Gun"

code/modules/projectiles/guns/projectile/pistol.dm

@@ -90,7 +90,7 @@
 	icon = 'icons/obj/guns/x9.dmi'
 	icon_state = "x9tactical"
 	item_state = "x9"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	accuracy = 1
 	load_method = MAGAZINE
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
@@ -139,7 +139,7 @@
 	icon_state = "silenced_pistol"
 	item_state = "silenced_pistol"
 	fire_sound = 'sound/weapons/gunshot/gunshot_suppressed.ogg'
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	accuracy = 1
 	caliber = ".45"
 	silenced = 1
@@ -223,7 +223,7 @@
 	icon = 'icons/obj/guns/pistol.dmi'
 	icon_state = "pistol"
 	item_state = "pistol"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	accuracy = 1
 	caliber = "9mm"
 	silenced = 0
@@ -276,7 +276,7 @@
 			to_chat(user, "<span class='notice'>You unscrew [silenced] from [src].</span>")
 			user.put_in_hands(silenced)
 			silenced = 0
-			w_class = 2
+			w_class = ITEMSIZE_SMALL
 			update_icon()
 			return
 	..()
@@ -289,7 +289,7 @@
 		user.drop_from_inventory(I,src)
 		to_chat(user, "<span class='notice'>You screw [I] onto [src].</span>")
 		silenced = I	//dodgy?
-		w_class = 3
+		w_class = ITEMSIZE_NORMAL
 		update_icon()
 		return
 	..()
@@ -315,7 +315,7 @@
 	desc = "A silencer"
 	icon = 'icons/obj/guns/pistol.dmi'
 	icon_state = "silencer"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 
 /obj/item/gun/projectile/pirate
 	name = "zip gun"
@@ -354,7 +354,7 @@
 	icon_state = "leyon"
 	item_state = "leyon"
 	caliber = "10mm"
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	ammo_type = /obj/item/ammo_casing/c10mm
 	magazine_type = /obj/item/ammo_magazine/mc10mm/leyon
 	max_shells = 5

code/modules/projectiles/guns/projectile/revolver.dm

@@ -118,7 +118,7 @@
 	icon_state = "derringer"
 	item_state = "derringer"
 	accuracy = -1
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 3)
 	handle_casings = CYCLE_CASINGS
 	load_method = SINGLE_CASING

code/modules/projectiles/guns/projectile/rifle.dm

@@ -25,7 +25,7 @@
 	icon = 'icons/obj/guns/obrez.dmi'
 	icon_state = "obrez"
 	item_state = "obrez"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	recoil = 2
 	accuracy = -2
 	slot_flags &= ~SLOT_BACK
@@ -46,7 +46,7 @@
 	icon = 'icons/obj/guns/obrez.dmi'
 	icon_state = "obrez"
 	item_state = "obrez"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	recoil = 2
 	accuracy = -2
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
@@ -227,7 +227,7 @@
 /obj/item/gun/projectile/gauss
 	name = "gauss thumper"
 	desc = "An outdated gauss weapon which sees sparing use in modern times."
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	slot_flags = 0
 	magazine_type = /obj/item/ammo_magazine/gauss
 	allowed_magazines = list(/obj/item/ammo_magazine/gauss)

code/modules/projectiles/guns/projectile/shotgun.dm

@@ -130,7 +130,7 @@
 	load_method = SINGLE_CASING|SPEEDLOADER
 	handle_casings = CYCLE_CASINGS
 	max_shells = 2
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	flags = CONDUCT
 	is_wieldable = TRUE
@@ -183,7 +183,7 @@
 	icon_state = "sawnshotgun"
 	item_state = "sawnshotgun"
 	is_wieldable = FALSE
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	force = 5
 	slot_flags &= ~SLOT_BACK	//you can't sling it on your back
 	slot_flags |= (SLOT_BELT|SLOT_HOLSTER) //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) - or in a holster, why not.
@@ -200,7 +200,7 @@
 	is_wieldable = FALSE
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
 	ammo_type = /obj/item/ammo_casing/shotgun/pellet
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	force = 5
 
 /obj/item/gun/projectile/shotgun/foldable
@@ -210,7 +210,7 @@
 	icon_state = "overunder"
 	item_state = "overunder"
 	slot_flags = SLOT_BELT
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	ammo_type = /obj/item/ammo_casing/shotgun/pellet
 	load_method = SINGLE_CASING|SPEEDLOADER
 	max_shells = 1
@@ -235,7 +235,7 @@
 		slot_flags = initial(slot_flags)
 		playsound(user, 'sound/weapons/sawclose.ogg', 60, 1)
 	else
-		w_class = 4
+		w_class = ITEMSIZE_LARGE
 		slot_flags &= ~SLOT_BELT
 		playsound(user, 'sound/weapons/sawopen.ogg', 60, 1)
 	to_chat(user, "You [folded ? "fold" : "unfold"] \the [src].")

code/modules/projectiles/guns/projectile/sniper.dm

@@ -7,7 +7,7 @@
 	icon = 'icons/obj/guns/heavysniper.dmi'
 	icon_state = "heavysniper"
 	item_state = "heavysniper"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	slot_flags = SLOT_BACK
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
@@ -149,7 +149,7 @@
 	icon = 'icons/obj/guns/tranqsniper.dmi'
 	icon_state = "tranqsniper"
 	item_state = "tranqsniper"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	slot_flags = SLOT_BACK
 	origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 2)
@@ -184,7 +184,7 @@
 	icon = 'icons/obj/guns/dragunov.dmi'
 	icon_state = "dragunov"
 	item_state = "dragunov"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	slot_flags = SLOT_BACK
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 3, TECH_MAGNET = 2, TECH_ILLEGAL = 5)
@@ -241,7 +241,7 @@
 	icon = 'icons/obj/guns/w556.dmi'
 	icon_state = "w556rifle"
 	item_state = "w556rifle"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	force = 10
 	slot_flags = SLOT_BACK
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 3)

code/modules/projectiles/modular/laser_base.dm

@@ -139,7 +139,7 @@
 /obj/item/device/laser_assembly
 	name = "laser assembly (small)"
 	desc = "A case for shoving things into. Hopefully they work."
-	w_class = 2
+	w_class = ITEMSIZE_SMALL
 	icon = 'icons/obj/guns/modular_laser.dmi'
 	var/base_icon_state = "small"
 	contained_sprite = TRUE

code/modules/projectiles/modular/laser_components.dm

@@ -3,21 +3,21 @@
 /obj/item/device/laser_assembly/medium
 	name = "laser assembly (medium)"
 	base_icon_state = "medium"
-	w_class = 3
+	w_class = ITEMSIZE_NORMAL
 	size = CHASSIS_MEDIUM
 	modifier_cap = 4
 
 /obj/item/device/laser_assembly/large
 	name = "laser assembly (large)"
 	base_icon_state = "large"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	size = CHASSIS_LARGE
 	modifier_cap = 5
 
 /obj/item/device/laser_assembly/admin
 	name = "laser assembly (obscene)"
 	base_icon_state = "large"
-	w_class = 4
+	w_class = ITEMSIZE_LARGE
 	size = CHASSIS_LARGE
 	modifier_cap = 25
 

code/modules/projectiles/pins.dm

@@ -13,7 +13,7 @@ Firing pins as a rule can't be removed without replacing them, blame a really sh
 	item_state = "pen"
 	origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 2)
 	flags = CONDUCT
-	w_class = 1
+	w_class = ITEMSIZE_TINY
 	attack_verb = list("poked")
 	var/emagged = FALSE
 	var/fail_message = "<span class='warning'>INVALID USER.</span>"
@@ -222,4 +222,4 @@ Pins Below.
 
 /obj/item/device/firing_pin/away_site/pin_auth(mob/living/user)
 	var/turf/T = get_turf(src)
-	return !isStationLevel(T.z)
+	return !isStationLevel(T.z)