diff --git a/code/modules/arcade/arcade_prize.dm b/code/modules/arcade/arcade_prize.dm
index d3457696268..6af1ca30f36 100644
--- a/code/modules/arcade/arcade_prize.dm
+++ b/code/modules/arcade/arcade_prize.dm
@@ -67,7 +67,7 @@
throwforce = 0
throw_speed = 1
throw_range = 1
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
max_amount = 9999 //Dang that's a lot of tickets
/obj/item/stack/tickets/New(var/loc, var/amount=null)
@@ -86,4 +86,4 @@
else if(amount >= 4)
icon_state = "tickets_2"
else
- icon_state = "tickets_1"
\ No newline at end of file
+ icon_state = "tickets_1"
diff --git a/code/modules/arcade/mob_hunt/mob_cards.dm b/code/modules/arcade/mob_hunt/mob_cards.dm
index 0479644ad85..26393e8e370 100644
--- a/code/modules/arcade/mob_hunt/mob_cards.dm
+++ b/code/modules/arcade/mob_hunt/mob_cards.dm
@@ -7,7 +7,7 @@
icon_state = "trade_card"
force = 0
throwforce = 1
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
var/datum/mob_hunt/mob_data
/obj/item/weapon/nanomob_card/proc/update_info()
@@ -40,4 +40,4 @@
/obj/item/weapon/storage/box/nanomob_booster_pack/New()
..()
for(var/i in 1 to 6)
- new /obj/item/weapon/nanomob_card/booster(src)
\ No newline at end of file
+ new /obj/item/weapon/nanomob_card/booster(src)
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index bd981e99076..8092d768ad0 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/assemblies/new_assemblies.dmi'
icon_state = ""
flags = CONDUCT
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
materials = list(MAT_METAL=100)
throwforce = 2
throw_speed = 3
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index f6019ace266..41a67a43560 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -3,7 +3,7 @@
icon = 'icons/obj/tank.dmi'
item_state = "assembly"
throwforce = 5
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
throw_speed = 2
throw_range = 4
flags = CONDUCT //Copied this from old code, so this may or may not be necessary
@@ -171,4 +171,4 @@
if(!T)
return
T.assume_air(removed)
- air_update_turf()
\ No newline at end of file
+ air_update_turf()
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index 47d33a1e5ce..f4a71a77ced 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -5,7 +5,7 @@
item_state = "assembly"
flags = CONDUCT
throwforce = 5
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 10
@@ -100,7 +100,7 @@
a_left.hear_talk(M, msg)
if(a_right)
a_right.hear_talk(M, msg)
-
+
hear_message(mob/living/M as mob, msg)
if(a_left)
a_left.hear_message(M, msg)
@@ -210,8 +210,3 @@
qdel(src)
return
return
-
-
-
-
-
diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm
index 6ffe6f42d12..aa8bc299e66 100644
--- a/code/modules/assembly/shock_kit.dm
+++ b/code/modules/assembly/shock_kit.dm
@@ -6,7 +6,7 @@
var/obj/item/clothing/head/helmet/part1 = null
var/obj/item/device/radio/electropack/part2 = null
var/status = 0
- w_class = 5
+ w_class = WEIGHT_CLASS_HUGE
flags = CONDUCT
/obj/item/assembly/shock_kit/Destroy()
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 914b3ed9209..2142d336fac 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -85,7 +85,7 @@
//Ears: currently only used for headsets and earmuffs
/obj/item/clothing/ears
name = "ears"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
throwforce = 2
slot_flags = SLOT_EARS
burn_state = FIRE_PROOF
@@ -128,7 +128,7 @@
/obj/item/clothing/ears/offear
name = "Other ear"
- w_class = 5
+ w_class = WEIGHT_CLASS_HUGE
icon = 'icons/mob/screen_gen.dmi'
icon_state = "block"
slot_flags = SLOT_EARS | SLOT_TWOEARS
@@ -145,7 +145,7 @@
/obj/item/clothing/glasses
name = "glasses"
icon = 'icons/obj/clothing/glasses.dmi'
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
flags_cover = GLASSESCOVERSEYES
slot_flags = SLOT_EYES
materials = list(MAT_GLASS = 250)
@@ -177,7 +177,7 @@ BLIND // can't see anything
/obj/item/clothing/gloves
name = "gloves"
gender = PLURAL //Carn: for grammarically correct text-parsing
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
icon = 'icons/obj/clothing/gloves.dmi'
siemens_coefficient = 0.50
body_parts_covered = HANDS
@@ -543,7 +543,7 @@ BLIND // can't see anything
desc = "A suit that protects against low pressure environments. Has a big 13 on the back."
icon_state = "space"
item_state = "s_suit"
- w_class = 4//bulky item
+ w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02
flags = STOPSPRESSUREDMAGE | THICKMATERIAL
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 5ddb28359e6..6d46eb7b061 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -380,7 +380,7 @@
throwforce = 3.0
throw_speed = 2
throw_range = 5
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
attack_verb = list("warned", "cautioned", "smashed")
burn_state = FIRE_PROOF
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index 25cdc259f92..59081cf3d00 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -5,7 +5,7 @@
item_state = "balaclava"
flags = BLOCKHAIR
flags_inv = HIDEFACE
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
actions_types = list(/datum/action/item_action/adjust)
adjusted_flags = SLOT_HEAD
species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin")
@@ -27,7 +27,7 @@
item_state = "luchag"
flags = BLOCKHAIR
flags_inv = HIDEFACE
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi',
@@ -47,4 +47,4 @@
name = "Rudos Mask"
desc = "Worn by robust fighters who are willing to do anything to win."
icon_state = "luchar"
- item_state = "luchar"
\ No newline at end of file
+ item_state = "luchar"
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index c0ebe33a796..851c10db354 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -5,7 +5,7 @@
item_state = "breath"
flags = AIRTIGHT
flags_cover = MASKCOVERSMOUTH
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
gas_transfer_coefficient = 0.10
permeability_coefficient = 0.50
actions_types = list(/datum/action/item_action/adjust)
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 0a3ee36ebbb..908397f990e 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -5,7 +5,7 @@
flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
item_state = "gas_alt"
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
@@ -70,7 +70,7 @@
flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
item_state = "bane_mask"
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
@@ -494,4 +494,3 @@
// ********************************************************************
-
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 8d031476931..d524d87e3d8 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -4,7 +4,7 @@
icon_state = "muzzle"
item_state = "muzzle"
flags_cover = MASKCOVERSMOUTH
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
gas_transfer_coefficient = 0.90
put_on_delay = 20
var/resist_time = 0 //deciseconds of how long you need to gnaw to get rid of the gag, 0 to make it impossible to remove
@@ -24,14 +24,14 @@
name = "gag"
desc = "Stick this in their mouth to stop the noise."
icon_state = "gag"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
/obj/item/clothing/mask/muzzle/tapegag
name = "tape gag"
desc = "MHPMHHH!"
icon_state = "tapegag"
item_state = null
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
resist_time = 150
mute = 0
species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin")
@@ -59,7 +59,7 @@
desc = "A sterile mask designed to help prevent the spread of diseases."
icon_state = "sterile"
item_state = "sterile"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
flags_cover = MASKCOVERSMOUTH
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.01
@@ -109,7 +109,7 @@
icon_state = "blueneckscarf"
item_state = "blueneckscarf"
flags_cover = MASKCOVERSMOUTH
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
gas_transfer_coefficient = 0.90
/obj/item/clothing/mask/redscarf
@@ -118,7 +118,7 @@
icon_state = "redwhite_scarf"
item_state = "redwhite_scarf"
flags_cover = MASKCOVERSMOUTH
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
gas_transfer_coefficient = 0.90
/obj/item/clothing/mask/greenscarf
@@ -127,7 +127,7 @@
icon_state = "green_scarf"
item_state = "green_scarf"
flags_cover = MASKCOVERSMOUTH
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
gas_transfer_coefficient = 0.90
/obj/item/clothing/mask/ninjascarf
@@ -136,7 +136,7 @@
icon_state = "ninja_scarf"
item_state = "ninja_scarf"
flags_cover = MASKCOVERSMOUTH
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
gas_transfer_coefficient = 0.90
@@ -147,7 +147,7 @@
item_state = "pig"
flags = BLOCKHAIR
flags_inv = HIDEFACE
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/clothing/mask/horsehead
@@ -157,7 +157,7 @@
item_state = "horsehead"
flags = BLOCKHAIR
flags_inv = HIDEFACE
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
var/voicechange = 0
var/temporaryname = " the Horse"
var/originalname = ""
@@ -247,7 +247,7 @@
icon_state = "fawkes"
item_state = "fawkes"
flags_inv = HIDEFACE
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/clothing/mask/gas/clown_hat/pennywise
name = "Pennywise Mask"
@@ -263,7 +263,7 @@
desc = "A colorful bandana."
flags_inv = HIDEFACE
flags_cover = MASKCOVERSMOUTH
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_MASK
adjusted_flags = SLOT_HEAD
icon_state = "bandbotany"
diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm
index 33e08206fd1..69ecd6eca0e 100644
--- a/code/modules/clothing/spacesuits/alien.dm
+++ b/code/modules/clothing/spacesuits/alien.dm
@@ -74,7 +74,7 @@
// Vox space gear (vaccuum suit, low pressure armour)
// Can't be equipped by any other species due to bone structure and vox cybernetics.
/obj/item/clothing/suit/space/vox
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
armor = list(melee = 40, bullet = 40, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm
index 82c4a832c6c..80257cda101 100644
--- a/code/modules/clothing/spacesuits/ert.dm
+++ b/code/modules/clothing/spacesuits/ert.dm
@@ -29,7 +29,7 @@
desc = "A suit worn by members of the Nanotrasen Emergency Response Team. Armoured, space ready, and fire resistant."
icon_state = "ert_commander"
item_state = "suit-command"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
armor = list(melee = 45, bullet = 25, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 50)
allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank, /obj/item/device/t_scanner, /obj/item/weapon/rcd, /obj/item/weapon/crowbar, \
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index ab601821ef8..802f39ad361 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -352,7 +352,7 @@
icon_state = "hardsuit1-syndi"
item_state = "syndie_hardsuit"
item_color = "syndi"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
var/on = 1
actions_types = list(/datum/action/item_action/toggle_hardsuit_mode)
armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
@@ -447,7 +447,7 @@
name = "gem-encrusted hardsuit"
desc = "A bizarre gem-encrusted suit that radiates magical energies."
item_state = "wiz_hardsuit"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
unacidable = 1
armor = list(melee = 40, bullet = 40, laser = 40, energy = 20, bomb = 35, bio = 100, rad = 50)
allowed = list(/obj/item/weapon/teleportation_scroll,/obj/item/weapon/tank)
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 54aa39a305e..20d9809f2b2 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -27,7 +27,7 @@
desc = "A bulky, heavy-duty piece of exclusive Nanotrasen armor. YOU are in charge!"
icon_state = "caparmor"
item_state = "capspacesuit"
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
allowed = list(/obj/item/weapon/tank, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs)
armor = list(melee = 40, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
species_restricted = list("exclude", "Diona", "Wryn")
@@ -86,7 +86,7 @@
blood_overlay_type = "coat"
flags_inv = 0
slowdown = 0
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
//Space santa outfit suit
/obj/item/clothing/head/helmet/space/santahat
@@ -123,7 +123,7 @@
desc = "Yarr."
icon_state = "pirate"
item_state = "pirate"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
slowdown = 0
armor = list(melee = 30, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index 9ece7d54aa3..4e43aaf61b4 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -62,7 +62,7 @@
flags = null //non-conductive
force = 0
throwforce = 0
- w_class = 2 //Fits in boxes.
+ w_class = WEIGHT_CLASS_SMALL //Fits in boxes.
materials = list()
attack_verb = list("tapped")
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index 24f5a340760..da181368cc5 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -14,7 +14,7 @@
slot_flags = SLOT_BACK
req_one_access = list()
req_access = list()
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
// These values are passed on to all component pieces.
armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75)
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index 4b8f32f5a74..37aa5b776ba 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -12,7 +12,7 @@
icon_state = "syndicate"
item_state = "space_suit_syndicate"
desc = "Has a tag on it: Totally not property of of a hostile corporation, honest!"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
@@ -173,4 +173,4 @@ obj/item/clothing/suit/space/syndicate/black/red/strike
/obj/item/clothing/suit/space/syndicate/black/engie
name = "Black Engineering Space Suit"
icon_state = "syndicate-black-engie"
- item_state = "syndicate-black"
\ No newline at end of file
+ item_state = "syndicate-black"
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index c9d3ccac27b..7a2fa10db07 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -376,7 +376,7 @@
desc = "A suit that protects against some damage."
icon_state = "centcom"
item_state = "centcom"
- w_class = 4//bulky item
+ w_class = WEIGHT_CLASS_BULKY
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
flags = THICKMATERIAL
@@ -393,7 +393,7 @@
icon_state = "heavy"
item_state = "swat_suit"
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
- w_class = 4//bulky item
+ w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.90
flags = THICKMATERIAL
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index f0fbfca0cbd..49f8a8ea8d1 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -15,7 +15,7 @@
desc = "A suit that protects against biological contamination."
icon_state = "bio"
item_state = "bio_suit"
- w_class = 4//bulky item
+ w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags = THICKMATERIAL
@@ -93,4 +93,4 @@
strip_delay = 40
put_on_delay = 20
species_fit = null
- sprite_sheets = null
\ No newline at end of file
+ sprite_sheets = null
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 5d25cf95c2d..8b6e4d2e0d3 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -135,7 +135,7 @@
icon_state = "syndicate-black-red"
item_state = "syndicate-black-red"
desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
burn_state = FIRE_PROOF
@@ -714,7 +714,7 @@
desc = "A soft white robe made of a synthetic fiber that provides improved protection against biohazards. Possessing multiple overlapping layers, yet light enough to allow complete freedom of movement, it denotes its wearer as a master physician."
icon_state = "mercy_hoodie"
item_state = "mercy_hoodie"
- w_class = 4//bulky item
+ w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags_size = ONESIZEFITSALL
diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm
index 70fa8a30227..5e73af7aa39 100644
--- a/code/modules/clothing/suits/storage.dm
+++ b/code/modules/clothing/suits/storage.dm
@@ -5,7 +5,7 @@
..()
pockets = new/obj/item/weapon/storage/internal(src)
pockets.storage_slots = 2 //two slots
- pockets.max_w_class = 2 //fit only pocket sized items
+ pockets.max_w_class = WEIGHT_CLASS_SMALL //fit only pocket sized items
pockets.max_combined_w_class = 4
/obj/item/clothing/suit/storage/Destroy()
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 81cc172d0e2..3d31af6230b 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -14,7 +14,7 @@
desc = "A suit that protects against fire and heat."
icon_state = "fire"
item_state = "fire_suit"
- w_class = 4//bulky item
+ w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
@@ -43,7 +43,7 @@
desc = "A suit that protects against extreme fire and heat."
//icon_state = "thermal"
item_state = "ro_suit"
- w_class = 4//bulky item
+ w_class = WEIGHT_CLASS_BULKY
slowdown = 1.5
/obj/item/clothing/suit/fire/atmos
@@ -85,7 +85,7 @@
desc = "A suit designed for safety when handling explosives."
icon_state = "bombsuit"
item_state = "bombsuit"
- w_class = 4//bulky item
+ w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags = THICKMATERIAL
@@ -142,7 +142,7 @@
desc = "A suit that protects against radiation. Label: Made with lead, do not eat insulation."
icon_state = "rad"
item_state = "rad_suit"
- w_class = 4//bulky item
+ w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
flags = THICKMATERIAL
@@ -157,4 +157,4 @@
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
- )
\ No newline at end of file
+ )
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index f0da2e141a0..5f358ac58f4 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -6,7 +6,7 @@
item_state = "" //no inhands
item_color = "bluetie"
slot_flags = SLOT_TIE
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
var/slot = "decor"
var/obj/item/clothing/under/has_suit = null //the suit the tie may be attached to
var/image/inv_overlay = null //overlay used when attached to clothing.
diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm
index cab12cba542..4c53d9c3c8d 100644
--- a/code/modules/clothing/under/accessories/holster.dm
+++ b/code/modules/clothing/under/accessories/holster.dm
@@ -7,7 +7,7 @@
var/holster_allow = /obj/item/weapon/gun
var/obj/item/weapon/gun/holstered = null
actions_types = list(/datum/action/item_action/accessory/holster)
- w_class = 3 // so it doesn't fit in pockets
+ w_class = WEIGHT_CLASS_NORMAL // so it doesn't fit in pockets
/obj/item/clothing/accessory/holster/Destroy()
QDEL_NULL(holstered)
@@ -140,4 +140,4 @@
name = "shoulder holster"
desc = "A handgun holster. Made of expensive leather."
icon_state = "holster"
- item_color = "holster_low"
\ No newline at end of file
+ item_color = "holster_low"
diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm
index fd335f43fb7..a306864cbfc 100644
--- a/code/modules/clothing/under/accessories/storage.dm
+++ b/code/modules/clothing/under/accessories/storage.dm
@@ -7,7 +7,7 @@
var/slots = 3
var/obj/item/weapon/storage/internal/hold
actions_types = list(/datum/action/item_action/accessory/storage)
- w_class = 3 // so it doesn't fit in pockets
+ w_class = WEIGHT_CLASS_NORMAL // so it doesn't fit in pockets
/obj/item/clothing/accessory/storage/New()
..()
@@ -110,4 +110,4 @@
hold.can_hold = list(/obj/item/weapon/hatchet/unathiknife, /obj/item/weapon/kitchen/knife)
new /obj/item/weapon/hatchet/unathiknife(hold)
- new /obj/item/weapon/hatchet/unathiknife(hold)
\ No newline at end of file
+ new /obj/item/weapon/hatchet/unathiknife(hold)
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 7494f559383..41111585072 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -167,7 +167,7 @@
icon_state = "black"
item_state = "bl_suit"
item_color = "black"
- w_class = 4//bulky item
+ w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index ee6747b39d3..807f49153c5 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -20,7 +20,7 @@
icon_state = "tatgun"
force = 0
throwforce = 0
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
var/tattoo_name = "tiger stripe tattoo" // Tat name for visible messages
var/tattoo_icon = "Tiger-stripe Tattoo" // body_accessory.dmi, new icons defined in sprite_accessories.dm
var/tattoo_r = 1 // RGB values for the body markings
@@ -221,7 +221,7 @@
item_state = "lunch_box"
force = 5
throwforce = 5
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 9
storage_slots = 3
@@ -248,7 +248,7 @@
hitsound = 'sound/weapons/tap.ogg'
force = 0
throwforce = 0
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
var/used = 0
/obj/item/fluff/wingler_comb/attack_self(mob/user)
@@ -268,7 +268,7 @@
desc = "Some sci-fi looking parts for a stun baton."
icon = 'icons/obj/custom_items.dmi'
icon_state = "scifikit"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/device/fluff/desolate_baton_kit/afterattack(atom/target, mob/user, proximity)
if(!proximity || !ishuman(user) || user.incapacitated())
@@ -293,7 +293,7 @@
name = "welding helmet modkit"
desc = "Some spraypaint and a stencil, perfect for painting flames onto a welding helmet!"
icon_state = "modkit"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
force = 0
throwforce = 0
@@ -318,7 +318,7 @@
name = "plasmaman suit modkit"
desc = "A kit containing nanites that are able to modify the look of a plasmaman suit and helmet without exposing the wearer to hostile environments."
icon_state = "modkit"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
force = 0
throwforce = 0
@@ -367,7 +367,7 @@
name = "sallet modkit"
desc = "A modkit that can make most helmets look like a steel sallet."
icon_state = "modkit"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
force = 0
throwforce = 0
diff --git a/code/modules/detective_work/evidence.dm b/code/modules/detective_work/evidence.dm
index e457d73fb87..cb4e2604771 100644
--- a/code/modules/detective_work/evidence.dm
+++ b/code/modules/detective_work/evidence.dm
@@ -6,7 +6,7 @@
icon = 'icons/obj/storage.dmi'
icon_state = "evidenceobj"
item_state = ""
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
/obj/item/weapon/evidencebag/afterattack(obj/item/I, mob/user,proximity)
if(!proximity || loc == I)
@@ -29,7 +29,7 @@
to_chat(user, "You find putting an evidence bag in another evidence bag to be slightly absurd.")
return 1 //now this is podracing
- if(I.w_class > 3)
+ if(I.w_class > WEIGHT_CLASS_NORMAL)
to_chat(user, "[I] won't fit in [src].")
return
@@ -76,7 +76,7 @@
"You hear someone rustle around in a plastic bag, and remove something.")
overlays.Cut() //remove the overlays
user.put_in_hands(I)
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
icon_state = "evidenceobj"
desc = "An empty evidence bag."
@@ -87,7 +87,7 @@
/obj/item/weapon/storage/box/evidence
name = "evidence bag box"
desc = "A box claiming to contain evidence bags."
-
+
/obj/item/weapon/storage/box/evidence/New()
new /obj/item/weapon/evidencebag(src)
new /obj/item/weapon/evidencebag(src)
@@ -95,4 +95,4 @@
new /obj/item/weapon/evidencebag(src)
new /obj/item/weapon/evidencebag(src)
new /obj/item/weapon/evidencebag(src)
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/detective_work/footprints_and_rag.dm b/code/modules/detective_work/footprints_and_rag.dm
index cc93863cc95..cc6a463a0ee 100644
--- a/code/modules/detective_work/footprints_and_rag.dm
+++ b/code/modules/detective_work/footprints_and_rag.dm
@@ -17,7 +17,7 @@
/obj/item/weapon/reagent_containers/glass/rag
name = "damp rag"
desc = "For cleaning up messes, you suppose."
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
icon = 'icons/obj/toy.dmi'
icon_state = "rag"
amount_per_transfer_from_this = 5
diff --git a/code/modules/detective_work/scanner.dm b/code/modules/detective_work/scanner.dm
index 69aeb643263..bb1a79f13ad 100644
--- a/code/modules/detective_work/scanner.dm
+++ b/code/modules/detective_work/scanner.dm
@@ -7,7 +7,7 @@
desc = "Used to remotely scan objects and biomass for DNA and fingerprints. Can print a report of the findings."
icon = 'icons/goonstation/objects/objects.dmi'
icon_state = "detscanner"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
item_state = "electronic"
flags = CONDUCT | NOBLUDGEON
slot_flags = SLOT_BELT
diff --git a/code/modules/fish/fish_eggs.dm b/code/modules/fish/fish_eggs.dm
index 5255859b704..756093fbd01 100644
--- a/code/modules/fish/fish_eggs.dm
+++ b/code/modules/fish/fish_eggs.dm
@@ -4,7 +4,7 @@
desc = "Eggs laid by a fish. This cluster seems... empty?"
icon = 'icons/obj/fish_items.dmi'
icon_state = "eggs"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
var/datum/fish/fish_type = null //Holds the datum of the fish that the egg is for, null means dud eggs
/obj/item/fish_eggs/goldfish
@@ -66,4 +66,3 @@
desc = "A cluster of bright neon eggs belonging to a bio-luminescent species of fish."
icon_state = "glofish_eggs"
fish_type = /datum/fish/glofish
-
diff --git a/code/modules/fish/fish_items.dm b/code/modules/fish/fish_items.dm
index 9f58d58942e..64ca8269298 100644
--- a/code/modules/fish/fish_items.dm
+++ b/code/modules/fish/fish_items.dm
@@ -10,7 +10,7 @@
icon_state = "egg_scoop"
slot_flags = SLOT_BELT
throwforce = 0
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
@@ -21,7 +21,7 @@
icon_state = "net"
slot_flags = SLOT_BELT
throwforce = 0
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
@@ -35,7 +35,7 @@
icon = 'icons/obj/fish_items.dmi'
icon_state = "fish_food"
throwforce = 1
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
@@ -46,7 +46,7 @@
icon_state = "brush"
slot_flags = SLOT_BELT
throwforce = 0
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
attack_verb = list("scrubbed", "brushed", "scraped")
@@ -90,7 +90,7 @@
icon = 'icons/obj/fish_items.dmi'
icon_state = "fish"
throwforce = 1
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
force = 1
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 23ae568af9b..0b5b2171f86 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -141,7 +141,7 @@
name = "pewter cup"
desc = "Everyone gets a trophy."
icon_state = "pewter_cup"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
force = 1
throwforce = 1
amount_per_transfer_from_this = 5
@@ -154,7 +154,7 @@
name = "gold cup"
desc = "You're winner!"
icon_state = "golden_cup"
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
force = 14
throwforce = 10
amount_per_transfer_from_this = 20
@@ -165,7 +165,7 @@
name = "silver cup"
desc = "Best loser!"
icon_state = "silver_cup"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
force = 10
throwforce = 8
amount_per_transfer_from_this = 15
@@ -176,7 +176,7 @@
name = "bronze cup"
desc = "At least you ranked!"
icon_state = "bronze_cup"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
force = 5
throwforce = 4
amount_per_transfer_from_this = 10
@@ -349,4 +349,4 @@
desc = "A bowl made out of mushrooms. Not food, though it might have contained some at some point."
icon = 'icons/obj/lavaland/ash_flora.dmi'
icon_state = "mushroom_bowl"
- w_class = 2
\ No newline at end of file
+ w_class = WEIGHT_CLASS_SMALL
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 75f9c9a776f..e1a517caaf3 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -130,7 +130,7 @@
throwforce = 5
throw_speed = 3
throw_range = 5
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
item_state = "beer"
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("stabbed", "slashed", "attacked")
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index 3a079e99da4..cbb049c883c 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -130,7 +130,7 @@
istype(W, /obj/item/weapon/hatchet) \
)
inaccurate = 1
- else if(W.w_class <= 2 && istype(src,/obj/item/weapon/reagent_containers/food/snacks/sliceable))
+ else if(W.w_class <= WEIGHT_CLASS_SMALL && istype(src,/obj/item/weapon/reagent_containers/food/snacks/sliceable))
if(!iscarbon(user))
return 1
to_chat(user, "You slip [W] inside [src].")
@@ -2477,4 +2477,4 @@
desc = "A large fried potato nugget that may or may not try to valid you."
icon_state = "tatortot"
list_reagents = list("nutriment" = 4)
- filling_color = "FFD700"
\ No newline at end of file
+ filling_color = "FFD700"
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index dbdffffda29..8301b021cc4 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -43,7 +43,7 @@
desc = "A peel from a banana."
icon_state = "banana_peel"
item_state = "banana_peel"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
throwforce = 0
throw_speed = 3
throw_range = 7
diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm
index a7ef947a5ce..d2dac1decfe 100644
--- a/code/modules/hydroponics/grown/corn.dm
+++ b/code/modules/hydroponics/grown/corn.dm
@@ -30,7 +30,7 @@
desc = "A reminder of meals gone by."
icon_state = "corncob"
item_state = "corncob"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
throwforce = 0
throw_speed = 3
throw_range = 7
@@ -62,7 +62,7 @@
desc = "A cob with snap pops"
icon_state = "snapcorn"
item_state = "corncob"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
throwforce = 0
throw_speed = 3
throw_range = 7
@@ -81,4 +81,4 @@
snap_pops -= 1
if(!snap_pops)
new /obj/item/weapon/grown/corncob(user.loc)
- qdel(src)
\ No newline at end of file
+ qdel(src)
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index 7deb961e67a..1752cda7567 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -117,7 +117,7 @@
force = 0
slot_flags = SLOT_HEAD
throwforce = 0
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
throw_speed = 1
throw_range = 3
@@ -167,7 +167,7 @@
force = 0
slot_flags = SLOT_HEAD
throwforce = 0
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
throw_speed = 1
throw_range = 3
attack_verb = list("roasted", "scorched", "burned")
diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm
index 5a229148a17..06bb153e47f 100644
--- a/code/modules/hydroponics/grown/melon.dm
+++ b/code/modules/hydroponics/grown/melon.dm
@@ -22,7 +22,7 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/watermelonslice
slices_num = 5
dried_type = null
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
filling_color = "#008000"
bitesize_mod = 3
diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm
index f6d9be51b4a..52f60d06b18 100644
--- a/code/modules/hydroponics/grown/nettle.dm
+++ b/code/modules/hydroponics/grown/nettle.dm
@@ -37,7 +37,7 @@
force = 15
hitsound = 'sound/weapons/bladeslice.ogg'
throwforce = 5
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
throw_speed = 1
throw_range = 3
origin_tech = "combat=3"
diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm
index 961fe7c4096..339459669be 100644
--- a/code/modules/hydroponics/grown/towercap.dm
+++ b/code/modules/hydroponics/grown/towercap.dm
@@ -37,7 +37,7 @@
icon_state = "logs"
force = 5
throwforce = 5
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
throw_speed = 2
throw_range = 3
origin_tech = "materials=1"
@@ -191,4 +191,4 @@
/obj/structure/bonfire/unbuckle_mob(force=0)
if(buckled_mob)
buckled_mob.pixel_y -= 13
- . = ..()
\ No newline at end of file
+ . = ..()
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index 608c52bfcb4..9a93d1a9673 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -5,7 +5,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "hydro"
item_state = "analyzer"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_BELT
origin_tech = "magnets=2;biotech=2"
materials = list(MAT_METAL=30, MAT_GLASS=20)
@@ -24,7 +24,7 @@
flags = OPENCONTAINER
slot_flags = SLOT_BELT
throwforce = 0
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 10
@@ -46,7 +46,7 @@
flags = OPENCONTAINER
slot_flags = SLOT_BELT
throwforce = 0
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 10
@@ -68,7 +68,7 @@
flags = CONDUCT
force = 5
throwforce = 7
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
materials = list(MAT_METAL=50)
attack_verb = list("slashed", "sliced", "cut", "clawed")
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -80,7 +80,7 @@
icon_state = "hatchet"
flags = CONDUCT
force = 12
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
throwforce = 15
throw_speed = 3
throw_range = 4
@@ -111,7 +111,7 @@
throwforce = 5
throw_speed = 2
throw_range = 3
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
flags = CONDUCT
armour_penetration = 20
slot_flags = SLOT_BACK
@@ -140,7 +140,7 @@
force = 3
sharp = 0
edge = 0
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
extend = 0
slot_flags = SLOT_BELT
origin_tech = "materials=3;combat=3"
@@ -154,7 +154,7 @@
icon_state = "tscythe1"
item_state = "scythe0" //use the normal scythe in-hands
slot_flags = SLOT_BACK //won't fit on belt, but can be worn on belt when extended
- w_class = 4 //won't fit in backpacks while extended
+ w_class = WEIGHT_CLASS_BULKY //won't fit in backpacks while extended
force = 15 //slightly better than normal scythe damage
attack_verb = list("chopped", "sliced", "cut", "reaped")
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -165,7 +165,7 @@
icon_state = "tscythe0"
item_state = null //no sprite for folded version, like a tele-baton
slot_flags = SLOT_BELT //can be worn on belt again, but no longer makes sense to wear on the back
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
force = 3
attack_verb = list("hit", "poked")
hitsound = "swing_hit"
@@ -200,7 +200,7 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
volume = 50
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(1,2,5,10,15,25,50)
@@ -249,7 +249,7 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
volume = 50
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(1,2,5,10,15,25,50)
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index ae79eda23d3..093cd2114a4 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -5,7 +5,7 @@
/obj/item/seeds
icon = 'icons/obj/hydroponics/seeds.dmi'
icon_state = "seed" // Unknown plant seed - these shouldn't exist in-game.
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
burn_state = FLAMMABLE
var/plantname = "Plants" // Name of plant when planted.
var/product // A type path. The thing that is created when the plant is harvested.
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index a32b31611cc..96f88f3d9c4 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -167,7 +167,7 @@
icon_state ="book"
throw_speed = 1
throw_range = 5
- w_class = 3 //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever)
+ w_class = WEIGHT_CLASS_NORMAL //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever)
attack_verb = list("bashed", "whacked", "educated")
burn_state = FLAMMABLE
@@ -201,7 +201,7 @@
/obj/item/weapon/book/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(carved)
if(!store)
- if(W.w_class < 3)
+ if(W.w_class < WEIGHT_CLASS_NORMAL)
user.drop_item()
W.forceMove(src)
store = W
@@ -293,7 +293,7 @@
icon_state ="scanner"
throw_speed = 1
throw_range = 5
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
var/obj/machinery/computer/library/checkout/computer // Associated computer - Modes 1 to 3 use this
var/obj/item/weapon/book/book // Currently scanned book
var/mode = 0 // 0 - Scan only, 1 - Scan and Set Buffer, 2 - Scan and Attempt to Check In, 3 - Scan and Attempt to Add to Inventory
diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm
index 971dc69a1b6..3f1705f4651 100644
--- a/code/modules/martial_arts/martial.dm
+++ b/code/modules/martial_arts/martial.dm
@@ -172,7 +172,7 @@
name = "bo staff"
desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts. Can be wielded to both kill and incapacitate."
force = 10
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
force_unwielded = 10
force_wielded = 24
diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm
index 00ea7632900..2ce3f8d6195 100644
--- a/code/modules/mining/coins.dm
+++ b/code/modules/mining/coins.dm
@@ -7,7 +7,7 @@
flags = CONDUCT
force = 1
throwforce = 2
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
var/string_attached
var/list/sideslist = list("heads","tails")
var/cmineral = null
@@ -149,4 +149,4 @@
if(do_after(user, 15, target = src))
user.visible_message("[user] has flipped [src]. It lands on [coinflip].", \
"You flip [src]. It lands on [coinflip].", \
- "You hear the clattering of loose change.")
\ No newline at end of file
+ "You hear the clattering of loose change.")
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index d6c375c2832..8bb891834a9 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -521,7 +521,7 @@
desc = "A token to redeem a piece of equipment. Use it on a mining equipment vendor."
icon = 'icons/obj/items.dmi'
icon_state = "mining_voucher"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
/**********************Mining Point Card**********************/
@@ -555,7 +555,7 @@
icon_state = "Jaunter"
item_state = "electronic"
throwforce = 0
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 5
origin_tech = "bluespace=2"
@@ -615,7 +615,7 @@
icon_state = "resonator"
item_state = "resonator"
desc = "A handheld device that creates small fields of energy that resonate until they detonate, crushing rock. It can also be activated without a target to create a field at the user's location, to act as a delayed time trap. It's more effective in a vaccuum."
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
force = 8
throwforce = 10
var/cooldown = 0
@@ -711,7 +711,7 @@
/obj/item/weapon/mining_drone_cube
name = "mining drone cube"
desc = "Compressed mining drone, ready for deployment. Just press the button to activate!"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
icon = 'icons/obj/aibots.dmi'
icon_state = "minedronecube"
item_state = "electronic"
@@ -728,7 +728,7 @@
name = "Drone Kit"
desc = "A boxed kit that includes one mining drone cube and a welding tool with an increased capacity."
icon_state = "implant"
- max_w_class = 3
+ max_w_class = WEIGHT_CLASS_NORMAL
storage_slots = 2
can_hold = list(/obj/item/weapon/mining_drone_cube, /obj/item/weapon/weldingtool/hugetank)
@@ -746,7 +746,7 @@
icon_state = "lazarus_hypo"
item_state = "hypo"
throwforce = 0
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 5
var/loaded = 1
@@ -806,7 +806,7 @@
name = "manual mining scanner"
icon_state = "mining1"
item_state = "analyzer"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
slot_flags = SLOT_BELT
var/cooldown = 0
@@ -838,7 +838,7 @@
name = "advanced automatic mining scanner"
icon_state = "mining0"
item_state = "analyzer"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
slot_flags = SLOT_BELT
var/cooldown = 35
@@ -931,7 +931,7 @@
desc = "A tank of compressed carbon dioxide for miners to use as propulsion in local space. The compact size allows for easy storage at the cost of capacity."
volume = 40
throw_range = 7
- w_class = 3 //same as syndie harness
+ w_class = WEIGHT_CLASS_NORMAL //same as syndie harness
/*********************Hivelord stabilizer****************/
@@ -940,7 +940,7 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle19"
desc = "Inject a hivelord core with this stabilizer to preserve its healing powers indefinitely."
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
origin_tech = "biotech=1"
/obj/item/weapon/hivelordstabilizer/afterattack(obj/item/organ/internal/M, mob/user)
@@ -963,7 +963,7 @@
\nMark a mob with the destabilizing force, then hit them in melee to activate it for extra damage. Extra damage if backstabbed in this fashion. \
This weapon is only particularly effective against large creatures."
force = 20 //As much as a bone spear, but this is significantly more annoying to carry around due to requiring the use of both hands at all times
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
force_unwielded = 20 //It's never not wielded so these are the same
force_wielded = 20
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index 922dd34a166..6289333549b 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -155,7 +155,7 @@
icon = 'icons/obj/lavaland/ash_flora.dmi'
icon_state = "mushroom_shavings"
list_reagents = list("sugar" = 3, "ethanol" = 2, "stabilizing_agent" = 3, "minttoxin" = 2)
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
/obj/item/weapon/reagent_containers/food/snacks/ash_flora/New()
..()
@@ -194,7 +194,7 @@
desc = "A bowl made out of mushrooms. Not food, though it might have contained some at some point."
icon = 'icons/obj/lavaland/ash_flora.dmi'
icon_state = "mushroom_bowl"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
//what you can craft with these things
/datum/crafting_recipe/mushroom_bowl
diff --git a/code/modules/mining/lavaland/loot/ashdragon_loot.dm b/code/modules/mining/lavaland/loot/ashdragon_loot.dm
index 4565039d52e..418d00c6f19 100644
--- a/code/modules/mining/lavaland/loot/ashdragon_loot.dm
+++ b/code/modules/mining/lavaland/loot/ashdragon_loot.dm
@@ -15,8 +15,8 @@
if(4)
new /obj/item/weapon/dragons_blood(src)
-// Spectral Blade
-
+// Spectral Blade
+
/obj/item/weapon/melee/ghost_sword
name = "spectral blade"
desc = "A rusted and dulled blade. It doesn't look like it'd do much damage. It glows weakly."
@@ -25,7 +25,7 @@
flags = CONDUCT
sharp = 1
edge = 1
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
force = 1
throwforce = 1
hitsound = 'sound/effects/ghost2.ogg'
@@ -71,7 +71,7 @@
var/turf/T = get_turf(src)
var/list/contents = T.GetAllContents()
var/mob/dead/observer/current_spirits = list()
-
+
for(var/mob/dead/observer/O in player_list)
if(is_type_in_list(O.following, contents))
ghost_counter++
@@ -145,7 +145,7 @@
stage4 = list("Your blood burns.")
stage5 = list("You're a fucking dragon. However, any previous allegiances you held still apply. It'd be incredibly rude to eat your still human friends for no reason.")
new_form = /mob/living/simple_animal/hostile/megafauna/dragon/lesser
-
+
//Lava Staff
/obj/item/weapon/lava_staff
@@ -156,7 +156,7 @@
icon = 'icons/obj/guns/magic.dmi'
slot_flags = SLOT_BACK
item_state = "staffofstorms"
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
force = 25
damtype = BURN
hitsound = 'sound/weapons/sear.ogg'
@@ -214,4 +214,4 @@
/obj/effect/overlay/temp/lavastaff
icon_state = "lavastaff_warn"
- duration = 50
\ No newline at end of file
+ duration = 50
diff --git a/code/modules/mining/lavaland/loot/hierophant_loot.dm b/code/modules/mining/lavaland/loot/hierophant_loot.dm
index f06fd25d428..64689a3a535 100644
--- a/code/modules/mining/lavaland/loot/hierophant_loot.dm
+++ b/code/modules/mining/lavaland/loot/hierophant_loot.dm
@@ -5,7 +5,7 @@
item_state = "hierophant_staff"
icon = 'icons/obj/guns/magic.dmi'
slot_flags = SLOT_BACK
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
force = 20
hitsound = "swing_hit"
//hitsound = 'sound/weapons/sonic_jackhammer.ogg'
@@ -185,4 +185,4 @@
//playsound(T,'sound/effects/bin_close.ogg', 200, 1)
sleep(2)
for(var/t in RANGE_TURFS(1, T))
- new /obj/effect/overlay/temp/hierophant/blast(t, user, friendly_fire_check)
\ No newline at end of file
+ new /obj/effect/overlay/temp/hierophant/blast(t, user, friendly_fire_check)
diff --git a/code/modules/mining/lavaland/loot/legion_loot.dm b/code/modules/mining/lavaland/loot/legion_loot.dm
index 49e64f3349e..f85a6a57aac 100644
--- a/code/modules/mining/lavaland/loot/legion_loot.dm
+++ b/code/modules/mining/lavaland/loot/legion_loot.dm
@@ -6,7 +6,7 @@
icon = 'icons/obj/guns/magic.dmi'
slot_flags = SLOT_BACK
item_state = "staffofstorms"
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
force = 25
damtype = BURN
hitsound = 'sound/weapons/sear.ogg'
@@ -49,4 +49,4 @@
"You hold [src] skyward, calling down a terrible storm!")
playsound(user, 'sound/magic/Staff_Change.ogg', 200, 0)
A.telegraph()
- storm_cooldown = world.time + 200
\ No newline at end of file
+ storm_cooldown = world.time + 200
diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm
index dec8712eb74..1c2093ce8c2 100644
--- a/code/modules/mining/lavaland/loot/tendril_loot.dm
+++ b/code/modules/mining/lavaland/loot/tendril_loot.dm
@@ -5,7 +5,7 @@
name = "paradox bag"
desc = "Somehow, it's in two places at once."
max_combined_w_class = 60
- max_w_class = 3
+ max_w_class = WEIGHT_CLASS_NORMAL
//External
/obj/item/device/shared_storage
@@ -144,7 +144,7 @@
item_state = "rods"
desc = "Not to be confused with the kind Research hassles you for."
force = 12
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
burn_state = LAVA_PROOF | FIRE_PROOF
/datum/crafting_recipe/oar
@@ -391,4 +391,4 @@
if(!can_destroy && !force)
return QDEL_HINT_LETMELIVE
else
- . = ..()
\ No newline at end of file
+ . = ..()
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index a9151609f74..fba1c56fac0 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -79,7 +79,7 @@
force = 15.0
throwforce = 10.0
item_state = "pickaxe"
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
materials = list(MAT_METAL=2000) //one sheet, but where can you make them?
var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
origin_tech = "materials=1;engineering=1"
@@ -152,7 +152,7 @@
icon_state = "smdrill"
origin_tech = "materials=6;powerstorage=4;engineering=5;syndicate=3"
desc = "Microscopic supermatter crystals cover the head of this tiny drill."
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/weapon/pickaxe/drill/cyborg/diamond //This is the BORG version!
name = "diamond-tipped cyborg mining drill" //To inherit the NODROP flag, and easier to change borg specific drill mechanics.
@@ -184,7 +184,7 @@
force = 8.0
throwforce = 4.0
item_state = "shovel"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL=50)
origin_tech = "materials=1;engineering=1"
attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
@@ -198,7 +198,7 @@
item_state = "spade"
force = 5.0
throwforce = 7.0
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
toolspeed = 2
@@ -219,7 +219,7 @@
desc = "It allows you to store and deploy lazarus-injected creatures easier."
icon = 'icons/obj/mobcap.dmi'
icon_state = "mobcap0"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
throw_range = 20
var/mob/living/simple_animal/captured = null
var/colorindex = 0
@@ -282,7 +282,7 @@
desc = "An emergency shelter stored within a pocket of bluespace."
icon_state = "capsule"
icon = 'icons/obj/mining.dmi'
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
origin_tech = "engineering=3;bluespace=3"
var/template_id = "shelter_alpha"
var/datum/map_template/shelter/template
diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm
index 3fa8d1c1edf..30fca5f2f95 100644
--- a/code/modules/mining/money_bag.dm
+++ b/code/modules/mining/money_bag.dm
@@ -9,7 +9,7 @@
throwforce = 0
burn_state = FLAMMABLE
burntime = 20
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
/obj/item/weapon/moneybag/attack_hand(user as mob)
var/amt_gold = 0
@@ -119,4 +119,4 @@
new /obj/item/weapon/coin/silver(src)
new /obj/item/weapon/coin/gold(src)
new /obj/item/weapon/coin/gold(src)
- new /obj/item/weapon/coin/adamantine(src)
\ No newline at end of file
+ new /obj/item/weapon/coin/adamantine(src)
diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm
index cc50f46b9e5..873b6c798d1 100644
--- a/code/modules/mining/ore.dm
+++ b/code/modules/mining/ore.dm
@@ -153,7 +153,7 @@
icon = 'icons/obj/mining.dmi'
icon_state = "Gibtonite ore"
item_state = "Gibtonite ore"
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
throw_range = 0
anchored = 1 //Forces people to carry it by hand, no pulling!
var/primed = 0
diff --git a/code/modules/mob/living/carbon/alien/humanoid/inventory.dm b/code/modules/mob/living/carbon/alien/humanoid/inventory.dm
index 223b6a512ae..08017da0b76 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/inventory.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/inventory.dm
@@ -22,7 +22,7 @@
if(slot_l_store)
if(l_store)
return
- if(W.w_class > 3)
+ if(W.w_class > WEIGHT_CLASS_NORMAL)
return
unEquip(W)
l_store = W
@@ -30,7 +30,7 @@
if(slot_r_store)
if(r_store)
return
- if(W.w_class > 3)
+ if(W.w_class > WEIGHT_CLASS_NORMAL)
return
unEquip(W)
r_store = W
@@ -44,4 +44,4 @@
if(slot_l_store)
if(l_store) l_store.attack_alien(src)
if(slot_r_store)
- if(r_store) r_store.attack_alien(src)
\ No newline at end of file
+ if(r_store) r_store.attack_alien(src)
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index 98d1bec775c..38ea99834b0 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -14,7 +14,7 @@ var/const/MAX_ACTIVE_TIME = 400
icon = 'icons/mob/alien.dmi'
icon_state = "facehugger"
item_state = "facehugger"
- w_class = 1 //note: can be picked up by aliens unlike most other items of w_class below 4
+ w_class = WEIGHT_CLASS_TINY //note: can be picked up by aliens unlike most other items of w_class below 4
throw_range = 5
tint = 3
flags = AIRTIGHT
@@ -249,4 +249,4 @@ var/const/MAX_ACTIVE_TIME = 400
gender = FEMALE
/obj/item/clothing/mask/facehugger/lamarr/New()//to prevent deleting it if aliums are disabled
- return
\ No newline at end of file
+ return
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index 15c52d2693c..ec77d1be3bf 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -5,7 +5,7 @@
desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity."
icon = 'icons/obj/assemblies.dmi'
icon_state = "mmi_empty"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
origin_tech = "biotech=3"
//Revised. Brainmob is now contained directly within object of transfer. MMI in this case.
diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm
index 56a98142f80..5a62ead4952 100644
--- a/code/modules/mob/living/carbon/brain/brain_item.dm
+++ b/code/modules/mob/living/carbon/brain/brain_item.dm
@@ -4,7 +4,7 @@
max_damage = 200
icon_state = "brain2"
force = 1.0
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
throwforce = 1.0
throw_speed = 3
throw_range = 5
diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index 565dd250fd8..8dd6e14e427 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -3,7 +3,7 @@
desc = "A cube of shining metal, four inches to a side and covered in shallow grooves."
icon = 'icons/obj/assemblies.dmi'
icon_state = "posibrain"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
origin_tech = "biotech=3;programming=2"
var/searching = 0
@@ -37,7 +37,7 @@
silenced = !silenced
to_chat(user, "You toggle the speaker [silenced ? "off" : "on"].")
if(brainmob && brainmob.key)
- to_chat(brainmob, "Your internal speaker has been toggled [silenced ? "off" : "on"].")
+ to_chat(brainmob, "Your internal speaker has been toggled [silenced ? "off" : "on"].")
/obj/item/device/mmi/posibrain/proc/request_player()
for(var/mob/dead/observer/O in player_list)
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index bb297513ef5..8e1c32f931a 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -546,7 +546,7 @@
return 0
if(I.slot_flags & SLOT_DENYPOCKET)
return
- if(I.w_class <= 2 || (I.slot_flags & SLOT_POCKET))
+ if(I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & SLOT_POCKET))
return 1
if(slot_r_store)
if(I.flags & NODROP)
@@ -559,7 +559,7 @@
return 0
if(I.slot_flags & SLOT_DENYPOCKET)
return 0
- if(I.w_class <= 2 || (I.slot_flags & SLOT_POCKET))
+ if(I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & SLOT_POCKET))
return 1
return 0
if(slot_s_store)
@@ -575,7 +575,7 @@
if(!disable_warning)
to_chat(src, "You somehow have a suit with no defined allowed items for suit storage, stop that.")
return 0
- if(I.w_class > 4)
+ if(I.w_class > WEIGHT_CLASS_BULKY)
if(!disable_warning)
to_chat(src, "The [name] is too big to attach.")
return 0
diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm
index d399db99515..2c9ab233eda 100644
--- a/code/modules/mob/living/silicon/robot/component.dm
+++ b/code/modules/mob/living/silicon/robot/component.dm
@@ -171,7 +171,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 3
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
throw_speed = 5
throw_range = 10
origin_tech = "magnets=1;biotech=1"
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index bbda7a05318..282f97c4dc4 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -327,7 +327,7 @@
..()
else if(istype(AM,/obj/item))
var/obj/item/O = AM
- if(O.w_class > 2)
+ if(O.w_class > WEIGHT_CLASS_SMALL)
to_chat(src, "You are too small to pull that.")
return
else
diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
index d524ffd8e06..a7d297d0bdc 100644
--- a/code/modules/mob/living/simple_animal/bot/construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -10,7 +10,7 @@
throwforce = 5
throw_speed = 2
throw_range = 5
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
var/created_name = "Cleanbot"
/obj/item/weapon/bucket_sensor/attackby(obj/item/W, mob/user as mob, params)
@@ -204,7 +204,7 @@
throwforce = 10
throw_speed = 2
throw_range = 5
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
var/created_name = "Floorbot"
/obj/item/weapon/toolbox_tiles_sensor
@@ -216,7 +216,7 @@
throwforce = 10
throw_speed = 2
throw_range = 5
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
var/created_name = "Floorbot"
/obj/item/weapon/storage/toolbox/mechanical/attackby(obj/item/stack/tile/plasteel/T, mob/user, params)
@@ -286,7 +286,7 @@
var/build_step = 0
var/created_name = "Medibot" //To preserve the name if it's a unique medbot I guess
var/skin = null //Same as medbot, set to tox or ointment for the respective kits.
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
var/treatment_brute = "salglu_solution"
var/treatment_oxy = "salbutamol"
var/treatment_fire = "salglu_solution"
@@ -478,4 +478,4 @@
overlays -= "hs_arm"
new /obj/item/robot_parts/l_arm(get_turf(src))
to_chat(user, "You remove the robot arm from [src].")
- build_step--
\ No newline at end of file
+ build_step--
diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
index 5b2419bf7e8..bc75bd554e5 100644
--- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
+++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
@@ -260,7 +260,7 @@
var/list/items = list()
for(var/obj/item/I in view(1,src))
- if(I.loc != src && I.w_class <= 2)
+ if(I.loc != src && I.w_class <= WEIGHT_CLASS_SMALL)
items.Add(I)
var/obj/selection = input("Select an item.", "Pickup") in items
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
index 80227526cbc..3298e334bd2 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
@@ -222,7 +222,7 @@
icon = 'icons/obj/items.dmi'
icon_state = "goliath_hide"
flags = NOBLUDGEON
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
layer = 4
/obj/item/asteroid/goliath_hide/afterattack(atom/target, mob/user, proximity_flag)
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 2c1fb61be2f..bd484903aa9 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -515,12 +515,12 @@
if(istype(AM, /obj/item))
var/obj/item/I = AM
- if(I.w_class < 2)
+ if(I.w_class < WEIGHT_CLASS_SMALL)
return I
if(iscarbon(AM))
var/mob/living/carbon/C = AM
- if((C.l_hand && C.l_hand.w_class <= 2) || (C.r_hand && C.r_hand.w_class <= 2))
+ if((C.l_hand && C.l_hand.w_class <= WEIGHT_CLASS_SMALL) || (C.r_hand && C.r_hand.w_class <= WEIGHT_CLASS_SMALL))
return C
return null
@@ -544,12 +544,12 @@
if(istype(AM, /obj/item))
var/obj/item/I = AM
- if(I.w_class <= 2)
+ if(I.w_class <= WEIGHT_CLASS_SMALL)
return I
if(iscarbon(AM))
var/mob/living/carbon/C = AM
- if(C.l_hand && C.l_hand.w_class <= 2 || C.r_hand && C.r_hand.w_class <= 2)
+ if(C.l_hand && C.l_hand.w_class <= WEIGHT_CLASS_SMALL || C.r_hand && C.r_hand.w_class <= WEIGHT_CLASS_SMALL)
return C
return null
@@ -571,7 +571,7 @@
for(var/obj/item/I in view(1,src))
//Make sure we're not already holding it and it's small enough
- if(I.loc != src && I.w_class <= 2)
+ if(I.loc != src && I.w_class <= WEIGHT_CLASS_SMALL)
//If we have a perch and the item is sitting on it, continue
if(!client && parrot_perch && I.loc == parrot_perch.loc)
@@ -600,10 +600,10 @@
var/obj/item/stolen_item = null
for(var/mob/living/carbon/C in view(1,src))
- if(C.l_hand && C.l_hand.w_class <= 2)
+ if(C.l_hand && C.l_hand.w_class <= WEIGHT_CLASS_SMALL)
stolen_item = C.l_hand
- if(C.r_hand && C.r_hand.w_class <= 2)
+ if(C.r_hand && C.r_hand.w_class <= WEIGHT_CLASS_SMALL)
stolen_item = C.r_hand
if(stolen_item)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index a1b6c652913..99d7a7a1fa6 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -424,7 +424,7 @@ var/list/slot_equipment_priority = list( \
return 0
if(slot_flags & SLOT_DENYPOCKET)
return
- if( w_class <= 2 || (slot_flags & SLOT_POCKET) )
+ if( w_class <= WEIGHT_CLASS_SMALL || (slot_flags & SLOT_POCKET) )
return 1
if(slot_r_store)
if(H.r_store)
@@ -435,7 +435,7 @@ var/list/slot_equipment_priority = list( \
return 0
if(slot_flags & SLOT_DENYPOCKET)
return 0
- if( w_class <= 2 || (slot_flags & SLOT_POCKET) )
+ if( w_class <= WEIGHT_CLASS_SMALL || (slot_flags & SLOT_POCKET) )
return 1
return 0
if(slot_s_store)
@@ -447,7 +447,7 @@ var/list/slot_equipment_priority = list( \
if(!disable_warning)
to_chat(usr, "You somehow have a suit with no defined allowed items for suit storage, stop that.")
return 0
- if(src.w_class > 4)
+ if(src.w_class > WEIGHT_CLASS_BULKY)
if(!disable_warning)
to_chat(usr, "The [name] is too big to attach.")
return 0
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 624ec318f03..fffd02adf0a 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -26,7 +26,7 @@
plane = HUD_PLANE
item_state = "nothing"
icon = 'icons/mob/screen_gen.dmi'
- w_class = 5
+ w_class = WEIGHT_CLASS_BULKY
/obj/item/weapon/grab/New(var/mob/user, var/mob/victim)
diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
index a5c64adc7ea..da26fc96fec 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -4,7 +4,7 @@
icon_state = "clipboard"
item_state = "clipboard"
throwforce = 0
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 10
var/obj/item/weapon/pen/haspen //The stored pen.
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index 00458df575c..214c284f206 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -3,7 +3,7 @@
desc = "A folder."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "folder"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
pressure_resistance = 2
burn_state = FLAMMABLE
@@ -121,4 +121,3 @@
..()
new /obj/item/documents/syndicate/blue(src)
update_icon()
-
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 60a501f1ecf..250abe3d682 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -10,7 +10,7 @@
icon_state = "paper"
item_state = "paper"
throwforce = 0
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
throw_range = 1
throw_speed = 1
layer = 4
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index da20ed65dde..2a7c7e113e1 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -5,7 +5,7 @@
icon_state = "paper"
item_state = "paper"
throwforce = 0
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
throw_range = 2
throw_speed = 1
layer = 4
@@ -241,4 +241,4 @@
if(photo)
desc += "\nThere is a photo attached to it."
overlays += image('icons/obj/bureaucracy.dmi', "clip")
- return
\ No newline at end of file
+ return
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index 89ba611f33c..efcce443d6c 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -4,7 +4,7 @@
icon_state = "paper_bin1"
item_state = "sheet-metal"
throwforce = 1
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
throw_speed = 3
throw_range = 7
pressure_resistance = 8
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 3b8a10ffbc0..89bd843467a 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -17,7 +17,7 @@
item_state = "pen"
slot_flags = SLOT_BELT | SLOT_EARS
throwforce = 0
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
throw_speed = 3
throw_range = 7
materials = list(MAT_METAL=10)
@@ -167,7 +167,7 @@
force = 18
sharp = 1
edge = 1
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
name = "energy dagger"
hitsound = 'sound/weapons/blade1.ogg'
throwforce = 35
@@ -200,4 +200,4 @@
add_logs(user, P, "used poison pen on")
to_chat(user, "You apply the poison to [P].")
else
- to_chat(user, "[src] clicks. It seems to be depleted.")
\ No newline at end of file
+ to_chat(user, "[src] clicks. It seems to be depleted.")
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index a9e232560fc..dc86ce2299a 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -15,7 +15,7 @@
desc = "A camera film cartridge. Insert it into a camera to reload it."
icon_state = "film"
item_state = "electropack"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
burn_state = FLAMMABLE
@@ -27,7 +27,7 @@
icon = 'icons/obj/items.dmi'
icon_state = "photo"
item_state = "paper"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
burn_state = FLAMMABLE
burntime = 5
var/blueprints = 0 // Does this have the blueprints?
@@ -146,7 +146,7 @@
desc = "A polaroid camera. 10 photos left."
icon_state = "camera"
item_state = "electropack"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
var/list/matter = list("metal" = 2000)
var/pictures_max = 10
@@ -508,7 +508,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
desc = "video camera that can send live feed to the entertainment network."
icon_state = "videocam"
item_state = "videocam"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
materials = list(MAT_METAL=2000)
var/on = 0
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index 26e397039d8..2ca25bf185f 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -5,7 +5,7 @@
icon_state = "stamp-ok"
item_state = "stamp"
throwforce = 0
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
throw_speed = 3
throw_range = 7
materials = list(MAT_METAL=60)
@@ -105,4 +105,4 @@
if(chosen_stamp)
name = chosen_stamp.name
icon_state = chosen_stamp.icon_state
- item_color = chosen_stamp.item_color
\ No newline at end of file
+ item_color = chosen_stamp.item_color
diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm
index d5208a01b8f..9da781b1ab1 100755
--- a/code/modules/pda/PDA.dm
+++ b/code/modules/pda/PDA.dm
@@ -10,7 +10,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
icon = 'icons/obj/pda.dmi'
icon_state = "pda"
item_state = "electronic"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_ID | SLOT_BELT | SLOT_PDA
//Main variables
diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm
index 459ae09835a..b432effb8be 100644
--- a/code/modules/pda/cart.dm
+++ b/code/modules/pda/cart.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/pda.dmi'
icon_state = "cart"
item_state = "electronic"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
var/obj/item/radio/integrated/radio = null
@@ -322,4 +322,4 @@
my_game.hacked = 1
to_chat(user, "TR4P_M45T3R.mod successfully initialized. ToS violated. User Agreement nullified. Gotta pwn them all.")
to_chat(user, "You can now create trapped versions of any mob in your collection that will damage hunters who attempt to capture it.")
- description_antag = "This copy of Nano-Mob Hunter GO! has been hacked to allow the creation of trap mobs which will cause any PDA that attempts to capture it to shock anyone holding it. Hacked copies of the game will not trigger the trap."
\ No newline at end of file
+ description_antag = "This copy of Nano-Mob Hunter GO! has been hacked to allow the creation of trap mobs which will cause any PDA that attempts to capture it to shock anyone holding it. Hacked copies of the game will not trigger the trap."
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 03a84d161e5..0b2c6f8b165 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -122,7 +122,7 @@
desc = "Heavy-duty switching circuits for power control."
icon = 'icons/obj/module.dmi'
icon_state = "power_mod"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
item_state = "electronic"
flags = CONDUCT
usesound = 'sound/items/Deconstruct.ogg'
@@ -621,7 +621,7 @@
if(((stat & BROKEN) || malfhack) \
&& !opened \
&& ( \
- (W.force >= 5 && W.w_class >= 3.0) \
+ (W.force >= 5 && W.w_class >= WEIGHT_CLASS_NORMAL) \
|| istype(W,/obj/item/weapon/crowbar) \
) \
&& prob(20) )
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 33aa4931fcc..b70e847cab4 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -485,7 +485,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
color = COLOR_RED
desc = "A coil of power cable."
throwforce = 10
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
throw_speed = 2
throw_range = 5
materials = list(MAT_METAL=10, MAT_GLASS=5)
@@ -568,9 +568,9 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
/obj/item/stack/cable_coil/proc/update_wclass()
if(amount == 1)
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
else
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/stack/cable_coil/examine(mob/user)
if(!..(user, 1))
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index a1e97bf58d2..3f42b4d58ce 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -592,7 +592,7 @@
icon = 'icons/obj/lighting.dmi'
force = 2
throwforce = 5
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
var/status = 0 // LIGHT_OK, LIGHT_BURNED or LIGHT_BROKEN
var/base_state
var/switchcount = 0 // number of times switched
@@ -612,7 +612,7 @@
brightness_range = 8
/obj/item/weapon/light/tube/large
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
name = "large light tube"
brightness_range = 15
brightness_power = 2
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index dea4c4797e8..fa9b61c8059 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -204,7 +204,7 @@
icon = 'icons/obj/power.dmi'
icon_state = "sp_base"
item_state = "electropack"
- w_class = 4 // Pretty big!
+ w_class = WEIGHT_CLASS_BULKY // Pretty big!
anchored = 0
var/tracker = 0
var/glass_type = null
diff --git a/code/modules/power/supermatter/sm_shard.dm b/code/modules/power/supermatter/sm_shard.dm
index 2ffd5b040ec..d4c1109e16e 100644
--- a/code/modules/power/supermatter/sm_shard.dm
+++ b/code/modules/power/supermatter/sm_shard.dm
@@ -7,7 +7,7 @@
icon_state = "supermatter"
sharp = 1
edge = 1
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
light_color = "#8A8A00"
var/brightness = 2
@@ -85,7 +85,7 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "tongs"
edge = 1
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
var/obj/item/held = null // The item currently being held
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
index 7b4b7a0d02e..ffaffd5ea81 100644
--- a/code/modules/power/tracker.dm
+++ b/code/modules/power/tracker.dm
@@ -81,4 +81,4 @@
name = "tracker electronics"
icon = 'icons/obj/doors/door_assembly.dmi'
icon_state = "door_electronics"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 924dcac3b4c..71400802ee2 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -6,7 +6,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 1
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
var/fire_sound = null //What sound should play when this ammo is fired
var/caliber = null //Which kind of guns it can be loaded into
var/projectile_type = null //The bullet type to create when New() is called
@@ -87,7 +87,7 @@
item_state = "syringe_kit"
materials = list(MAT_METAL=30000)
throwforce = 2
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
throw_speed = 4
throw_range = 10
var/list/stored_ammo = list()
@@ -192,4 +192,4 @@
var/turf_mag = get_turf(src)
for(var/obj/item/ammo in stored_ammo)
ammo.forceMove(turf_mag)
- stored_ammo -= ammo
\ No newline at end of file
+ stored_ammo -= ammo
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index bba922624f1..0304f4a48a9 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -7,7 +7,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT
materials = list(MAT_METAL=2000)
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
throwforce = 5
throw_speed = 3
throw_range = 5
diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm
index de217a9715d..f541ca2a94a 100644
--- a/code/modules/projectiles/guns/alien.dm
+++ b/code/modules/projectiles/guns/alien.dm
@@ -3,7 +3,7 @@
desc = "A vicious alien projectile weapon. Parts of it quiver gelatinously, as though the thing is insectile and alive."
icon_state = "spikethrower"
item_state = "spikethrower"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
fire_sound_text = "a strange noise"
mag_type = /obj/item/ammo_box/magazine/internal/spikethrower
burst_size = 2
@@ -52,7 +52,7 @@
sharp = 1
edge = 0
throwforce = 5
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
caliber = "spike"
icon_state = "bolt"
fire_sound = 'sound/weapons/bladeslice.ogg'
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 40356f8a7d9..fc14b32a09c 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -3,7 +3,7 @@
desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal."
icon_state = "laser"
item_state = "laser"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL=2000)
origin_tech = "combat=3;magnets=2"
ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
@@ -66,7 +66,7 @@
desc = "An advanced laser cannon that does more damage the farther away the target is."
icon_state = "lasercannon"
item_state = "laser"
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
force = 10
flags = CONDUCT
slot_flags = SLOT_BACK
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 727ebdd7082..379a8af70d8 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -31,7 +31,7 @@
desc = "A small, pistol-sized energy gun with a built-in flashlight. It has two settings: stun and kill."
icon_state = "mini"
item_state = "gun"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
ammo_x_offset = 2
charge_sections = 3
can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update
@@ -71,7 +71,7 @@
icon_state = "turretlaser"
item_state = "turretlaser"
slot_flags = null
- w_class = 5
+ w_class = WEIGHT_CLASS_HUGE
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
weapon_weight = WEAPON_MEDIUM
can_flashlight = 0
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index 456627398ce..7ded54f6690 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -3,7 +3,7 @@
desc = "A heavy-duty, multifaceted energy rifle with three modes. Preferred by front-line combat personnel."
icon_state = "pulse"
item_state = null
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
force = 10
flags = CONDUCT
slot_flags = SLOT_BACK
@@ -25,7 +25,7 @@
/obj/item/weapon/gun/energy/pulse/carbine
name = "pulse carbine"
desc = "A compact variant of the pulse rifle with less firepower but easier storage."
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
slot_flags = SLOT_BELT
icon_state = "pulse_carbine"
item_state = "pulse"
@@ -37,7 +37,7 @@
/obj/item/weapon/gun/energy/pulse/pistol
name = "pulse pistol"
desc = "A pulse rifle in an easily concealed handgun package with low capacity."
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
icon_state = "pulse_pistol"
item_state = "gun"
@@ -77,9 +77,9 @@
icon_state = "turretlaser"
item_state = "turretlaser"
slot_flags = null
- w_class = 5
+ w_class = WEIGHT_CLASS_HUGE
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser/pulse)
weapon_weight = WEAPON_MEDIUM
can_flashlight = 0
trigger_guard = TRIGGER_GUARD_NONE
- ammo_x_offset = 2
\ No newline at end of file
+ ammo_x_offset = 2
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 3595b9c7ea8..009d2c6c5e8 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -5,7 +5,7 @@
item_state = null //so the human update icon uses the icon_state instead.
fire_sound = 'sound/weapons/IonRifle.ogg'
origin_tech = "combat=2;magnets=4"
- w_class = 5
+ w_class = WEIGHT_CLASS_HUGE
flags = CONDUCT
slot_flags = SLOT_BACK
ammo_type = list(/obj/item/ammo_casing/energy/ion)
@@ -21,7 +21,7 @@
desc = "The MK.II Prototype Ion Projector is a lightweight carbine version of the larger ion rifle, built to be ergonomic and efficient."
icon_state = "ioncarbine"
origin_tech = "combat=4;magnets=4;materials=4"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
slot_flags = SLOT_BELT
ammo_x_offset = 2
flight_x_offset = 18
@@ -60,7 +60,7 @@
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "riotgun"
item_state = "c20r"
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
ammo_type = list(/obj/item/ammo_casing/energy/meteor)
cell_type = /obj/item/weapon/stock_parts/cell/potato
clumsy_check = 0 //Admin spawn only, might as well let clowns use it.
@@ -74,7 +74,7 @@
item_state = "pen"
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
/obj/item/weapon/gun/energy/mindflayer
name = "\improper Mind Flayer"
@@ -89,7 +89,7 @@
desc = "A weapon favored by syndicate stealth specialists."
icon_state = "crossbow"
item_state = "crossbow"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
materials = list(MAT_METAL=2000)
origin_tech = "combat=2;magnets=2;syndicate=5"
suppressed = 1
@@ -111,7 +111,7 @@
name = "energy crossbow"
desc = "A reverse engineered weapon using syndicate technology."
icon_state = "crossbowlarge"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL=4000)
origin_tech = "combat=2;magnets=2;syndicate=3" //can be further researched for more syndie tech
suppressed = 0
@@ -280,7 +280,7 @@
desc = "A specialized firearm designed to fire lethal bolts of toxins."
icon_state = "toxgun"
fire_sound = 'sound/effects/stealthoff.ogg'
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
origin_tech = "combat=4;plasmatech=3"
ammo_type = list(/obj/item/ammo_casing/energy/toxplasma)
shaded_charge = 1
@@ -292,7 +292,7 @@
origin_tech = "combat=6;materials=5;powerstorage=4"
ammo_type = list(/obj/item/ammo_casing/energy/sniper)
slot_flags = SLOT_BACK
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
zoomable = TRUE
zoom_amt = 7 //Long range, enough to see in front of you, but no tiles behind you.
shaded_charge = 1
@@ -303,7 +303,7 @@
icon_state = "tempgun_4"
item_state = "tempgun_4"
slot_flags = SLOT_BACK
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
fire_sound = 'sound/weapons/pulse3.ogg'
desc = "A gun that changes the body temperature of its targets."
var/temperature = 300
diff --git a/code/modules/projectiles/guns/grenade_launcher.dm b/code/modules/projectiles/guns/grenade_launcher.dm
index 5abac9ebad9..ad49c99bfc4 100644
--- a/code/modules/projectiles/guns/grenade_launcher.dm
+++ b/code/modules/projectiles/guns/grenade_launcher.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "riotgun"
item_state = "riotgun"
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
throw_speed = 2
throw_range = 10
force = 5
diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm
index 860d52d2550..f26583bbe0d 100644
--- a/code/modules/projectiles/guns/magic.dm
+++ b/code/modules/projectiles/guns/magic.dm
@@ -7,7 +7,7 @@
fire_sound = 'sound/weapons/emitter.ogg'
fire_sound_text = "energy blast"
flags = CONDUCT
- w_class = 5
+ w_class = WEIGHT_CLASS_HUGE
var/max_charges = 6
var/charges = 0
var/recharge_rate = 4
diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index 20461c08acf..ac804ab9192 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -4,7 +4,7 @@
ammo_type = /obj/item/ammo_casing/magic
icon_state = "nothingwand"
item_state = "wand"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
can_charge = 0
max_charges = 100 //100, 50, 50, 34 (max charge distribution by 25%ths)
var/variable_charges = 1
diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm
index a556d4572a2..59a24533e80 100644
--- a/code/modules/projectiles/guns/medbeam.dm
+++ b/code/modules/projectiles/guns/medbeam.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/chronos.dmi'
icon_state = "chronogun"
item_state = "chronogun"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
var/mob/living/current_target
var/last_check = 0
diff --git a/code/modules/projectiles/guns/mounted.dm b/code/modules/projectiles/guns/mounted.dm
index ae9c8f06d09..8fec6cd8b8e 100644
--- a/code/modules/projectiles/guns/mounted.dm
+++ b/code/modules/projectiles/guns/mounted.dm
@@ -4,7 +4,7 @@
icon_state = "armcannon"
force = 5
flags = NODROP
- w_class = 5
+ w_class = WEIGHT_CLASS_HUGE
can_flashlight = 0
selfcharge = 1
trigger_guard = TRIGGER_GUARD_ALLOW_ALL // Has no trigger at all, uses neural signals instead
@@ -20,7 +20,7 @@
item_state = "armcannonlase"
force = 5
flags = NODROP
- w_class = 5
+ w_class = WEIGHT_CLASS_HUGE
materials = null
selfcharge = 1
trigger_guard = TRIGGER_GUARD_ALLOW_ALL
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 961a7b91e05..7575e9b92f8 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -3,7 +3,7 @@
name = "projectile gun"
icon_state = "pistol"
origin_tech = "combat=2;materials=2"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL=1000)
var/mag_type = /obj/item/ammo_box/magazine/m10mm //Removes the need for max_ammo and caliber info
@@ -77,7 +77,7 @@
S.oldsound = fire_sound
S.initial_w_class = w_class
fire_sound = 'sound/weapons/Gunshot_silenced.ogg'
- w_class = 3 //so pistols do not fit in pockets when suppressed
+ w_class = WEIGHT_CLASS_NORMAL //so pistols do not fit in pockets when suppressed
A.loc = src
update_icon()
return
@@ -169,7 +169,7 @@
user.visible_message("[user] shortens \the [src]!", "You shorten \the [src].")
name = "sawn-off [name]"
desc = sawn_desc
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
item_state = "gun"//phil235 is it different with different skin?
slot_flags &= ~SLOT_BACK //you can't sling it on your back
slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
@@ -191,7 +191,7 @@
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "suppressor"
item_state = "suppressor"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
var/oldsound = null
var/initial_w_class = null
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 0b174c635b0..1b666a88953 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -1,5 +1,5 @@
/obj/item/weapon/gun/projectile/automatic
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
var/alarmed = 0
var/select = 1
can_suppress = 1
@@ -194,7 +194,7 @@
desc = "A genuine 'Chicago Typewriter'."
icon_state = "tommygun"
item_state = "shotgun"
- w_class = 5
+ w_class = WEIGHT_CLASS_HUGE
slot_flags = 0
origin_tech = "combat=5;materials=1;syndicate=2"
mag_type = /obj/item/ammo_box/magazine/tommygunm45
@@ -222,7 +222,7 @@
desc = "A compact, mag-fed semi-automatic shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines."
icon_state = "bulldog"
item_state = "bulldog"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
origin_tech = "combat=5;materials=4;syndicate=6"
mag_type = /obj/item/ammo_box/magazine/m12g
fire_sound = 'sound/weapons/Gunshot4.ogg'
@@ -255,7 +255,7 @@
desc = "An experimental carbine. Uses encased laser projectors as ammunition."//we need to uncouple the toroidal resistance dejammers
icon_state = "lasercarbine"
item_state = "laser"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
origin_tech = "combat=5;materials=5"
mag_type = /obj/item/ammo_box/magazine/laser
fire_sound = 'sound/weapons/emitter2.ogg'
diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm
index 462341fdc36..e8dd43d1501 100644
--- a/code/modules/projectiles/guns/projectile/launchers.dm
+++ b/code/modules/projectiles/guns/projectile/launchers.dm
@@ -8,7 +8,7 @@
item_state = "gun"
mag_type = /obj/item/ammo_box/magazine/internal/grenadelauncher
fire_sound = 'sound/weapons/grenadelaunch.ogg'
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
/obj/item/weapon/gun/projectile/revolver/grenadelauncher/attackby(var/obj/item/A, mob/user, params)
..()
@@ -57,7 +57,7 @@
desc = "A weapon favored by carp hunters. Fires specialized spears using kinetic energy."
icon_state = "speargun"
item_state = "speargun"
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
force = 10
can_suppress = 0
mag_type = /obj/item/ammo_box/magazine/internal/speargun
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 5de627d7933..4db9d3175d7 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -2,7 +2,7 @@
name = "stechkin pistol"
desc = "A small, easily concealable 10mm handgun. Has a threaded barrel for suppressors."
icon_state = "pistol"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
origin_tech = "combat=2;materials=2;syndicate=2"
mag_type = /obj/item/ammo_box/magazine/m10mm
can_suppress = 1
@@ -22,7 +22,7 @@
name = "\improper M1911"
desc = "A classic .45 handgun with a small magazine capacity."
icon_state = "m1911"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
mag_type = /obj/item/ammo_box/magazine/m45
can_suppress = 0
@@ -66,7 +66,7 @@
name = "stechkin APS pistol"
desc = "The original russian version of a widely used Syndicate sidearm. Uses 9mm ammo."
icon_state = "aps"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
origin_tech = "combat=3;materials=2;syndicate=3"
mag_type = /obj/item/ammo_box/magazine/pistolm9mm
can_suppress = 0
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 80192a3091d..2efc6cda7e0 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -270,7 +270,7 @@
desc = "A true classic."
icon_state = "dshotgun"
item_state = "shotgun"
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
force = 10
flags = CONDUCT
slot_flags = SLOT_BACK
@@ -325,7 +325,7 @@
desc = "Essentially a tube that aims shotgun shells."
icon_state = "ishotgun"
item_state = "shotgun"
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
force = 10
slot_flags = null
origin_tech = "combat=2;materials=2"
@@ -373,7 +373,7 @@
icon_state = "cane"
item_state = "stick"
sawn_state = SAWN_OFF
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
force = 10
can_unsuppress = 0
slot_flags = null
diff --git a/code/modules/projectiles/guns/projectile/saw.dm b/code/modules/projectiles/guns/projectile/saw.dm
index cfe8ffbb0a5..3c80b241613 100644
--- a/code/modules/projectiles/guns/projectile/saw.dm
+++ b/code/modules/projectiles/guns/projectile/saw.dm
@@ -3,7 +3,7 @@
desc = "A heavily modified 5.56 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation."
icon_state = "l6closed100"
item_state = "l6closedmag"
- w_class = 5
+ w_class = WEIGHT_CLASS_HUGE
slot_flags = 0
origin_tech = "combat=5;materials=1;syndicate=2"
mag_type = /obj/item/ammo_box/magazine/mm556x45
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 35cde243c20..970f874c334 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -3,7 +3,7 @@
desc = "A traditional shotgun with wood furniture and a four-shell capacity underneath."
icon_state = "shotgun"
item_state = "shotgun"
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
force = 10
flags = CONDUCT
slot_flags = SLOT_BACK
@@ -173,7 +173,7 @@
icon_state = "cshotgun"
origin_tech = "combat=5;materials=2"
mag_type = /obj/item/ammo_box/magazine/internal/shot/com
- w_class = 5
+ w_class = WEIGHT_CLASS_HUGE
//Dual Feed Shotgun
@@ -183,7 +183,7 @@
icon_state = "cycler"
origin_tech = "combat=4;materials=2"
mag_type = /obj/item/ammo_box/magazine/internal/shot/tube
- w_class = 5
+ w_class = WEIGHT_CLASS_HUGE
var/toggled = 0
var/obj/item/ammo_box/magazine/internal/shot/alternate_magazine
diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm
index bf26dad78b3..5d4078e666d 100644
--- a/code/modules/projectiles/guns/projectile/sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper.dm
@@ -11,7 +11,7 @@
origin_tech = "combat=8"
can_unsuppress = 1
can_suppress = 1
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
zoomable = TRUE
zoom_amt = 7 //Long range, enough to see in front of you, but no tiles behind you.
slot_flags = SLOT_BACK
diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm
index 809647e4186..8a191f06b97 100644
--- a/code/modules/projectiles/guns/projectile/toy.dm
+++ b/code/modules/projectiles/guns/projectile/toy.dm
@@ -20,7 +20,7 @@
name = "foam force pistol"
desc = "A small, easily concealable toy handgun. Ages 8 and up."
icon_state = "pistol"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
mag_type = /obj/item/ammo_box/magazine/toy/pistol
fire_sound = 'sound/weapons/Gunshot.ogg'
can_suppress = 0
@@ -65,7 +65,7 @@
mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/crossbow
fire_sound = 'sound/items/syringeproj.ogg'
slot_flags = SLOT_BELT
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/weapon/gun/projectile/automatic/c20r/toy
name = "donksoft SMG"
@@ -96,4 +96,4 @@
icon_state = "tommygun"
item_state = "shotgun"
mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/tommygun
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
diff --git a/code/modules/projectiles/guns/rocket.dm b/code/modules/projectiles/guns/rocket.dm
index f9a8d00bdb1..0bb44409acd 100644
--- a/code/modules/projectiles/guns/rocket.dm
+++ b/code/modules/projectiles/guns/rocket.dm
@@ -4,7 +4,7 @@
desc = "Say hello to my little friend"
icon_state = "rocket"
item_state = "rocket"
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
throw_speed = 2
throw_range = 10
force = 5.0
diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm
index 332d279376b..e9d79fe42c4 100644
--- a/code/modules/projectiles/guns/syringe_gun.dm
+++ b/code/modules/projectiles/guns/syringe_gun.dm
@@ -3,7 +3,7 @@
desc = "A spring loaded rifle designed to fit syringes, used to incapacitate unruly patients from a distance."
icon_state = "syringegun"
item_state = "syringegun"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
throw_speed = 3
throw_range = 7
force = 4
@@ -88,7 +88,7 @@
desc = "A small spring-loaded sidearm that functions identically to a syringe gun."
icon_state = "syringe_pistol"
item_state = "gun" //Smaller inhand
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
origin_tech = "combat=2;syndicate=2"
force = 2 //Also very weak because it's smaller
suppressed = 1 //Softer fire sound
diff --git a/code/modules/projectiles/guns/throw/crossbow.dm b/code/modules/projectiles/guns/throw/crossbow.dm
index 11d39bf2a38..77d3e89eade 100644
--- a/code/modules/projectiles/guns/throw/crossbow.dm
+++ b/code/modules/projectiles/guns/throw/crossbow.dm
@@ -153,7 +153,7 @@
icon_state = "bolt"
item_state = "bolt"
throwforce = 20
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
sharp = 1
edge = 0
diff --git a/code/modules/projectiles/guns/throw/pielauncher.dm b/code/modules/projectiles/guns/throw/pielauncher.dm
index f6405f47194..3af48788134 100644
--- a/code/modules/projectiles/guns/throw/pielauncher.dm
+++ b/code/modules/projectiles/guns/throw/pielauncher.dm
@@ -2,7 +2,7 @@
name = "pie cannon"
desc = "A projectile weapon that fires pies."
icon_state = "piecannon"
- w_class = 5
+ w_class = WEIGHT_CLASS_HUGE
throw_speed = 2
throw_range = 3
force = 5
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index c441ab97805..009828543ce 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -3,7 +3,7 @@
desc = "..."
icon = 'icons/obj/chemical.dmi'
icon_state = null
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
var/amount_per_transfer_from_this = 5
var/possible_transfer_amounts = list(5,10,15,25,30)
var/volume = 30
diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm
index b170f6b0867..5d22a21aa4a 100644
--- a/code/modules/reagents/reagent_containers/glass_containers.dm
+++ b/code/modules/reagents/reagent_containers/glass_containers.dm
@@ -330,7 +330,7 @@
icon_state = "bucket"
item_state = "bucket"
materials = list(MAT_METAL=200)
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
amount_per_transfer_from_this = 20
possible_transfer_amounts = list(5,10,15,20,25,30,50,80,100,120)
volume = 120
@@ -353,4 +353,4 @@
user.unEquip(src)
qdel(src)
else
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index cc4bf75ea45..8674ba75a09 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -7,7 +7,7 @@
flags = OPENCONTAINER | NOBLUDGEON
slot_flags = SLOT_BELT
throwforce = 0
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
var/spray_maxrange = 3 //what the sprayer will set spray_currentrange to in the attack_self.
@@ -145,7 +145,7 @@
icon_state = "chemsprayer"
item_state = "chemsprayer"
throwforce = 0
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
spray_maxrange = 7
spray_currentrange = 7
amount_per_transfer_from_this = 10
@@ -204,4 +204,4 @@
icon_state = "plantbgone"
item_state = "plantbgone"
volume = 100
- list_reagents = list("glyphosate" = 100)
\ No newline at end of file
+ list_reagents = list("glyphosate" = 100)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 0f2b766bb3c..ebb13f0830c 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -14,7 +14,7 @@
amount_per_transfer_from_this = 5
possible_transfer_amounts = null //list(5,10,15)
volume = 15
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
sharp = 1
var/mode = SYRINGE_DRAW
var/projectile_type = /obj/item/projectile/bullet/dart/syringe
@@ -398,4 +398,4 @@
/obj/item/weapon/reagent_containers/syringe/bioterror
name = "bioterror syringe"
desc = "Contains several paralyzing reagents."
- list_reagents = list("neurotoxin" = 5, "capulettium_plus" = 5, "sodium_thiopental" = 5)
\ No newline at end of file
+ list_reagents = list("neurotoxin" = 5, "capulettium_plus" = 5, "sodium_thiopental" = 5)
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 209edb809b2..8896d939e2f 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -334,7 +334,7 @@
icon_state = "conveyor0"
name = "conveyor belt assembly"
desc = "A conveyor belt assembly."
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
var/id = "" //inherited by the belt
/obj/item/conveyor_construct/attackby(obj/item/I, mob/user, params)
@@ -361,7 +361,7 @@
desc = "A conveyor control switch assembly."
icon = 'icons/obj/recycling.dmi'
icon_state = "switch-off"
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
var/id = "" //inherited by the switch
/obj/item/conveyor_switch_construct/New()
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index a8d3902e6f3..52db1f8d30c 100755
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -216,7 +216,7 @@
//The whole system for the sorttype var is determined based on the order of this list,
//disposals must always be 1, since anything that's untagged will automatically go to disposals, or sorttype = 1 --Superxpdude
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
item_state = "electronic"
flags = CONDUCT
slot_flags = SLOT_BELT
@@ -430,4 +430,4 @@
/obj/item/shippingPackage/Destroy()
QDEL_NULL(wrapped)
- return ..()
\ No newline at end of file
+ return ..()
diff --git a/code/modules/research/xenoarchaeology/chemistry.dm b/code/modules/research/xenoarchaeology/chemistry.dm
index b198bd02459..7094f2d00f4 100644
--- a/code/modules/research/xenoarchaeology/chemistry.dm
+++ b/code/modules/research/xenoarchaeology/chemistry.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "solution_tray"
materials = list(MAT_GLASS=5)
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
amount_per_transfer_from_this = 1
possible_transfer_amounts = list(1, 2)
volume = 2
@@ -51,4 +51,4 @@ obj/item/weapon/reagent_containers/glass/solution_tray/attackby(obj/item/weapon/
/obj/item/weapon/reagent_containers/glass/beaker/fuel
name = "beaker 'fuel'"
- list_reagents = list("fuel" = 50)
\ No newline at end of file
+ list_reagents = list("fuel" = 50)
diff --git a/code/modules/research/xenoarchaeology/geosample.dm b/code/modules/research/xenoarchaeology/geosample.dm
index e4aaa4a554b..6d32b4e0ca9 100644
--- a/code/modules/research/xenoarchaeology/geosample.dm
+++ b/code/modules/research/xenoarchaeology/geosample.dm
@@ -19,7 +19,7 @@
desc = "It looks extremely delicate."
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "sliver1" //0-4
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
sharp = 1
//item_state = "electronic"
var/source_rock = "/turf/simulated/mineral/"
diff --git a/code/modules/research/xenoarchaeology/tools/tools.dm b/code/modules/research/xenoarchaeology/tools/tools.dm
index 6ac7aee6a2b..b17569da383 100644
--- a/code/modules/research/xenoarchaeology/tools/tools.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools.dm
@@ -7,7 +7,7 @@
desc = "A coiled metallic tape used to check dimensions and lengths."
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "measuring"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
//todo: dig site tape
@@ -17,8 +17,8 @@
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/fossil)
diff --git a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
index d020845784c..4edf8f69d9a 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "flashgun"
item_state = "lampgreen"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_BELT
var/nearest_artifact_id = "unknown"
var/nearest_artifact_distance = -1
diff --git a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
index 72f85146df1..8c4ec23004c 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
@@ -19,7 +19,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "sampler0"
item_state = "screwdriver_brown"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
//slot_flags = SLOT_BELT
var/sampled_turf = ""
var/num_stored_bags = 10
@@ -73,7 +73,7 @@
filled_bag.icon_state = "evidence"
var/image/I = image("icon"=R, "layer"=FLOAT_LAYER)
filled_bag.underlays += I
- filled_bag.w_class = 1
+ filled_bag.w_class = WEIGHT_CLASS_TINY
to_chat(user, "You take a core sample of the [item_to_sample].")
else
diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
index 83429d509bc..ad195a0a141 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
@@ -9,7 +9,7 @@
icon = 'icons/obj/pda.dmi'
icon_state = "crap"
item_state = "analyzer"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_BELT
var/list/positive_locations = list()
var/datum/depth_scan/current
diff --git a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
index 4e6e48b49b5..ec00023ab29 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
@@ -12,7 +12,7 @@
excavation_amount = 0.5
digsound = list('sound/weapons/thudswoosh.ogg')
drill_verb = "brushing"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/weapon/pickaxe/one_pick
name = "1/6 pick"
@@ -24,7 +24,7 @@
excavation_amount = 1
digsound = list('sound/items/Screwdriver.ogg')
drill_verb = "delicately picking"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/weapon/pickaxe/two_pick
name = "1/3 pick"
@@ -36,7 +36,7 @@
excavation_amount = 2
digsound = list('sound/items/Screwdriver.ogg')
drill_verb = "delicately picking"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/weapon/pickaxe/three_pick
name = "1/2 pick"
@@ -48,7 +48,7 @@
excavation_amount = 3
digsound = list('sound/items/Screwdriver.ogg')
drill_verb = "delicately picking"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/weapon/pickaxe/four_pick
name = "2/3 pick"
@@ -60,7 +60,7 @@
excavation_amount = 4
digsound = list('sound/items/Screwdriver.ogg')
drill_verb = "delicately picking"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/weapon/pickaxe/five_pick
name = "5/6 pick"
@@ -72,7 +72,7 @@
excavation_amount = 5
digsound = list('sound/items/Screwdriver.ogg')
drill_verb = "delicately picking"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/weapon/pickaxe/six_pick
name = "1/1 pick"
@@ -84,7 +84,7 @@
excavation_amount = 6
digsound = list('sound/items/Screwdriver.ogg')
drill_verb = "delicately picking"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/weapon/pickaxe/hand
name = "hand pickaxe"
@@ -96,7 +96,7 @@
excavation_amount = 15
digsound = list('sound/items/Crowbar.ogg')
drill_verb = "clearing"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
/obj/item/weapon/pickaxe/robotic
name = "robotic pickaxe"
@@ -125,7 +125,7 @@
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
storage_slots = 7
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
can_hold = list(/obj/item/weapon/pickaxe/brush,\
/obj/item/weapon/pickaxe/one_pick,\
/obj/item/weapon/pickaxe/two_pick,\
@@ -134,7 +134,7 @@
/obj/item/weapon/pickaxe/five_pick,\
/obj/item/weapon/pickaxe/six_pick)
max_combined_w_class = 17
- max_w_class = 4
+ max_w_class = WEIGHT_CLASS_BULKY
use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
/obj/item/weapon/storage/box/excavation/New()
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index c42b6e8286c..6846548ee6d 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -7,7 +7,7 @@
icon = 'icons/mob/slimes.dmi'
icon_state = "grey slime extract"
force = 1
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
throwforce = 0
throw_speed = 3
throw_range = 6
@@ -121,7 +121,7 @@
/obj/item/slimepotion
name = "slime potion"
desc = "A hard yet gelatinous capsule excreted by a slime, containing mysterious substances."
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
origin_tech = "biotech=4"
/obj/item/slimepotion/afterattack(obj/item/weapon/reagent_containers/target, mob/user, proximity_flag)
@@ -552,7 +552,7 @@
singular_name = "floor tile"
desc = "Through a series of micro-teleports, these tiles let people move at incredible speeds."
icon_state = "tile-bluespace"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
force = 6
materials = list(MAT_METAL=500)
throwforce = 10
@@ -575,7 +575,7 @@
singular_name = "floor tile"
desc = "Time seems to flow very slowly around these tiles."
icon_state = "tile-sepia"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
force = 6
materials = list(MAT_METAL=500)
throwforce = 10
diff --git a/code/modules/spacepods/equipment.dm b/code/modules/spacepods/equipment.dm
index 65b3b9232b8..d1f78ffdf28 100644
--- a/code/modules/spacepods/equipment.dm
+++ b/code/modules/spacepods/equipment.dm
@@ -269,7 +269,7 @@
desc = "A key for a spacepod lock."
icon = 'icons/vehicles/spacepod.dmi'
icon_state = "podkey"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
var/id = 0
// Key - Lock Interactions
diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm
index 1c66bd2c31b..873f1332216 100644
--- a/code/modules/surgery/organs/augments_eyes.dm
+++ b/code/modules/surgery/organs/augments_eyes.dm
@@ -5,7 +5,7 @@
implant_overlay = "eye_implant_overlay"
slot = "eye_sight"
parent_organ = "eyes"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
var/vision_flags = 0
var/dark_view = 0
diff --git a/code/modules/surgery/organs/autoimplanter.dm b/code/modules/surgery/organs/autoimplanter.dm
index 4af88abc52f..6f72deca2e1 100644
--- a/code/modules/surgery/organs/autoimplanter.dm
+++ b/code/modules/surgery/organs/autoimplanter.dm
@@ -3,7 +3,7 @@
desc = "A device that automatically injects a cyber-implant into the user without the hassle of extensive surgery. It has a slot to insert implants and a screwdriver slot for removing accidentally added implants."
icon_state = "autoimplanter"
item_state = "walkietalkie"//left as this so as to intentionally not have inhands
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
usesound = 'sound/weapons/circsawhit.ogg'
var/obj/item/organ/internal/cyberimp/storedorgan
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 7bea9c480af..eb503b77f16 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -3,7 +3,7 @@
/obj/item/organ/internal
origin_tech = "biotech=2"
force = 1
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
throwforce = 0
var/zone = "chest"
var/slot
@@ -500,7 +500,7 @@
desc = "A tiny black mass with red tendrils trailing from it. It seems to shrivel in the light."
icon_state = "blacktumor"
origin_tech = "biotech=4"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
parent_organ = "head"
slot = "brain_tumor"
health = 3
@@ -532,7 +532,7 @@
desc = "A tiny yellow mass shaped like..a banana?"
icon_state = "honktumor"
origin_tech = "biotech=1"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
parent_organ = "head"
slot = "brain_tumor"
health = 3
@@ -619,7 +619,7 @@
desc = "Let they who is worthy wear the beard of Thorbjorndottir."
icon_state = "liver"
origin_tech = "biotech=1"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
parent_organ = "head"
slot = "hair_organ"
diff --git a/code/modules/surgery/organs/subtypes/skrell.dm b/code/modules/surgery/organs/subtypes/skrell.dm
index b8debe746e7..842088f2937 100644
--- a/code/modules/surgery/organs/subtypes/skrell.dm
+++ b/code/modules/surgery/organs/subtypes/skrell.dm
@@ -21,7 +21,7 @@
// Allow adjacency calculation to work properly
loc = owner
// Fit only pocket sized items
- pocket.max_w_class = 2
+ pocket.max_w_class = WEIGHT_CLASS_SMALL
pocket.max_combined_w_class = 2
/obj/item/organ/internal/headpocket/on_life()
diff --git a/code/modules/surgery/organs/subtypes/standard.dm b/code/modules/surgery/organs/subtypes/standard.dm
index 62ae8c78d66..a6467584963 100644
--- a/code/modules/surgery/organs/subtypes/standard.dm
+++ b/code/modules/surgery/organs/subtypes/standard.dm
@@ -8,7 +8,7 @@
icon_name = "torso"
max_damage = 100
min_broken_damage = 35
- w_class = 5
+ w_class = WEIGHT_CLASS_HUGE
body_part = UPPER_TORSO
vital = 1
amputation_point = "spine"
@@ -42,7 +42,7 @@
icon_name = "groin"
max_damage = 100
min_broken_damage = 35
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY // if you know what I mean ;)
body_part = LOWER_TORSO
vital = 1
parent_organ = "chest"
@@ -55,7 +55,7 @@
icon_name = "l_arm"
max_damage = 50
min_broken_damage = 30
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
body_part = ARM_LEFT
parent_organ = "chest"
amputation_point = "left shoulder"
@@ -74,7 +74,7 @@
icon_name = "l_leg"
max_damage = 50
min_broken_damage = 30
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
body_part = LEG_LEFT
icon_position = LEFT
parent_organ = "groin"
@@ -95,7 +95,7 @@
icon_name = "l_foot"
max_damage = 30
min_broken_damage = 15
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
body_part = FOOT_LEFT
icon_position = LEFT
parent_organ = "l_leg"
@@ -121,7 +121,7 @@
icon_name = "l_hand"
max_damage = 30
min_broken_damage = 15
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
body_part = HAND_LEFT
parent_organ = "l_arm"
amputation_point = "left wrist"
@@ -152,7 +152,7 @@
name = "head"
max_damage = 75
min_broken_damage = 35
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
body_part = HEAD
vital = 1
parent_organ = "chest"
diff --git a/code/modules/surgery/organs/subtypes/xenos.dm b/code/modules/surgery/organs/subtypes/xenos.dm
index 5e771931165..19e9335a61b 100644
--- a/code/modules/surgery/organs/subtypes/xenos.dm
+++ b/code/modules/surgery/organs/subtypes/xenos.dm
@@ -37,7 +37,7 @@
name = "xeno plasma vessel"
icon_state = "plasma"
origin_tech = "biotech=5;plasmatech=2"
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
parent_organ = "chest"
slot = "plasmavessel"
alien_powers = list(/mob/living/carbon/alien/humanoid/verb/plant, /mob/living/carbon/alien/humanoid/verb/transfer_plasma)
@@ -127,7 +127,7 @@
parent_organ = "head"
slot = "hivenode"
origin_tech = "biotech=5;magnets=4;bluespace=3"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
alien_powers = list(/mob/living/carbon/alien/humanoid/verb/whisp)
/obj/item/organ/internal/xenos/hivenode/insert(mob/living/carbon/M, special = 0)
@@ -163,6 +163,6 @@
icon_state = "eggsac"
parent_organ = "groin"
slot = "eggsac"
- w_class = 4
+ w_class = WEIGHT_CLASS_BULKY
origin_tech = "biotech=8"
alien_powers = list(/mob/living/carbon/alien/humanoid/queen/verb/lay_egg)
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index b0014a391a3..06b9def9c00 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -5,7 +5,7 @@
icon_state = "retractor"
materials = list(MAT_METAL=6000, MAT_GLASS=3000)
flags = CONDUCT
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
origin_tech = "materials=1;biotech=1"
@@ -16,7 +16,7 @@
icon_state = "hemostat"
materials = list(MAT_METAL=5000, MAT_GLASS=2500)
flags = CONDUCT
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
origin_tech = "materials=1;biotech=1"
attack_verb = list("attacked", "pinched")
@@ -28,7 +28,7 @@
icon_state = "cautery"
materials = list(MAT_METAL=2500, MAT_GLASS=750)
flags = CONDUCT
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
origin_tech = "materials=1;biotech=1"
attack_verb = list("burnt")
@@ -44,7 +44,7 @@
force = 15.0
sharp = 1
edge = 1
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
origin_tech = "materials=1;biotech=1"
attack_verb = list("drilled")
@@ -64,7 +64,7 @@
force = 10.0
sharp = 1
edge = 1
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
throwforce = 5.0
throw_speed = 3
throw_range = 5
@@ -124,7 +124,7 @@
force = 15.0
sharp = 1
edge = 1
- w_class = 3
+ w_class = WEIGHT_CLASS_NORMAL
throwforce = 9.0
throw_speed = 3
throw_range = 5
@@ -138,7 +138,7 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "bone-gel"
force = 0
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
throwforce = 1.0
origin_tech = "materials=1;biotech=1"
@@ -149,7 +149,7 @@
force = 0
throwforce = 1.0
origin_tech = "materials=1;biotech=1"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/weapon/bonesetter
name = "bone setter"
@@ -159,7 +159,7 @@
throwforce = 9.0
throw_speed = 3
throw_range = 5
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
attack_verb = list("attacked", "hit", "bludgeoned")
origin_tech = "materials=1;biotech=1"
@@ -168,6 +168,6 @@
desc = "Nanotrasen brand surgical drapes provide optimal safety and infection control."
icon = 'icons/obj/surgery.dmi'
icon_state = "surgical_drapes"
- w_class = 1
+ w_class = WEIGHT_CLASS_SMALL
origin_tech = "biotech=1"
attack_verb = list("slapped")
diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm
index 113d2abd751..d6cdd0e3b5d 100644
--- a/code/modules/telesci/bscrystal.dm
+++ b/code/modules/telesci/bscrystal.dm
@@ -4,7 +4,7 @@
desc = "A glowing bluespace crystal, not much is known about how they work. It looks very delicate."
icon = 'icons/obj/telescience.dmi'
icon_state = "bluespace_crystal"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
origin_tech = "bluespace=4;materials=3"
points = 50
var/blink_range = 8 // The teleport range when crushed/thrown at someone.
diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm
index 7558fd602ee..b042453eec4 100644
--- a/code/modules/telesci/gps.dm
+++ b/code/modules/telesci/gps.dm
@@ -4,7 +4,7 @@ var/list/GPS_list = list()
desc = "Helping lost spacemen find their way through the planets since 2016."
icon = 'icons/obj/telescience.dmi'
icon_state = "gps-c"
- w_class = 2
+ w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
origin_tech = "programming=2;engineering=2"
var/gpstag = "COM0"
@@ -32,7 +32,7 @@ var/list/GPS_list = list()
emped = FALSE
overlays -= "emp"
overlays += "working"
-
+
/obj/item/device/gps/AltClick(mob/user)
if(CanUseTopic(user, inventory_state) != STATUS_INTERACTIVE)
return 1 //user not valid to use gps
@@ -51,7 +51,7 @@ var/list/GPS_list = list()
if(!tracking)
to_chat(user, "[src] is turned off. Use alt+click to toggle it back on.")
return
-
+
var/obj/item/device/gps/t = ""
var/gps_window_height = 110 + GPS_list.len * 20 // Variable window height, depending on how many GPS units there are to show
if(emped)
@@ -82,12 +82,12 @@ var/list/GPS_list = list()
/obj/item/device/gps/Topic(href, href_list)
if(..(state = inventory_state))
return 1
-
+
if(href_list["tag"] )
var/a = input("Please enter desired tag.", name, gpstag) as text|null
if(!a || ..(state = inventory_state))
return 1
-
+
a = uppertext(sanitize(copytext(a, 1, 5)))
if(src.loc == usr)
gpstag = a
@@ -112,8 +112,8 @@ var/list/GPS_list = list()
gpstag = "BORG0"
desc = "A mining cyborg internal positioning system. Used as a recovery beacon for damaged cyborg assets, or a collaboration tool for mining teams."
flags = NODROP
-
-/obj/item/device/gps/internal
+
+/obj/item/device/gps/internal
icon_state = null
flags = ABSTRACT
gpstag = "Eerie Signal"
@@ -162,4 +162,4 @@ var/list/GPS_list = list()
clear()
tagged = null
fast_processing.Remove(src)
- . = ..()
\ No newline at end of file
+ . = ..()
diff --git a/code/modules/vehicle/vehicle.dm b/code/modules/vehicle/vehicle.dm
index 2a1ea4c7d64..bdd8ca39c90 100644
--- a/code/modules/vehicle/vehicle.dm
+++ b/code/modules/vehicle/vehicle.dm
@@ -61,7 +61,7 @@
desc = "A small grey key."
icon = 'icons/obj/vehicles.dmi'
icon_state = "key"
- w_class = 1
+ w_class = WEIGHT_CLASS_TINY
//BUCKLE HOOKS
@@ -159,4 +159,4 @@
spaceworthy = TRUE
/obj/vehicle/space/Process_Spacemove(direction)
- return 1
\ No newline at end of file
+ return 1