Initial

code/game/objects/items/RCD.dm

@@ -578,7 +578,7 @@ RLD
 	icon = 'icons/obj/ammo.dmi'
 	icon_state = "rcd"
 	item_state = "rcdammo"
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_NORMAL
 	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
 	custom_materials = list(/datum/material/iron=12000, /datum/material/glass=8000)

code/game/objects/items/devices/PDA/PDA.dm

@@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	item_flags = NOBLUDGEON
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 	slot_flags = ITEM_SLOT_ID | ITEM_SLOT_BELT
 	actions_types = list(/datum/action/item_action/toggle_light)
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)

code/game/objects/items/devices/electroadaptive_pseudocircuit.dm

@@ -4,7 +4,7 @@
 	desc = "An all-in-one circuit imprinter, designer, synthesizer, outfitter, creator, and chef. It can be used in place of any generic circuit board during construction."
 	icon = 'icons/obj/module.dmi'
 	icon_state = "boris"
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 	custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 300)
 	var/recharging = FALSE
 	var/circuits = 5 //How many circuits the pseudocircuit has left

code/game/objects/items/devices/flashlight.dm

@@ -170,6 +170,7 @@
 	icon_state = "penlight"
 	item_state = ""
 	flags_1 = CONDUCT_1
+	w_class = WEIGHT_CLASS_TINY
 	light_range = 2
 	light_color = "#FFDDCC"
 	light_power = 0.3

code/game/objects/items/devices/polycircuit.dm

@@ -4,7 +4,7 @@
 	desc = "A dense, overdesigned cluster of electronics which attempted to function as a multipurpose circuit electronic. Circuits can be removed from it... if you don't bleed out in the process."
 	icon_state = "circuit_mess"
 	item_state = "rods"
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_NORMAL
 	max_amount = 8
 	var/circuit_type = /obj/item/electronics/airlock
 	var/chosen_circuit = "airlock"

code/game/objects/items/devices/radio/radio.dm

@@ -16,34 +16,54 @@
 	throw_speed = 3
 	throw_range = 7
 	w_class = WEIGHT_CLASS_SMALL
-	custom_materials = list(/datum/material/iron=75, /datum/material/glass=25)
+	custom_materials = list(/datum/material/iron = 75, /datum/material/glass = 25)
+	slot_flags = ITEM_SLOT_NECK //Allows to be worn on neck so it's not eating pocket slots.
 	obj_flags = USES_TGUI
 
 	var/on = TRUE
 	var/frequency = FREQ_COMMON
-	var/canhear_range = 3  // The range around the radio in which mobs can hear what it receives.
-	var/emped = 0  // Tracks the number of EMPs currently stacked.
-	var/headset = FALSE // It can be used for hotkeys
-	var/last_chatter_time // The time since we last played a radio chatter sound. (WS edit - Radio Chatter #434)
-
-	var/broadcasting = FALSE  // Whether the radio will transmit dialogue it hears nearby.
-	var/listening = FALSE  // Whether the radio is currently receiving.
-	var/prison_radio = FALSE  // If true, the transmit wire starts cut.
-	var/unscrewed = FALSE  // Whether wires are accessible. Toggleable by screwdrivering.
-	var/freerange = FALSE  // If true, the radio has access to the full spectrum.
-	var/subspace_transmission = FALSE  // If true, the radio transmits and receives on subspace exclusively.
-	var/subspace_switchable = FALSE  // If true, subspace_transmission can be toggled at will.
-	var/freqlock = FALSE  // Frequency lock to stop the user from untuning specialist radios.
-	var/use_command = FALSE  // If true, broadcasts will be large and BOLD.
-	var/command = FALSE  // If true, use_command can be toggled at will.
-	var/log = FALSE // If true, the UI will display the voice log for the frequency
-	var/list/loglist = list() //the voice log
-
-	// Encryption key handling
+	///The range around the radio in which mobs can hear what it receives.
+	var/canhear_range = 3
+	///Tracks the number of EMPs currently stacked.
+	var/emped = 0
+	///It can be used for hotkeys
+	var/headset = FALSE
+	///The time since we last played a radio chatter sound.
+	var/last_chatter_time
+
+	///Whether the radio will transmit dialogue it hears nearby.
+	var/broadcasting = FALSE
+	///Whether the radio is currently receiving.
+	var/listening = FALSE
+	///If true, the transmit wire starts cut.
+	var/prison_radio = FALSE
+	///Whether wires are accessible. Toggleable by screwdrivering.
+	var/unscrewed = FALSE
+	///If true, the radio has access to the full spectrum.
+	var/freerange = FALSE
+	///If true, the radio transmits and receives on subspace exclusively.
+	var/subspace_transmission = FALSE 
+	///If true, subspace_transmission can be toggled at will.
+	var/subspace_switchable = FALSE 
+	///Frequency lock to stop the user from untuning specialist radios.
+	var/freqlock = FALSE 
+	///If true, broadcasts will be large and BOLD.
+	var/use_command = FALSE 
+	///If true, use_command can be toggled at will.
+	var/command = FALSE 
+	///If true, the UI will display the voice log for the frequency
+	var/log = FALSE
+	///the voice log
+	var/list/loglist = list() 
+
+	///Encryption key handling
 	var/obj/item/encryptionkey/keyslot
