Storage tweaks

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

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/stack_objects.dmi'
 	amount = 6
 	max_amount = 6
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 	full_w_class = WEIGHT_CLASS_SMALL
 	throw_speed = 3
 	throw_range = 7

code/game/objects/items/storage/firstaid.dm

@@ -108,7 +108,7 @@
 		return
 	var/static/items_inside = list(
 		/obj/item/healthanalyzer = 1,
-		/obj/item/stack/medical/gauze = 1,
+		/obj/item/stack/medical/gauze/twelve = 1,
 		/obj/item/stack/medical/suture = 2,
 		/obj/item/stack/medical/mesh = 2,
 		/obj/item/reagent_containers/hypospray/medipen = 1,

code/modules/projectiles/guns/ballistic/assault.dm

@@ -1,5 +1,6 @@
 /obj/item/gun/ballistic/automatic/assault
 	show_magazine_on_sprite = TRUE
+	w_class = WEIGHT_CLASS_BULKY
 
 	gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
 	default_firemode = FIREMODE_SEMIAUTO
@@ -40,7 +41,6 @@
 	show_magazine_on_sprite = TRUE
 	unique_mag_sprites_for_variants = TRUE
 	weapon_weight = WEAPON_MEDIUM
-	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = ITEM_SLOT_BACK
 	manufacturer = MANUFACTURER_IMPORT
 	mag_type = /obj/item/ammo_box/magazine/skm_762_40
@@ -82,7 +82,6 @@
 	icon_state = "p16"
 	item_state = "p16"
 	show_magazine_on_sprite = TRUE
-	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = ITEM_SLOT_BACK
 	mag_type = /obj/item/ammo_box/magazine/p16
 	spread = 2
@@ -131,7 +130,6 @@
 
 	fire_select_icon_state_prefix = "swisschesse_"
 
-	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = ITEM_SLOT_BACK
 	mag_type = /obj/item/ammo_box/magazine/swiss
 	manufacturer = MANUFACTURER_SOLARARMORIES
@@ -162,7 +160,6 @@
 	default_firemode = FIREMODE_OTHER
 
 	weapon_weight = WEAPON_MEDIUM
-	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = ITEM_SLOT_BACK
 
 	show_magazine_on_sprite = TRUE
@@ -308,7 +305,6 @@
 	icon_state = "vickland"
 	item_state = "vickland"
 	weapon_weight = WEAPON_MEDIUM
-	w_class = WEIGHT_CLASS_BULKY
 	internal_magazine = TRUE
 	mag_type = /obj/item/ammo_box/magazine/internal/vickland
 	fire_sound = 'sound/weapons/gun/rifle/vickland.ogg'

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

@@ -1,6 +1,6 @@
 
 /obj/item/gun/ballistic/automatic
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = WEIGHT_CLASS_BULKY
 
 	gun_firemodes = list(FIREMODE_SEMIAUTO)
 	default_firemode = FIREMODE_SEMIAUTO

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

@@ -1,5 +1,6 @@
 /obj/item/gun/ballistic/automatic/pistol
 	bolt_type = BOLT_TYPE_LOCKING
+	w_class = WEIGHT_CLASS_NORMAL
 
 	vary_fire_sound = FALSE
 	fire_sound_volume = 90

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

@@ -12,6 +12,7 @@
 	ammo_x_offset = 2
 	dual_wield_spread = 60
 	manufacturer = MANUFACTURER_SHARPLITE_NEW
+	w_class = WEIGHT_CLASS_BULKY
 
 /obj/item/gun/energy/e_gun/empty_cell
 	dead_cell = TRUE
@@ -46,7 +47,6 @@
 	cell_type = /obj/item/stock_parts/cell/gun/upgraded
 
 	weapon_weight = WEAPON_MEDIUM
-	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = ITEM_SLOT_BACK
 
 	gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
@@ -229,7 +229,6 @@
 	icon_state = "iotshotgun"
 	item_state = "shotgun_combat"
 	shaded_charge = TRUE
-	w_class = WEIGHT_CLASS_BULKY
 	ammo_type = list(/obj/item/ammo_casing/energy/disabler/scatter/ultima, /obj/item/ammo_casing/energy/laser/ultima)
 	var/obj/item/modular_computer/integratedNTOS
 	var/NTOS_type = /obj/item/modular_computer/internal

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

@@ -4,7 +4,7 @@
 
 	icon_state = "laser"
 	item_state = "laser"
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = WEIGHT_CLASS_BULKY
 	custom_materials = list(/datum/material/iron=2000)
 	ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
 	ammo_x_offset = 1
@@ -170,7 +170,6 @@
 	inhand_y_dimension = 64
 	icon_state = "iotshotgun"
 	item_state = "shotgun_combat"
-	w_class = WEIGHT_CLASS_BULKY
 	ammo_type = list(/obj/item/ammo_casing/energy/disabler/scatter/ultima)
 	var/obj/item/modular_computer/integratedNTOS
 	var/NTOS_type = /obj/item/modular_computer/internal
@@ -258,7 +257,6 @@
 	shaded_charge = FALSE
 	ammo_x_offset = 4
 	charge_sections = 2
-	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = 0
 
 

code/modules/projectiles/guns/manufacturer/etherbor/energy_gunsword.dm

@@ -105,7 +105,6 @@
 	desc = "The HBG-7 is the standard-issue rifle weapon of the PGF. It comes with a special DMR mode that has greater armor piercing for dealing with armored targets."
 	icon_state = "pgfheavy"
 	item_state = "pgfheavy"
-	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = ITEM_SLOT_BACK
 
 	modifystate = FALSE

code/modules/projectiles/guns/manufacturer/frontier_import/ballistics.dm

@@ -8,7 +8,6 @@
 
 	icon_state = "mauler"
 	item_state = "hp_generic"
-	w_class = WEIGHT_CLASS_NORMAL
 	mag_type = /obj/item/ammo_box/magazine/m9mm_mauler
 	fire_delay = 0.06 SECONDS
 
@@ -130,6 +129,7 @@
 	lefthand_file = 'icons/obj/guns/manufacturer/frontier_import/lefthand.dmi'
 	righthand_file = 'icons/obj/guns/manufacturer/frontier_import/righthand.dmi'
 	mob_overlay_icon = 'icons/obj/guns/manufacturer/frontier_import/onmob.dmi'
+	w_class = WEIGHT_CLASS_BULKY //this gun is visually larger, so I believe this is good
 
 	icon_state = "pounder"
 	item_state = "pounder"

code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm

@@ -307,7 +307,7 @@ EMPTY_GUN_HELPER(automatic/pistol/rattlesnake)
 	mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
 
 
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 	mag_type = /obj/item/ammo_box/magazine/m22lr_himehabu
 	fire_sound = 'sound/weapons/gun/pistol/himehabu.ogg'
 
@@ -355,7 +355,7 @@ EMPTY_GUN_HELPER(automatic/pistol/himehabu)
 	ammo_type = /obj/item/ammo_casing/c22lr
 	caliber = "22lr"
 	max_ammo = 10
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 	multiple_sprites = AMMO_BOX_PER_BULLET
 
 //########### SMGS ###########//