diff --git a/code/__defines/inventory_sizes.dm b/code/__defines/inventory_sizes.dm
new file mode 100644
index 0000000000..6fb72505d0
--- /dev/null
+++ b/code/__defines/inventory_sizes.dm
@@ -0,0 +1,25 @@
+// The below should be used to define an item's w_class variable.
+// Example: w_class = ITENSIZE_LARGE
+// This allows the addition of future w_classes without needing to change every file.
+#define ITEMSIZE_TINY 1
+#define ITEMSIZE_SMALL 2
+#define ITEMSIZE_NORMAL 3
+#define ITEMSIZE_LARGE 4
+#define ITEMSIZE_HUGE 5
+#define ITEMSIZE_NO_CONTAINER 100 // Use this to forbid item from being placed in a container.
+
+// Tweak these to determine how much space an item takes in a container.
+// Look in storage.dm for get_storage_cost(), which uses these. Containers also use these as a reference for size.
+// ITEMSIZE_COST_NORMAL is equivalent to one slot using the old inventory system. As such, it is a nice reference to use for
+// defining how much space there is in a container.
+#define ITEMSIZE_COST_TINY 1
+#define ITEMSIZE_COST_SMALL 2
+#define ITEMSIZE_COST_NORMAL 4
+#define ITEMSIZE_COST_LARGE 8
+#define ITEMSIZE_COST_HUGE 16
+#define ITEMSIZE_COST_NO_CONTAINER 1000
+
+// Container sizes. Note that different containers can hold a maximum ITEMSIZE.
+#define INVENTORY_STANDARD_SPACE ITEMSIZE_COST_NORMAL * 7 // 28
+#define INVENTORY_DUFFLEBAG_SPACE ITEMSIZE_COST_NORMAL * 9 // 36
+#define INVENTORY_BOX_SPACE ITEMSIZE_COST_SMALL * 4 // 8
\ No newline at end of file
diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm
index d416475a27..4c976f4458 100644
--- a/code/_onclick/telekinesis.dm
+++ b/code/_onclick/telekinesis.dm
@@ -67,7 +67,7 @@ var/const/tk_maxrange = 15
icon_state = "2"
flags = NOBLUDGEON
//item_state = null
- w_class = 10.0
+ w_class = ITEMSIZE_NO_CONTAINER
layer = 20
var/last_throw = 0
diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index ddf88533e1..c1aeca1c30 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -194,7 +194,7 @@ var/global/list/PDA_Manifest = list()
name = "beach ball"
density = 0
anchored = 0
- w_class = 4
+ w_class = ITEMSIZE_LARGE
force = 0.0
throwforce = 0.0
throw_speed = 1
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index bcf0573367..57a446cce5 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -8,7 +8,7 @@
throwforce = 2.0
throw_speed = 1
throw_range = 4
- w_class = 2
+ w_class = ITEMSIZE_SMALL
attack_verb = list("called", "rang")
hitsound = 'sound/weapons/ring.ogg'
@@ -22,7 +22,7 @@
anchored = 0.0
var/stored_matter = 0
var/mode = 1
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
/obj/item/weapon/soap
name = "soap"
@@ -30,7 +30,7 @@
gender = PLURAL
icon = 'icons/obj/items.dmi'
icon_state = "soap"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throwforce = 0
throw_speed = 4
throw_range = 20
@@ -57,7 +57,7 @@
icon_state = "bike_horn"
item_state = "bike_horn"
throwforce = 3
- w_class = 2
+ w_class = ITEMSIZE_SMALL
throw_speed = 3
throw_range = 15
attack_verb = list("HONKED")
@@ -70,7 +70,7 @@
icon = 'icons/obj/items.dmi'
icon_state = "c_tube"
throwforce = 1
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throw_speed = 4
throw_range = 5
@@ -86,7 +86,7 @@
flags = CONDUCT
force = 5.0
throwforce = 7.0
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
matter = list(DEFAULT_WALL_MATERIAL = 50)
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
@@ -148,7 +148,7 @@
desc = "Better keep this safe."
icon_state = "nucleardisk"
item_state = "card-id"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
/*
/obj/item/weapon/game_kit
@@ -160,7 +160,7 @@
var/data = ""
var/base_url = "http://svn.slurm.us/public/spacestation13/misc/game_kit"
item_state = "sheet-metal"
- w_class = 5.0
+ w_class = ITEMSIZE_HUGE
*/
/obj/item/weapon/gift
@@ -171,7 +171,7 @@
var/size = 3.0
var/obj/item/gift = null
item_state = "gift"
- w_class = 4.0
+ w_class = ITEMSIZE_LARGE
/obj/item/weapon/legcuffs
name = "legcuffs"
@@ -181,7 +181,7 @@
icon_state = "handcuff"
flags = CONDUCT
throwforce = 0
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_MATERIAL = 1)
var/breakouttime = 300 //Deciseconds = 30s = 0.5 minute
sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/handcuffs.dmi')
@@ -195,7 +195,7 @@
throwforce = 3.0
throw_speed = 1
throw_range = 5
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
attack_verb = list("warned", "cautioned", "smashed")
/obj/item/weapon/caution/cone
@@ -215,7 +215,7 @@
var/mob/currentUser = null
var/obj/item/device/radio/origradio = null
flags = CONDUCT | ONBELT
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
item_state = "radio"
throw_speed = 4
throw_range = 20
@@ -236,7 +236,7 @@
slot_flags = SLOT_BELT
item_state = "radio"
throwforce = 5
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throw_speed = 4
throw_range = 20
matter = list(DEFAULT_WALL_MATERIAL = 100)
@@ -255,7 +255,7 @@
throwforce = 5.0
throw_speed = 1
throw_range = 5
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
attack_verb = list("bludgeoned", "whacked", "disciplined")
/obj/item/weapon/staff/broom
@@ -280,12 +280,12 @@
throwforce = 5.0
throw_speed = 1
throw_range = 5
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
/obj/item/weapon/module
icon = 'icons/obj/module.dmi'
icon_state = "std_module"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
item_state = "electronic"
flags = CONDUCT
var/mtype = 1 // 1=electronic 2=hardware
@@ -328,7 +328,7 @@
name = "camera bug"
icon = 'icons/obj/device.dmi'
icon_state = "flash"
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
item_state = "electronic"
throw_speed = 4
throw_range = 20
@@ -365,7 +365,7 @@
icon = 'icons/obj/cigarettes.dmi'
icon_state = "cigarpacket"
item_state = "cigarpacket"
- w_class = 1
+ w_class = ITEMSIZE_TINY
throwforce = 2
var/cigarcount = 6
flags = ONBELT
@@ -385,7 +385,7 @@
name = "rapid part exchange device"
desc = "Special mechanical module made to store, sort, and apply standard machine parts."
icon_state = "RPED"
- w_class = 5
+ w_class = ITEMSIZE_HUGE
can_hold = list(/obj/item/weapon/stock_parts)
storage_slots = 50
use_to_pickup = 1
@@ -393,7 +393,7 @@
allow_quick_empty = 1
collection_mode = 1
display_contents_with_number = 1
- max_w_class = 3
+ max_w_class = ITEMSIZE_NORMAL
max_storage_space = 100
/obj/item/weapon/stock_parts
@@ -401,7 +401,7 @@
desc = "What?"
gender = PLURAL
icon = 'icons/obj/stock_parts.dmi'
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
var/rating = 1
/obj/item/weapon/stock_parts/New()
diff --git a/code/game/gamemodes/changeling/powers/armblade.dm b/code/game/gamemodes/changeling/powers/armblade.dm
index 26b8283a36..f241f41840 100644
--- a/code/game/gamemodes/changeling/powers/armblade.dm
+++ b/code/game/gamemodes/changeling/powers/armblade.dm
@@ -27,7 +27,7 @@
desc = "A grotesque blade made out of bone and flesh that cleaves through people as a hot knife through butter."
icon = 'icons/obj/weapons.dmi'
icon_state = "arm_blade"
- w_class = 5.0
+ w_class = ITEMSIZE_HUGE
force = 40
sharp = 1
edge = 1
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index 20b49bb7f8..ac3e5c3d61 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -2,7 +2,7 @@
name = "cult blade"
desc = "An arcane weapon wielded by the followers of Nar-Sie."
icon_state = "cultblade"
- w_class = 4
+ w_class = ITEMSIZE_LARGE
force = 30
throwforce = 10
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -105,7 +105,7 @@
name = "cult armour"
icon_state = "cult_armour"
desc = "A bulky suit of armour, bristling with spikes. It looks space-worthy."
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
allowed = list(/obj/item/weapon/book/tome,/obj/item/weapon/melee/cultblade,/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/suit_cooling_unit)
slowdown = 1
armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index 853d3f02dc..ca1d5639e9 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -183,7 +183,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
icon_state ="tome"
throw_speed = 1
throw_range = 5
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
unique = 1
var/tomedat = ""
var/list/words = list("ire" = "ire", "ego" = "ego", "nahlizet" = "nahlizet", "certum" = "certum", "veri" = "veri", "jatkaa" = "jatkaa", "balaq" = "balaq", "mgar" = "mgar", "karazet" = "karazet", "geeri" = "geeri")
@@ -434,7 +434,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
return
/obj/item/weapon/book/tome/imbued //admin tome, spawns working runes without waiting
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
var/cultistsonly = 1
attack_self(mob/user as mob)
if(src.cultistsonly && !iscultist(usr))
diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm
index 63832b809c..5d67b6eece 100644
--- a/code/game/gamemodes/nuclear/pinpointer.dm
+++ b/code/game/gamemodes/nuclear/pinpointer.dm
@@ -4,7 +4,7 @@
icon_state = "pinoff"
flags = CONDUCT
slot_flags = SLOT_BELT
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
item_state = "electronic"
throw_speed = 4
throw_range = 20
diff --git a/code/game/gamemodes/technomancer/assistance/assistance.dm b/code/game/gamemodes/technomancer/assistance/assistance.dm
index 786a7f0b85..8779824896 100644
--- a/code/game/gamemodes/technomancer/assistance/assistance.dm
+++ b/code/game/gamemodes/technomancer/assistance/assistance.dm
@@ -11,7 +11,7 @@
obj_path = /obj/item/weapon/antag_spawner/technomancer_apprentice
/obj/item/weapon/antag_spawner
- w_class = 1
+ w_class = ITEMSIZE_TINY
var/used = 0
/obj/item/weapon/antag_spawner/proc/spawn_antag(client/C, turf/T)
diff --git a/code/game/gamemodes/technomancer/catalog.dm b/code/game/gamemodes/technomancer/catalog.dm
index c253d44199..74019d7149 100644
--- a/code/game/gamemodes/technomancer/catalog.dm
+++ b/code/game/gamemodes/technomancer/catalog.dm
@@ -27,7 +27,7 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) -
requisition various things from.. where ever they came from."
icon = 'icons/obj/storage.dmi'
icon_state ="scientology" //placeholder
- w_class = 2
+ w_class = ITEMSIZE_SMALL
var/budget = 1000
var/max_budget = 1000
var/mob/living/carbon/human/owner = null
diff --git a/code/game/gamemodes/technomancer/core_obj.dm b/code/game/gamemodes/technomancer/core_obj.dm
index 5ef5d37507..48c45f3f06 100644
--- a/code/game/gamemodes/technomancer/core_obj.dm
+++ b/code/game/gamemodes/technomancer/core_obj.dm
@@ -5,7 +5,7 @@
icon = 'icons/obj/technomancer.dmi'
icon_state = "technomancer_core"
item_state = "technomancer_core"
- w_class = 5
+ w_class = ITEMSIZE_HUGE
slot_flags = SLOT_BACK
unacidable = 1
origin_tech = list(
diff --git a/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm b/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm
index 4ce5f8a16a..0106ff027e 100644
--- a/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm
+++ b/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm
@@ -11,7 +11,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "hand_tele" //temporary
var/uses = 3.0
- w_class = 1
+ w_class = ITEMSIZE_TINY
item_state = "paper"
origin_tech = list(TECH_BLUESPACE = 4, TECH_POWER = 3)
diff --git a/code/game/gamemodes/technomancer/equipment.dm b/code/game/gamemodes/technomancer/equipment.dm
index 4c94d2e7f0..54cae5670e 100644
--- a/code/game/gamemodes/technomancer/equipment.dm
+++ b/code/game/gamemodes/technomancer/equipment.dm
@@ -83,9 +83,9 @@
name = "Belt of Holding"
desc = "Can hold more than you'd expect."
icon_state = "ems"
- max_w_class = 3 // Can hold normal sized items.
+ max_w_class = ITEMSIZE_NORMAL // Can hold normal sized items.
storage_slots = 14 // Twice the capacity of a typical belt.
- max_storage_space = 42
+ max_storage_space = ITEMSIZE_COST_NORMAL * 14
/datum/technomancer/equipment/thermals
name = "Thermoncle"
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index 398bac9c54..ca424f122b 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -775,7 +775,7 @@ Just a object used in constructing air alarms
icon = 'icons/obj/doors/door_assembly.dmi'
icon_state = "door_electronics"
desc = "Looks like a circuit. Probably is."
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
*/
/*
@@ -991,7 +991,7 @@ Just a object used in constructing fire alarms
icon = 'icons/obj/doors/door_assembly.dmi'
icon_state = "door_electronics"
desc = "A circuit. It has a label on it, it says \"Can handle heat levels up to 40 degrees celsius!\""
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
*/
/obj/machinery/partyalarm
diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index 80b33cfaa0..2a59f345d4 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -5,7 +5,7 @@
density = 1
var/health = 100.0
flags = CONDUCT
- w_class = 5
+ w_class = ITEMSIZE_HUGE
var/valve_open = 0
var/release_pressure = ONE_ATMOSPHERE
diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm
index a5bdac7421..9f31a9ba1a 100644
--- a/code/game/machinery/atmoalter/pump.dm
+++ b/code/game/machinery/atmoalter/pump.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/atmos.dmi'
icon_state = "psiphon:0"
density = 1
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
var/on = 0
var/direction_out = 0 //0 = siphoning, 1 = releasing
diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm
index 87997d32c8..10091a4918 100644
--- a/code/game/machinery/atmoalter/scrubber.dm
+++ b/code/game/machinery/atmoalter/scrubber.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/atmos.dmi'
icon_state = "pscrubber:0"
density = 1
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
var/on = 0
var/volume_rate = 800
diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
index 135ad3c1f0..33cb1b0613 100644
--- a/code/game/machinery/camera/camera_assembly.dm
+++ b/code/game/machinery/camera/camera_assembly.dm
@@ -3,7 +3,7 @@
desc = "A pre-fabricated security camera kit, ready to be assembled and mounted to a surface."
icon = 'icons/obj/monitors.dmi'
icon_state = "cameracase"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
anchored = 0
matter = list(DEFAULT_WALL_MATERIAL = 700,"glass" = 300)
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 88bafe5cd3..17c3b58763 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -395,7 +395,7 @@
icon = 'icons/obj/cloning.dmi'
icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk.
item_state = "card-id"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
var/datum/dna2/record/buf = null
var/read_only = 0 //Well,it's still a floppy disk
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index d338edacc1..0a568b4ade 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -1005,7 +1005,7 @@
desc = "A model spaceship, it looks like those used back in the day when travelling to Orion! It even has a miniature FX-293 reactor, which was renowned for its instability and tendency to explode..."
icon = 'icons/obj/toy.dmi'
icon_state = "ship"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
var/active = 0 //if the ship is on
/obj/item/weapon/orion_ship/examine(mob/user)
diff --git a/code/game/machinery/computer3/buildandrepair.dm b/code/game/machinery/computer3/buildandrepair.dm
index 47ceffb756..a064d8ce1c 100644
--- a/code/game/machinery/computer3/buildandrepair.dm
+++ b/code/game/machinery/computer3/buildandrepair.dm
@@ -2,7 +2,7 @@
/obj/item/part/computer/circuitboard
density = 0
anchored = 0
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
name = "Circuit board"
icon = 'icons/obj/module.dmi'
icon_state = "id_mod"
diff --git a/code/game/machinery/computer3/component.dm b/code/game/machinery/computer3/component.dm
index 0f7f64d011..47d5e29853 100644
--- a/code/game/machinery/computer3/component.dm
+++ b/code/game/machinery/computer3/component.dm
@@ -14,7 +14,7 @@
gender = PLURAL
icon = 'icons/obj/stock_parts.dmi'
icon_state = "hdd1"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
var/emagged = 0
diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm
index 3ae0891b89..39ca2d5f40 100644
--- a/code/game/machinery/doors/airlock_electronics.dm
+++ b/code/game/machinery/doors/airlock_electronics.dm
@@ -4,7 +4,7 @@
name = "airlock electronics"
icon = 'icons/obj/doors/door_assembly.dmi'
icon_state = "door_electronics"
- w_class = 2.0 //It should be tiny! -Agouri
+ w_class = ITEMSIZE_SMALL //It should be tiny! -Agouri
matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 50)
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 9b7760a12e..af8bd8eb41 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -96,7 +96,7 @@ Class Procs:
/obj/machinery
name = "machinery"
icon = 'icons/obj/stationobjs.dmi'
- w_class = 10
+ w_class = ITEMSIZE_NO_CONTAINER
var/stat = 0
var/emagged = 0
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index 1de7cc367b..4758a77489 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -794,7 +794,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
desc = "An issue of The Griffon, the newspaper circulating aboard most stations."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "newspaper"
- w_class = 2 //Let's make it fit in trashbags!
+ w_class = ITEMSIZE_SMALL //Let's make it fit in trashbags!
attack_verb = list("bapped")
var/screen = 0
var/pages = 0
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index 9c5fc61332..908ce1395f 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -62,7 +62,7 @@ Buildable meters
icon = 'icons/obj/pipe-item.dmi'
icon_state = "simple"
item_state = "buildpipe"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
level = 2
/obj/item/pipe/New(var/loc, var/pipe_type as num, var/dir as num, var/obj/machinery/atmospherics/make_from = null)
@@ -1160,7 +1160,7 @@ Buildable meters
icon = 'icons/obj/pipe-item.dmi'
icon_state = "meter"
item_state = "buildpipe"
- w_class = 4
+ w_class = ITEMSIZE_LARGE
/obj/item/pipe_meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
..()
diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm
index 876e6c3f6b..00720d13dc 100644
--- a/code/game/mecha/mecha_parts.dm
+++ b/code/game/mecha/mecha_parts.dm
@@ -8,7 +8,7 @@
name = "mecha part"
icon = 'icons/mecha/mech_construct.dmi'
icon_state = "blank"
- w_class = 5
+ w_class = ITEMSIZE_HUGE
flags = CONDUCT
origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2)
@@ -39,32 +39,32 @@
/obj/item/mecha_parts/part/ripley_torso
name="Ripley Torso"
desc="A torso part of Ripley APLU. Contains power unit, processing core and life support systems."
- icon_state = "ripley_harness"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_ENGINEERING = 2)
+ icon_state = "ripley_harness"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_ENGINEERING = 2)
/obj/item/mecha_parts/part/ripley_left_arm
name="Ripley Left Arm"
desc="A Ripley APLU left arm. Data and power sockets are compatible with most exosuit tools."
- icon_state = "ripley_l_arm"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
+ icon_state = "ripley_l_arm"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
/obj/item/mecha_parts/part/ripley_right_arm
name="Ripley Right Arm"
desc="A Ripley APLU right arm. Data and power sockets are compatible with most exosuit tools."
- icon_state = "ripley_r_arm"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
+ icon_state = "ripley_r_arm"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
/obj/item/mecha_parts/part/ripley_left_leg
name="Ripley Left Leg"
desc="A Ripley APLU left leg. Contains somewhat complex servodrives and balance maintaining systems."
- icon_state = "ripley_l_leg"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
+ icon_state = "ripley_l_leg"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
/obj/item/mecha_parts/part/ripley_right_leg
name="Ripley Right Leg"
desc="A Ripley APLU right leg. Contains somewhat complex servodrives and balance maintaining systems."
- icon_state = "ripley_r_leg"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
+ icon_state = "ripley_r_leg"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
///////// Gygax
@@ -78,41 +78,41 @@
/obj/item/mecha_parts/part/gygax_torso
name="Gygax Torso"
desc="A torso part of Gygax. Contains power unit, processing core and life support systems. Has an additional equipment slot."
- icon_state = "gygax_harness"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_BIO = 3, TECH_ENGINEERING = 3)
+ icon_state = "gygax_harness"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_BIO = 3, TECH_ENGINEERING = 3)
/obj/item/mecha_parts/part/gygax_head
name="Gygax Head"
desc="A Gygax head. Houses advanced surveilance and targeting sensors."
- icon_state = "gygax_head"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_MAGNET = 3, TECH_ENGINEERING = 3)
+ icon_state = "gygax_head"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_MAGNET = 3, TECH_ENGINEERING = 3)
/obj/item/mecha_parts/part/gygax_left_arm
name="Gygax Left Arm"
desc="A Gygax left arm. Data and power sockets are compatible with most exosuit tools and weapons."
- icon_state = "gygax_l_arm"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 3)
+ icon_state = "gygax_l_arm"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 3)
/obj/item/mecha_parts/part/gygax_right_arm
name="Gygax Right Arm"
desc="A Gygax right arm. Data and power sockets are compatible with most exosuit tools and weapons."
- icon_state = "gygax_r_arm"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 3)
+ icon_state = "gygax_r_arm"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 3)
/obj/item/mecha_parts/part/gygax_left_leg
name="Gygax Left Leg"
- icon_state = "gygax_l_leg"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 3)
+ icon_state = "gygax_l_leg"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 3)
/obj/item/mecha_parts/part/gygax_right_leg
name="Gygax Right Leg"
- icon_state = "gygax_r_leg"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 3)
+ icon_state = "gygax_r_leg"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 3)
/obj/item/mecha_parts/part/gygax_armour
name="Gygax Armour Plates"
- icon_state = "gygax_armour"
- origin_tech = list(TECH_MATERIAL = 6, TECH_COMBAT = 4, TECH_ENGINEERING = 5)
+ icon_state = "gygax_armour"
+ origin_tech = list(TECH_MATERIAL = 6, TECH_COMBAT = 4, TECH_ENGINEERING = 5)
//////////// Durand
@@ -126,38 +126,38 @@
/obj/item/mecha_parts/part/durand_torso
name="Durand Torso"
- icon_state = "durand_harness"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_BIO = 3, TECH_ENGINEERING = 3)
+ icon_state = "durand_harness"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_BIO = 3, TECH_ENGINEERING = 3)
/obj/item/mecha_parts/part/durand_head
name="Durand Head"
- icon_state = "durand_head"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_MAGNET = 3, TECH_ENGINEERING = 3)
+ icon_state = "durand_head"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_MAGNET = 3, TECH_ENGINEERING = 3)
/obj/item/mecha_parts/part/durand_left_arm
name="Durand Left Arm"
- icon_state = "durand_l_arm"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3)
+ icon_state = "durand_l_arm"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3)
/obj/item/mecha_parts/part/durand_right_arm
name="Durand Right Arm"
- icon_state = "durand_r_arm"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3)
+ icon_state = "durand_r_arm"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3)
/obj/item/mecha_parts/part/durand_left_leg
name="Durand Left Leg"
- icon_state = "durand_l_leg"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3)
+ icon_state = "durand_l_leg"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3)
/obj/item/mecha_parts/part/durand_right_leg
name="Durand Right Leg"
- icon_state = "durand_r_leg"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3)
+ icon_state = "durand_r_leg"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3)
/obj/item/mecha_parts/part/durand_armour
name="Durand Armour Plates"
- icon_state = "durand_armour"
- origin_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 4, TECH_ENGINEERING = 5)
+ icon_state = "durand_armour"
+ origin_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 4, TECH_ENGINEERING = 5)
@@ -204,44 +204,44 @@
/obj/item/mecha_parts/part/phazon_torso
name="Phazon Torso"
icon_state = "phazon_harness"
- //construction_time = 300
+ //construction_time = 300
//construction_cost = list(DEFAULT_WALL_MATERIAL=35000,"glass"=10000,"phoron"=20000)
- origin_tech = list(TECH_DATA = 5, TECH_MATERIAL = 7, TECH_BLUESPACE = 6, TECH_POWER = 6)
+ origin_tech = list(TECH_DATA = 5, TECH_MATERIAL = 7, TECH_BLUESPACE = 6, TECH_POWER = 6)
/obj/item/mecha_parts/part/phazon_head
name="Phazon Head"
icon_state = "phazon_head"
- //construction_time = 200
+ //construction_time = 200
//construction_cost = list(DEFAULT_WALL_MATERIAL=15000,"glass"=5000,"phoron"=10000)
- origin_tech = list(TECH_DATA = 4, TECH_MATERIAL = 5, TECH_MAGNET = 6)
+ origin_tech = list(TECH_DATA = 4, TECH_MATERIAL = 5, TECH_MAGNET = 6)
/obj/item/mecha_parts/part/phazon_left_arm
name="Phazon Left Arm"
icon_state = "phazon_l_arm"
- //construction_time = 200
+ //construction_time = 200
//construction_cost = list(DEFAULT_WALL_MATERIAL=20000,"phoron"=10000)
- origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 2, TECH_MAGNET = 2)
+ origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 2, TECH_MAGNET = 2)
/obj/item/mecha_parts/part/phazon_right_arm
name="Phazon Right Arm"
icon_state = "phazon_r_arm"
- //construction_time = 200
+ //construction_time = 200
//construction_cost = list(DEFAULT_WALL_MATERIAL=20000,"phoron"=10000)
- origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 2, TECH_MAGNET = 2)
+ origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 2, TECH_MAGNET = 2)
/obj/item/mecha_parts/part/phazon_left_leg
name="Phazon Left Leg"
icon_state = "phazon_l_leg"
- //construction_time = 200
+ //construction_time = 200
//construction_cost = list(DEFAULT_WALL_MATERIAL=20000,"phoron"=10000)
- origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 3, TECH_MAGNET = 3)
+ origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 3, TECH_MAGNET = 3)
/obj/item/mecha_parts/part/phazon_right_leg
name="Phazon Right Leg"
icon_state = "phazon_r_leg"
- //construction_time = 200
+ //construction_time = 200
//construction_cost = list(DEFAULT_WALL_MATERIAL=20000,"phoron"=10000)
- origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 3, TECH_MAGNET = 3)
+ origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 3, TECH_MAGNET = 3)
///////// Odysseus
@@ -256,37 +256,37 @@
/obj/item/mecha_parts/part/odysseus_head
name="Odysseus Head"
icon_state = "odysseus_head"
- origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 2)
+ origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 2)
/obj/item/mecha_parts/part/odysseus_torso
name="Odysseus Torso"
desc="A torso part of Odysseus. Contains power unit, processing core and life support systems."
- icon_state = "odysseus_torso"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_ENGINEERING = 2)
+ icon_state = "odysseus_torso"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_ENGINEERING = 2)
/obj/item/mecha_parts/part/odysseus_left_arm
name="Odysseus Left Arm"
desc="An Odysseus left arm. Data and power sockets are compatible with most exosuit tools."
- icon_state = "odysseus_l_arm"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
+ icon_state = "odysseus_l_arm"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
/obj/item/mecha_parts/part/odysseus_right_arm
name="Odysseus Right Arm"
desc="An Odysseus right arm. Data and power sockets are compatible with most exosuit tools."
- icon_state = "odysseus_r_arm"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
+ icon_state = "odysseus_r_arm"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
/obj/item/mecha_parts/part/odysseus_left_leg
name="Odysseus Left Leg"
desc="An Odysseus left leg. Contains somewhat complex servodrives and balance maintaining systems."
- icon_state = "odysseus_l_leg"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
+ icon_state = "odysseus_l_leg"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
/obj/item/mecha_parts/part/odysseus_right_leg
name="Odysseus Right Leg"
desc="A Odysseus right leg. Contains somewhat complex servodrives and balance maintaining systems."
- icon_state = "odysseus_r_leg"
- origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
+ icon_state = "odysseus_r_leg"
+ origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
/*/obj/item/mecha_parts/part/odysseus_armour
name="Odysseus Carapace"
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 4d78f5aa9d..6703be9d75 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -1,7 +1,7 @@
/obj/item
name = "item"
icon = 'icons/obj/items.dmi'
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
var/image/blood_overlay = null //this saves our blood splatter overlay, which will be processed not to go over the edges of the sprite
var/abstract = 0
@@ -143,18 +143,19 @@
src.loc = T
+// See inventory_sizes.dm for the defines.
/obj/item/examine(mob/user, var/distance = -1)
var/size
switch(src.w_class)
- if(1.0)
+ if(ITEMSIZE_TINY)
size = "tiny"
- if(2.0)
+ if(ITEMSIZE_SMALL)
size = "small"
- if(3.0)
+ if(ITEMSIZE_NORMAL)
size = "normal-sized"
- if(4.0)
+ if(ITEMSIZE_LARGE)
size = "bulky"
- if(5.0)
+ if(ITEMSIZE_HUGE)
size = "huge"
return ..(user, distance, "", "It is a [size] item.")
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index b154cd0468..6c86b7ebf4 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -5,7 +5,7 @@
desc = "A folded bag designed for the storage and transportation of cadavers."
icon = 'icons/obj/bodybag.dmi'
icon_state = "bodybag_folded"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
attack_self(mob/user)
var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc)
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 76c7dfd6a5..e72b4ba484 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -9,7 +9,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
icon = 'icons/obj/pda.dmi'
icon_state = "pda"
item_state = "electronic"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
slot_flags = SLOT_ID | SLOT_BELT
sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/id.dmi')
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index 94230418e8..2c4368736e 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -49,7 +49,7 @@ var/list/civilian_cartridges = list(
icon = 'icons/obj/pda.dmi'
icon_state = "cart"
item_state = "electronic"
- w_class = 1
+ w_class = ITEMSIZE_TINY
var/obj/item/radio/integrated/radio = null
var/access_security = 0
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index e06e28f3c7..b6d8a81709 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -3,7 +3,7 @@
icon = 'icons/obj/pda.dmi'
icon_state = "aicard" // aicard-full
item_state = "electronic"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
slot_flags = SLOT_BELT
show_messages = 0
diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm
index b6e0ca1aca..00ef6501d4 100644
--- a/code/game/objects/items/devices/binoculars.dm
+++ b/code/game/objects/items/devices/binoculars.dm
@@ -6,7 +6,7 @@
flags = CONDUCT
force = 5.0
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throwforce = 5.0
throw_range = 15
throw_speed = 3
diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
index 1085dd3477..4b870481fa 100644
--- a/code/game/objects/items/devices/chameleonproj.dm
+++ b/code/game/objects/items/devices/chameleonproj.dm
@@ -7,7 +7,7 @@
throwforce = 5.0
throw_speed = 1
throw_range = 5
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_ILLEGAL = 4, TECH_MAGNET = 4)
var/can_use = 1
var/obj/effect/dummy/chameleon/active_dummy = null
diff --git a/code/game/objects/items/devices/communicator/communicator.dm b/code/game/objects/items/devices/communicator/communicator.dm
index e5715c6060..2f0d7f1c3c 100644
--- a/code/game/objects/items/devices/communicator/communicator.dm
+++ b/code/game/objects/items/devices/communicator/communicator.dm
@@ -10,7 +10,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
communications across different stations, planets, or even star systems."
icon = 'icons/obj/device.dmi'
icon_state = "communicator"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
slot_flags = SLOT_ID | SLOT_BELT
show_messages = 1
diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm
index 9072e4cc7e..c8d326b44e 100644
--- a/code/game/objects/items/devices/debugger.dm
+++ b/code/game/objects/items/devices/debugger.dm
@@ -11,7 +11,7 @@
icon_state = "hacktool-g"
flags = CONDUCT
force = 5.0
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throwforce = 5.0
throw_range = 15
throw_speed = 3
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index 2901e4c2c9..8562ac7f28 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -4,7 +4,7 @@
icon_state = "flash"
item_state = "flashtool"
throwforce = 5
- w_class = 2
+ w_class = ITEMSIZE_SMALL
throw_speed = 4
throw_range = 10
flags = CONDUCT
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index dc042b2a6b..15b7db63e1 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -3,7 +3,7 @@
desc = "A hand-held emergency light."
icon = 'icons/obj/lighting.dmi'
icon_state = "flashlight"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
flags = CONDUCT
slot_flags = SLOT_BELT
@@ -92,7 +92,7 @@
flags = CONDUCT
slot_flags = SLOT_EARS
brightness_on = 2
- w_class = 1
+ w_class = ITEMSIZE_TINY
/obj/item/device/flashlight/maglight
name = "maglight"
@@ -102,7 +102,7 @@
flags = CONDUCT
brightness_on = 4
slot_flags = SLOT_BELT
- w_class = 2
+ w_class = ITEMSIZE_SMALL
attack_verb = list ("smacked", "thwacked", "thunked")
matter = list(DEFAULT_WALL_MATERIAL = 200,"glass" = 50)
hitsound = "swing_hit"
@@ -114,7 +114,7 @@
item_state = null
flags = CONDUCT
brightness_on = 2
- w_class = 1
+ w_class = ITEMSIZE_TINY
// the desk lamps are a bit special
@@ -123,7 +123,7 @@
desc = "A desk lamp with an adjustable mount."
icon_state = "lamp"
brightness_on = 5
- w_class = 4
+ w_class = ITEMSIZE_LARGE
flags = CONDUCT
on = 1
@@ -149,7 +149,7 @@
/obj/item/device/flashlight/flare
name = "flare"
desc = "A red standard-issue flare. There are instructions on the side reading 'pull cord, make light'."
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
brightness_on = 8 // Pretty bright.
light_power = 3
light_color = "#e58775"
@@ -211,7 +211,7 @@
/obj/item/device/flashlight/glowstick
name = "green glowstick"
desc = "A green military-grade glowstick."
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
brightness_on = 4
light_power = 2
light_color = "#49F37C"
@@ -283,7 +283,7 @@
icon = 'icons/obj/lighting.dmi'
icon_state = "floor1" //not a slime extract sprite but... something close enough!
item_state = "slime"
- w_class = 1
+ w_class = ITEMSIZE_TINY
brightness_on = 6
on = 1 //Bio-luminesence has one setting, on.
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index 0357a8b80b..0ce2f405ff 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -3,7 +3,7 @@
desc = "A device used to project your voice. Loudly."
icon_state = "megaphone"
item_state = "radio"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
flags = CONDUCT
var/spamcheck = 0
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index 4e6154189a..85c680ca98 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -10,7 +10,7 @@
icon_state = "multitool"
flags = CONDUCT
force = 5.0
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throwforce = 5.0
throw_range = 15
throw_speed = 3
diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index 89042464b3..e0e05ff467 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -3,7 +3,7 @@
icon = 'icons/obj/pda.dmi'
icon_state = "pai"
item_state = "electronic"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
slot_flags = SLOT_BELT
origin_tech = list(TECH_DATA = 2)
show_messages = 0
diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm
index 3478abce1d..497ad68f09 100644
--- a/code/game/objects/items/devices/powersink.dm
+++ b/code/game/objects/items/devices/powersink.dm
@@ -5,7 +5,7 @@
desc = "A nulling power sink which drains energy from electrical systems."
icon_state = "powersink0"
item_state = "electronic"
- w_class = 4.0
+ w_class = ITEMSIZE_LARGE
flags = CONDUCT
throwforce = 5
throw_speed = 1
diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index f945fd89e6..ddcb23a5aa 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -10,7 +10,7 @@
frequency = 1449
flags = CONDUCT
slot_flags = SLOT_BACK
- w_class = 5.0
+ w_class = ITEMSIZE_HUGE
matter = list(DEFAULT_WALL_MATERIAL = 10000,"glass" = 2500)
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index 961286da09..ef7d16f9b8 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -4,7 +4,7 @@
desc = "An encryption key for a radio headset. Contains cypherkeys."
icon = 'icons/obj/radio.dmi'
icon_state = "cypherkey"
- w_class = 1
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
var/translate_binary = 0
var/translate_hive = 0
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index 4ea8837d80..72d4c50685 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -3,7 +3,7 @@
desc = "Talk through this."
icon_state = "intercom"
anchored = 1
- w_class = 4.0
+ w_class = ITEMSIZE_LARGE
canhear_range = 2
flags = CONDUCT | NOBLOODY
var/circuit = /obj/item/weapon/circuitboard/intercom
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 93353ca1ed..4c841e2651 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -43,7 +43,7 @@ var/global/list/default_medbay_channels = list(
slot_flags = SLOT_BELT
throw_speed = 2
throw_range = 9
- w_class = 2
+ w_class = ITEMSIZE_SMALL
show_messages = 1
matter = list("glass" = 25,DEFAULT_WALL_MATERIAL = 75)
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 5388dc4420..1f88d91f06 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -17,7 +17,7 @@ REAGENT SCANNER
flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 3
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throw_speed = 5
throw_range = 10
matter = list(DEFAULT_WALL_MATERIAL = 200)
@@ -208,7 +208,7 @@ REAGENT SCANNER
desc = "A hand-held environmental scanner which reports current gas levels."
icon_state = "atmos"
item_state = "analyzer"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 5
@@ -242,7 +242,7 @@ REAGENT SCANNER
desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample."
icon_state = "spectrometer"
item_state = "analyzer"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
flags = CONDUCT | OPENCONTAINER
slot_flags = SLOT_BELT
throwforce = 5
@@ -304,7 +304,7 @@ REAGENT SCANNER
desc = "A hand-held reagent scanner which identifies chemical agents."
icon_state = "spectrometer"
item_state = "analyzer"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 5
@@ -353,7 +353,7 @@ REAGENT SCANNER
icon_state = "adv_spectrometer"
item_state = "analyzer"
origin_tech = list(TECH_BIO = 1)
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
flags = CONDUCT
throwforce = 0
throw_speed = 3
diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm
index 063e7a85ce..d05289e2cb 100644
--- a/code/game/objects/items/devices/spy_bug.dm
+++ b/code/game/objects/items/devices/spy_bug.dm
@@ -8,7 +8,7 @@
flags = CONDUCT
force = 5.0
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
throwforce = 5.0
throw_range = 15
@@ -51,7 +51,7 @@
icon_state = "pda"
item_state = "electronic"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1, TECH_ILLEGAL = 3)
diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm
index 4447ca7af2..fb34bb0996 100644
--- a/code/game/objects/items/devices/suit_cooling.dm
+++ b/code/game/objects/items/devices/suit_cooling.dm
@@ -1,7 +1,7 @@
/obj/item/device/suit_cooling_unit
name = "portable suit cooling unit"
desc = "A portable heat sink and liquid cooled radiator that can be hooked up to a space suit's existing temperature controls to provide industrial levels of cooling."
- w_class = 4
+ w_class = ITEMSIZE_LARGE
icon = 'icons/obj/device.dmi'
icon_state = "suitcooler0"
slot_flags = SLOT_BACK
diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm
index 7dc13cb9e8..dde6814494 100644
--- a/code/game/objects/items/devices/t_scanner.dm
+++ b/code/game/objects/items/devices/t_scanner.dm
@@ -5,7 +5,7 @@
desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
icon_state = "t-ray0"
slot_flags = SLOT_BELT
- w_class = 2
+ w_class = ITEMSIZE_SMALL
item_state = "electronic"
matter = list(DEFAULT_WALL_MATERIAL = 150)
origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1)
diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index 2740831046..689e92fb7c 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -3,7 +3,7 @@
desc = "A device that can record up to an hour of dialogue and play it back. It automatically translates the content in playback."
icon_state = "taperecorderidle"
item_state = "analyzer"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
matter = list(DEFAULT_WALL_MATERIAL = 60,"glass" = 30)
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index fbed4e7ebb..126a4871c9 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -19,7 +19,7 @@ effective or pretty fucking useless.
desc = "A strange device with twin antennas."
icon_state = "batterer"
throwforce = 5
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
throw_speed = 4
throw_range = 10
flags = CONDUCT
diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm
index 4c26a482a1..4a67bffe56 100644
--- a/code/game/objects/items/devices/whistle.dm
+++ b/code/game/objects/items/devices/whistle.dm
@@ -3,7 +3,7 @@
desc = "Used by obese officers to save their breath for running."
icon_state = "voice0"
item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang)
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
flags = CONDUCT
slot_flags = SLOT_EARS
diff --git a/code/game/objects/items/glassjar.dm b/code/game/objects/items/glassjar.dm
index 54062ff853..c04b9b17dd 100644
--- a/code/game/objects/items/glassjar.dm
+++ b/code/game/objects/items/glassjar.dm
@@ -3,7 +3,7 @@
desc = "A small empty jar."
icon = 'icons/obj/items.dmi'
icon_state = "jar"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
matter = list("glass" = 200)
flags = NOBLUDGEON
var/list/accept_mobs = list(/mob/living/simple_animal/lizard, /mob/living/simple_animal/mouse)
diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm
index 009248dec1..ad24aa90a1 100644
--- a/code/game/objects/items/latexballoon.dm
+++ b/code/game/objects/items/latexballoon.dm
@@ -9,7 +9,7 @@
item_state = "lgloves"
force = 0
throwforce = 0
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throw_speed = 1
throw_range = 15
var/state
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 41ae7ac7c3..15f3310322 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/items.dmi'
amount = 10
max_amount = 10
- w_class = 2
+ w_class = ITEMSIZE_SMALL
throw_speed = 4
throw_range = 20
var/heal_brute = 0
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index 73d4d3cbcd..543a432606 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -4,7 +4,7 @@
singular_name = "metal rod"
icon_state = "rods"
flags = CONDUCT
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
force = 9.0
throwforce = 15.0
throw_speed = 5
diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm
index f56b9580fc..b0c48fffa2 100644
--- a/code/game/objects/items/stacks/telecrystal.dm
+++ b/code/game/objects/items/stacks/telecrystal.dm
@@ -5,7 +5,7 @@
singular_name = "telecrystal"
icon = 'icons/obj/stock_parts.dmi'
icon_state = "telecrystal"
- w_class = 1
+ w_class = ITEMSIZE_TINY
max_amount = 240
origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4)
force = 1 //Needs a token force to ensure you can attack because for some reason you can't attack with 0 force things
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 20cfb07864..f8981bc471 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -12,7 +12,7 @@
name = "tile"
singular_name = "tile"
desc = "A non-descript floor tile"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
max_amount = 60
/obj/item/stack/tile/New()
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 7b8042c8c1..ef9edae115 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -96,7 +96,7 @@
force = 0
icon = 'icons/obj/weapons.dmi'
icon_state = "syndballoon"
- w_class = 4.0
+ w_class = ITEMSIZE_LARGE
/obj/item/toy/nanotrasenballoon
name = "criminal balloon"
@@ -107,7 +107,7 @@
force = 0
icon = 'icons/obj/weapons.dmi'
icon_state = "ntballoon"
- w_class = 4.0
+ w_class = ITEMSIZE_LARGE
/*
* Fake telebeacon
@@ -141,7 +141,7 @@
icon_l_hand = 'icons/mob/items/lefthand_guns.dmi',
icon_r_hand = 'icons/mob/items/righthand_guns.dmi',
)
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
attack_verb = list("attacked", "struck", "hit")
var/bullets = 5
@@ -234,7 +234,7 @@
desc = "It's nerf or nothing! Ages 8 and up."
icon = 'icons/obj/toy.dmi'
icon_state = "foamdart"
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
/obj/effect/foam_dart_dummy
@@ -258,7 +258,7 @@
slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi',
)
var/active = 0.0
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
attack_verb = list("attacked", "struck", "hit")
attack_self(mob/user as mob)
@@ -267,12 +267,12 @@
user << "You extend the plastic blade with a quick flick of your wrist."
playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
src.icon_state = "swordblue"
- src.w_class = 4
+ src.w_class = ITEMSIZE_LARGE
else
user << "You push the plastic blade back down into the handle."
playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
src.icon_state = "sword0"
- src.w_class = 2
+ src.w_class = ITEMSIZE_SMALL
if(istype(user,/mob/living/carbon/human))
var/mob/living/carbon/human/H = user
@@ -295,7 +295,7 @@
slot_flags = SLOT_BELT | SLOT_BACK
force = 5
throwforce = 5
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
attack_verb = list("attacked", "slashed", "stabbed", "sliced")
/*
@@ -306,7 +306,7 @@
desc = "Wow!"
icon = 'icons/obj/toy.dmi'
icon_state = "snappop"
- w_class = 1
+ w_class = ITEMSIZE_TINY
throw_impact(atom/hit_atom)
..()
@@ -410,7 +410,7 @@
icon = 'icons/obj/toy.dmi'
icon_state = "bosunwhistle"
var/cooldown = 0
- w_class = 1
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
/obj/item/toy/bosunwhistle/attack_self(mob/user as mob)
@@ -707,7 +707,7 @@
slot_flags = SLOT_BELT | SLOT_BACK
force = 5
throwforce = 5
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
attack_verb = list("attacked", "slashed", "stabbed", "sliced")
/obj/item/toy/therapy_red
@@ -716,7 +716,7 @@
icon = 'icons/obj/toy.dmi'
icon_state = "therapyred"
item_state = "egg4" // It's the red egg in items_left/righthand
- w_class = 1
+ w_class = ITEMSIZE_TINY
/obj/item/toy/therapy_purple
name = "purple therapy doll"
@@ -724,7 +724,7 @@
icon = 'icons/obj/toy.dmi'
icon_state = "therapypurple"
item_state = "egg1" // It's the magenta egg in items_left/righthand
- w_class = 1
+ w_class = ITEMSIZE_TINY
/obj/item/toy/therapy_blue
name = "blue therapy doll"
@@ -732,7 +732,7 @@
icon = 'icons/obj/toy.dmi'
icon_state = "therapyblue"
item_state = "egg2" // It's the blue egg in items_left/righthand
- w_class = 1
+ w_class = ITEMSIZE_TINY
/obj/item/toy/therapy_yellow
name = "yellow therapy doll"
@@ -740,7 +740,7 @@
icon = 'icons/obj/toy.dmi'
icon_state = "therapyyellow"
item_state = "egg5" // It's the yellow egg in items_left/righthand
- w_class = 1
+ w_class = ITEMSIZE_TINY
/obj/item/toy/therapy_orange
name = "orange therapy doll"
@@ -748,7 +748,7 @@
icon = 'icons/obj/toy.dmi'
icon_state = "therapyorange"
item_state = "egg4" // It's the red one again, lacking an orange item_state and making a new one is pointless
- w_class = 1
+ w_class = ITEMSIZE_TINY
/obj/item/toy/therapy_green
name = "green therapy doll"
@@ -756,7 +756,7 @@
icon = 'icons/obj/toy.dmi'
icon_state = "therapygreen"
item_state = "egg3" // It's the green egg in items_left/righthand
- w_class = 1
+ w_class = ITEMSIZE_TINY
/*
* Plushies
@@ -864,7 +864,7 @@
slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi',
)
- w_class = 4
+ w_class = ITEMSIZE_LARGE
attack_verb = list("attacked", "slashed", "stabbed", "poked")
/* NYET.
@@ -873,7 +873,7 @@
name = "toddler"
desc = "This baby looks almost real. Wait, did it just burp?"
force = 5
- w_class = 4.0
+ w_class = ITEMSIZE_LARGE
slot_flags = SLOT_BACK
*/
@@ -891,6 +891,6 @@
desc = "Tiny cute Christmas tree."
icon = 'icons/obj/toy.dmi'
icon_state = "tinyxmastree"
- w_class = 1
+ w_class = ITEMSIZE_TINY
force = 1
throwforce = 1
\ No newline at end of file
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index 1d171d9dbe..7fb09e116c 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -4,7 +4,7 @@
//Added by Jack Rost
/obj/item/trash
icon = 'icons/obj/trash.dmi'
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
desc = "This is rubbish."
/obj/item/trash/raisins
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index ec1e5dbf41..ce28a6eb0b 100755
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -14,7 +14,7 @@ AI MODULES
desc = "An AI Module for transmitting encrypted instructions to the AI."
flags = CONDUCT
force = 5.0
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throwforce = 5.0
throw_speed = 3
throw_range = 15
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index 80080220e9..e21c509c15 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -12,7 +12,7 @@
throwforce = 10.0
throw_speed = 1
throw_range = 5
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 2)
matter = list(DEFAULT_WALL_MATERIAL = 50000)
var/datum/effect/effect/system/spark_spread/spark_system
@@ -161,7 +161,7 @@
icon = 'icons/obj/ammo.dmi'
icon_state = "rcd"
item_state = "rcdammo"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_MATERIAL = 2)
matter = list(DEFAULT_WALL_MATERIAL = 30000,"glass" = 15000)
diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm
index 6384508c04..10a847b469 100644
--- a/code/game/objects/items/weapons/RSF.dm
+++ b/code/game/objects/items/weapons/RSF.dm
@@ -14,7 +14,7 @@ RSF
anchored = 0.0
var/stored_matter = 30
var/mode = 1
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
/obj/item/weapon/rsf/examine(mob/user)
if(..(user, 0))
diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/game/objects/items/weapons/autopsy.dm
index 3cbc75bfeb..1b1b3a5433 100644
--- a/code/game/objects/items/weapons/autopsy.dm
+++ b/code/game/objects/items/weapons/autopsy.dm
@@ -8,7 +8,7 @@
icon = 'icons/obj/autopsy_scanner.dmi'
icon_state = ""
flags = CONDUCT
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
var/list/datum/autopsy_data_scanner/wdata = list()
var/list/datum/autopsy_data_scanner/chemtraces = list()
diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm
index 740b5e5a12..5ea04c2dab 100644
--- a/code/game/objects/items/weapons/candle.dm
+++ b/code/game/objects/items/weapons/candle.dm
@@ -3,7 +3,7 @@
desc = "a small pillar candle. Its specially-formulated fuel-oxidizer wax mixture allows continued combustion in airless environments."
icon = 'icons/obj/candle.dmi'
icon_state = "candle1"
- w_class = 1
+ w_class = ITEMSIZE_TINY
light_color = "#E09D37"
var/wax = 2000
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 214476ec12..b2200981b9 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -15,7 +15,7 @@
name = "card"
desc = "Does card things."
icon = 'icons/obj/card.dmi'
- w_class = 1
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
var/associated_account_number = 0
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index f201fbb3c6..417385c930 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -37,7 +37,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon_state = "match_unlit"
var/burnt = 0
var/smoketime = 5
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
origin_tech = list(TECH_MATERIAL = 1)
slot_flags = SLOT_EARS
attack_verb = list("burnt", "singed")
@@ -226,7 +226,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon_state = "cigoff"
throw_speed = 0.5
item_state = "cigoff"
- w_class = 1
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS | SLOT_MASK
attack_verb = list("burnt", "singed")
icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi
@@ -311,7 +311,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
desc = "A manky old cigarette butt."
icon = 'icons/obj/clothing/masks.dmi'
icon_state = "cigbutt"
- w_class = 1
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
throwforce = 1
@@ -440,7 +440,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon = 'icons/obj/items.dmi'
icon_state = "lighter-g"
item_state = "lighter-g"
- w_class = 1
+ w_class = ITEMSIZE_TINY
throwforce = 4
flags = CONDUCT
slot_flags = SLOT_BELT
diff --git a/code/game/objects/items/weapons/circuitboards/circuitboard.dm b/code/game/objects/items/weapons/circuitboards/circuitboard.dm
index 3711cf0690..f17ee1c292 100644
--- a/code/game/objects/items/weapons/circuitboards/circuitboard.dm
+++ b/code/game/objects/items/weapons/circuitboards/circuitboard.dm
@@ -12,7 +12,7 @@
origin_tech = list(TECH_DATA = 2)
density = 0
anchored = 0
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
flags = CONDUCT
force = 5.0
throwforce = 5.0
diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm
index db630d8fad..9d3a9cb0a4 100644
--- a/code/game/objects/items/weapons/cosmetics.dm
+++ b/code/game/objects/items/weapons/cosmetics.dm
@@ -4,7 +4,7 @@
desc = "A generic brand of lipstick."
icon = 'icons/obj/items.dmi'
icon_state = "lipstick"
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
var/colour = "red"
var/open = 0
@@ -67,7 +67,7 @@
/obj/item/weapon/haircomb //sparklysheep's comb
name = "purple comb"
desc = "A pristine purple comb made from flexible plastic."
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
icon = 'icons/obj/items.dmi'
icon_state = "purplecomb"
diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm
index 86310d2b78..9099ff3bd1 100644
--- a/code/game/objects/items/weapons/dice.dm
+++ b/code/game/objects/items/weapons/dice.dm
@@ -3,7 +3,7 @@
desc = "A dice with six sides."
icon = 'icons/obj/dice.dmi'
icon_state = "d66"
- w_class = 1
+ w_class = ITEMSIZE_TINY
var/sides = 6
attack_verb = list("diced")
diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm
index ba60bfc361..80ce010ddb 100644
--- a/code/game/objects/items/weapons/dna_injector.dm
+++ b/code/game/objects/items/weapons/dna_injector.dm
@@ -8,7 +8,7 @@
var/s_time = 10.0
throw_speed = 1
throw_range = 5
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
var/uses = 1
var/nofail
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index 46e8e7ba26..1a8cc97def 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -6,7 +6,7 @@
icon_state = "plastic-explosive0"
item_state = "plasticx"
flags = NOBLUDGEON
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_ILLEGAL = 2)
var/datum/wires/explosive/c4/wires = null
var/timer = 10
diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index 6e323d7387..3bcb68bcee 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -7,7 +7,7 @@
hitsound = 'sound/weapons/smash.ogg'
flags = CONDUCT
throwforce = 10
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
throw_speed = 2
throw_range = 10
force = 10
@@ -28,7 +28,7 @@
item_state = "miniFE"
hitsound = null //it is much lighter, after all.
throwforce = 2
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
force = 3.0
max_water = 150
spray_particles = 3
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index 37018e8576..c3f93a016f 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -13,7 +13,7 @@
throwforce = 10.0
throw_speed = 1
throw_range = 5
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_COMBAT = 1, TECH_PHORON = 1)
matter = list(DEFAULT_WALL_MATERIAL = 500)
var/status = 0
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index f87f0fa830..be7d90830d 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -3,7 +3,7 @@
icon_state = "chemg"
item_state = "grenade"
desc = "A hand made chemical grenade."
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
force = 2.0
det_time = null
unacidable = 1
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index 8a8536d434..b46d987b4c 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/grenade
name = "grenade"
desc = "A hand held grenade, with an adjustable timer."
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
icon = 'icons/obj/grenade.dmi'
icon_state = "grenade"
item_state = "grenade"
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index 25ee157950..e6962669dc 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -7,7 +7,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 5
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throw_speed = 2
throw_range = 5
origin_tech = list(TECH_MATERIAL = 1)
diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm
index 8160c14cd8..749f1a08b9 100644
--- a/code/game/objects/items/weapons/hydroponics.dm
+++ b/code/game/objects/items/weapons/hydroponics.dm
@@ -11,7 +11,7 @@
var/mode = 1; //0 = pick one at a time, 1 = pick all on tile
var/capacity = 500; //the number of seeds it can carry.
slot_flags = SLOT_BELT
- w_class = 1
+ w_class = ITEMSIZE_TINY
var/list/item_quants = list()
/obj/item/weapon/seedbag/attack_self(mob/user as mob)
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index 3f4164a4c4..17d3e32f92 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -6,7 +6,7 @@
name = "implant"
icon = 'icons/obj/device.dmi'
icon_state = "implant"
- w_class = 1
+ w_class = ITEMSIZE_TINY
var/implanted = null
var/mob/imp_in = null
var/obj/item/organ/external/part = null
diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm
index 49b1b280a7..815050636a 100644
--- a/code/game/objects/items/weapons/implants/implantcase.dm
+++ b/code/game/objects/items/weapons/implants/implantcase.dm
@@ -8,7 +8,7 @@
item_state = "implantcase"
throw_speed = 1
throw_range = 5
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
var/obj/item/weapon/implant/imp = null
/obj/item/weapon/implantcase/proc/update()
diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm
index 655727a62a..f872cd0bf4 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -5,7 +5,7 @@
item_state = "syringe_0"
throw_speed = 1
throw_range = 5
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
var/obj/item/weapon/implant/imp = null
/obj/item/weapon/implanter/attack_self(var/mob/user)
@@ -31,7 +31,7 @@
return
if (user && src.imp)
M.visible_message("[user] is attemping to implant [M].")
-
+
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
user.do_attack_animation(M)
diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm
index a6feac2998..dc054536ac 100644
--- a/code/game/objects/items/weapons/implants/implantpad.dm
+++ b/code/game/objects/items/weapons/implants/implantpad.dm
@@ -8,7 +8,7 @@
item_state = "electronic"
throw_speed = 1
throw_range = 5
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
var/obj/item/weapon/implantcase/case = null
var/broadcasting = null
var/listening = 1.0
diff --git a/code/game/objects/items/weapons/improvised_components.dm b/code/game/objects/items/weapons/improvised_components.dm
index 0fd7d95e8c..c76f927ef2 100644
--- a/code/game/objects/items/weapons/improvised_components.dm
+++ b/code/game/objects/items/weapons/improvised_components.dm
@@ -46,7 +46,7 @@
flags = CONDUCT
force = 8
throwforce = 10
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
attack_verb = list("hit", "bludgeoned", "whacked", "bonked")
force_divisor = 0.1
thrown_force_divisor = 0.1
diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm
index 7b70013a0d..8fdac8549e 100644
--- a/code/game/objects/items/weapons/material/kitchen.dm
+++ b/code/game/objects/items/weapons/material/kitchen.dm
@@ -1,11 +1,11 @@
/obj/item/weapon/material/kitchen
icon = 'icons/obj/kitchen.dmi'
-
+
/*
* Utensils
*/
/obj/item/weapon/material/kitchen/utensil
- w_class = 1
+ w_class = ITEMSIZE_TINY
thrown_force_divisor = 1
origin_tech = "materials=1"
attack_verb = list("attacked", "stabbed", "poked")
diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm
index f49d16c034..a70a253579 100644
--- a/code/game/objects/items/weapons/material/knives.dm
+++ b/code/game/objects/items/weapons/material/knives.dm
@@ -5,7 +5,7 @@
item_state = null
hitsound = null
var/active = 0
- w_class = 2
+ w_class = ITEMSIZE_SMALL
attack_verb = list("patted", "tapped")
force_divisor = 0.25 // 15 when wielded with hardness 60 (steel)
thrown_force_divisor = 0.25 // 5 when thrown with weight 20 (steel)
@@ -18,7 +18,7 @@
throwforce = max(3,force-3)
hitsound = 'sound/weapons/bladeslice.ogg'
icon_state += "_open"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
else
force = 3
diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm
index 73f8b57320..c724a4a774 100644
--- a/code/game/objects/items/weapons/material/material_weapons.dm
+++ b/code/game/objects/items/weapons/material/material_weapons.dm
@@ -7,7 +7,7 @@
gender = NEUTER
throw_speed = 3
throw_range = 7
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
sharp = 0
edge = 0
item_icons = list(
diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm
index 0d88c2b3aa..c68256922e 100644
--- a/code/game/objects/items/weapons/material/misc.dm
+++ b/code/game/objects/items/weapons/material/misc.dm
@@ -13,7 +13,7 @@
desc = "A pair of brass knuckles. Generally used to enhance the user's punches."
icon_state = "knuckledusters"
gender = PLURAL
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
force_divisor = 0.63
attack_verb = list("punched", "beaten", "struck")
applies_material_colour = 0
@@ -25,7 +25,7 @@
icon_state = "hatchet"
force_divisor = 0.2 // 12 with hardness 60 (steel)
thrown_force_divisor = 0.75 // 15 with weight 20 (steel)
- w_class = 2
+ w_class = ITEMSIZE_SMALL
sharp = 1
edge = 1
origin_tech = "materials=2;combat=1"
@@ -82,7 +82,7 @@
icon_state = "hoe"
force_divisor = 0.25 // 5 with weight 20 (steel)
thrown_force_divisor = 0.25 // as above
- w_class = 2
+ w_class = ITEMSIZE_SMALL
attack_verb = list("slashed", "sliced", "cut", "clawed")
/obj/item/weapon/material/scythe
@@ -95,7 +95,7 @@
edge = 1
throw_speed = 1
throw_range = 3
- w_class = 4
+ w_class = ITEMSIZE_LARGE
slot_flags = SLOT_BACK
origin_tech = "materials=2;combat=2"
attack_verb = list("chopped", "sliced", "cut", "reaped")
diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm
index d957c049b5..78ee869604 100644
--- a/code/game/objects/items/weapons/material/shards.dm
+++ b/code/game/objects/items/weapons/material/shards.dm
@@ -7,7 +7,7 @@
icon_state = "large"
sharp = 1
edge = 1
- w_class = 2
+ w_class = ITEMSIZE_SMALL
force_divisor = 0.25 // 7.5 with hardness 30 (glass)
thrown_force_divisor = 0.5
item_state = "shard-glass"
diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm
index 5299ce2a99..08489b7df3 100644
--- a/code/game/objects/items/weapons/material/twohanded.dm
+++ b/code/game/objects/items/weapons/material/twohanded.dm
@@ -17,7 +17,7 @@
* Twohanded
*/
/obj/item/weapon/material/twohanded
- w_class = 4
+ w_class = ITEMSIZE_LARGE
var/wielded = 0
var/force_wielded = 0
var/force_unwielded
@@ -87,7 +87,7 @@
force_divisor = 0.7 // 10/42 with hardness 60 (steel) and 0.25 unwielded divisor
sharp = 1
edge = 1
- w_class = 4.0
+ w_class = ITEMSIZE_LARGE
slot_flags = SLOT_BACK
force_wielded = 30
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
@@ -129,7 +129,7 @@
name = "spear"
desc = "A haphazardly-constructed yet still deadly weapon of ancient design."
force = 10
- w_class = 4.0
+ w_class = ITEMSIZE_LARGE
slot_flags = SLOT_BACK
force_divisor = 0.75 // 22 when wielded with hardness 15 (glass)
unwielded_force_divisor = 0.375
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index ac8da3d835..4bb8e25e8b 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -67,14 +67,14 @@
//active_force = 150 //holy...
active_force = 60
active_throwforce = 35
- active_w_class = 5
+ active_w_class = ITEMSIZE_HUGE
//force = 40
//throwforce = 25
force = 20
throwforce = 10
throw_speed = 1
throw_range = 5
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
flags = CONDUCT | NOBLOODY
origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 4)
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
@@ -105,12 +105,12 @@
icon_state = "sword0"
active_force = 30
active_throwforce = 20
- active_w_class = 4
+ active_w_class = ITEMSIZE_LARGE
force = 3
throwforce = 5
throw_speed = 1
throw_range = 5
- w_class = 2
+ w_class = ITEMSIZE_SMALL
flags = NOBLOODY
origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4)
sharp = 1
@@ -154,7 +154,7 @@
/obj/item/weapon/melee/energy/sword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
if(active && default_parry_check(user, attacker, damage_source) && prob(50))
user.visible_message("\The [user] parries [attack_text] with \the [src]!")
-
+
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, user.loc)
spark_system.start()
@@ -188,7 +188,7 @@
throwforce = 1 //Throwing or dropping the item deletes it.
throw_speed = 1
throw_range = 1
- w_class = 4.0//So you can't hide it in your pocket or some such.
+ w_class = ITEMSIZE_LARGE//So you can't hide it in your pocket or some such.
flags = NOBLOODY
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
var/mob/living/creator
diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm
index ae8250dd02..3554cd45c0 100644
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/code/game/objects/items/weapons/melee/misc.dm
@@ -6,7 +6,7 @@
slot_flags = SLOT_BELT
force = 10
throwforce = 7
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_COMBAT = 4)
attack_verb = list("flogged", "whipped", "lashed", "disciplined")
diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index 3fbef18d3e..3e46128d71 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -7,7 +7,7 @@
throwforce = 10.0
throw_speed = 5
throw_range = 10
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
var/mopping = 0
var/mopcount = 0
@@ -35,4 +35,4 @@
/obj/effect/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/soap))
return
- ..()
+ ..()
diff --git a/code/game/objects/items/weapons/mop_deploy.dm b/code/game/objects/items/weapons/mop_deploy.dm
index e50f82966b..8baab87528 100644
--- a/code/game/objects/items/weapons/mop_deploy.dm
+++ b/code/game/objects/items/weapons/mop_deploy.dm
@@ -7,7 +7,7 @@
throwforce = 1 //Throwing or dropping the item deletes it.
throw_speed = 1
throw_range = 1
- w_class = 4.0//So you can't hide it in your pocket or some such.
+ w_class = ITEMSIZE_LARGE//So you can't hide it in your pocket or some such.
attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
var/mob/living/creator
var/mopping = 0
diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm
index fe1247cc89..5d12f5c33b 100644
--- a/code/game/objects/items/weapons/paint.dm
+++ b/code/game/objects/items/weapons/paint.dm
@@ -10,7 +10,7 @@ var/global/list/cached_icons = list()
icon_state = "paint_neutral"
item_state = "paintcan"
matter = list(DEFAULT_WALL_MATERIAL = 200)
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(10,20,30,60)
volume = 60
diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm
index 4ddd60526c..a2f5c78bd0 100644
--- a/code/game/objects/items/weapons/policetape.dm
+++ b/code/game/objects/items/weapons/policetape.dm
@@ -3,7 +3,7 @@
name = "tape roll"
icon = 'icons/policetape.dmi'
icon_state = "rollstart"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
var/turf/start
var/turf/end
var/tape_type = /obj/item/tape
diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm
index e61875f5ec..716bbc2c9a 100644
--- a/code/game/objects/items/weapons/power_cells.dm
+++ b/code/game/objects/items/weapons/power_cells.dm
@@ -9,7 +9,7 @@
throwforce = 5.0
throw_speed = 3
throw_range = 5
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
var/charge = 0 // note %age conveted to actual charge in New
var/maxcharge = 1000
var/rigged = 0 // true if rigged to explode
@@ -25,7 +25,7 @@
name = "device power cell"
desc = "A small power cell designed to power handheld devices."
icon_state = "cell" //placeholder
- w_class = 2
+ w_class = ITEMSIZE_SMALL
force = 0
throw_speed = 5
throw_range = 7
diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm
index 8cc8ee5cfa..2756822401 100644
--- a/code/game/objects/items/weapons/scrolls.dm
+++ b/code/game/objects/items/weapons/scrolls.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/wizard.dmi'
icon_state = "scroll"
var/uses = 4.0
- w_class = 1
+ w_class = ITEMSIZE_TINY
item_state = "paper"
throw_speed = 4
throw_range = 20
diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
index 2903c7f971..2c47c8ab9d 100644
--- a/code/game/objects/items/weapons/shields.dm
+++ b/code/game/objects/items/weapons/shields.dm
@@ -63,7 +63,7 @@
throwforce = 5.0
throw_speed = 1
throw_range = 4
- w_class = 4.0
+ w_class = ITEMSIZE_LARGE
origin_tech = list(TECH_MATERIAL = 2)
matter = list("glass" = 7500, DEFAULT_WALL_MATERIAL = 1000)
attack_verb = list("shoved", "bashed")
@@ -119,7 +119,7 @@
throwforce = 5.0
throw_speed = 1
throw_range = 4
- w_class = 2
+ w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_MATERIAL = 4, TECH_MAGNET = 3, TECH_ILLEGAL = 4)
attack_verb = list("shoved", "bashed")
var/active = 0
@@ -150,7 +150,7 @@
if (active)
force = 10
update_icon()
- w_class = 4
+ w_class = ITEMSIZE_LARGE
slot_flags = null
playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
user << "\The [src] is now active."
@@ -158,7 +158,7 @@
else
force = 3
update_icon()
- w_class = 1
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
user << "\The [src] can now be concealed."
@@ -188,7 +188,7 @@
throwforce = 3
throw_speed = 3
throw_range = 4
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
var/active = 0
/*
/obj/item/weapon/shield/energy/IsShield()
@@ -206,14 +206,14 @@
force = 8
throwforce = 5
throw_speed = 2
- w_class = 4
+ w_class = ITEMSIZE_LARGE
slot_flags = SLOT_BACK
user << "You extend \the [src]."
else
force = 3
throwforce = 3
throw_speed = 3
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
slot_flags = null
user << "[src] can now be concealed."
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 6189cc9658..20db066683 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -9,10 +9,10 @@
sprite_sheets = list(
"Teshari" = 'icons/mob/species/seromi/back.dmi'
)
- w_class = 4
+ w_class = ITEMSIZE_LARGE
slot_flags = SLOT_BACK
- max_w_class = 4
- max_storage_space = 28
+ max_w_class = ITEMSIZE_LARGE
+ max_storage_space = INVENTORY_STANDARD_SPACE
/obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (src.use_sound)
@@ -40,9 +40,9 @@
desc = "A backpack that opens into a localized pocket of Blue Space."
origin_tech = list(TECH_BLUESPACE = 4)
icon_state = "holdingpack"
- max_w_class = 4
- max_storage_space = 56
- storage_cost = 29
+ max_w_class = ITEMSIZE_LARGE
+ max_storage_space = ITEMSIZE_COST_NORMAL * 14 // 56
+ storage_cost = INVENTORY_STANDARD_SPACE + 1
New()
..()
@@ -66,9 +66,9 @@
desc = "Space Santa uses this to deliver toys to all the nice children in space in Christmas! Wow, it's pretty big!"
icon_state = "giftbag0"
item_state_slots = list(slot_r_hand_str = "giftbag", slot_l_hand_str = "giftbag")
- w_class = 4.0
- max_w_class = 3
- max_storage_space = 400 // can store a ton of shit!
+ w_class = ITEMSIZE_LARGE
+ max_w_class = ITEMSIZE_NORMAL
+ max_storage_space = ITEMSIZE_COST_NORMAL * 100 // can store a ton of shit!
item_state_slots = null
/obj/item/weapon/storage/backpack/cultpack
@@ -135,7 +135,7 @@
desc = "A large dufflebag for holding extra things."
icon_state = "duffle"
slowdown = 1
- max_storage_space = 36
+ max_storage_space = INVENTORY_DUFFLEBAG_SPACE
/obj/item/weapon/storage/backpack/dufflebag/syndie
name = "black dufflebag"
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index 12eca53626..241e5c008f 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -32,8 +32,8 @@
icon_state = "trashbag0"
item_state_slots = list(slot_r_hand_str = "trashbag", slot_l_hand_str = "trashbag")
- w_class = 4
- max_w_class = 2
+ w_class = ITEMSIZE_LARGE
+ max_w_class = ITEMSIZE_SMALL
can_hold = list() // any
cant_hold = list(/obj/item/weapon/disk/nuclear)
@@ -57,8 +57,8 @@
icon = 'icons/obj/trash.dmi'
icon_state = "plasticbag"
- w_class = 4
- max_w_class = 2
+ w_class = ITEMSIZE_LARGE
+ max_w_class = ITEMSIZE_SMALL
can_hold = list() // any
cant_hold = list(/obj/item/weapon/disk/nuclear)
@@ -72,9 +72,9 @@
icon = 'icons/obj/mining.dmi'
icon_state = "satchel"
slot_flags = SLOT_BELT | SLOT_POCKET
- w_class = 3
- max_storage_space = 100
- max_w_class = 3
+ w_class = ITEMSIZE_NORMAL
+ max_storage_space = ITEMSIZE_COST_NORMAL * 25
+ max_w_class = ITEMSIZE_NORMAL
can_hold = list(/obj/item/weapon/ore)
@@ -86,9 +86,9 @@
name = "plant bag"
icon = 'icons/obj/hydroponics_machines.dmi'
icon_state = "plantbag"
- max_storage_space = 100
- max_w_class = 3
- w_class = 2
+ max_storage_space = ITEMSIZE_COST_NORMAL * 25
+ max_w_class = ITEMSIZE_NORMAL
+ w_class = ITEMSIZE_SMALL
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/weapon/grown)
@@ -105,7 +105,7 @@
desc = "A patented storage system designed for any kind of mineral sheet."
var/capacity = 300; //the number of sheets it can carry.
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
storage_slots = 7
allow_quick_empty = 1 // this function is superceded
@@ -243,7 +243,7 @@
icon = 'icons/obj/storage.dmi'
icon_state = "cashbag"
desc = "A bag for carrying lots of cash. It's got a big dollar sign printed on the front."
- max_storage_space = 100
- max_w_class = 3
- w_class = 2
+ max_storage_space = ITEMSIZE_COST_NORMAL * 25
+ max_w_class = ITEMSIZE_NORMAL
+ w_class = ITEMSIZE_SMALL
can_hold = list(/obj/item/weapon/coin,/obj/item/weapon/spacecash)
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 6f0beed5e9..27145d6338 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -4,8 +4,8 @@
icon = 'icons/obj/clothing/belts.dmi'
icon_state = "utility"
storage_slots = 7
- max_storage_space = 28 //This should ensure belts always have enough room to store whatever.
- max_w_class = 3
+ max_storage_space = ITEMSIZE_COST_NORMAL * 7 //This should ensure belts always have enough room to store whatever.
+ max_w_class = ITEMSIZE_NORMAL
slot_flags = SLOT_BELT
attack_verb = list("whipped", "lashed", "disciplined")
sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/belt.dmi')
@@ -117,7 +117,7 @@
name = "security belt"
desc = "Can hold security gear like handcuffs and flashes."
icon_state = "security"
- max_w_class = 3
+ max_w_class = ITEMSIZE_NORMAL
can_hold = list(
/obj/item/weapon/grenade,
/obj/item/weapon/reagent_containers/spray/pepper,
@@ -150,7 +150,7 @@
desc = "A belt for holding forensics equipment."
icon_state = "security"
storage_slots = 7
- max_w_class = 3
+ max_w_class = ITEMSIZE_NORMAL
can_hold = list(
/obj/item/device/taperecorder,
/obj/item/clothing/glasses,
@@ -218,8 +218,8 @@
desc = "Can hold security gear like handcuffs and flashes, with more pouches for more storage."
icon_state = "swat"
storage_slots = 9
- max_w_class = 3
- max_storage_space = 28
+ max_w_class = ITEMSIZE_NORMAL
+ max_storage_space = ITEMSIZE_COST_NORMAL * 7
/obj/item/weapon/storage/belt/security/tactical/bandolier
name = "combat belt"
@@ -231,7 +231,7 @@
desc = "A belt used to hold most janitorial supplies."
icon_state = "janitor"
storage_slots = 7
- max_w_class = 3
+ max_w_class = ITEMSIZE_NORMAL
can_hold = list(
/obj/item/clothing/glasses,
/obj/item/device/flashlight,
diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm
index 8a29fdefa8..186715db54 100644
--- a/code/game/objects/items/weapons/storage/bible.dm
+++ b/code/game/objects/items/weapons/storage/bible.dm
@@ -4,7 +4,7 @@
icon_state ="bible"
throw_speed = 1
throw_range = 5
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
var/mob/affecting = null
var/deity_name = "Christ"
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 46a3cd29e9..5ce729187b 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -25,7 +25,8 @@
icon_state = "box"
item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")
var/foldable = /obj/item/stack/material/cardboard // BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard
- max_w_class = 2
+ max_w_class = ITEMSIZE_SMALL
+ max_storage_space = INVENTORY_BOX_SPACE
// BubbleWrap - A box can be folded up to make card
/obj/item/weapon/storage/box/attack_self(mob/user as mob)
@@ -478,7 +479,7 @@
desc = "A small box of 'Space-Proof' premium matches."
icon = 'icons/obj/cigarettes.dmi'
icon_state = "matchbox"
- w_class = 1
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_BELT
can_hold = list(/obj/item/weapon/flame/match)
@@ -512,9 +513,9 @@
icon_state = "light"
desc = "This box is shaped on the inside so that only light tubes and bulbs fit."
item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")
- storage_slots=21
+ storage_slots = 21
can_hold = list(/obj/item/weapon/light/tube, /obj/item/weapon/light/bulb)
- max_storage_space = 42 //holds 21 items of w_class 2
+ max_storage_space = ITEMSIZE_COST_SMALL * 21 //holds 21 items of w_class 2
use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
/obj/item/weapon/storage/box/lights/bulbs/New()
@@ -549,9 +550,9 @@
icon_state = "portafreezer"
item_state_slots = list(slot_r_hand_str = "medicalpack", slot_l_hand_str = "medicalpack")
foldable = null
- max_w_class = 3
+ max_w_class = ITEMSIZE_NORMAL
can_hold = list(/obj/item/organ, /obj/item/weapon/reagent_containers/food, /obj/item/weapon/reagent_containers/glass)
- max_storage_space = 21
+ max_storage_space = ITEMSIZE_COST_NORMAL * 5 // Formally 21. Odd numbers are bad.
use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
/obj/item/weapon/storage/box/freezer/Entered(var/atom/movable/AM)
diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm
index d80ce0bb9c..2b830b17f6 100644
--- a/code/game/objects/items/weapons/storage/briefcase.dm
+++ b/code/game/objects/items/weapons/storage/briefcase.dm
@@ -6,6 +6,6 @@
force = 8.0
throw_speed = 1
throw_range = 4
- w_class = 4
- max_w_class = 3
- max_storage_space = 16
+ w_class = ITEMSIZE_LARGE
+ max_w_class = ITEMSIZE_NORMAL
+ max_storage_space = ITEMSIZE_COST_NORMAL * 4
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 2561886efa..9cac348373 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -86,7 +86,7 @@
desc = "A box of crayons for all your rune drawing needs."
icon = 'icons/obj/crayons.dmi'
icon_state = "crayonbox"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
icon_type = "crayon"
can_hold = list(
/obj/item/weapon/pen/crayon
@@ -128,7 +128,7 @@
icon = 'icons/obj/cigarettes.dmi'
icon_state = "cigpacket"
item_state_slots = list(slot_r_hand_str = "cigpacket", slot_l_hand_str = "cigpacket")
- w_class = 1
+ w_class = ITEMSIZE_TINY
throwforce = 2
slot_flags = SLOT_BELT
storage_slots = 6
@@ -228,7 +228,7 @@
desc = "A case for holding your cigars when you are not smoking them."
icon_state = "cigarcase"
icon = 'icons/obj/cigarettes.dmi'
- w_class = 1
+ w_class = ITEMSIZE_TINY
throwforce = 2
slot_flags = SLOT_BELT
storage_slots = 7
@@ -276,9 +276,9 @@
icon = 'icons/obj/vialbox.dmi'
icon_state = "vialbox0"
item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")
- max_w_class = 2
+ max_w_class = ITEMSIZE_SMALL
can_hold = list(/obj/item/weapon/reagent_containers/glass/beaker/vial)
- max_storage_space = 12 //The sum of the w_classes of all the items in this storage item.
+ max_storage_space = ITEMSIZE_COST_SMALL * 6 //The sum of the w_classes of all the items in this storage item.
storage_slots = 6
req_access = list(access_virology)
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index adbb4c2ca8..f6703bb7cb 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -14,7 +14,7 @@
throw_speed = 2
throw_range = 8
var/empty = 0
- max_storage_space = 14
+ max_storage_space = ITEMSIZE_COST_SMALL * 7 // 14
/obj/item/weapon/storage/firstaid/fire
@@ -132,8 +132,8 @@
/obj/item/weapon/storage/firstaid/surgery
name = "surgery kit"
desc = "Contains tools for surgery."
- max_storage_space = 21
- max_w_class = 3
+ max_storage_space = ITEMSIZE_COST_NORMAL * 6 // Formally 21. Odd numbers should be avoided for a system based on exponents of 2.
+ max_w_class = ITEMSIZE_NORMAL
/obj/item/weapon/storage/firstaid/surgery/New()
..()
@@ -159,13 +159,13 @@
icon_state = "pill_canister"
icon = 'icons/obj/chemical.dmi'
item_state_slots = list(slot_r_hand_str = "contsolid", slot_l_hand_str = "contsolid")
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
can_hold = list(/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/dice,/obj/item/weapon/paper)
allow_quick_gather = 1
use_to_pickup = 1
use_sound = null
- max_storage_space = 14
- max_w_class = 1
+ max_storage_space = ITEMSIZE_COST_TINY * 14
+ max_w_class = ITEMSIZE_TINY
/obj/item/weapon/storage/pill_bottle/antitox
name = "bottle of Dylovene pills"
diff --git a/code/game/objects/items/weapons/storage/laundry_basket.dm b/code/game/objects/items/weapons/storage/laundry_basket.dm
index b8c0cd3a0f..3758b73de2 100644
--- a/code/game/objects/items/weapons/storage/laundry_basket.dm
+++ b/code/game/objects/items/weapons/storage/laundry_basket.dm
@@ -10,9 +10,9 @@
item_state_slots = list(slot_r_hand_str = "laundry", slot_l_hand_str = "laundry")
desc = "The peak of thousands of years of laundry evolution."
- w_class = 5
- max_w_class = 4
- max_storage_space = 25 //20 for clothes + a bit of additional space for non-clothing items that were worn on body
+ w_class = ITEMSIZE_HUGE
+ max_w_class = ITEMSIZE_LARGE
+ max_storage_space = ITEMSIZE_COST_NORMAL * 6 //20 for clothes + a bit of additional space for non-clothing items that were worn on body
storage_slots = 14
use_to_pickup = 1
allow_quick_empty = 1
diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm
index 4a589ed76e..770ecd169b 100644
--- a/code/game/objects/items/weapons/storage/lockbox.dm
+++ b/code/game/objects/items/weapons/storage/lockbox.dm
@@ -5,9 +5,9 @@
desc = "A locked box."
icon_state = "lockbox+l"
item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")
- w_class = 4
- max_w_class = 3
- max_storage_space = 14 //The sum of the w_classes of all the items in this storage item.
+ w_class = ITEMSIZE_LARGE
+ max_w_class = ITEMSIZE_NORMAL
+ max_storage_space = ITEMSIZE_COST_NORMAL * 4 //The sum of the w_classes of all the items in this storage item.
req_access = list(access_armory)
var/locked = 1
var/broken = 0
diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm
index 4bd34c52c7..bf4856501a 100644
--- a/code/game/objects/items/weapons/storage/misc.dm
+++ b/code/game/objects/items/weapons/storage/misc.dm
@@ -34,7 +34,7 @@
icon_state = "donutbox"
name = "donut box"
var/startswith = 6
- max_storage_space = 12
+ max_storage_space = ITEMSIZE_COST_SMALL * 6
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/donut)
foldable = /obj/item/stack/material/cardboard
diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm
index 4727ef61bb..169496ff6c 100644
--- a/code/game/objects/items/weapons/storage/secure.dm
+++ b/code/game/objects/items/weapons/storage/secure.dm
@@ -23,9 +23,9 @@
var/l_hacking = 0
var/emagged = 0
var/open = 0
- w_class = 3
- max_w_class = 2
- max_storage_space = 14
+ w_class = ITEMSIZE_NORMAL
+ max_w_class = ITEMSIZE_SMALL
+ max_storage_space = ITEMSIZE_SMALL * 7
examine(mob/user)
if(..(user, 1))
@@ -149,7 +149,7 @@
force = 8.0
throw_speed = 1
throw_range = 4
- w_class = 4.0
+ w_class = ITEMSIZE_LARGE
attack_hand(mob/user as mob)
if ((src.loc == user) && (src.locked == 1))
@@ -176,8 +176,8 @@
icon_locking = "safeb"
icon_sparking = "safespark"
force = 8.0
- w_class = 8.0
- max_w_class = 8
+ w_class = ITEMSIZE_NO_CONTAINER
+ max_w_class = ITEMSIZE_LARGE // This was 8 previously...
anchored = 1.0
density = 0
cant_hold = list(/obj/item/weapon/storage/secure/briefcase)
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 06327b27ac..cddb84ca18 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -12,14 +12,14 @@
slot_l_hand_str = 'icons/mob/items/lefthand_storage.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_storage.dmi',
)
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
show_messages = 1
var/list/can_hold = new/list() //List of objects which this item can store (if set, it can't store anything else)
var/list/cant_hold = new/list() //List of objects which this item can't store (in effect only if can_hold isn't set)
var/list/is_seeing = new/list() //List of mobs which are currently seeing the contents of this item's storage
- var/max_w_class = 2 //Max size of objects that this object can store (in effect only if can_hold isn't set)
- var/max_storage_space = 8 //The sum of the storage costs of all the items in this storage item.
+ var/max_w_class = ITEMSIZE_SMALL //Max size of objects that this object can store (in effect only if can_hold isn't set)
+ var/max_storage_space = ITEMSIZE_COST_SMALL * 4 //The sum of the storage costs of all the items in this storage item.
var/storage_slots = null //The number of storage slots in this container. If null, it uses the volume-based storage instead.
var/obj/screen/storage/boxes = null
var/obj/screen/storage/storage_start = null //storage UI
@@ -211,7 +211,10 @@
/obj/item/weapon/storage/proc/space_orient_objs(var/list/obj/item/display_contents)
- var/baseline_max_storage_space = 16 //should be equal to default backpack capacity
+ var/baseline_max_storage_space = INVENTORY_STANDARD_SPACE / 2 //should be equal to default backpack capacity // This is a lie.
+ // Above var is misleading, what it does upon changing is makes smaller inventory sizes have smaller space on the UI.
+ // It's cut in half because otherwise boxes of IDs and other tiny items are unbearably cluttered.
+
var/storage_cap_width = 2 //length of sprite for start and end of the box representing total storage space
var/stored_cap_width = 4 //length of sprite for start and end of the box representing the stored item
var/storage_width = min( round( 224 * max_storage_space/baseline_max_storage_space ,1) ,274) //length of sprite for the box representing total storage space
@@ -609,20 +612,21 @@
return depth
+// See inventory_sizes.dm for the defines.
/obj/item/proc/get_storage_cost()
if (storage_cost)
return storage_cost
else
switch(w_class)
- if(1)
- return 1
- if(2)
- return 2
- if(3)
- return 4
- if(4)
- return 8
- if(5)
- return 16
+ if(ITEMSIZE_TINY)
+ return ITEMSIZE_COST_TINY
+ if(ITEMSIZE_SMALL)
+ return ITEMSIZE_COST_SMALL
+ if(ITEMSIZE_NORMAL)
+ return ITEMSIZE_COST_NORMAL
+ if(ITEMSIZE_LARGE)
+ return ITEMSIZE_COST_LARGE
+ if(ITEMSIZE_HUGE)
+ return ITEMSIZE_COST_HUGE
else
- return 1000
+ return ITEMSIZE_COST_NO_CONTAINER
diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm
index 9c779f013a..8e6e5ca682 100644
--- a/code/game/objects/items/weapons/storage/toolbox.dm
+++ b/code/game/objects/items/weapons/storage/toolbox.dm
@@ -9,9 +9,9 @@
throwforce = 10
throw_speed = 1
throw_range = 7
- w_class = 4
- max_w_class = 3
- max_storage_space = 14 //enough to hold all starting contents
+ w_class = ITEMSIZE_LARGE
+ max_w_class = ITEMSIZE_NORMAL
+ max_storage_space = ITEMSIZE_COST_SMALL * 7 //enough to hold all starting contents
origin_tech = list(TECH_COMBAT = 1)
attack_verb = list("robusted")
@@ -80,13 +80,13 @@
new /obj/item/device/multitool(src)
/obj/item/weapon/storage/toolbox/lunchbox
- max_storage_space = 8 //slightly smaller than a toolbox
+ max_storage_space = ITEMSIZE_COST_SMALL * 4 //slightly smaller than a toolbox
name = "rainbow lunchbox"
icon_state = "lunchbox_rainbow"
item_state_slots = list(slot_r_hand_str = "toolbox_pink", slot_l_hand_str = "toolbox_pink")
desc = "A little lunchbox. This one is the colors of the rainbow!"
- w_class = 3
- max_w_class = 2
+ w_class = ITEMSIZE_NORMAL
+ max_w_class = ITEMSIZE_SMALL
var/filled = FALSE
attack_verb = list("lunched")
diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm
index 9cbda62db7..1056166ac6 100644
--- a/code/game/objects/items/weapons/storage/wallets.dm
+++ b/code/game/objects/items/weapons/storage/wallets.dm
@@ -4,7 +4,7 @@
storage_slots = 10
icon = 'icons/obj/wallet.dmi'
icon_state = "wallet-orange"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
can_hold = list(
/obj/item/weapon/spacecash,
/obj/item/weapon/card,
@@ -87,7 +87,7 @@
verbs |= /obj/item/weapon/storage/wallet/poly/proc/change_color
color = "#"+get_random_colour()
update_icon()
-
+
/obj/item/weapon/storage/wallet/poly/proc/change_color()
set name = "Change Wallet Color"
set category = "Object"
@@ -106,9 +106,8 @@
var/original_state = icon_state
icon_state = "wallet-emp"
update_icon()
-
+
spawn(200)
if(src)
icon_state = original_state
update_icon()
-
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index d92fcf1336..5a92c72d01 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -9,7 +9,7 @@
sharp = 0
edge = 0
throwforce = 7
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_COMBAT = 2)
attack_verb = list("beaten")
var/lightcolor = "#FF6A00"
diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm
index 7e96ad2c08..0c942bf486 100644
--- a/code/game/objects/items/weapons/surgery_tools.dm
+++ b/code/game/objects/items/weapons/surgery_tools.dm
@@ -18,7 +18,7 @@
icon_state = "retractor"
matter = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 5000)
flags = CONDUCT
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
/*
@@ -31,7 +31,7 @@
icon_state = "hemostat"
matter = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 2500)
flags = CONDUCT
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
attack_verb = list("attacked", "pinched")
@@ -45,7 +45,7 @@
icon_state = "cautery"
matter = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 2500)
flags = CONDUCT
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
attack_verb = list("burnt")
@@ -61,7 +61,7 @@
matter = list(DEFAULT_WALL_MATERIAL = 15000, "glass" = 10000)
flags = CONDUCT
force = 15.0
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
attack_verb = list("drilled")
@@ -82,7 +82,7 @@
force = 10.0
sharp = 1
edge = 1
- w_class = 1
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
throwforce = 5.0
throw_speed = 3
@@ -137,7 +137,7 @@
hitsound = 'sound/weapons/circsawhit.ogg'
flags = CONDUCT
force = 15.0
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
throwforce = 9.0
throw_speed = 3
throw_range = 5
@@ -153,7 +153,7 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "bone-gel"
force = 0
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throwforce = 1.0
/obj/item/weapon/FixOVein
@@ -163,7 +163,7 @@
force = 0
throwforce = 1.0
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 3)
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
var/usage_amount = 10
/obj/item/weapon/bonesetter
@@ -174,5 +174,5 @@
throwforce = 9.0
throw_speed = 3
throw_range = 5
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
attack_verb = list("attacked", "hit", "bludgeoned")
diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm
index 2341df50ce..e1deceadde 100644
--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -36,7 +36,7 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "telebaton0"
slot_flags = SLOT_BELT
- w_class = 2
+ w_class = ITEMSIZE_SMALL
force = 3
var/on = 0
@@ -48,7 +48,7 @@
"You extend the baton.",\
"You hear an ominous click.")
icon_state = "telebaton1"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
force = 15//quite robust
attack_verb = list("smacked", "struck", "slapped")
else
@@ -56,7 +56,7 @@
"You collapse the baton.",\
"You hear a click.")
icon_state = "telebaton0"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
force = 3//not so robust now
attack_verb = list("hit", "punched")
diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm
index fb9aa3eb41..490ae2d62b 100644
--- a/code/game/objects/items/weapons/syndie.dm
+++ b/code/game/objects/items/weapons/syndie.dm
@@ -11,7 +11,7 @@
item_state = "radio"
name = "normal-sized package"
desc = "A small wrapped package."
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
var/power = 1 /*Size of the explosion.*/
var/size = "small" /*Used for the icon, this one will make c-4small_0 for the off state.*/
diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm
index 12a048ee07..41c78ecd3b 100644
--- a/code/game/objects/items/weapons/tanks/jetpack.dm
+++ b/code/game/objects/items/weapons/tanks/jetpack.dm
@@ -5,7 +5,7 @@
desc = "A tank of compressed gas for use as propulsion in zero-gravity areas. Use with caution."
icon_state = "jetpack"
gauge_icon = null
- w_class = 4.0
+ w_class = ITEMSIZE_LARGE
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_storage.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_storage.dmi',
diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm
index 85d1352703..83372ffa58 100644
--- a/code/game/objects/items/weapons/tanks/tank_types.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types.dm
@@ -70,7 +70,7 @@
src.air_contents.adjust_multi("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD, "nitrogen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD)
return
-
+
/*
* Phoron
*/
@@ -111,7 +111,7 @@
gauge_cap = 4
flags = CONDUCT
slot_flags = SLOT_BELT
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
force = 4.0
distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
volume = 2 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index dd3c4cff29..57a5cf06a4 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -14,7 +14,7 @@ var/list/global/tank_gauge_cache = list()
flags = CONDUCT
slot_flags = SLOT_BACK
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
pressure_resistance = ONE_ATMOSPHERE*5
diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm
index 80b0dc5964..98d53bb586 100644
--- a/code/game/objects/items/weapons/tape.dm
+++ b/code/game/objects/items/weapons/tape.dm
@@ -3,7 +3,7 @@
desc = "A roll of sticky tape. Possibly for taping ducks... or was that ducts?"
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "taperoll"
- w_class = 1
+ w_class = ITEMSIZE_TINY
/obj/item/weapon/tape_roll/attack(var/mob/living/carbon/human/H, var/mob/user)
if(istype(H))
@@ -83,7 +83,7 @@
desc = "A piece of sticky tape."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "tape"
- w_class = 1
+ w_class = ITEMSIZE_TINY
layer = 4
anchored = 1 //it's sticky, no you cant move it
diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm
index fdad2423fc..b27ef63a4a 100644
--- a/code/game/objects/items/weapons/teleportation.dm
+++ b/code/game/objects/items/weapons/teleportation.dm
@@ -17,12 +17,12 @@
var/broadcasting = null
var/listening = 1.0
flags = CONDUCT
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
item_state = "electronic"
throw_speed = 4
throw_range = 20
- origin_tech = list(TECH_MAGNET = 1)
- matter = list(DEFAULT_WALL_MATERIAL = 400)
+ origin_tech = list(TECH_MAGNET = 1)
+ matter = list(DEFAULT_WALL_MATERIAL = 400)
/obj/item/weapon/locator/attack_self(mob/user as mob)
user.set_machine(src)
@@ -129,11 +129,11 @@ Frequency:
icon_state = "hand_tele"
item_state = "electronic"
throwforce = 5
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throw_speed = 3
throw_range = 5
- origin_tech = list(TECH_MAGNET = 1, TECH_BLUESPACE = 3)
- matter = list(DEFAULT_WALL_MATERIAL = 10000)
+ origin_tech = list(TECH_MAGNET = 1, TECH_BLUESPACE = 3)
+ matter = list(DEFAULT_WALL_MATERIAL = 10000)
/obj/item/weapon/hand_tele/attack_self(mob/user as mob)
var/turf/current_location = get_turf(user)//What turf is the user on?
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 98c7876811..c61ee90918 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -23,7 +23,7 @@
slot_flags = SLOT_BELT
force = 6
throwforce = 7
- w_class = 2
+ w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
matter = list(DEFAULT_WALL_MATERIAL = 150)
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
@@ -40,7 +40,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT | SLOT_EARS
force = 6
- w_class = 1
+ w_class = ITEMSIZE_TINY
throwforce = 5
throw_speed = 3
throw_range = 5
@@ -103,7 +103,7 @@
force = 6
throw_speed = 2
throw_range = 9
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
matter = list(DEFAULT_WALL_MATERIAL = 80)
attack_verb = list("pinched", "nipped")
@@ -144,7 +144,7 @@
throwforce = 5.0
throw_speed = 1
throw_range = 5
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
//Cost to make in the autolathe
matter = list(DEFAULT_WALL_MATERIAL = 70, "glass" = 30)
@@ -307,7 +307,7 @@
T.visible_message("\The [src] turns on.")
src.force = 15
src.damtype = "fire"
- src.w_class = 4
+ src.w_class = ITEMSIZE_LARGE
welding = 1
update_icon()
processing_objects |= src
@@ -380,14 +380,14 @@
/obj/item/weapon/weldingtool/hugetank
name = "upgraded welding tool"
max_fuel = 80
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_ENGINEERING = 3)
matter = list(DEFAULT_WALL_MATERIAL = 70, "glass" = 120)
/obj/item/weapon/weldingtool/experimental
name = "experimental welding tool"
max_fuel = 40
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_ENGINEERING = 4, TECH_PHORON = 3)
matter = list(DEFAULT_WALL_MATERIAL = 70, "glass" = 120)
var/last_gen = 0
@@ -415,7 +415,7 @@
throwforce = 7
pry = 1
item_state = "crowbar"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_ENGINEERING = 1)
matter = list(DEFAULT_WALL_MATERIAL = 50)
attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
@@ -448,7 +448,7 @@
desc = "It even has one of those nubbins for doing the thingy."
icon = 'icons/obj/items.dmi'
icon_state = "combitool"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
var/list/spawn_tools = list(
/obj/item/weapon/screwdriver,
diff --git a/code/game/objects/items/weapons/towels.dm b/code/game/objects/items/weapons/towels.dm
index d51cc8d1d0..5f66562c61 100644
--- a/code/game/objects/items/weapons/towels.dm
+++ b/code/game/objects/items/weapons/towels.dm
@@ -4,7 +4,7 @@
icon_state = "towel"
slot_flags = SLOT_HEAD | SLOT_BELT | SLOT_OCLOTHING
force = 3.0
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
attack_verb = list("whipped")
hitsound = 'sound/weapons/towelwhip.ogg'
desc = "A soft cotton towel."
diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm
index 9c355356b3..e5a655d7f9 100644
--- a/code/game/objects/items/weapons/traps.dm
+++ b/code/game/objects/items/weapons/traps.dm
@@ -7,7 +7,7 @@
icon_state = "beartrap0"
desc = "A mechanically activated leg trap. Low-tech, but reliable. Looks like it could really hurt if you set it off."
throwforce = 0
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
origin_tech = "materials=1"
matter = list(DEFAULT_WALL_MATERIAL = 18750)
var/deployed = 0
diff --git a/code/game/objects/items/weapons/trays.dm b/code/game/objects/items/weapons/trays.dm
index 624b6fcb98..ca32d730f3 100644
--- a/code/game/objects/items/weapons/trays.dm
+++ b/code/game/objects/items/weapons/trays.dm
@@ -10,7 +10,7 @@
throwforce = 10.0
throw_speed = 1
throw_range = 5
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
flags = CONDUCT
matter = list(DEFAULT_WALL_MATERIAL = 3000)
var/list/carrying = list() // List of things on the tray. - Doohl
@@ -160,9 +160,9 @@
var/val = 0 // value to return
for(var/obj/item/I in carrying)
- if(I.w_class == 1.0)
+ if(I.w_class == ITEMSIZE_TINY)
val ++
- else if(I.w_class == 2.0)
+ else if(I.w_class == ITEMSIZE_SMALL)
val += 3
else
val += 5
@@ -177,9 +177,9 @@
for(var/obj/item/I in loc)
if( I != src && !I.anchored && !istype(I, /obj/item/clothing/under) && !istype(I, /obj/item/clothing/suit) && !istype(I, /obj/item/projectile) )
var/add = 0
- if(I.w_class == 1.0)
+ if(I.w_class == ITEMSIZE_TINY)
add = 1
- else if(I.w_class == 2.0)
+ else if(I.w_class == ITEMSIZE_SMALL)
add = 3
else
add = 5
@@ -199,11 +199,11 @@
/obj/item/weapon/tray/dropped(mob/user)
var/noTable = null
-
+
spawn() //Allows the tray to udpate location, rather than just checking against mob's location
if(isturf(src.loc) && !(locate(/obj/structure/table) in src.loc))
noTable = 1
-
+
if(isturf(loc) && !(locate(/mob/living) in src.loc))
overlays.Cut()
for(var/obj/item/I in carrying)
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index 0075b6cdfd..d604eca82c 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -8,7 +8,7 @@
throw_speed = 1
throw_range = 4
throwforce = 10
- w_class = 2
+ w_class = ITEMSIZE_SMALL
suicide_act(mob/user)
viewers(user) << "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide."
diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/game/objects/items/weapons/weldbackpack.dm
index e9b5fdb379..6a6d77521e 100644
--- a/code/game/objects/items/weapons/weldbackpack.dm
+++ b/code/game/objects/items/weapons/weldbackpack.dm
@@ -4,7 +4,7 @@
slot_flags = SLOT_BACK
icon = 'icons/obj/storage.dmi'
icon_state = "welderpack"
- w_class = 4.0
+ w_class = ITEMSIZE_LARGE
var/max_fuel = 350
/obj/item/weapon/weldpack/New()
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 2712d6de79..f4e7f4d056 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -1,6 +1,6 @@
/obj/structure
icon = 'icons/obj/structures.dmi'
- w_class = 10
+ w_class = ITEMSIZE_NO_CONTAINER
var/climbable
var/breakable
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index 964afb0527..397bf92661 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -14,7 +14,7 @@ LINEN BINS
throwforce = 1
throw_speed = 1
throw_range = 2
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
/obj/item/weapon/bedsheet/attack_self(mob/user as mob)
user.drop_item()
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 107ea11520..e7f81877a8 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/closet.dmi'
icon_state = "closed"
density = 1
- w_class = 5
+ w_class = ITEMSIZE_HUGE
var/icon_closed = "closed"
var/icon_opened = "open"
var/opened = 0
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index cb7dac0684..bd39d82801 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -4,7 +4,7 @@
icon_state = "door_as_0"
anchored = 0
density = 1
- w_class = 5
+ w_class = ITEMSIZE_HUGE
var/state = 0
var/base_icon_state = ""
var/base_name = "airlock"
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 52afecd66d..19f3b48076 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -3,7 +3,7 @@
anchored = 1
density = 1
layer = 2
- w_class = 5
+ w_class = ITEMSIZE_HUGE
var/state = 0
var/health = 200
var/cover = 50 //how much cover the girder provides against projectiles.
diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm
index 20b326ebc9..d6d25ffc0a 100644
--- a/code/game/objects/structures/inflatable.dm
+++ b/code/game/objects/structures/inflatable.dm
@@ -3,7 +3,7 @@
desc = "A folded membrane which rapidly expands into a large cubical shape on activation."
icon = 'icons/obj/inflatable.dmi'
icon_state = "folded_wall"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
attack_self(mob/user)
playsound(loc, 'sound/items/zip.ogg', 75, 1)
@@ -248,8 +248,8 @@
desc = "Contains inflatable walls and doors."
icon_state = "inf_box"
item_state = "syringe_kit"
- w_class = 3
- max_storage_space = 28
+ w_class = ITEMSIZE_NORMAL
+ max_storage_space = ITEMSIZE_COST_NORMAL * 7
can_hold = list(/obj/item/inflatable)
New()
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index b3ad998895..588517a7ed 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -291,4 +291,4 @@
desc = "A keyring with a small steel key, and a pink fob reading \"Pussy Wagon\"."
icon = 'icons/obj/vehicles.dmi'
icon_state = "keys"
- w_class = 1
+ w_class = ITEMSIZE_TINY
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index eff0de4b48..7a21c5966e 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -5,7 +5,7 @@
icon_state = "latticefull"
density = 0
anchored = 1.0
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
layer = 2.3 //under pipes
// flags = CONDUCT
diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm
index c76ca1802d..db234a1a2e 100644
--- a/code/game/objects/structures/mop_bucket.dm
+++ b/code/game/objects/structures/mop_bucket.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "mopbucket"
density = 1
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
pressure_resistance = 5
flags = OPENCONTAINER
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index 5d5fc2d943..e8ce8bfb1c 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -4,7 +4,7 @@
opacity = 0
density = 0
layer = 3.5
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
/obj/structure/sign/ex_act(severity)
switch(severity)
@@ -37,7 +37,7 @@
name = "sign"
desc = ""
icon = 'icons/obj/decals.dmi'
- w_class = 3 //big
+ w_class = ITEMSIZE_NORMAL //big
var/sign_state = ""
/obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob) //construction
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 73ceddb70f..a2e8e3f21b 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -226,7 +226,7 @@
desc = "A collapsed roller bed that can be carried around."
icon = 'icons/obj/rollerbed.dmi'
icon_state = "folded"
- w_class = 4.0 // Can't be put in backpacks. Oh well.
+ w_class = ITEMSIZE_LARGE // Can't be put in backpacks. Oh well.
/obj/item/roller/attack_self(mob/user)
var/obj/structure/bed/roller/R = new /obj/structure/bed/roller(user.loc)
diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
index e4d54f48ba..6592e51b29 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
@@ -8,7 +8,7 @@ var/global/list/stool_cache = list() //haha stool
icon_state = "stool_preview" //set for the map
force = 10
throwforce = 10
- w_class = 5
+ w_class = ITEMSIZE_HUGE
var/base_icon = "stool_base"
var/material/material
var/material/padding_material
diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm
index 0e7546f271..c13ae10e64 100644
--- a/code/game/objects/structures/tank_dispenser.dm
+++ b/code/game/objects/structures/tank_dispenser.dm
@@ -5,7 +5,7 @@
icon_state = "dispenser"
density = 1
anchored = 1.0
- w_class = 5
+ w_class = ITEMSIZE_HUGE
var/oxygentanks = 10
var/phorontanks = 10
var/list/oxytanks = list() //sorry for the similar var names
diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm
index 68b10ccf7a..83396b363e 100644
--- a/code/game/objects/structures/target_stake.dm
+++ b/code/game/objects/structures/target_stake.dm
@@ -5,7 +5,7 @@
icon = 'icons/obj/objects.dmi'
icon_state = "target_stake"
density = 1
- w_class = 5
+ w_class = ITEMSIZE_HUGE
flags = CONDUCT
var/obj/item/target/pinned_target // the current pinned target
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index 3764386679..10c6ae08f1 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -16,7 +16,7 @@ obj/structure/windoor_assembly
anchored = 0
density = 0
dir = NORTH
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
var/obj/item/weapon/airlock_electronics/electronics = null
var/created_name = null
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index c419de639d..15d6e32213 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -3,7 +3,7 @@
desc = "A window."
icon = 'icons/obj/structures.dmi'
density = 1
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
layer = 3.2//Just above doors
pressure_resistance = 4*ONE_ATMOSPHERE
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index 479bbed53f..9587984177 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/assemblies/new_assemblies.dmi'
icon_state = ""
flags = CONDUCT
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
matter = list(DEFAULT_WALL_MATERIAL = 100)
throwforce = 2
throw_speed = 3
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index a78126bedc..e41576020e 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -3,7 +3,7 @@
icon = 'icons/obj/tank.dmi'
item_state = "assembly"
throwforce = 5
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
throw_speed = 2
throw_range = 4
flags = CONDUCT | PROXMOVE
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index 021216f218..a614135f22 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -5,7 +5,7 @@
item_state = "assembly"
flags = CONDUCT | PROXMOVE
throwforce = 5
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throw_speed = 3
throw_range = 10
diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm
index 8ba62cdc37..edbe0e7491 100644
--- a/code/modules/assembly/shock_kit.dm
+++ b/code/modules/assembly/shock_kit.dm
@@ -5,7 +5,7 @@
var/obj/item/clothing/head/helmet/part1 = null
var/obj/item/device/radio/electropack/part2 = null
var/status = 0
- w_class = 5.0
+ w_class = ITEMSIZE_HUGE
flags = CONDUCT
/obj/item/assembly/shock_kit/Destroy()
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index 40071651c6..cf20e4b74e 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -363,7 +363,7 @@
name = "desert eagle"
desc = "A hologram projector in the shape of a gun. There is a dial on the side to change the gun's disguise."
icon_state = "deagle"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
matter = list()
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index ec3a210e4e..a7ee8077cd 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -111,7 +111,7 @@
// Ears: headsets, earmuffs and tiny objects
/obj/item/clothing/ears
name = "ears"
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
throwforce = 2
slot_flags = SLOT_EARS
sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/ears.dmi')
@@ -157,7 +157,7 @@
/obj/item/clothing/ears/offear
name = "Other ear"
- w_class = 5.0
+ w_class = ITEMSIZE_HUGE
icon = 'icons/mob/screen1_Midnight.dmi'
icon_state = "block"
slot_flags = SLOT_EARS | SLOT_TWOEARS
@@ -177,7 +177,7 @@
slot_r_hand_str = 'icons/mob/items/righthand_gloves.dmi',
)
gender = PLURAL //Carn: for grammarically correct text-parsing
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
icon = 'icons/obj/clothing/gloves.dmi'
siemens_coefficient = 0.75
var/wired = 0
@@ -237,7 +237,7 @@
)
body_parts_covered = HEAD
slot_flags = SLOT_HEAD
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
var/light_overlay = "helmet_light"
var/light_applied
@@ -461,7 +461,7 @@
slot_flags = SLOT_OCLOTHING
var/blood_overlay_type = "suit"
siemens_coefficient = 0.9
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
sprite_sheets = list(
"Teshari" = 'icons/mob/species/seromi/suit.dmi'
@@ -487,7 +487,7 @@
permeability_coefficient = 0.90
slot_flags = SLOT_ICLOTHING
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
show_messages = 1
var/has_sensor = 1 //For the crew computer 2 = unable to change mode
diff --git a/code/modules/clothing/ears/ears.dm b/code/modules/clothing/ears/ears.dm
index 151b581f5c..e6cc1e0983 100644
--- a/code/modules/clothing/ears/ears.dm
+++ b/code/modules/clothing/ears/ears.dm
@@ -44,7 +44,7 @@
name = "skrell tentacle wear"
desc = "Some stuff worn by skrell to adorn their head tentacles."
icon = 'icons/obj/clothing/ears.dmi'
- w_class = 1
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
species_restricted = list("Skrell")
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 27fb0e0fa4..7bbe5a7a71 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -14,7 +14,7 @@ BLIND // can't see anything
/obj/item/clothing/glasses
name = "glasses"
icon = 'icons/obj/clothing/glasses.dmi'
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
slot_flags = SLOT_EYES
var/vision_flags = 0
var/darkness_view = 0//Base human is 2
@@ -226,7 +226,7 @@ BLIND // can't see anything
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "tape_cross"
item_state_slots = list(slot_r_hand_str = null, slot_l_hand_str = null)
- w_class = 1
+ w_class = ITEMSIZE_TINY
/obj/item/clothing/glasses/sunglasses/prescription
name = "prescription sunglasses"
@@ -235,7 +235,7 @@ BLIND // can't see anything
/obj/item/clothing/glasses/sunglasses/big
desc = "Strangely ancient technology used to help provide rudimentary eye cover. Larger than average enhanced shielding blocks many flashes."
icon_state = "bigsunglasses"
-
+
/obj/item/clothing/glasses/fakesunglasses //Sunglasses without flash immunity
desc = "A pair of designer sunglasses. Doesn't seem like it'll block flashes."
name = "stylish sunglasses"
diff --git a/code/modules/clothing/gloves/arm_guards.dm b/code/modules/clothing/gloves/arm_guards.dm
index 2108cd48e8..7fe17dd758 100644
--- a/code/modules/clothing/gloves/arm_guards.dm
+++ b/code/modules/clothing/gloves/arm_guards.dm
@@ -4,7 +4,7 @@
body_parts_covered = HANDS|ARMS
slowdown = 0.5
overgloves = 1
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
/obj/item/clothing/gloves/arm_guard/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..()) //This will only run if no other problems occured when equiping.
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 4548b41a24..86023f5202 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -10,7 +10,7 @@
heat_protection = HEAD
max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
siemens_coefficient = 0.7
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
ear_protection = 1
/obj/item/clothing/head/helmet/riot
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 1ea5376d6a..0fed75c822 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -23,7 +23,7 @@
body_parts_covered = HEAD|FACE|EYES
action_button_name = "Flip Welding Mask"
siemens_coefficient = 0.9
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
var/base_state
/obj/item/clothing/head/welding/attack_self()
@@ -122,7 +122,7 @@
body_parts_covered = HEAD|FACE|EYES
brightness_on = 2
light_overlay = "helmet_light"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
/*
* Kitty ears
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index 3dabeb99d6..978a5c13e6 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -5,7 +5,7 @@
item_state_slots = list(slot_r_hand_str = "bandblack", slot_l_hand_str = "bandblack")
flags_inv = HIDEFACE|BLOCKHAIR
body_parts_covered = FACE|HEAD
- w_class = 2
+ w_class = ITEMSIZE_SMALL
sprite_sheets = list(
"Tajara" = 'icons/mob/species/tajaran/mask.dmi',
"Unathi" = 'icons/mob/species/unathi/mask.dmi',
@@ -17,7 +17,7 @@
icon_state = "swatclava"
item_state_slots = list(slot_r_hand_str = "bandgreen", slot_l_hand_str = "bandgreen")
flags_inv = HIDEFACE|BLOCKHAIR
- w_class = 2
+ w_class = ITEMSIZE_SMALL
sprite_sheets = list(
"Tajara" = 'icons/mob/species/tajaran/mask.dmi',
"Unathi" = 'icons/mob/species/unathi/mask.dmi',
@@ -29,7 +29,7 @@
icon_state = "luchag"
flags_inv = HIDEFACE|BLOCKHAIR
body_parts_covered = HEAD|FACE
- w_class = 2
+ w_class = ITEMSIZE_SMALL
siemens_coefficient = 3.0
/obj/item/clothing/mask/luchador/tecnicos
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index 7568d53b74..f03684931d 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -5,7 +5,7 @@
item_state_slots = list(slot_r_hand_str = "breath", slot_l_hand_str = "breath")
item_flags = AIRTIGHT|FLEXIBLEMATERIAL
body_parts_covered = FACE
- w_class = 2
+ w_class = ITEMSIZE_SMALL
gas_transfer_coefficient = 0.10
permeability_coefficient = 0.50
var/hanging = 0
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index ad7c9928d2..e675611390 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -5,7 +5,7 @@
item_flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
body_parts_covered = FACE|EYES
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
item_state_slots = list(slot_r_hand_str = "gas_alt", slot_l_hand_str = "gas_alt")
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index fe0cfdebaa..3e8c9de370 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -3,7 +3,7 @@
desc = "To stop that awful noise."
icon_state = "muzzle"
body_parts_covered = FACE
- w_class = 2
+ w_class = ITEMSIZE_SMALL
gas_transfer_coefficient = 0.90
voicechange = 1
@@ -13,7 +13,7 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "tape_cross"
item_state_slots = list(slot_r_hand_str = null, slot_l_hand_str = null)
- w_class = 1
+ w_class = ITEMSIZE_TINY
/obj/item/clothing/mask/muzzle/New()
..()
@@ -31,7 +31,7 @@
desc = "A sterile mask designed to help prevent the spread of diseases."
icon_state = "sterile"
item_state_slots = list(slot_r_hand_str = "sterile", slot_l_hand_str = "sterile")
- w_class = 2
+ w_class = ITEMSIZE_SMALL
body_parts_covered = FACE
item_flags = FLEXIBLEMATERIAL
gas_transfer_coefficient = 0.90
@@ -85,7 +85,7 @@
icon_state = "blueneckscarf"
body_parts_covered = FACE
item_flags = FLEXIBLEMATERIAL
- w_class = 2
+ w_class = ITEMSIZE_SMALL
gas_transfer_coefficient = 0.90
/obj/item/clothing/mask/redscarf
@@ -94,7 +94,7 @@
icon_state = "redwhite_scarf"
body_parts_covered = FACE
item_flags = FLEXIBLEMATERIAL
- w_class = 2
+ w_class = ITEMSIZE_SMALL
gas_transfer_coefficient = 0.90
/obj/item/clothing/mask/greenscarf
@@ -103,7 +103,7 @@
icon_state = "green_scarf"
body_parts_covered = FACE
item_flags = FLEXIBLEMATERIAL
- w_class = 2
+ w_class = ITEMSIZE_SMALL
gas_transfer_coefficient = 0.90
/obj/item/clothing/mask/ninjascarf
@@ -112,7 +112,7 @@
icon_state = "ninja_scarf"
body_parts_covered = FACE
item_flags = FLEXIBLEMATERIAL
- w_class = 2
+ w_class = ITEMSIZE_SMALL
gas_transfer_coefficient = 0.90
siemens_coefficient = 0
@@ -121,7 +121,7 @@
desc = "A rubber pig mask."
icon_state = "pig"
flags_inv = HIDEFACE|BLOCKHAIR
- w_class = 2
+ w_class = ITEMSIZE_SMALL
siemens_coefficient = 0.9
body_parts_covered = HEAD|FACE|EYES
@@ -131,7 +131,7 @@
icon_state = "horsehead"
flags_inv = HIDEFACE|BLOCKHAIR
body_parts_covered = HEAD|FACE|EYES
- w_class = 2
+ w_class = ITEMSIZE_SMALL
siemens_coefficient = 0.9
/obj/item/clothing/mask/horsehead/New()
@@ -174,7 +174,7 @@
/obj/item/clothing/mask/bandana
name = "black bandana"
desc = "A fine black bandana with nanotech lining."
- w_class = 1
+ w_class = ITEMSIZE_TINY
flags_inv = HIDEFACE
slot_flags = SLOT_MASK
icon_state = "bandblack"
diff --git a/code/modules/clothing/shoes/leg_guards.dm b/code/modules/clothing/shoes/leg_guards.dm
index 640b6c2e06..786ded8a62 100644
--- a/code/modules/clothing/shoes/leg_guards.dm
+++ b/code/modules/clothing/shoes/leg_guards.dm
@@ -4,7 +4,7 @@
body_parts_covered = LEGS|FEET
slowdown = SHOES_SLOWDOWN+0.5
species_restricted = null //Unathi and Taj can wear leg armor now
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
/obj/item/clothing/shoes/leg_guard/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..()) //This will only run if no other problems occured when equiping.
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index fd8e5c7c40..a8109493c7 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -168,7 +168,7 @@
icon_state = "slippers"
force = 0
species_restricted = null
- w_class = 2
+ w_class = ITEMSIZE_SMALL
/obj/item/clothing/shoes/slippers_worn
name = "worn bunny slippers"
@@ -176,7 +176,7 @@
icon_state = "slippers_worn"
item_state_slots = list(slot_r_hand_str = "slippers", slot_l_hand_str = "slippers")
force = 0
- w_class = 2
+ w_class = ITEMSIZE_SMALL
/obj/item/clothing/shoes/laceup
name = "laceup shoes"
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index f9884846ee..262611db0d 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -13,7 +13,7 @@
name = "Station Administrator's armor"
desc = "A bulky, heavy-duty piece of exclusive corporate armor. YOU are in charge!"
icon_state = "caparmor"
- w_class = 5
+ w_class = ITEMSIZE_HUGE
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02
item_flags = STOPPRESSUREDAMAGE
@@ -80,7 +80,7 @@
name = "pirate coat"
desc = "Yarr."
icon_state = "pirate"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
slowdown = 0
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index 23a5a69039..0bd14ef9d1 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 = 5
+ w_class = ITEMSIZE_HUGE
action_button_name = "Toggle Heatsink"
// These values are passed on to all component pieces.
diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm
index 942921b0e9..b66ff5334a 100644
--- a/code/modules/clothing/spacesuits/spacesuits.dm
+++ b/code/modules/clothing/spacesuits/spacesuits.dm
@@ -46,7 +46,7 @@
name = "Space suit"
desc = "A suit that protects against low pressure environments. \""+station_short+"\" is written in large block letters on the back."
icon_state = "space"
- w_class = 5 // So you can't fit this in your bag and be prepared at all times.
+ w_class = ITEMSIZE_HUGE // So you can't fit this in your bag and be prepared at all times.
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02
item_flags = STOPPRESSUREDAMAGE | THICKMATERIAL
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index 20ee7ddc04..7c8cfdaba2 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -10,7 +10,7 @@
name = "red space suit"
icon_state = "syndicate"
desc = "A crimson spacesuit sporting clean lines and durable plating. Robust, reliable, and slightly suspicious."
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
slowdown = 1
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
@@ -37,7 +37,7 @@
name = "dark green space suit"
desc = "A dark green spacesuit sporting clean lines and durable plating. Robust, reliable, and slightly suspicious."
icon_state = "syndicate-green-dark"
-
+
//Orange syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/orange
name = "orange space helmet"
@@ -119,7 +119,7 @@
name = "black and red space helmet"
desc = "A black helmet sporting a single red stripe and durable plating. Engineered to look menacing."
icon_state = "syndicate-helm-black-red"
-
+
/obj/item/clothing/suit/space/syndicate/black/red
name = "black and red space suit"
desc = "A black spacesuit sporting red stripes and durable plating. Robust, reliable, and slightly suspicious."
diff --git a/code/modules/clothing/spacesuits/void/merc.dm b/code/modules/clothing/spacesuits/void/merc.dm
index 9e1e3513cc..06d376f26a 100644
--- a/code/modules/clothing/spacesuits/void/merc.dm
+++ b/code/modules/clothing/spacesuits/void/merc.dm
@@ -16,7 +16,7 @@
desc = "An advanced suit that protects against injuries during special operations. Property of Gorlex Marauders."
item_state_slots = list(slot_r_hand_str = "syndie_voidsuit", slot_l_hand_str = "syndie_voidsuit")
slowdown = 1
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
siemens_coefficient = 0.6
diff --git a/code/modules/clothing/spacesuits/void/wizard.dm b/code/modules/clothing/spacesuits/void/wizard.dm
index 4c2318355f..d39f553aea 100644
--- a/code/modules/clothing/spacesuits/void/wizard.dm
+++ b/code/modules/clothing/spacesuits/void/wizard.dm
@@ -17,7 +17,7 @@
desc = "A bizarre gem-encrusted suit that radiates magical energies."
item_state_slots = list(slot_r_hand_str = "wiz_voidsuit", slot_l_hand_str = "wiz_voidsuit")
slowdown = 1
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
unacidable = 1
armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60)
siemens_coefficient = 0.7
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 648cf07a41..839bb041c1 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -124,7 +124,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
slowdown = 1
- w_class = 5
+ w_class = ITEMSIZE_HUGE
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 100, rad = 100)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
@@ -384,7 +384,7 @@
desc = "A suit that protects against some damage."
icon_state = "centcom"
item_state_slots = list(slot_r_hand_str = "armor", slot_l_hand_str = "armor")
- w_class = 4//bulky item
+ w_class = ITEMSIZE_LARGE//bulky item
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
@@ -398,7 +398,7 @@
icon_state = "heavy"
item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat")
armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)
- w_class = 4//bulky item
+ w_class = ITEMSIZE_LARGE//bulky item
gas_transfer_coefficient = 0.90
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
slowdown = 3
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index 227414b0e4..51b05d1526 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -13,7 +13,7 @@
name = "bio suit"
desc = "A suit that protects against biological contamination."
icon_state = "bio"
- w_class = 4//bulky item
+ w_class = ITEMSIZE_LARGE//bulky item
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 2dc9e22404..4ee992f9a5 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -128,7 +128,7 @@
name = "red space suit replica"
icon_state = "syndicate"
desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm
index 2534845173..13d91661f5 100644
--- a/code/modules/clothing/suits/storage.dm
+++ b/code/modules/clothing/suits/storage.dm
@@ -4,8 +4,8 @@
/obj/item/clothing/suit/storage/New()
..()
pockets = new/obj/item/weapon/storage/internal(src)
- pockets.max_w_class = 2 //fit only pocket sized items
- pockets.max_storage_space = 4
+ pockets.max_w_class = ITEMSIZE_SMALL //fit only pocket sized items
+ pockets.max_storage_space = ITEMSIZE_COST_SMALL * 2
/obj/item/clothing/suit/storage/Destroy()
qdel(pockets)
@@ -76,8 +76,8 @@
/obj/item/clothing/suit/storage/vest/heavy/New()
..()
pockets = new/obj/item/weapon/storage/internal(src)
- pockets.max_w_class = 2
- pockets.max_storage_space = 8
+ pockets.max_w_class = ITEMSIZE_SMALL
+ pockets.max_storage_space = ITEMSIZE_COST_SMALL * 4
/obj/item/clothing/suit/storage/vest
var/icon_badge
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 53ea2d85b6..8bf36d0044 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -13,7 +13,7 @@
name = "firesuit"
desc = "A suit that protects against fire and heat."
icon_state = "fire"
- w_class = 4//bulky item
+ w_class = ITEMSIZE_LARGE//bulky item
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
@@ -33,7 +33,7 @@
desc = "A suit that protects against extreme fire and heat."
//icon_state = "thermal"
item_state_slots = list(slot_r_hand_str = "black_suit", slot_l_hand_str = "black_suit")
- w_class = 4//bulky item
+ w_class = ITEMSIZE_LARGE//bulky item
slowdown = 1.5
/*
@@ -52,7 +52,7 @@
name = "bomb suit"
desc = "A suit designed for safety when handling explosives."
icon_state = "bombsuit"
- w_class = 4//bulky item
+ w_class = ITEMSIZE_LARGE//bulky item
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
slowdown = 2
@@ -85,7 +85,7 @@
name = "Radiation suit"
desc = "A suit that protects against radiation. Label: Made with lead, do not eat insulation."
icon_state = "rad"
- w_class = 4//bulky item
+ w_class = ITEMSIZE_LARGE//bulky item
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 1d6c610cea..a38f51f1fa 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -5,7 +5,7 @@
icon_state = "bluetie"
item_state_slots = list(slot_r_hand_str = "", slot_l_hand_str = "")
slot_flags = SLOT_TIE
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
var/slot = "decor"
var/obj/item/clothing/has_suit = null //the suit the tie may be attached to
var/image/inv_overlay = null //overlay used when attached to clothing.
diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm
index bfd89707cc..cfd1c1d49a 100644
--- a/code/modules/clothing/under/accessories/clothing.dm
+++ b/code/modules/clothing/under/accessories/clothing.dm
@@ -54,7 +54,7 @@
slot_flags = SLOT_OCLOTHING | SLOT_TIE
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
siemens_coefficient = 0.9
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
slot = "over"
sprite_sheets = list(
diff --git a/code/modules/clothing/under/accessories/lockets.dm b/code/modules/clothing/under/accessories/lockets.dm
index 43fb495669..6c06a48dbf 100644
--- a/code/modules/clothing/under/accessories/lockets.dm
+++ b/code/modules/clothing/under/accessories/lockets.dm
@@ -3,7 +3,7 @@
desc = "This oval shaped, argentium sterling silver locket hangs on an incredibly fine, refractive string, almost thin as hair and microweaved from links to a deceptive strength, of similar material. The edges are engraved very delicately with an elegant curving design, but overall the main is unmarked and smooth to the touch, leaving room for either remaining as a stolid piece or future alterations. There is an obvious internal place for a picture or lock of some sort, but even behind that is a very thin compartment unhinged with the pinch of a thumb and forefinger."
icon_state = "locket"
slot_flags = 0
- w_class = 2
+ w_class = ITEMSIZE_SMALL
slot_flags = SLOT_MASK | SLOT_TIE
var/base_icon
var/open
diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm
index b3461b82c2..4cc9c03dd0 100644
--- a/code/modules/clothing/under/accessories/storage.dm
+++ b/code/modules/clothing/under/accessories/storage.dm
@@ -7,13 +7,13 @@
var/slots = 3
var/obj/item/weapon/storage/internal/hold
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
/obj/item/clothing/accessory/storage/New()
..()
hold = new/obj/item/weapon/storage/internal(src)
hold.max_storage_space = slots * 2
- hold.max_w_class = 2
+ hold.max_w_class = ITEMSIZE_SMALL
/obj/item/clothing/accessory/storage/attack_hand(mob/user as mob)
if (has_suit) //if we are part of a suit
@@ -97,7 +97,7 @@
/obj/item/clothing/accessory/storage/knifeharness/New()
..()
- hold.max_storage_space = 4
+ hold.max_storage_space = ITEMSIZE_COST_SMALL * 2
hold.can_hold = list(/obj/item/weapon/material/hatchet/unathiknife,\
/obj/item/weapon/material/kitchen/utensil/knife,\
/obj/item/weapon/material/kitchen/utensil/knife/plastic,\
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 4b22d93877..b57cb41cf1 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -102,7 +102,7 @@
name = "\improper NASA jumpsuit"
desc = "It has a NASA logo on it and is made of space-proofed materials."
icon_state = "black"
- w_class = 4//bulky item
+ w_class = ITEMSIZE_LARGE//bulky item
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
diff --git a/code/modules/detectivework/forensics.dm b/code/modules/detectivework/forensics.dm
index 27e2231d24..7bb68feb34 100644
--- a/code/modules/detectivework/forensics.dm
+++ b/code/modules/detectivework/forensics.dm
@@ -1,6 +1,6 @@
/obj/item/weapon/forensics
icon = 'icons/obj/forensics.dmi'
- w_class = 1
+ w_class = ITEMSIZE_TINY
//This is the output of the stringpercent(print) proc, and means about 80% of
//the print must be there for it to be complete. (Prints are 32 digits)
diff --git a/code/modules/detectivework/tools/evidencebag.dm b/code/modules/detectivework/tools/evidencebag.dm
index 9e2c490300..806d7ad34a 100644
--- a/code/modules/detectivework/tools/evidencebag.dm
+++ b/code/modules/detectivework/tools/evidencebag.dm
@@ -6,7 +6,7 @@
icon = 'icons/obj/storage.dmi'
icon_state = "evidenceobj"
item_state = null
- w_class = 2
+ w_class = ITEMSIZE_SMALL
var/obj/item/stored_item = null
/obj/item/weapon/evidencebag/MouseDrop(var/obj/item/I as obj)
diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm
index b16c03f0ef..57af12525d 100644
--- a/code/modules/detectivework/tools/rag.dm
+++ b/code/modules/detectivework/tools/rag.dm
@@ -16,7 +16,7 @@
/obj/item/weapon/reagent_containers/glass/rag
name = "rag"
desc = "For cleaning up messes, you suppose."
- w_class = 1
+ w_class = ITEMSIZE_TINY
icon = 'icons/obj/toy.dmi'
icon_state = "rag"
amount_per_transfer_from_this = 5
diff --git a/code/modules/detectivework/tools/sample_kits.dm b/code/modules/detectivework/tools/sample_kits.dm
index fa5c7312a8..33931e87f9 100644
--- a/code/modules/detectivework/tools/sample_kits.dm
+++ b/code/modules/detectivework/tools/sample_kits.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/sample
name = "forensic sample"
icon = 'icons/obj/forensics.dmi'
- w_class = 1
+ w_class = ITEMSIZE_TINY
var/list/evidence = list()
/obj/item/weapon/sample/New(var/newloc, var/atom/supplied)
@@ -125,7 +125,7 @@
name = "fiber collection kit"
desc = "A magnifying glass and tweezers. Used to lift suit fibers."
icon_state = "m_glass"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
var/evidence_type = "fiber"
var/evidence_path = /obj/item/weapon/sample/fibers
diff --git a/code/modules/detectivework/tools/uvlight.dm b/code/modules/detectivework/tools/uvlight.dm
index 40b8e87326..6997e3a04a 100644
--- a/code/modules/detectivework/tools/uvlight.dm
+++ b/code/modules/detectivework/tools/uvlight.dm
@@ -3,7 +3,7 @@
desc = "A small handheld black light."
icon_state = "uv_off"
slot_flags = SLOT_BELT
- w_class = 2
+ w_class = ITEMSIZE_SMALL
item_state = "electronic"
action_button_name = "Toggle UV light"
matter = list(DEFAULT_WALL_MATERIAL = 150)
diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm
index 1229cee322..5d5790758a 100644
--- a/code/modules/economy/cash.dm
+++ b/code/modules/economy/cash.dm
@@ -11,7 +11,7 @@
throwforce = 1.0
throw_speed = 1
throw_range = 2
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
var/access = list()
access = access_crate_cash
var/worth = 0
diff --git a/code/modules/economy/retail_scanner.dm b/code/modules/economy/retail_scanner.dm
index 4ddf058de2..7117172af8 100644
--- a/code/modules/economy/retail_scanner.dm
+++ b/code/modules/economy/retail_scanner.dm
@@ -6,7 +6,7 @@
flags = NOBLUDGEON|CONDUCT
slot_flags = SLOT_BELT
req_access = list(access_heads)
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_MATERIAL = 1)
var/locked = 1
diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index 42bd4b709b..0eba340761 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -4,7 +4,7 @@
var/back_icon = "card_back"
/obj/item/weapon/deck
- w_class = 2
+ w_class = ITEMSIZE_SMALL
icon = 'icons/obj/playing_cards.dmi'
var/list/cards = list()
@@ -180,7 +180,7 @@
icon_state = "card_pack"
icon = 'icons/obj/playing_cards.dmi'
- w_class = 1
+ w_class = ITEMSIZE_TINY
var/list/cards = list()
@@ -201,7 +201,7 @@
desc = "Some playing cards."
icon = 'icons/obj/playing_cards.dmi'
icon_state = "empty"
- w_class = 1
+ w_class = ITEMSIZE_TINY
var/concealed = 0
var/list/cards = list()
diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm
index 69077aad84..a6273a7423 100644
--- a/code/modules/holodeck/HolodeckObjects.dm
+++ b/code/modules/holodeck/HolodeckObjects.dm
@@ -247,7 +247,7 @@
throw_speed = 1
throw_range = 5
throwforce = 0
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
flags = NOBLOODY
var/active = 0
var/item_color
@@ -263,7 +263,7 @@
/obj/item/weapon/holo/esword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
if(active && default_parry_check(user, attacker, damage_source) && prob(50))
user.visible_message("\The [user] parries [attack_text] with \the [src]!")
-
+
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, user.loc)
spark_system.start()
@@ -279,13 +279,13 @@
if (active)
force = 30
icon_state = "sword[item_color]"
- w_class = 4
+ w_class = ITEMSIZE_LARGE
playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
user << "[src] is now active."
else
force = 3
icon_state = "sword0"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
user << "[src] can now be concealed."
@@ -304,7 +304,7 @@
icon_state = "basketball"
name = "basketball"
desc = "Here's your chance, do your dance at the Space Jam."
- w_class = 4 //Stops people from hiding it in their bags/pockets
+ w_class = ITEMSIZE_LARGE //Stops people from hiding it in their bags/pockets
/obj/structure/holohoop
name = "basketball hoop"
diff --git a/code/modules/hydroponics/beekeeping/beehive.dm b/code/modules/hydroponics/beekeeping/beehive.dm
index 5cd5458b4a..27487a4e1f 100644
--- a/code/modules/hydroponics/beekeeping/beehive.dm
+++ b/code/modules/hydroponics/beekeeping/beehive.dm
@@ -198,14 +198,14 @@
desc = "A device used to calm down bees before harvesting honey."
icon = 'icons/obj/device.dmi'
icon_state = "battererburnt"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
/obj/item/honey_frame
name = "beehive frame"
desc = "A frame for the beehive that the bees will fill with honeycombs."
icon = 'icons/obj/beekeeping.dmi'
icon_state = "honeyframe"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
var/honey = 0
diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm
index 1c823ef61b..88fd37c466 100644
--- a/code/modules/hydroponics/grown_inedible.dm
+++ b/code/modules/hydroponics/grown_inedible.dm
@@ -37,7 +37,7 @@
desc = "A reminder of meals gone by."
icon = 'icons/obj/trash.dmi'
icon_state = "corncob"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throwforce = 0
throw_speed = 4
throw_range = 20
@@ -55,7 +55,7 @@
desc = "A peel from a banana."
icon = 'icons/obj/items.dmi'
icon_state = "banana_peel"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throwforce = 0
throw_speed = 4
throw_range = 20
diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm
index 015ab88ccb..1479ffdc5c 100644
--- a/code/modules/hydroponics/seed_machines.dm
+++ b/code/modules/hydroponics/seed_machines.dm
@@ -3,7 +3,7 @@
desc = "A small disk used for carrying data on plant genetics."
icon = 'icons/obj/hydroponics_machines.dmi'
icon_state = "disk"
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
var/list/genes = list()
var/genesource = "unknown"
diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm
index 7c1b70c4c7..544ba9046b 100644
--- a/code/modules/hydroponics/seed_packets.dm
+++ b/code/modules/hydroponics/seed_packets.dm
@@ -5,7 +5,7 @@ var/global/list/plant_seed_sprites = list()
name = "packet of seeds"
icon = 'icons/obj/seeds.dmi'
icon_state = "blank"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
var/seed_type
var/datum/seed/seed
diff --git a/code/modules/hydroponics/trays/tray_reagents.dm b/code/modules/hydroponics/trays/tray_reagents.dm
index 1ab73542b0..a9c7f600c6 100644
--- a/code/modules/hydroponics/trays/tray_reagents.dm
+++ b/code/modules/hydroponics/trays/tray_reagents.dm
@@ -4,7 +4,7 @@
flags = NOBLUDGEON
slot_flags = SLOT_BELT
throwforce = 4
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throw_speed = 2
throw_range = 10
var/toxicity = 4
diff --git a/code/modules/integrated_electronics/_defines.dm b/code/modules/integrated_electronics/_defines.dm
index 97acfd2c98..702ae47fc0 100644
--- a/code/modules/integrated_electronics/_defines.dm
+++ b/code/modules/integrated_electronics/_defines.dm
@@ -6,7 +6,7 @@
desc = "It's a tiny chip! This one doesn't seem to do much, however."
icon = 'icons/obj/electronic_assemblies.dmi'
icon_state = "template"
- w_class = 1
+ w_class = ITEMSIZE_TINY
var/extended_desc = null
var/list/inputs = list()
var/list/outputs = list()
diff --git a/code/modules/integrated_electronics/assemblies.dm b/code/modules/integrated_electronics/assemblies.dm
index f9037e60e7..5efbca4003 100644
--- a/code/modules/integrated_electronics/assemblies.dm
+++ b/code/modules/integrated_electronics/assemblies.dm
@@ -1,7 +1,7 @@
/obj/item/device/electronic_assembly
name = "electronic assembly"
desc = "It's a case, for building electronics with."
- w_class = 2
+ w_class = ITEMSIZE_SMALL
icon = 'icons/obj/electronic_assemblies.dmi'
icon_state = "setup_small"
var/max_components = 10
@@ -11,21 +11,21 @@
/obj/item/device/electronic_assembly/medium
name = "electronic mechanism"
icon_state = "setup_medium"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
max_components = 20
max_complexity = 80
/obj/item/device/electronic_assembly/large
name = "electronic machine"
icon_state = "setup_large"
- w_class = 4
+ w_class = ITEMSIZE_LARGE
max_components = 30
max_complexity = 120
/obj/item/device/electronic_assembly/drone
name = "electronic drone"
icon_state = "setup_drone"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
max_components = 25
max_complexity = 100
diff --git a/code/modules/integrated_electronics/tools.dm b/code/modules/integrated_electronics/tools.dm
index 75609ca59c..5826068b9e 100644
--- a/code/modules/integrated_electronics/tools.dm
+++ b/code/modules/integrated_electronics/tools.dm
@@ -12,7 +12,7 @@
icon = 'icons/obj/electronic_assemblies.dmi'
icon_state = "wirer-wire"
flags = CONDUCT
- w_class = 2
+ w_class = ITEMSIZE_SMALL
var/datum/integrated_io/selected_io = null
var/mode = WIRE
@@ -111,7 +111,7 @@
icon = 'icons/obj/electronic_assemblies.dmi'
icon_state = "debugger"
flags = CONDUCT
- w_class = 2
+ w_class = ITEMSIZE_SMALL
var/data_to_write = null
var/accepting_refs = 0
@@ -162,10 +162,10 @@
desc = "This kit's essential for any circuitry projects."
icon = 'icons/obj/electronic_assemblies.dmi'
icon_state = "circuit_kit"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
storage_slots = 200
- max_storage_space = 400
- max_w_class = 3
+ max_storage_space = ITEMSIZE_COST_NORMAL * 100
+ max_w_class = ITEMSIZE_NORMAL
display_contents_with_number = 1
can_hold = list(/obj/item/integrated_circuit, /obj/item/device/integrated_electronics, /obj/item/device/electronic_assembly,
/obj/item/weapon/screwdriver, /obj/item/weapon/crowbar)
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index ba96ada8b7..859c63261d 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -140,7 +140,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 = ITEMSIZE_NORMAL //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever)
attack_verb = list("bashed", "whacked", "educated")
var/dat // Actual page content
var/due_date = 0 // Game time in 1/10th seconds
@@ -268,7 +268,7 @@
icon_state ="scanner"
throw_speed = 1
throw_range = 5
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
var/obj/machinery/librarycomp/computer // Associated computer - Modes 1 to 3 use this
var/obj/item/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/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm
index aab806aa7c..57365f4367 100644
--- a/code/modules/materials/material_sheets.dm
+++ b/code/modules/materials/material_sheets.dm
@@ -2,7 +2,7 @@
/obj/item/stack/material
force = 5.0
throwforce = 5
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
throw_speed = 3
throw_range = 3
max_amount = 50
@@ -288,4 +288,4 @@
default_type = "reinforced borosilicate glass"
/obj/item/stack/material/glass/phoronrglass/fifty
- amount = 50
+ amount = 50
diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm
index 7491bf668d..10c8855b7e 100644
--- a/code/modules/mining/coins.dm
+++ b/code/modules/mining/coins.dm
@@ -7,7 +7,7 @@
flags = CONDUCT
force = 0.0
throwforce = 0.0
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
var/string_attached
var/sides = 2
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index ea69670885..00ec3d68ca 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -48,7 +48,7 @@
throwforce = 4.0
icon_state = "pickaxe"
item_state = "jackhammer"
- w_class = 4.0
+ w_class = ITEMSIZE_LARGE
matter = list(DEFAULT_WALL_MATERIAL = 3750)
var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
@@ -103,7 +103,7 @@
name = "plasma cutter"
icon_state = "plasmacutter"
item_state = "gun"
- w_class = 3.0 //it is smaller than the pickaxe
+ w_class = ITEMSIZE_NORMAL //it is smaller than the pickaxe
damtype = "fire"
digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/ light thermite on fire
origin_tech = list(TECH_MATERIAL = 4, TECH_PHORON = 3, TECH_ENGINEERING = 3)
@@ -151,7 +151,7 @@
force = 8.0
throwforce = 4.0
item_state = "shovel"
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
matter = list(DEFAULT_WALL_MATERIAL = 50)
attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
@@ -165,7 +165,7 @@
item_state = "spade"
force = 5.0
throwforce = 7.0
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
/**********************Mining car (Crate like thing, not the rail car)**************************/
diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm
index 7409859af2..9884349be9 100644
--- a/code/modules/mining/money_bag.dm
+++ b/code/modules/mining/money_bag.dm
@@ -7,7 +7,7 @@
flags = CONDUCT
force = 10.0
throwforce = 2.0
- w_class = 4.0
+ w_class = ITEMSIZE_LARGE
/obj/item/weapon/moneybag/attack_hand(user as mob)
var/amt_gold = 0
diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm
index 1f78c7ce77..128dc17332 100644
--- a/code/modules/mining/ore.dm
+++ b/code/modules/mining/ore.dm
@@ -2,7 +2,7 @@
name = "small rock"
icon = 'icons/obj/mining.dmi'
icon_state = "ore2"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
var/datum/geosample/geologic_data
var/material
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 5e4bfeb24a..51f291fa74 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -94,7 +94,7 @@ var/list/holder_mob_icon_cache = list()
origin_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 5)
/obj/item/weapon/holder/mouse
- w_class = 1
+ w_class = ITEMSIZE_TINY
/obj/item/weapon/holder/borer
origin_tech = list(TECH_BIO = 6)
diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm
index a6fc34f738..779d912cf3 100644
--- a/code/modules/mob/living/bot/cleanbot.dm
+++ b/code/modules/mob/living/bot/cleanbot.dm
@@ -177,7 +177,7 @@
throwforce = 10.0
throw_speed = 2
throw_range = 5
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
var/created_name = "Cleanbot"
/obj/item/weapon/bucket_sensor/attackby(var/obj/item/W, var/mob/user)
diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm
index 905c53a20a..5f49794d8b 100644
--- a/code/modules/mob/living/bot/farmbot.dm
+++ b/code/modules/mob/living/bot/farmbot.dm
@@ -313,7 +313,7 @@
var/build_step = 0
var/created_name = "Farmbot"
var/obj/tank
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
/obj/item/weapon/farmbot_arm_assembly/New(var/newloc, var/theTank)
diff --git a/code/modules/mob/living/bot/floorbot.dm b/code/modules/mob/living/bot/floorbot.dm
index ca4f572775..2259515941 100644
--- a/code/modules/mob/living/bot/floorbot.dm
+++ b/code/modules/mob/living/bot/floorbot.dm
@@ -304,7 +304,7 @@
throwforce = 10.0
throw_speed = 2
throw_range = 5
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
var/created_name = "Floorbot"
/obj/item/weapon/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob)
@@ -334,7 +334,7 @@
throwforce = 10.0
throw_speed = 2
throw_range = 5
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
var/created_name = "Floorbot"
/obj/item/weapon/toolbox_tiles_sensor/attackby(var/obj/item/W, mob/user as mob)
diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm
index fffe5879fa..baf6af9eba 100644
--- a/code/modules/mob/living/bot/medbot.dm
+++ b/code/modules/mob/living/bot/medbot.dm
@@ -317,7 +317,7 @@
var/build_step = 0
var/created_name = "Medibot" //To preserve the name if it's a unique medbot I guess
var/skin = null //Same as medbot, set to tox or ointment for the respective kits.
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
/obj/item/weapon/firstaid_arm_assembly/New()
..()
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index 5fe2255803..3f0fa31708 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -22,7 +22,7 @@
desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity."
icon = 'icons/obj/assemblies.dmi'
icon_state = "mmi_empty"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_BIO = 3)
req_access = list(access_robotics)
diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm
index 11e3b1197a..973e55a48b 100644
--- a/code/modules/mob/living/carbon/brain/brain_item.dm
+++ b/code/modules/mob/living/carbon/brain/brain_item.dm
@@ -7,7 +7,7 @@
vital = 1
icon_state = "brain2"
force = 1.0
- w_class = 2.0
+ w_class = ITEMSIZE_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 c61659261d..057c24bdcc 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 = ITEMSIZE_NORMAL
origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2, TECH_DATA = 4)
var/searching = 0
diff --git a/code/modules/mob/living/carbon/brain/robot.dm b/code/modules/mob/living/carbon/brain/robot.dm
index d44779c520..d870751dc1 100644
--- a/code/modules/mob/living/carbon/brain/robot.dm
+++ b/code/modules/mob/living/carbon/brain/robot.dm
@@ -3,7 +3,7 @@
desc = "The pinnacle of artifical intelligence which can be achieved using classical computer science."
icon = 'icons/obj/module.dmi'
icon_state = "mainboard"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 3, TECH_DATA = 4)
/obj/item/device/mmi/digital/robot/New()
diff --git a/code/modules/mob/living/carbon/metroid/items.dm b/code/modules/mob/living/carbon/metroid/items.dm
index 15455f375e..c59c6826d5 100644
--- a/code/modules/mob/living/carbon/metroid/items.dm
+++ b/code/modules/mob/living/carbon/metroid/items.dm
@@ -4,7 +4,7 @@
icon = 'icons/mob/slimes.dmi'
icon_state = "grey slime extract"
force = 1.0
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
throwforce = 0
throw_speed = 3
throw_range = 6
@@ -292,7 +292,7 @@
icon = 'icons/mob/slimes.dmi'
icon_state = "slime extract"
force = 1.0
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
throwforce = 1.0
throw_speed = 2
throw_range = 6
diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm
index 9881948b1b..671f61e29c 100644
--- a/code/modules/mob/living/silicon/robot/analyzer.dm
+++ b/code/modules/mob/living/silicon/robot/analyzer.dm
@@ -9,7 +9,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 3
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throw_speed = 5
throw_range = 10
origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 1, TECH_ENGINEERING = 2)
diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm
index e5b8ff3de2..6e5616e7b4 100644
--- a/code/modules/mob/living/silicon/robot/robot_items.dm
+++ b/code/modules/mob/living/silicon/robot/robot_items.dm
@@ -152,9 +152,9 @@
if( I != src && !I.anchored && !istype(I, /obj/item/clothing/under) && !istype(I, /obj/item/clothing/suit) && !istype(I, /obj/item/projectile) )
var/add = 0
- if(I.w_class == 1.0)
+ if(I.w_class == ITEMSIZE_TINY)
add = 1
- else if(I.w_class == 2.0)
+ else if(I.w_class == ITEMSIZE_SMALL)
add = 3
else
add = 5
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index c1ca5732b5..879f3f4cc5 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -17,7 +17,7 @@ var/global/list/robot_modules = list(
name = "robot module"
icon = 'icons/obj/module.dmi'
icon_state = "std_module"
- w_class = 100.0
+ w_class = ITEMSIZE_NO_CONTAINER
item_state = "electronic"
flags = CONDUCT
var/hide_on_manifest = 0
diff --git a/code/modules/mob/living/simple_animal/constructs/soulstone.dm b/code/modules/mob/living/simple_animal/constructs/soulstone.dm
index 54fd738279..08160f257f 100644
--- a/code/modules/mob/living/simple_animal/constructs/soulstone.dm
+++ b/code/modules/mob/living/simple_animal/constructs/soulstone.dm
@@ -7,7 +7,7 @@
icon_state = "soulstone"
item_state = "electronic"
desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefacts power."
- w_class = 2
+ w_class = ITEMSIZE_SMALL
slot_flags = SLOT_BELT
origin_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 4)
var/imprinted = "empty"
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index e40b14dffd..fde9d03711 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -34,7 +34,7 @@
layer = 21
abstract = 1
item_state = "nothing"
- w_class = 5.0
+ w_class = ITEMSIZE_HUGE
/obj/item/weapon/grab/New(mob/user, mob/victim)
diff --git a/code/modules/organs/subtypes/diona.dm b/code/modules/organs/subtypes/diona.dm
index 7f371066bb..4ae5e964ac 100644
--- a/code/modules/organs/subtypes/diona.dm
+++ b/code/modules/organs/subtypes/diona.dm
@@ -30,7 +30,7 @@
icon_name = "torso"
max_damage = 200
min_broken_damage = 50
- w_class = 5
+ w_class = ITEMSIZE_HUGE
body_part = UPPER_TORSO
vital = 1
cannot_amputate = 1
@@ -43,7 +43,7 @@
icon_name = "groin"
max_damage = 100
min_broken_damage = 50
- w_class = 4
+ w_class = ITEMSIZE_LARGE
body_part = LOWER_TORSO
parent_organ = BP_TORSO
gendered_icon = 1
@@ -54,7 +54,7 @@
icon_name = "l_arm"
max_damage = 50
min_broken_damage = 20
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
body_part = ARM_LEFT
parent_organ = BP_TORSO
can_grasp = 1
@@ -71,7 +71,7 @@
icon_name = "l_leg"
max_damage = 50
min_broken_damage = 20
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
body_part = LEG_LEFT
icon_position = LEFT
parent_organ = BP_GROIN
@@ -90,7 +90,7 @@
icon_name = "l_foot"
max_damage = 35
min_broken_damage = 10
- w_class = 2
+ w_class = ITEMSIZE_SMALL
body_part = FOOT_LEFT
icon_position = LEFT
parent_organ = "l_leg"
@@ -112,7 +112,7 @@
icon_name = "l_hand"
max_damage = 40
min_broken_damage = 15
- w_class = 2
+ w_class = ITEMSIZE_SMALL
body_part = HAND_LEFT
parent_organ = "l_arm"
can_grasp = 1
diff --git a/code/modules/organs/subtypes/standard.dm b/code/modules/organs/subtypes/standard.dm
index 5b40922642..e0409fb16e 100644
--- a/code/modules/organs/subtypes/standard.dm
+++ b/code/modules/organs/subtypes/standard.dm
@@ -10,7 +10,7 @@
icon_name = "torso"
max_damage = 100
min_broken_damage = 35
- w_class = 5
+ w_class = ITEMSIZE_HUGE
body_part = UPPER_TORSO
vital = 1
amputation_point = "spine"
@@ -34,7 +34,7 @@
icon_name = "groin"
max_damage = 100
min_broken_damage = 35
- w_class = 4
+ w_class = ITEMSIZE_LARGE
body_part = LOWER_TORSO
vital = 1
parent_organ = BP_TORSO
@@ -51,7 +51,7 @@
icon_name = "l_arm"
max_damage = 80
min_broken_damage = 30
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
body_part = ARM_LEFT
parent_organ = BP_TORSO
joint = "left elbow"
@@ -72,7 +72,7 @@
icon_name = "l_leg"
max_damage = 80
min_broken_damage = 30
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
body_part = LEG_LEFT
icon_position = LEFT
parent_organ = BP_GROIN
@@ -95,7 +95,7 @@
icon_name = "l_foot"
max_damage = 50
min_broken_damage = 15
- w_class = 2
+ w_class = ITEMSIZE_SMALL
body_part = FOOT_LEFT
icon_position = LEFT
parent_organ = "l_leg"
@@ -124,7 +124,7 @@
icon_name = "l_hand"
max_damage = 50
min_broken_damage = 15
- w_class = 2
+ w_class = ITEMSIZE_SMALL
body_part = HAND_LEFT
parent_organ = "l_arm"
joint = "left wrist"
@@ -154,7 +154,7 @@
slot_flags = SLOT_BELT
max_damage = 75
min_broken_damage = 35
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
body_part = HEAD
vital = 1
parent_organ = BP_TORSO
diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
index 891fd809fe..ccb527986f 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -4,7 +4,7 @@
icon_state = "clipboard"
item_state = "clipboard"
throwforce = 0
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throw_speed = 3
throw_range = 10
var/obj/item/weapon/pen/haspen //The stored pen.
@@ -43,7 +43,7 @@
return
/obj/item/weapon/clipboard/attackby(obj/item/weapon/W as obj, mob/user as mob)
-
+
if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/photo))
user.drop_item()
W.loc = src
@@ -106,20 +106,20 @@
else if(href_list["write"])
var/obj/item/weapon/P = locate(href_list["write"])
-
+
if(P && (P.loc == src) && istype(P, /obj/item/weapon/paper) && (P == toppaper) )
-
+
var/obj/item/I = usr.get_active_hand()
-
+
if(istype(I, /obj/item/weapon/pen))
-
+
P.attackby(I, usr)
else if(href_list["remove"])
var/obj/item/P = locate(href_list["remove"])
-
+
if(P && (P.loc == src) && (istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/photo)) )
-
+
P.loc = usr.loc
usr.put_in_hands(P)
if(P == toppaper)
@@ -129,24 +129,24 @@
toppaper = newtop
else
toppaper = null
-
+
else if(href_list["rename"])
var/obj/item/weapon/O = locate(href_list["rename"])
-
+
if(O && (O.loc == src))
if(istype(O, /obj/item/weapon/paper))
var/obj/item/weapon/paper/to_rename = O
to_rename.rename()
-
+
else if(istype(O, /obj/item/weapon/photo))
var/obj/item/weapon/photo/to_rename = O
to_rename.rename()
else if(href_list["read"])
var/obj/item/weapon/paper/P = locate(href_list["read"])
-
+
if(P && (P.loc == src) && istype(P, /obj/item/weapon/paper) )
-
+
if(!(istype(usr, /mob/living/carbon/human) || istype(usr, /mob/observer/dead) || istype(usr, /mob/living/silicon)))
usr << browse("[P.name][stars(P.info)][P.stamps]", "window=[P.name]")
onclose(usr, "[P.name]")
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index b6450b4455..2c967ba62c 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -3,7 +3,7 @@
desc = "A folder."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "folder"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
pressure_resistance = 2
/obj/item/weapon/folder/blue
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index d290c07382..f78ab08687 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 = ITEMSIZE_TINY
throw_range = 1
throw_speed = 1
layer = 4
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index 53110bed0f..350aab3414 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -5,7 +5,7 @@
icon_state = "paper"
item_state = "paper"
throwforce = 0
- w_class = 2
+ w_class = ITEMSIZE_SMALL
throw_range = 2
throw_speed = 1
layer = 4
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index a2a1273ced..f6d192276f 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -8,7 +8,7 @@
)
item_state = "sheet-metal"
throwforce = 1
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
throw_speed = 3
throw_range = 7
pressure_resistance = 10
diff --git a/code/modules/paperwork/papershredder.dm b/code/modules/paperwork/papershredder.dm
index 37cfdaa86b..48e95071c5 100644
--- a/code/modules/paperwork/papershredder.dm
+++ b/code/modules/paperwork/papershredder.dm
@@ -128,7 +128,7 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "shredp"
throwforce = 0
- w_class = 1
+ w_class = ITEMSIZE_TINY
throw_range = 3
throw_speed = 1
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 7ee79cb923..c36ec736ae 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.0
+ w_class = ITEMSIZE_TINY
throw_speed = 7
throw_range = 15
matter = list(DEFAULT_WALL_MATERIAL = 10)
@@ -184,7 +184,7 @@
desc = "A colourful crayon. Please refrain from eating it or putting it in your nose."
icon = 'icons/obj/crayons.dmi'
icon_state = "crayonred"
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
attack_verb = list("attacked", "coloured")
colour = "#FF0000" //RGB
var/shadeColour = "#220000" //RGB
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 0df6b30432..bbaec17318 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 = "camera"
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
/********
@@ -28,7 +28,7 @@ var/global/photo_count = 0
icon = 'icons/obj/items.dmi'
icon_state = "photo"
item_state = "paper"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
var/id
var/icon/img //Big photo image
var/scribble //Scribble on the back.
@@ -121,7 +121,7 @@ var/global/photo_count = 0
desc = "A polaroid camera. 10 photos left."
icon_state = "camera"
item_state = "camera"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
flags = CONDUCT
slot_flags = SLOT_BELT
matter = list(DEFAULT_WALL_MATERIAL = 2000)
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index 59f0dd67b2..e64bb7b13f 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -5,7 +5,7 @@
icon_state = "stamp-qm"
item_state = "stamp"
throwforce = 0
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
throw_speed = 7
throw_range = 15
matter = list(DEFAULT_WALL_MATERIAL = 60)
diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm
index 4f89687fb4..809a0750b0 100644
--- a/code/modules/power/antimatter/shielding.dm
+++ b/code/modules/power/antimatter/shielding.dm
@@ -191,7 +191,7 @@ proc/cardinalrange(var/center)
icon = 'icons/obj/machines/antimatter.dmi'
icon_state = "box"
item_state = "electronic"
- w_class = 4.0
+ w_class = ITEMSIZE_LARGE
flags = CONDUCT
throwforce = 5
throw_speed = 1
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 4d75a99cf7..c837f502dd 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -488,7 +488,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
color = COLOR_RED
desc = "A coil of power cable."
throwforce = 10
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throw_speed = 2
throw_range = 5
matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20)
@@ -570,9 +570,9 @@ obj/structure/cable/proc/cableColor(var/colorC)
/obj/item/stack/cable_coil/proc/update_wclass()
if(amount == 1)
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
else
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
/obj/item/stack/cable_coil/examine(mob/user)
if(get_dist(src, user) > 1)
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 2d736804d5..e36f00c027 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -702,7 +702,7 @@
icon = 'icons/obj/lighting.dmi'
force = 2
throwforce = 5
- w_class = 1
+ w_class = ITEMSIZE_TINY
var/status = 0 // LIGHT_OK, LIGHT_BURNED or LIGHT_BROKEN
var/base_state
var/switchcount = 0 // number of times switched
@@ -723,7 +723,7 @@
brightness_power = 3
/obj/item/weapon/light/tube/large
- w_class = 2
+ w_class = ITEMSIZE_SMALL
name = "large light tube"
brightness_range = 15
brightness_power = 4
@@ -827,4 +827,4 @@
desc = "A lamp shade for a lamp."
icon = 'icons/obj/lighting.dmi'
icon_state = "lampshade"
- w_class = 1
\ No newline at end of file
+ w_class = ITEMSIZE_TINY
\ No newline at end of file
diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm
index 0ce32da396..2f0fe9419d 100644
--- a/code/modules/power/smes_construction.dm
+++ b/code/modules/power/smes_construction.dm
@@ -11,7 +11,7 @@
desc = "Standard superconductive magnetic coil with average capacity and I/O rating."
icon = 'icons/obj/stock_parts.dmi'
icon_state = "smes_coil" // Just few icons patched together. If someone wants to make better icon, feel free to do so!
- w_class = 4.0 // It's LARGE (backpack size)
+ w_class = ITEMSIZE_LARGE // It's LARGE (backpack size)
var/ChargeCapacity = 6000000 // 100 kWh
var/IOCapacity = 250000 // 250 kW
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index cbb974e2e6..f580457835 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -207,7 +207,7 @@ var/list/solars_list = list()
icon = 'icons/obj/power.dmi'
icon_state = "sp_base"
item_state = "camera"
- w_class = 4 // Pretty big!
+ w_class = ITEMSIZE_LARGE // Pretty big!
anchored = 0
var/tracker = 0
var/glass_type = null
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
index 34e20d499c..b06ed2aaf1 100644
--- a/code/modules/power/tracker.dm
+++ b/code/modules/power/tracker.dm
@@ -80,4 +80,4 @@
name = "tracker electronics"
icon = 'icons/obj/doors/door_assembly.dmi'
icon_state = "door_electronics"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 930cc54d82..e142f31ca0 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -6,7 +6,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT | SLOT_EARS
throwforce = 1
- w_class = 1
+ w_class = ITEMSIZE_TINY
var/leaves_residue = 1
var/caliber = "" //Which kind of guns it can be loaded into
@@ -72,7 +72,7 @@
item_state = "syringe_kit"
matter = list(DEFAULT_WALL_MATERIAL = 500)
throwforce = 5
- w_class = 2
+ w_class = ITEMSIZE_SMALL
throw_speed = 4
throw_range = 10
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
index 993db0f27c..b1cb0964d1 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -81,7 +81,7 @@
/obj/item/ammo_magazine/tommydrum
name = "tommygun drum magazine (.45)"
icon_state = "tommy-drum"
- w_class = 3 // Bulky ammo doesn't fit in your pockets!
+ w_class = ITEMSIZE_NORMAL // Bulky ammo doesn't fit in your pockets!
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/c45
matter = list(DEFAULT_WALL_MATERIAL = 3750)
@@ -359,7 +359,7 @@
caliber = "a762"
matter = list(DEFAULT_WALL_MATERIAL = 10000)
ammo_type = /obj/item/ammo_casing/a762
- w_class = 3 // This should NOT fit in your pocket!!
+ w_class = ITEMSIZE_NORMAL // This should NOT fit in your pocket!!
max_ammo = 50
multiple_sprites = 1
diff --git a/code/modules/projectiles/dnalocking.dm b/code/modules/projectiles/dnalocking.dm
index 394600fc61..e4ff374fc4 100644
--- a/code/modules/projectiles/dnalocking.dm
+++ b/code/modules/projectiles/dnalocking.dm
@@ -3,7 +3,7 @@
icon = 'icons/obj/ammo.dmi'
icon_state = "dnalockchip"
desc = "A state of the art technological chip that can be installed in a firearm. It allows the user to store their DNA and lock the gun's use from unwanted users."
- w_class = 1
+ w_class = ITEMSIZE_TINY
origin_tech = list(TECH_COMBAT = 4, TECH_DATA = 4, TECH_BIO = 4)
var/list/stored_dna = list() //list of the dna stored in the gun, used to allow users to use it or not
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 01dfce8e8c..81c2f9fbf2 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -41,7 +41,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT|SLOT_HOLSTER
matter = list(DEFAULT_WALL_MATERIAL = 2000)
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
throwforce = 5
throw_speed = 4
throw_range = 5
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index cef84810bd..86bd1e5661 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -6,7 +6,7 @@
item_state = "laser"
fire_sound = 'sound/weapons/Laser.ogg'
slot_flags = SLOT_BELT|SLOT_BACK
- w_class = 4
+ w_class = ITEMSIZE_LARGE
force = 10
origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
matter = list(DEFAULT_WALL_MATERIAL = 2000)
@@ -41,7 +41,7 @@ obj/item/weapon/gun/energy/retro
desc = "An older model of the basic lasergun. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws."
fire_sound = 'sound/weapons/Laser.ogg'
slot_flags = SLOT_BELT
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
projectile_type = /obj/item/projectile/beam
fire_delay = 10 //old technology
@@ -53,7 +53,7 @@ obj/item/weapon/gun/energy/retro
force = 5
fire_sound = 'sound/weapons/Laser.ogg'
slot_flags = SLOT_BELT
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
projectile_type = /obj/item/projectile/beam
origin_tech = null
max_shots = 5 //to compensate a bit for self-recharging
@@ -71,7 +71,7 @@ obj/item/weapon/gun/energy/retro
projectile_type = /obj/item/projectile/beam/heavylaser/cannon
max_shots = 4
fire_delay = 20
- w_class = 4
+ w_class = ITEMSIZE_LARGE
// requires_two_hands = 1
one_handed_penalty = 6 // The thing's heavy and huge.
accuracy = 3
@@ -116,7 +116,7 @@ obj/item/weapon/gun/energy/retro
max_shots = 4
fire_delay = 35
force = 10
- w_class = 5 // So it can't fit in a backpack.
+ w_class = ITEMSIZE_HUGE // So it can't fit in a backpack.
accuracy = -3 //shooting at the hip
scoped_accuracy = 0
// requires_two_hands = 1
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 6819c1cd81..dca895e931 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -30,7 +30,7 @@
fire_sound = 'sound/weapons/Taser.ogg'
max_shots = 18
force = 8
- w_class = 4 //Probably gonna make it a rifle sooner or later
+ w_class = ITEMSIZE_LARGE //Probably gonna make it a rifle sooner or later
fire_delay = 6
projectile_type = /obj/item/projectile/beam/stun/weak
@@ -54,7 +54,7 @@
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_POWER = 3)
slot_flags = SLOT_BELT
force = 8 //looks heavier than a pistol
- w_class = 4 //Looks bigger than a pistol, too.
+ w_class = ITEMSIZE_LARGE //Looks bigger than a pistol, too.
fire_delay = 6 //This one's not a handgun, it should have the same fire delay as everything else
self_recharge = 1
modifystate = null
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 0c3822cced..9d0e664d2d 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -5,7 +5,7 @@
item_state = "ionrifle"
fire_sound = 'sound/weapons/Laser.ogg'
origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 4)
- w_class = 4
+ w_class = ITEMSIZE_LARGE
force = 10
flags = CONDUCT
slot_flags = SLOT_BACK
@@ -65,7 +65,7 @@
icon_state = "riotgun"
item_state = "c20r"
slot_flags = SLOT_BELT|SLOT_BACK
- w_class = 4
+ w_class = ITEMSIZE_LARGE
projectile_type = /obj/item/projectile/meteor
cell_type = /obj/item/weapon/cell/potato
self_recharge = 1
@@ -78,7 +78,7 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "pen"
item_state = "pen"
- w_class = 1
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_BELT
@@ -94,7 +94,7 @@
desc = "A specialized firearm designed to fire lethal bolts of phoron."
icon_state = "toxgun"
fire_sound = 'sound/effects/stealthoff.ogg'
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_COMBAT = 5, TECH_PHORON = 4)
projectile_type = /obj/item/projectile/energy/phoron
@@ -109,7 +109,7 @@
fire_sound = 'sound/weapons/emitter.ogg'
flags = CONDUCT
slot_flags = SLOT_BACK
- w_class = 4.0
+ w_class = ITEMSIZE_LARGE
max_shots = 5
projectile_type = /obj/item/projectile/change
origin_tech = null
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 20fa18b09e..97558d8e6a 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -33,7 +33,7 @@
name = "mini energy-crossbow"
desc = "A weapon favored by many mercenary stealth specialists."
icon_state = "crossbow"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
item_state = "crossbow"
origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 2, TECH_ILLEGAL = 5)
matter = list(DEFAULT_WALL_MATERIAL = 2000)
@@ -52,7 +52,7 @@
/obj/item/weapon/gun/energy/crossbow/largecrossbow
name = "energy crossbow"
desc = "A weapon favored by mercenary infiltration teams."
- w_class = 4
+ w_class = ITEMSIZE_LARGE
force = 10
matter = list(DEFAULT_WALL_MATERIAL = 200000)
projectile_type = /obj/item/projectile/energy/bolt/large
diff --git a/code/modules/projectiles/guns/launcher.dm b/code/modules/projectiles/guns/launcher.dm
index 8d5a9748f1..1c9a09e4e3 100644
--- a/code/modules/projectiles/guns/launcher.dm
+++ b/code/modules/projectiles/guns/launcher.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/gun/launcher
name = "launcher"
desc = "A device that launches things."
- w_class = 5.0
+ w_class = ITEMSIZE_HUGE
flags = CONDUCT
slot_flags = SLOT_BACK
diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm
index 407b70d20a..0fdad19238 100644
--- a/code/modules/projectiles/guns/launcher/crossbow.dm
+++ b/code/modules/projectiles/guns/launcher/crossbow.dm
@@ -7,7 +7,7 @@
icon_state = "bolt"
item_state = "bolt"
throwforce = 8
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
sharp = 1
edge = 0
@@ -20,7 +20,7 @@
sharp = 1
edge = 0
throwforce = 5
- w_class = 2
+ w_class = ITEMSIZE_SMALL
icon = 'icons/obj/weapons.dmi'
icon_state = "metal-rod"
item_state = "bolt"
diff --git a/code/modules/projectiles/guns/launcher/grenade_launcher.dm b/code/modules/projectiles/guns/launcher/grenade_launcher.dm
index 107330c13d..207572a8c6 100644
--- a/code/modules/projectiles/guns/launcher/grenade_launcher.dm
+++ b/code/modules/projectiles/guns/launcher/grenade_launcher.dm
@@ -3,7 +3,7 @@
desc = "A bulky pump-action grenade launcher. Holds up to 6 grenades in a revolving magazine."
icon_state = "riotgun"
item_state = "riotgun"
- w_class = 4
+ w_class = ITEMSIZE_LARGE
force = 10
fire_sound = 'sound/weapons/empty.ogg'
@@ -94,7 +94,7 @@
/obj/item/weapon/gun/launcher/grenade/underslung
name = "underslung grenade launcher"
desc = "Not much more than a tube and a firing mechanism, this grenade launcher is designed to be fitted to a rifle."
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
force = 5
max_grenades = 0
diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm
index 5463fe26f0..422515de14 100644
--- a/code/modules/projectiles/guns/launcher/pneumatic.dm
+++ b/code/modules/projectiles/guns/launcher/pneumatic.dm
@@ -4,15 +4,15 @@
icon_state = "pneumatic"
item_state = "pneumatic"
slot_flags = SLOT_BELT
- w_class = 5.0
+ w_class = ITEMSIZE_HUGE
flags = CONDUCT
fire_sound_text = "a loud whoosh of moving air"
fire_delay = 50
fire_sound = 'sound/weapons/tablehit1.ogg'
var/fire_pressure // Used in fire checks/pressure checks.
- var/max_w_class = 3 // Hopper intake size.
- var/max_storage_space = 20 // Total internal storage size.
+ var/max_w_class = ITEMSIZE_NORMAL // Hopper intake size.
+ var/max_storage_space = ITEMSIZE_COST_NORMAL * 5 // Total internal storage size.
var/obj/item/weapon/tank/tank = null // Tank of gas for use in firing the cannon.
var/obj/item/weapon/storage/item_storage
diff --git a/code/modules/projectiles/guns/launcher/rocket.dm b/code/modules/projectiles/guns/launcher/rocket.dm
index 300121aef7..438485320e 100644
--- a/code/modules/projectiles/guns/launcher/rocket.dm
+++ b/code/modules/projectiles/guns/launcher/rocket.dm
@@ -3,7 +3,7 @@
desc = "MAGGOT."
icon_state = "rocket"
item_state = "rocket"
- w_class = 4.0
+ w_class = ITEMSIZE_LARGE
throw_speed = 2
throw_range = 10
force = 5.0
diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm
index 3cbbd40f34..6b2c52a304 100644
--- a/code/modules/projectiles/guns/launcher/syringe_gun.dm
+++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm
@@ -9,7 +9,7 @@
slot_flags = SLOT_BELT | SLOT_EARS
throwforce = 3
force = 3
- w_class = 1
+ w_class = ITEMSIZE_TINY
var/obj/item/weapon/reagent_containers/syringe/syringe
/obj/item/weapon/syringe_cartridge/update_icon()
@@ -67,7 +67,7 @@
desc = "A spring loaded rifle designed to fit syringes, designed to incapacitate unruly patients from a distance."
icon_state = "syringegun"
item_state = "syringegun"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
force = 7
matter = list(DEFAULT_WALL_MATERIAL = 2000)
slot_flags = SLOT_BELT
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 93904387cd..2d3d034bf9 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -7,7 +7,7 @@
desc = "A gun that fires bullets."
icon_state = "revolver"
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
matter = list(DEFAULT_WALL_MATERIAL = 1000)
recoil = 1
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 2ed89336a9..6c00f9431a 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -2,7 +2,7 @@
name = "prototype SMG"
desc = "A protoype lightweight, fast firing gun. Uses 9mm rounds."
icon_state = "saber" //ugly
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
load_method = SPEEDLOADER //yup. until someone sprites a magazine for it.
max_shells = 22
caliber = "9mm"
@@ -26,7 +26,7 @@
desc = "The C-20r is a lightweight and rapid firing SMG, for when you REALLY need someone dead. Uses 10mm rounds. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
icon_state = "c20r"
item_state = "c20r"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
force = 10
caliber = "10mm"
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
@@ -54,7 +54,7 @@
desc = "The rugged STS-35 is a durable automatic weapon of a make popular on the frontier worlds. Uses 7.62mm rounds. This one is unmarked."
icon_state = "arifle"
item_state = null
- w_class = 4
+ w_class = ITEMSIZE_LARGE
force = 10
caliber = "a762"
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4)
@@ -84,7 +84,7 @@
desc = "The WT550 Saber is a cheap self-defense weapon mass-produced by Ward-Takahashi for paramilitary and private use. Uses 9mm rounds."
icon_state = "wt550"
item_state = "wt550"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
caliber = "9mm"
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)
slot_flags = SLOT_BELT
@@ -107,7 +107,7 @@
desc = "The Z8 Bulldog is an older model designated marksman rifle, made by the now defunct Zendai Foundries. Makes you feel like a space marine when you hold it, even though it can only hold 10 round magazines. Uses 5.56mm rounds and has an under barrel grenade launcher."
icon_state = "carbine" // This isn't a carbine. :T
item_state = "z8carbine"
- w_class = 4
+ w_class = ITEMSIZE_LARGE
force = 10
caliber = "a556"
origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 3)
@@ -177,7 +177,7 @@
desc = "A rather traditionally made L6 SAW with a pleasantly lacquered wooden pistol grip. Has 'Aussec Armoury- 2531' engraved on the reciever"
icon_state = "l6closed100"
item_state = "l6closed"
- w_class = 4
+ w_class = ITEMSIZE_LARGE
force = 10
slot_flags = 0
max_shells = 50
@@ -250,7 +250,7 @@
desc = "The AS-24 is a durable, rugged looking automatic weapon of a make popular on the frontier worlds. Uses 12 gauge shells. It is unmarked."
icon_state = "ashot"
item_state = null
- w_class = 4
+ w_class = ITEMSIZE_LARGE
force = 10
caliber = "shotgun"
fire_sound = 'sound/weapons/shotgun.ogg'
@@ -280,7 +280,7 @@
name = "\improper Uzi"
desc = "A lightweight, compact, fast firing gun, for when you want someone really dead. Uses .45 rounds."
icon_state = "mini-uzi"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
load_method = MAGAZINE
caliber = ".45"
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
@@ -304,7 +304,7 @@
desc = "The H90K is a compact, high capacity submachine gun produced by Hephaistos Industries. Despite its fierce reputation, it still manages to feel like a toy. Uses 9mm rounds."
icon_state = "p90smg"
item_state = "p90"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
caliber = "9mm"
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)
slot_flags = SLOT_BELT // ToDo: Belt sprite.
@@ -325,7 +325,7 @@
name = "\improper Tommygun"
desc = "This weapon was made famous by gangsters in the 20th century. Cybersun Industries is currently reproducing these for a target market of historic gun collectors and classy criminals. Uses .45 rounds."
icon_state = "tommygun"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
caliber = ".45"
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
slot_flags = SLOT_BELT // ToDo: Belt sprite.
@@ -348,7 +348,7 @@
desc = "The bullpup configured GP3000 is a lightweight, compact, military-grade assault rifle produced by Gurov Projectile Weapons LLC. It is sold almost exclusively to standing armies. The serial number on this one has been scratched off. Uses 5.56mm rounds."
icon_state = "bullpupm"
item_state = "bullpup"
- w_class = 4
+ w_class = ITEMSIZE_LARGE
force = 10
caliber = "a556"
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4)
diff --git a/code/modules/projectiles/guns/projectile/boltaction.dm b/code/modules/projectiles/guns/projectile/boltaction.dm
index 28da9997d2..3ff12364ef 100644
--- a/code/modules/projectiles/guns/projectile/boltaction.dm
+++ b/code/modules/projectiles/guns/projectile/boltaction.dm
@@ -39,7 +39,7 @@
return
if(do_after(user, 30))
icon_state = "obrez"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
recoil = 2 // Owch
accuracy = -1 // You know damn well why.
item_state = "gun"
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 08442fcb8c..fd46803c68 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -104,7 +104,7 @@
name = "silenced pistol"
desc = "A small, quiet, easily concealable gun. Uses .45 rounds."
icon_state = "silenced_pistol"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
caliber = ".45"
silenced = 1
fire_delay = 1
@@ -190,7 +190,7 @@
desc = "The Lumoco Arms P3 Whisper. A small, easily concealable gun. Uses 9mm rounds."
icon_state = "pistol"
item_state = null
- w_class = 2
+ w_class = ITEMSIZE_SMALL
caliber = "9mm"
silenced = 0
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 2)
@@ -212,7 +212,7 @@
user << "You unscrew [silenced] from [src]."
user.put_in_hands(silenced)
silenced = 0
- w_class = 2
+ w_class = ITEMSIZE_SMALL
update_icon()
return
..()
@@ -225,7 +225,7 @@
user.drop_item()
user << "You screw [I] onto [src]."
silenced = I //dodgy?
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
I.loc = src //put the silencer into the gun
update_icon()
return
@@ -243,7 +243,7 @@
desc = "a silencer"
icon = 'icons/obj/gun.dmi'
icon_state = "silencer"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
/obj/item/weapon/gun/projectile/pirate
name = "zip gun"
@@ -284,7 +284,7 @@
desc = "It's not size of your gun that matters, just the size of your load. Uses .357 rounds." //OHHH MYYY~
icon_state = "derringer"
item_state = "concealed"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 3)
handle_casings = CYCLE_CASINGS //player has to take the old casing out manually before reloading
load_method = SINGLE_CASING
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 025aac20d9..90da6cac49 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -4,7 +4,7 @@
icon_state = "shotgun"
item_state = "shotgun"
max_shells = 4
- w_class = 4.0
+ w_class = ITEMSIZE_LARGE
force = 10
flags = CONDUCT
slot_flags = SLOT_BACK
@@ -60,7 +60,7 @@
load_method = SINGLE_CASING|SPEEDLOADER
handle_casings = CYCLE_CASINGS
max_shells = 2
- w_class = 4
+ w_class = ITEMSIZE_LARGE
force = 10
flags = CONDUCT
slot_flags = SLOT_BACK
@@ -98,7 +98,7 @@
if(do_after(user, 30)) //SHIT IS STEALTHY EYYYYY
icon_state = "sawnshotgun"
item_state = "sawnshotgun"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
force = 5
slot_flags &= ~SLOT_BACK //you can't sling it on your back
slot_flags |= (SLOT_BELT|SLOT_HOLSTER) //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) - or in a holster, why not.
@@ -115,5 +115,5 @@
item_state = "sawnshotgun"
slot_flags = SLOT_BELT|SLOT_HOLSTER
ammo_type = /obj/item/ammo_casing/shotgun/pellet
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
force = 5
diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm
index f91054b2c7..be280c2f64 100644
--- a/code/modules/projectiles/guns/projectile/sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper.dm
@@ -6,7 +6,7 @@
icon_state = "heavysniper"
item_state = "l6closed-empty" // placeholder
item_state_slots = list(slot_r_hand_str = "heavysniper", slot_l_hand_str = "heavysniper")
- w_class = 5 // So it can't fit in a backpack.
+ w_class = ITEMSIZE_HUGE // So it can't fit in a backpack.
force = 10
slot_flags = SLOT_BACK
origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
@@ -75,7 +75,7 @@
desc = "The SVD, also known as the Dragunov, was mass produced with an Optical Sniper Sight so simple that even Ivan can figure out how it works. Too bad for you that it's written in Russian. Uses 7.62mm rounds."
icon_state = "SVD"
item_state = "SVD"
- w_class = 5 // So it can't fit in a backpack.
+ w_class = ITEMSIZE_HUGE // So it can't fit in a backpack.
force = 10
slot_flags = SLOT_BACK // Needs a sprite.
origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
diff --git a/code/modules/reagents/dispenser/cartridge.dm b/code/modules/reagents/dispenser/cartridge.dm
index 2f7369cba0..3a129d4872 100644
--- a/code/modules/reagents/dispenser/cartridge.dm
+++ b/code/modules/reagents/dispenser/cartridge.dm
@@ -3,7 +3,7 @@
desc = "This goes in a chemical dispenser."
icon_state = "cartridge"
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
volume = CARTRIDGE_VOLUME_LARGE
amount_per_transfer_from_this = 50
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 2c8c853ebc..6721cbd3bb 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -3,7 +3,7 @@
desc = "..."
icon = 'icons/obj/chemical.dmi'
icon_state = null
- w_class = 2
+ w_class = ITEMSIZE_SMALL
var/amount_per_transfer_from_this = 5
var/possible_transfer_amounts = list(5,10,15,25,30)
var/volume = 30
diff --git a/code/modules/reagents/reagent_containers/drinkingglass/extras.dm b/code/modules/reagents/reagent_containers/drinkingglass/extras.dm
index 5a92b61c88..284d4ecfa9 100644
--- a/code/modules/reagents/reagent_containers/drinkingglass/extras.dm
+++ b/code/modules/reagents/reagent_containers/drinkingglass/extras.dm
@@ -52,7 +52,7 @@
var/glass_addition
var/glass_desc
var/glass_color
- w_class = 1
+ w_class = ITEMSIZE_TINY
icon = DRINK_ICON_FILE
/obj/item/weapon/glass_extra/stick
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index ba671cdb50..7ee525fc0b 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -8,7 +8,7 @@
icon_state = "dropper0"
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(1,2,3,4,5)
- w_class = 1
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
volume = 5
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index b8a6e2bd51..945bbbc8e0 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -94,7 +94,7 @@
name = "golden cup"
icon_state = "golden_cup"
item_state = "" //nope :(
- w_class = 4
+ w_class = ITEMSIZE_LARGE
force = 14
throwforce = 10
amount_per_transfer_from_this = 20
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index a5dff3868d..f0bda3a3cc 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -13,7 +13,7 @@
var/dry = 0
var/nutriment_amt = 0
center_of_mass = list("x"=16, "y"=16)
- w_class = 2
+ w_class = ITEMSIZE_SMALL
/obj/item/weapon/reagent_containers/food/snacks/New()
..()
@@ -2214,7 +2214,7 @@
// sliceable is just an organization type path, it doesn't have any additional code or variables tied to it.
/obj/item/weapon/reagent_containers/food/snacks/sliceable
- w_class = 3 //Whole pizzas and cakes shouldn't fit in a pocket, you can slice them if you want to do that.
+ w_class = ITEMSIZE_NORMAL //Whole pizzas and cakes shouldn't fit in a pocket, you can slice them if you want to do that.
/obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread
name = "meatbread loaf"
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 1347a182fc..b041aa13e7 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -12,7 +12,7 @@
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,60)
volume = 60
- w_class = 2
+ w_class = ITEMSIZE_SMALL
flags = OPENCONTAINER
unacidable = 1 //glass doesn't dissolve in acid
@@ -218,7 +218,7 @@
icon_state = "bucket"
item_state = "bucket"
matter = list(DEFAULT_WALL_MATERIAL = 200)
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
amount_per_transfer_from_this = 20
possible_transfer_amounts = list(10,20,30,60,120)
volume = 120
@@ -256,7 +256,7 @@
icon = 'icons/obj/vending.dmi'
icon_state = "water_cooler_bottle"
matter = list("glass" = 2000)
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
amount_per_transfer_from_this = 20
possible_transfer_amounts = list(10,20,30,60,120)
volume = 120
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 150a774309..464e066264 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -8,7 +8,7 @@
icon_state = null
item_state = "pill"
possible_transfer_amounts = null
- w_class = 1
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
volume = 60
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index c3b48691c0..c1c2597daf 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 = 3
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
throw_speed = 2
throw_range = 10
amount_per_transfer_from_this = 10
@@ -163,7 +163,7 @@
icon_state = "chemsprayer"
item_state = "chemsprayer"
throwforce = 3
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
possible_transfer_amounts = null
volume = 600
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_ENGINEERING = 3)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 87b5311be2..4bf97175d1 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -15,7 +15,7 @@
amount_per_transfer_from_this = 5
possible_transfer_amounts = null
volume = 15
- w_class = 1
+ w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
sharp = 1
unacidable = 1 //glass
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 70ac20ae87..be3cfa72a8 100755
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -218,7 +218,7 @@
name = "package wrapper"
icon = 'icons/obj/items.dmi'
icon_state = "deliveryPaper"
- w_class = 3.0
+ w_class = ITEMSIZE_NORMAL
var/amount = 25.0
@@ -327,7 +327,7 @@
icon_state = "dest_tagger"
var/currTag = 0
- w_class = 2
+ w_class = ITEMSIZE_SMALL
item_state = "electronic"
flags = CONDUCT
slot_flags = SLOT_BELT
diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm
index 41c6f6978c..ce5a9e151a 100644
--- a/code/modules/research/research.dm
+++ b/code/modules/research/research.dm
@@ -203,7 +203,7 @@ research holder datum.
icon = 'icons/obj/cloning.dmi'
icon_state = "datadisk2"
item_state = "card-id"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
matter = list(DEFAULT_WALL_MATERIAL = 30, "glass" = 10)
var/datum/tech/stored
@@ -217,7 +217,7 @@ research holder datum.
icon = 'icons/obj/cloning.dmi'
icon_state = "datadisk2"
item_state = "card-id"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
matter = list(DEFAULT_WALL_MATERIAL = 30, "glass" = 10)
var/datum/design/blueprint
diff --git a/code/modules/spells/spellbook.dm b/code/modules/spells/spellbook.dm
index b54b243609..34923745a4 100644
--- a/code/modules/spells/spellbook.dm
+++ b/code/modules/spells/spellbook.dm
@@ -5,7 +5,7 @@
icon_state ="spellbook"
throw_speed = 1
throw_range = 5
- w_class = 2
+ w_class = ITEMSIZE_SMALL
var/uses = 5
var/temp = null
var/max_uses = 5
diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm
index 5b1fc876b3..a8ff23a91f 100644
--- a/code/modules/vehicles/cargo_train.dm
+++ b/code/modules/vehicles/cargo_train.dm
@@ -20,7 +20,7 @@
desc = "A keyring with a small steel key, and a yellow fob reading \"Choo Choo!\"."
icon = 'icons/obj/vehicles.dmi'
icon_state = "train_keys"
- w_class = 1
+ w_class = ITEMSIZE_TINY
/obj/vehicle/train/cargo/trolley
name = "cargo train trolley"
diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm
index 59e208f034..887a547e0d 100644
--- a/code/modules/virus2/items_devices.dm
+++ b/code/modules/virus2/items_devices.dm
@@ -4,7 +4,7 @@
name = "antibody scanner"
desc = "Scans living beings for antibodies in their blood."
icon_state = "health"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
item_state = "electronic"
flags = CONDUCT
@@ -99,7 +99,7 @@
name = "blank GNA disk"
icon = 'icons/obj/cloning.dmi'
icon_state = "datadisk0"
- w_class = 1
+ w_class = ITEMSIZE_TINY
var/datum/disease2/effectholder/effect = null
var/list/species = null
var/stage = 1
diff --git a/code/modules/xenoarcheaology/sampling.dm b/code/modules/xenoarcheaology/sampling.dm
index fa0d54a9a7..e79957ba28 100644
--- a/code/modules/xenoarcheaology/sampling.dm
+++ b/code/modules/xenoarcheaology/sampling.dm
@@ -3,7 +3,7 @@
desc = "It looks extremely delicate."
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "sliver1"
- w_class = 1
+ w_class = ITEMSIZE_TINY
sharp = 1
var/datum/geosample/geological_data
@@ -86,7 +86,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "sampler0"
item_state = "screwdriver_brown"
- w_class = 1
+ w_class = ITEMSIZE_TINY
var/sampled_turf = ""
var/num_stored_bags = 10
@@ -144,7 +144,7 @@
var/image/I = image("icon"=R, "layer"=FLOAT_LAYER)
filled_bag.overlays += I
filled_bag.overlays += "evidence"
- filled_bag.w_class = 1
+ filled_bag.w_class = ITEMSIZE_TINY
user << "You take a core sample of the [item_to_sample]."
else
diff --git a/code/modules/xenoarcheaology/tools/tools.dm b/code/modules/xenoarcheaology/tools/tools.dm
index 42b8e692ec..d5cab2ef6e 100644
--- a/code/modules/xenoarcheaology/tools/tools.dm
+++ b/code/modules/xenoarcheaology/tools/tools.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "locator"
item_state = "locator"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
/obj/item/device/gps/attack_self(var/mob/user as mob)
var/turf/T = get_turf(src)
@@ -15,7 +15,7 @@
desc = "A coiled metallic tape used to check dimensions and lengths."
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "measuring"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
/obj/item/weapon/storage/bag/fossils
name = "Fossil Satchel"
@@ -23,10 +23,10 @@
icon = 'icons/obj/mining.dmi'
icon_state = "satchel"
slot_flags = SLOT_BELT | SLOT_POCKET
- w_class = 3
+ w_class = ITEMSIZE_NORMAL
storage_slots = 50
- max_storage_space = 200
- max_w_class = 3
+ max_storage_space = ITEMSIZE_COST_NORMAL * 50
+ max_w_class = ITEMSIZE_NORMAL
can_hold = list(/obj/item/weapon/fossil)
/obj/item/weapon/storage/box/samplebags
@@ -46,7 +46,7 @@
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "flashgun"
item_state = "lampgreen"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
slot_flags = SLOT_BELT
var/last_scan_time = 0
@@ -102,7 +102,7 @@
icon = 'icons/obj/pda.dmi'
icon_state = "crap"
item_state = "analyzer"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
slot_flags = SLOT_BELT
var/list/positive_locations = list()
var/datum/depth_scan/current
diff --git a/code/modules/xenoarcheaology/tools/tools_pickaxe.dm b/code/modules/xenoarcheaology/tools/tools_pickaxe.dm
index a8bf853e82..b954d5eb05 100644
--- a/code/modules/xenoarcheaology/tools/tools_pickaxe.dm
+++ b/code/modules/xenoarcheaology/tools/tools_pickaxe.dm
@@ -9,7 +9,7 @@
excavation_amount = 1
drill_sound = 'sound/weapons/thudswoosh.ogg'
drill_verb = "brushing"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
/obj/item/weapon/pickaxe/one_pick
name = "2cm pick"
@@ -21,7 +21,7 @@
excavation_amount = 2
drill_sound = 'sound/items/Screwdriver.ogg'
drill_verb = "delicately picking"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
/obj/item/weapon/pickaxe/two_pick
name = "4cm pick"
@@ -33,7 +33,7 @@
excavation_amount = 4
drill_sound = 'sound/items/Screwdriver.ogg'
drill_verb = "delicately picking"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
/obj/item/weapon/pickaxe/three_pick
name = "6cm pick"
@@ -45,7 +45,7 @@
excavation_amount = 6
drill_sound = 'sound/items/Screwdriver.ogg'
drill_verb = "delicately picking"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
/obj/item/weapon/pickaxe/four_pick
name = "8cm pick"
@@ -57,7 +57,7 @@
excavation_amount = 8
drill_sound = 'sound/items/Screwdriver.ogg'
drill_verb = "delicately picking"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
/obj/item/weapon/pickaxe/five_pick
name = "10cm pick"
@@ -69,7 +69,7 @@
excavation_amount = 10
drill_sound = 'sound/items/Screwdriver.ogg'
drill_verb = "delicately picking"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
/obj/item/weapon/pickaxe/six_pick
name = "12cm pick"
@@ -81,7 +81,7 @@
excavation_amount = 12
drill_sound = 'sound/items/Screwdriver.ogg'
drill_verb = "delicately picking"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
/obj/item/weapon/pickaxe/hand
name = "hand pickaxe"
@@ -93,7 +93,7 @@
excavation_amount = 30
drill_sound = 'sound/items/Crowbar.ogg'
drill_verb = "clearing"
- w_class = 2
+ w_class = ITEMSIZE_SMALL
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Pack for holding pickaxes
@@ -105,7 +105,7 @@
desc = "A set of picks for excavation."
item_state = "syringe_kit"
storage_slots = 7
- w_class = 2
+ w_class = ITEMSIZE_SMALL
can_hold = list(/obj/item/weapon/pickaxe/brush,
/obj/item/weapon/pickaxe/one_pick,
/obj/item/weapon/pickaxe/two_pick,
@@ -114,8 +114,8 @@
/obj/item/weapon/pickaxe/five_pick,
/obj/item/weapon/pickaxe/six_pick,
/obj/item/weapon/pickaxe/hand)
- max_storage_space = 18
- max_w_class = 2
+ max_storage_space = ITEMSIZE_COST_SMALL * 9
+ max_w_class = ITEMSIZE_SMALL
use_to_pickup = 1
/obj/item/weapon/storage/excavation/New()
diff --git a/code/modules/xenobio2/machinery/gene_manipulators.dm b/code/modules/xenobio2/machinery/gene_manipulators.dm
index 8cf7b45a1f..98c2fa8160 100644
--- a/code/modules/xenobio2/machinery/gene_manipulators.dm
+++ b/code/modules/xenobio2/machinery/gene_manipulators.dm
@@ -15,7 +15,7 @@
desc = "A small disk used for carrying data on genetics."
icon = 'icons/obj/hydroponics_machines.dmi'
icon_state = "disk"
- w_class = 1.0
+ w_class = ITEMSIZE_TINY
var/list/genes = list()
var/genesource = "unknown"
diff --git a/polaris.dme b/polaris.dme
index b11ecda08d..0c42f4e7a1 100644
--- a/polaris.dme
+++ b/polaris.dme
@@ -25,6 +25,7 @@
#include "code\__defines\damage_organs.dm"
#include "code\__defines\dna.dm"
#include "code\__defines\gamemode.dm"
+#include "code\__defines\inventory_sizes.dm"
#include "code\__defines\items_clothing.dm"
#include "code\__defines\lighting.dm"
#include "code\__defines\machinery.dm"