-	var/translate_binary = FALSE  // If true, can hear the special binary channel.
-	var/independent = FALSE  // If true, can say/hear on the special CentCom channel.
-	var/list/channels = list()  // Map from name (see communications.dm) to on/off. First entry is current department (:h)
+	///If true, can hear the special binary channel.
+	var/translate_binary = FALSE
+	///If true, can say/hear on the special CentCom channel.
+	var/independent = FALSE
+	///Map from name (see communications.dm) to on/off. First entry is current department (:h)
+	var/list/channels = list()
 	var/list/secure_radio_connections
 
 	var/const/FREQ_LISTENING = 1

code/game/objects/items/devices/scanners.dm

@@ -88,7 +88,7 @@ GENE SCANNER
 	item_flags = NOBLUDGEON
 	slot_flags = ITEM_SLOT_BELT
 	throwforce = 3
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 	throw_speed = 3
 	throw_range = 7
 	custom_materials = list(/datum/material/iron=200)
@@ -862,7 +862,7 @@ GENE SCANNER
 	item_flags = NOBLUDGEON
 	slot_flags = ITEM_SLOT_BELT
 	throwforce = 3
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 	throw_speed = 3
 	throw_range = 7
 	custom_materials = list(/datum/material/iron=200)

code/game/objects/items/devices/taperecorder.dm

@@ -245,7 +245,7 @@
 	item_state = "analyzer"
 	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 	custom_materials = list(/datum/material/iron=20, /datum/material/glass=5)
 	force = 1
 	throwforce = 0

code/game/objects/items/documents.dm

@@ -5,7 +5,7 @@
 	icon_state = "docs_generic"
 	item_state = "paper"
 	throwforce = 0
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_NORMAL
 	throw_range = 1
 	throw_speed = 1
 	layer = MOB_LAYER

code/game/objects/items/stacks/medical.dm

@@ -5,15 +5,15 @@
 	amount = 6
 	max_amount = 6
 	w_class = WEIGHT_CLASS_TINY
-	full_w_class = WEIGHT_CLASS_TINY
+	full_w_class = WEIGHT_CLASS_SMALL
 	throw_speed = 3
 	throw_range = 7
 	resistance_flags = FLAMMABLE
 	max_integrity = 40
 	novariants = FALSE
 	item_flags = NOBLUDGEON
-	var/splint_fracture = FALSE //WS Edit- Splints
-	var/failure_chance //WS Edit - Failure chance
+	var/splint_fracture = FALSE
+	var/failure_chance
 	var/self_delay = 50
 	var/other_delay = 0
 	var/repeating = FALSE

code/game/objects/items/stacks/sheets/mineral.dm

@@ -75,7 +75,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
 	name = "empty sandbag"
 	desc = "A bag to be filled with sand."
 	icon_state = "sandbag"
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 
 /obj/item/emptysandbag/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/stack/ore/glass))

code/game/objects/items/toys.dm

@@ -247,7 +247,7 @@
 	desc = "Make sure to recyle the box in an autolathe when it gets empty."
 	icon = 'icons/obj/ammo.dmi'
 	icon_state = "357OLD-7"
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_NORMAL
 	custom_materials = list(/datum/material/iron=10, /datum/material/glass=10)
 	var/amount_left = 7
 

code/game/objects/structures/bedsheet_bin.dm

@@ -17,7 +17,7 @@ LINEN BINS
 	throwforce = 0
 	throw_speed = 1
 	throw_range = 2
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 	resistance_flags = FLAMMABLE
 	dying_key = DYE_REGISTRY_BEDSHEET
 	greyscale_icon_state = "bedsheet"

code/game/objects/structures/watercloset.dm

@@ -214,7 +214,6 @@
 		exposed = !exposed
 	return TRUE
 
-
 /obj/item/reagent_containers/food/snacks/urinalcake
 	name = "urinal cake"
 	desc = "The noble urinal cake, protecting the people's pipes from the people's pee. Edibility is suggested to be low."

code/modules/assembly/flash.dm

@@ -7,7 +7,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
 	throwforce = 0
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 	custom_materials = list(/datum/material/iron = 300, /datum/material/glass = 300)
 	light_system = MOVABLE_LIGHT //Used as a flash here.
 	light_range = FLASH_LIGHT_RANGE

code/modules/fishing/aquarium/aquarium_kit.dm

@@ -4,7 +4,7 @@
 	desc = "Autogenerates nutritious fish feed based on sample inside."
 	icon = 'icons/obj/aquarium.dmi'
 	icon_state = "fish_feed"
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 
 /obj/item/fish_feed/Initialize(mapload)
 	. = ..()
