Converts /modules/ to using WEIGHT_CLASS_x

2026-08-23 20:16:55 +01:00 · 2017-05-28 01:25:09 +01:00
parent 3bc135b825
commit 2d13e2f7bf
137 changed files with 350 additions and 358 deletions
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/device.dmi'
 	icon_state = "solution_tray"
 	materials = list(MAT_GLASS=5)
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	amount_per_transfer_from_this = 1
 	possible_transfer_amounts = list(1, 2)
 	volume = 2
@@ -51,4 +51,4 @@ obj/item/weapon/reagent_containers/glass/solution_tray/attackby(obj/item/weapon/

 /obj/item/weapon/reagent_containers/glass/beaker/fuel
 	name = "beaker 'fuel'"
-	list_reagents = list("fuel" = 50)
+	list_reagents = list("fuel" = 50)
@@ -19,7 +19,7 @@
 	desc = "It looks extremely delicate."
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "sliver1"	//0-4
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	sharp = 1
 	//item_state = "electronic"
 	var/source_rock = "/turf/simulated/mineral/"
@@ -7,7 +7,7 @@
 	desc = "A coiled metallic tape used to check dimensions and lengths."
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "measuring"
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL

 //todo: dig site tape

@@ -17,8 +17,8 @@
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "satchel"
 	slot_flags = SLOT_BELT | SLOT_POCKET
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	storage_slots = 50
 	max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * ore.w_class
-	max_w_class = 3
+	max_w_class = WEIGHT_CLASS_NORMAL
 	can_hold = list(/obj/item/weapon/fossil)
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "flashgun"
 	item_state = "lampgreen"
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	slot_flags = SLOT_BELT
 	var/nearest_artifact_id = "unknown"
 	var/nearest_artifact_distance = -1
@@ -19,7 +19,7 @@
 	icon = 'icons/obj/device.dmi'
 	icon_state = "sampler0"
 	item_state = "screwdriver_brown"
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	//slot_flags = SLOT_BELT
 	var/sampled_turf = ""
 	var/num_stored_bags = 10
@@ -73,7 +73,7 @@
 			filled_bag.icon_state = "evidence"
 			var/image/I = image("icon"=R, "layer"=FLOAT_LAYER)
 			filled_bag.underlays += I
-			filled_bag.w_class = 1
+			filled_bag.w_class = WEIGHT_CLASS_TINY

 			to_chat(user, "<span class='notice'>You take a core sample of the [item_to_sample].</span>")
 	else
@@ -9,7 +9,7 @@
 	icon = 'icons/obj/pda.dmi'
 	icon_state = "crap"
 	item_state = "analyzer"
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	slot_flags = SLOT_BELT
 	var/list/positive_locations = list()
 	var/datum/depth_scan/current
@@ -12,7 +12,7 @@
 	excavation_amount = 0.5
 	digsound = list('sound/weapons/thudswoosh.ogg')
 	drill_verb = "brushing"
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL

 /obj/item/weapon/pickaxe/one_pick
 	name = "1/6 pick"
@@ -24,7 +24,7 @@
 	excavation_amount = 1
 	digsound = list('sound/items/Screwdriver.ogg')
 	drill_verb = "delicately picking"
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL

 /obj/item/weapon/pickaxe/two_pick
 	name = "1/3 pick"
@@ -36,7 +36,7 @@
 	excavation_amount = 2
 	digsound = list('sound/items/Screwdriver.ogg')
 	drill_verb = "delicately picking"
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL

 /obj/item/weapon/pickaxe/three_pick
 	name = "1/2 pick"
@@ -48,7 +48,7 @@
 	excavation_amount = 3
 	digsound = list('sound/items/Screwdriver.ogg')
 	drill_verb = "delicately picking"
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL

 /obj/item/weapon/pickaxe/four_pick
 	name = "2/3 pick"
@@ -60,7 +60,7 @@
 	excavation_amount = 4
 	digsound = list('sound/items/Screwdriver.ogg')
 	drill_verb = "delicately picking"
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL

 /obj/item/weapon/pickaxe/five_pick
 	name = "5/6 pick"
@@ -72,7 +72,7 @@
 	excavation_amount = 5
 	digsound = list('sound/items/Screwdriver.ogg')
 	drill_verb = "delicately picking"
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL

 /obj/item/weapon/pickaxe/six_pick
 	name = "1/1 pick"
@@ -84,7 +84,7 @@
 	excavation_amount = 6
 	digsound = list('sound/items/Screwdriver.ogg')
 	drill_verb = "delicately picking"
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL

 /obj/item/weapon/pickaxe/hand
 	name = "hand pickaxe"
@@ -96,7 +96,7 @@
 	excavation_amount = 15
 	digsound = list('sound/items/Crowbar.ogg')
 	drill_verb = "clearing"
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL

 /obj/item/weapon/pickaxe/robotic
 	name = "robotic pickaxe"
@@ -125,7 +125,7 @@
 	item_state = "syringe_kit"
 	foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
 	storage_slots = 7
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	can_hold = list(/obj/item/weapon/pickaxe/brush,\
 	/obj/item/weapon/pickaxe/one_pick,\
 	/obj/item/weapon/pickaxe/two_pick,\
@@ -134,7 +134,7 @@
 	/obj/item/weapon/pickaxe/five_pick,\
 	/obj/item/weapon/pickaxe/six_pick)
 	max_combined_w_class = 17
-	max_w_class = 4
+	max_w_class = WEIGHT_CLASS_BULKY
 	use_to_pickup = 1 // for picking up broken bulbs, not that most people will try

 /obj/item/weapon/storage/box/excavation/New()
@@ -7,7 +7,7 @@
 	icon = 'icons/mob/slimes.dmi'
 	icon_state = "grey slime extract"
 	force = 1
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	throwforce = 0
 	throw_speed = 3
 	throw_range = 6
@@ -121,7 +121,7 @@
 /obj/item/slimepotion
 	name = "slime potion"
 	desc = "A hard yet gelatinous capsule excreted by a slime, containing mysterious substances."
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	origin_tech = "biotech=4"

 /obj/item/slimepotion/afterattack(obj/item/weapon/reagent_containers/target, mob/user, proximity_flag)
@@ -552,7 +552,7 @@
 	singular_name = "floor tile"
 	desc = "Through a series of micro-teleports, these tiles let people move at incredible speeds."
 	icon_state = "tile-bluespace"
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	force = 6
 	materials = list(MAT_METAL=500)
 	throwforce = 10
@@ -575,7 +575,7 @@
 	singular_name = "floor tile"
 	desc = "Time seems to flow very slowly around these tiles."
 	icon_state = "tile-sepia"
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	force = 6
 	materials = list(MAT_METAL=500)
 	throwforce = 10