@@ -32,13 +32,12 @@
 	desc = "Everything you need to build your own aquarium. Raw materials sold separately."
 	icon = 'icons/obj/aquarium.dmi'
 	icon_state = "construction_kit"
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 
 /obj/item/aquarium_kit/attack_self(mob/user)
 	. = ..()
 	to_chat(user,span_notice("There's instruction and tools necessary to build aquarium inside. All you need is to start crafting."))
 
-
 /obj/item/aquarium_prop
 	name = "generic aquarium prop"
 	desc = "very boring"

code/modules/hydroponics/hydroitemdefines.dm

@@ -7,7 +7,7 @@
 	item_state = "analyzer"
 	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 	slot_flags = ITEM_SLOT_BELT
 	custom_materials = list(/datum/material/iron=30, /datum/material/glass=20)
 	var/scan_mode = PLANT_SCANMODE_STATS

code/modules/mining/equipment/regenerative_core.dm

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/chemical/medicine.dmi'
 	icon_state = "bottle19"
 	desc = "Inject certain types of monster organs with this stabilizer to preserve their healing powers indefinitely."
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_NORMAL
 	custom_price = 400
 
 /obj/item/hivelordstabilizer/afterattack(obj/item/organ/M, mob/user, proximity)

code/modules/mining/machine_vending.dm

@@ -105,7 +105,6 @@
 	icon_state = "mining_voucher"
 	w_class = WEIGHT_CLASS_TINY
 
-
 ///Conscript kit
 
 /obj/item/storage/backpack/duffelbag/mining_conscript

code/modules/reagents/reagent_containers/hypospray.dm

@@ -18,7 +18,7 @@
 
 /obj/item/reagent_containers/hypospray
 	name = "hypospray"
-	desc = "The DeForest Medical Corporation hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients."
+	desc = "The hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients."
 	icon = 'icons/obj/syringe.dmi'
 	item_state = "hypo"
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
@@ -103,15 +103,6 @@
 	icon_state = "[base_icon_state][(reagents.total_volume > 0) ? null : 0]"
 	return ..()
 
-/obj/item/reagent_containers/hypospray/combat/heresypurge
-	name = "holy water piercing injector"
-	desc = "A modified air-needle autoinjector for use in combat situations. Prefilled with 5 doses of a holy water and pacifier mixture. Not for use on your teammates."
-	item_state = "holy_hypo"
-	icon_state = "holy_hypo"
-	volume = 250
-	list_reagents = list(/datum/reagent/water/holywater = 150, /datum/reagent/peaceborg/tire = 50, /datum/reagent/peaceborg/confuse = 50)
-	amount_per_transfer_from_this = 50
-
 //MediPens
 
 /obj/item/reagent_containers/hypospray/medipen

code/modules/surgery/tools.dm

@@ -11,15 +11,14 @@
 	custom_materials = list(/datum/material/iron=6000, /datum/material/glass=3000)
 	flags_1 = CONDUCT_1
 	item_flags = SURGICAL_TOOL
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 	tool_behaviour = TOOL_RETRACTOR
 	toolspeed = 1
 
 /obj/item/retractor/augment
 	desc = "Micro-mechanical manipulator for retracting stuff."
 	toolspeed = 0.5
 
-
 /obj/item/hemostat
 	name = "hemostat"
 	desc = "A tiny needle-eye has been machined into one of the clamps to streamline the application of ligature."
@@ -33,7 +32,7 @@
 	custom_materials = list(/datum/material/iron=5000, /datum/material/glass=2500)
 	flags_1 = CONDUCT_1
 	item_flags = SURGICAL_TOOL
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 	attack_verb = list("attacked", "pinched")
 	tool_behaviour = TOOL_HEMOSTAT
 	toolspeed = 1
@@ -42,7 +41,6 @@
 	desc = "Tiny servos power a pair of pincers to stop bleeding."
 	toolspeed = 0.5
 
-
 /obj/item/cautery
 	name = "cautery"
 	desc = "An obtuse, rectangular design is just big enough to accomodate this cautery's incredibly durable battery."
@@ -56,7 +54,7 @@
 	custom_materials = list(/datum/material/iron=2500, /datum/material/glass=750)
 	flags_1 = CONDUCT_1
 	item_flags = SURGICAL_TOOL
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 	attack_verb = list("burnt")
 	tool_behaviour = TOOL_CAUTERY
 	toolspeed = 1
@@ -97,7 +95,6 @@
 	w_class = WEIGHT_CLASS_SMALL
 	toolspeed = 0.5
 
-
 /obj/item/scalpel
 	name = "scalpel"
 	desc = "The handle of the scalpel is an awkward ergonomic mold, designed to encourage proper form. A blade release button on the end allows for easy cleaning and replacement."
@@ -111,7 +108,7 @@
 	flags_1 = CONDUCT_1
 	item_flags = SURGICAL_TOOL | EYE_STAB
 	force = 10
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 	throwforce = 5
 	throw_speed = 3
 	throw_range = 5