Removes weapons

code/modules/client/preference_setup/loadout/gear_tweaks.dm

@@ -213,13 +213,13 @@ var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new()
 //end of custom description
 
 /datum/gear_tweak/tablet
-	var/list/ValidProcessors = list(/obj/item/weapon/computer_hardware/processor_unit/small)
-	var/list/ValidBatteries = list(/obj/item/weapon/computer_hardware/battery_module/nano, /obj/item/weapon/computer_hardware/battery_module/micro, /obj/item/weapon/computer_hardware/battery_module)
-	var/list/ValidHardDrives = list(/obj/item/weapon/computer_hardware/hard_drive/micro, /obj/item/weapon/computer_hardware/hard_drive/small, /obj/item/weapon/computer_hardware/hard_drive)
-	var/list/ValidNetworkCards = list(/obj/item/weapon/computer_hardware/network_card, /obj/item/weapon/computer_hardware/network_card/advanced)
-	var/list/ValidNanoPrinters = list(null, /obj/item/weapon/computer_hardware/nano_printer)
-	var/list/ValidCardSlots = list(null, /obj/item/weapon/computer_hardware/card_slot)
-	var/list/ValidTeslaLinks = list(null, /obj/item/weapon/computer_hardware/tesla_link)
+	var/list/ValidProcessors = list(/obj/item/computer_hardware/processor_unit/small)
+	var/list/ValidBatteries = list(/obj/item/computer_hardware/battery_module/nano, /obj/item/computer_hardware/battery_module/micro, /obj/item/computer_hardware/battery_module)
+	var/list/ValidHardDrives = list(/obj/item/computer_hardware/hard_drive/micro, /obj/item/computer_hardware/hard_drive/small, /obj/item/computer_hardware/hard_drive)
+	var/list/ValidNetworkCards = list(/obj/item/computer_hardware/network_card, /obj/item/computer_hardware/network_card/advanced)
+	var/list/ValidNanoPrinters = list(null, /obj/item/computer_hardware/nano_printer)
+	var/list/ValidCardSlots = list(null, /obj/item/computer_hardware/card_slot)
+	var/list/ValidTeslaLinks = list(null, /obj/item/computer_hardware/tesla_link)
 
 /datum/gear_tweak/tablet/get_contents(var/list/metadata)
 	var/list/names = list()
@@ -362,13 +362,13 @@ var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new()
 	I.update_verbs()
 
 /datum/gear_tweak/laptop
-	var/list/ValidProcessors = list(/obj/item/weapon/computer_hardware/processor_unit/small, /obj/item/weapon/computer_hardware/processor_unit)
-	var/list/ValidBatteries = list(/obj/item/weapon/computer_hardware/battery_module, /obj/item/weapon/computer_hardware/battery_module/advanced, /obj/item/weapon/computer_hardware/battery_module/super)
-	var/list/ValidHardDrives = list(/obj/item/weapon/computer_hardware/hard_drive, /obj/item/weapon/computer_hardware/hard_drive/advanced, /obj/item/weapon/computer_hardware/hard_drive/super)
-	var/list/ValidNetworkCards = list(/obj/item/weapon/computer_hardware/network_card, /obj/item/weapon/computer_hardware/network_card/advanced)
-	var/list/ValidNanoPrinters = list(null, /obj/item/weapon/computer_hardware/nano_printer)
-	var/list/ValidCardSlots = list(null, /obj/item/weapon/computer_hardware/card_slot)
-	var/list/ValidTeslaLinks = list(null, /obj/item/weapon/computer_hardware/tesla_link)
+	var/list/ValidProcessors = list(/obj/item/computer_hardware/processor_unit/small, /obj/item/computer_hardware/processor_unit)
+	var/list/ValidBatteries = list(/obj/item/computer_hardware/battery_module, /obj/item/computer_hardware/battery_module/advanced, /obj/item/computer_hardware/battery_module/super)
+	var/list/ValidHardDrives = list(/obj/item/computer_hardware/hard_drive, /obj/item/computer_hardware/hard_drive/advanced, /obj/item/computer_hardware/hard_drive/super)
+	var/list/ValidNetworkCards = list(/obj/item/computer_hardware/network_card, /obj/item/computer_hardware/network_card/advanced)
+	var/list/ValidNanoPrinters = list(null, /obj/item/computer_hardware/nano_printer)
+	var/list/ValidCardSlots = list(null, /obj/item/computer_hardware/card_slot)
+	var/list/ValidTeslaLinks = list(null, /obj/item/computer_hardware/tesla_link)
 
 /datum/gear_tweak/laptop/get_contents(var/list/metadata)
 	var/list/names = list()
@@ -541,7 +541,7 @@ var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new()
 /datum/gear_tweak/implant_location/get_default()
 	return bodypart_names_to_tokens[1]
 
-/datum/gear_tweak/implant_location/tweak_item(var/obj/item/weapon/implant/I, var/metadata)
+/datum/gear_tweak/implant_location/tweak_item(var/obj/item/implant/I, var/metadata)
 	if(istype(I))
 		I.initialize_loc = bodypart_names_to_tokens[metadata] || BP_TORSO
 

code/modules/client/preference_setup/loadout/loadout_accessories.dm

@@ -28,15 +28,15 @@
 
 /datum/gear/accessory/wallet
 	display_name = "wallet, orange"
-	path = /obj/item/weapon/storage/wallet/random
+	path = /obj/item/storage/wallet/random
 
 /datum/gear/accessory/wallet_poly
 	display_name = "wallet, polychromic"
-	path = /obj/item/weapon/storage/wallet/poly
+	path = /obj/item/storage/wallet/poly
 
 /datum/gear/accessory/wallet/womens
 	display_name = "wallet, womens"
-	path = /obj/item/weapon/storage/wallet/womens
+	path = /obj/item/storage/wallet/womens
 
 /datum/gear/accessory/wallet/womens/New()
 	..()
@@ -44,7 +44,7 @@
 
 /datum/gear/accessory/clutch
 	display_name = "clutch bag"
-	path = /obj/item/weapon/storage/briefcase/clutch
+	path = /obj/item/storage/briefcase/clutch
 	cost = 2
 
 /datum/gear/accessory/clutch/New()
@@ -53,7 +53,7 @@
 
 /datum/gear/accessory/purse
 	display_name = "purse"
-	path = /obj/item/weapon/storage/backpack/purse
+	path = /obj/item/storage/backpack/purse
 	cost = 3
 
 /datum/gear/accessory/purse/New()
@@ -183,13 +183,13 @@
 /datum/gear/accessory/fannypack
 	display_name = "fannypack selection"
 	cost = 2
-	path = /obj/item/weapon/storage/belt/fannypack
+	path = /obj/item/storage/belt/fannypack
 
 /datum/gear/accessory/fannypack/New()
 	..()
 	var/list/fannys = list()
-	for(var/fanny in typesof(/obj/item/weapon/storage/belt/fannypack))
-		var/obj/item/weapon/storage/belt/fannypack/fanny_type = fanny
+	for(var/fanny in typesof(/obj/item/storage/belt/fannypack))
+		var/obj/item/storage/belt/fannypack/fanny_type = fanny
 		fannys[initial(fanny_type.name)] = fanny_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(fannys))
 

code/modules/client/preference_setup/loadout/loadout_cosmetics.dm

@@ -1,20 +1,20 @@
 /datum/gear/cosmetic/lipstick/black
 	display_name = "lipstick, black"
-	path = /obj/item/weapon/lipstick/black
+	path = /obj/item/lipstick/black
 
 /datum/gear/cosmetic/lipstick/jade
 	display_name = "lipstick, jade"
-	path = /obj/item/weapon/lipstick/jade
+	path = /obj/item/lipstick/jade
 
 /datum/gear/cosmetic/lipstick/purple
 	display_name = "lipstick, purple"
-	path = /obj/item/weapon/lipstick/purple
+	path = /obj/item/lipstick/purple
 
 /datum/gear/cosmetic/lipstick
 	display_name = "lipstick, red"
-	path = /obj/item/weapon/lipstick
+	path = /obj/item/lipstick
 
 /datum/gear/cosmetic
 	display_name = "purple comb"
-	path = /obj/item/weapon/haircomb
+	path = /obj/item/haircomb
 	sort_category = "Cosmetics"

code/modules/client/preference_setup/loadout/loadout_cyberware.dm

@@ -1,7 +1,7 @@
 /datum/gear/utility/implant
 	display_name = "implant, neural assistance web"
 	description = "A complex web implanted into the subject, medically in order to compensate for neurological disease."
-	path = /obj/item/weapon/implant/neural
+	path = /obj/item/implant/neural
 	slot = "implant"
 	exploitable = 1
 	sort_category = "Cyberware"
@@ -9,13 +9,13 @@
 
 /datum/gear/utility/implant/tracking
 	display_name = "implant, tracking"
-	path = /obj/item/weapon/implant/tracking/weak
+	path = /obj/item/implant/tracking/weak
 	cost = 10
 
 /datum/gear/utility/implant/generic
 	display_name = "implant, generic, primary"
 	description = "An implant with no obvious purpose."
-	path = /obj/item/weapon/implant
+	path = /obj/item/implant
 	cost = 1
 
 /datum/gear/utility/implant/generic/second
@@ -35,9 +35,9 @@
 /datum/gear/utility/implant/language/eal
 	display_name = "vocal synthesizer, EAL"
 	description = "A surgically implanted vocal synthesizer which allows the owner to speak EAL, if they know it."
-	path = /obj/item/weapon/implant/language/eal
+	path = /obj/item/implant/language/eal
 
 /datum/gear/utility/implant/language/skrellian
 	display_name = "vocal synthesizer, Skrellian"
 	description = "A surgically implanted vocal synthesizer which allows the owner to speak Common Skrellian, if they know it."
-	path = /obj/item/weapon/implant/language/skrellian
+	path = /obj/item/implant/language/skrellian

code/modules/client/preference_setup/loadout/loadout_general.dm

@@ -1,50 +1,50 @@
 /datum/gear/cane
 	display_name = "cane"
-	path = /obj/item/weapon/cane
+	path = /obj/item/cane
 
 /datum/gear/cane/white
 	display_name = "white cane"
-	path = /obj/item/weapon/cane/white
+	path = /obj/item/cane/white
 
 /datum/gear/cane/white2
 	display_name = "telescopic white cane"
-	path = /obj/item/weapon/cane/white/collapsible
+	path = /obj/item/cane/white/collapsible
 
 /datum/gear/crutch
 	display_name = "crutch"
-	path = /obj/item/weapon/cane/crutch
+	path = /obj/item/cane/crutch
 
 /datum/gear/dice
 	display_name = "dice pack"
-	path = /obj/item/weapon/storage/pill_bottle/dice
+	path = /obj/item/storage/pill_bottle/dice
 
 /datum/gear/dice/nerd
 	display_name = "dice pack (gaming)"
-	path = /obj/item/weapon/storage/pill_bottle/dice_nerd
+	path = /obj/item/storage/pill_bottle/dice_nerd
 
 /datum/gear/dice/cup
 	display_name = "dice cup and dice"
-	path = /obj/item/weapon/storage/dicecup/loaded
+	path = /obj/item/storage/dicecup/loaded
 
 /datum/gear/cards
 	display_name = "deck of cards"
-	path = /obj/item/weapon/deck/cards
+	path = /obj/item/deck/cards
 
 /datum/gear/tarot
 	display_name = "deck of tarot cards"
-	path = /obj/item/weapon/deck/tarot
+	path = /obj/item/deck/tarot
 
 /datum/gear/holder
 	display_name = "card holder"
-	path = /obj/item/weapon/deck/holder
+	path = /obj/item/deck/holder
 
 /datum/gear/cardemon_pack
 	display_name = "Cardemon booster pack"
-	path = /obj/item/weapon/pack/cardemon
+	path = /obj/item/pack/cardemon
 
 /datum/gear/spaceball_pack
 	display_name = "Spaceball booster pack"
-	path = /obj/item/weapon/pack/spaceball
+	path = /obj/item/pack/spaceball
 
 /datum/gear/plushie
 	display_name = "plushie selection"
@@ -81,7 +81,7 @@
 	var/toytype = list()
 	toytype["Blink toy"] = /obj/item/toy/blink
 	toytype["Gravitational singularity"] = /obj/item/toy/spinningtoy
-	toytype["Water flower"] = /obj/item/weapon/reagent_containers/spray/waterflower
+	toytype["Water flower"] = /obj/item/reagent_containers/spray/waterflower
 	toytype["Bosun's whistle"] = /obj/item/toy/bosunwhistle
 	toytype["Magic 8 Ball"] = /obj/item/toy/eight_ball
 	toytype["Magic Conch shell"] = /obj/item/toy/eight_ball/conch
@@ -90,7 +90,7 @@
 
 /datum/gear/flask
 	display_name = "flask"
-	path = /obj/item/weapon/reagent_containers/food/drinks/flask/barflask
+	path = /obj/item/reagent_containers/food/drinks/flask/barflask
 
 /datum/gear/flask/New()
 	..()
@@ -98,7 +98,7 @@
 
 /datum/gear/vacflask
 	display_name = "vacuum-flask"
-	path = /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask
+	path = /obj/item/reagent_containers/food/drinks/flask/vacuumflask
 
 /datum/gear/vacflask/New()
 	..()
@@ -108,13 +108,13 @@
 	display_name = "lunchbox"
 	description = "A little lunchbox."
 	cost = 2
-	path = /obj/item/weapon/storage/toolbox/lunchbox
+	path = /obj/item/storage/toolbox/lunchbox
 
 /datum/gear/lunchbox/New()
 	..()
 	var/list/lunchboxes = list()
-	for(var/lunchbox_type in typesof(/obj/item/weapon/storage/toolbox/lunchbox))
-		var/obj/item/weapon/storage/toolbox/lunchbox/lunchbox = lunchbox_type
+	for(var/lunchbox_type in typesof(/obj/item/storage/toolbox/lunchbox))
+		var/obj/item/storage/toolbox/lunchbox/lunchbox = lunchbox_type
 		if(!initial(lunchbox.filled))
 			lunchboxes[initial(lunchbox.name)] = lunchbox_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(lunchboxes))
@@ -124,51 +124,51 @@
 	display_name = "coffee mugs"
 	description = "A coffee mug in various designs."
 	cost = 1
-	path = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug
+	path = /obj/item/reagent_containers/food/drinks/glass2/coffeemug
 
 /datum/gear/coffeemug/New()
 	..()
 	var/list/coffeemugs = list()
-	coffeemugs["plain coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug
-	coffeemugs["SCG coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/sol
-	coffeemugs["Fleet coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fleet
-	coffeemugs["Five Arrows coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fivearrows
-	coffeemugs["Pearlshield coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/psc
-	coffeemugs["Almach Association coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/alma
-	coffeemugs["Almach Protectorate coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/almp
-	coffeemugs["NT coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/nt
-	coffeemugs["Wulf Aeronautics mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal/wulf
-	coffeemugs["Gilthari Exports coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/gilthari
-	coffeemugs["Zeng-Hu coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/zeng
-	coffeemugs["Ward-Takahashi coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/wt
-	coffeemugs["Aether Atmospherics coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/aether
-	coffeemugs["Bishop Cybernetics coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/bishop
-	coffeemugs["Oculum Broadcast coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/oculum
-	coffeemugs["#1 coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/one
-	coffeemugs["#1 monkey coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/puni
-	coffeemugs["heart coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/heart
-	coffeemugs["pawn coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/pawn
-	coffeemugs["diona coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/diona
-	coffeemugs["british coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/britcup
-	coffeemugs["NCS Northern Star coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tourist
-	coffeemugs["flame coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/flame
-	coffeemugs["blue coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/blue
-	coffeemugs["black coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/black
-	coffeemugs["green coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green
-	coffeemugs["dark green coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green/dark
-	coffeemugs["rainbow coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/rainbow
-	coffeemugs["metal coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal
-	coffeemugs["glass coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/glass
-	coffeemugs["tall coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall
-	coffeemugs["tall black coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/black
-	coffeemugs["tall metal coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/metal
-	coffeemugs["tall rainbow coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/rainbow
+	coffeemugs["plain coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug
+	coffeemugs["SCG coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/sol
+	coffeemugs["Fleet coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/fleet
+	coffeemugs["Five Arrows coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/fivearrows
+	coffeemugs["Pearlshield coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/psc
+	coffeemugs["Almach Association coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/alma
+	coffeemugs["Almach Protectorate coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/almp
+	coffeemugs["NT coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/nt
+	coffeemugs["Wulf Aeronautics mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/metal/wulf
+	coffeemugs["Gilthari Exports coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/gilthari
+	coffeemugs["Zeng-Hu coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/zeng
+	coffeemugs["Ward-Takahashi coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/wt
+	coffeemugs["Aether Atmospherics coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/aether
+	coffeemugs["Bishop Cybernetics coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/bishop
+	coffeemugs["Oculum Broadcast coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/oculum
+	coffeemugs["#1 coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/one
+	coffeemugs["#1 monkey coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/puni
+	coffeemugs["heart coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/heart
+	coffeemugs["pawn coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/pawn
+	coffeemugs["diona coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/diona
+	coffeemugs["british coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/britcup
+	coffeemugs["NCS Northern Star coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tourist
+	coffeemugs["flame coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/flame
+	coffeemugs["blue coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/blue
+	coffeemugs["black coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/black
+	coffeemugs["green coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/green
+	coffeemugs["dark green coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/green/dark
+	coffeemugs["rainbow coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/rainbow
+	coffeemugs["metal coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/metal
+	coffeemugs["glass coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/glass
+	coffeemugs["tall coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tall
+	coffeemugs["tall black coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tall/black
+	coffeemugs["tall metal coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tall/metal
+	coffeemugs["tall rainbow coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tall/rainbow
 	gear_tweaks += new /datum/gear_tweak/path(coffeemugs)
 	gear_tweaks += new /datum/gear_tweak/reagents(lunchables_drink_reagents())
 
 /datum/gear/towel
 	display_name = "towel"
-	path = /obj/item/weapon/towel
+	path = /obj/item/towel
 
 /datum/gear/towel/New()
 	..()
@@ -176,10 +176,10 @@
 
 /datum/gear/cahwhite
 	display_name = "Cards Against The Galaxy (white deck)"
-	path = /obj/item/weapon/deck/cah
+	path = /obj/item/deck/cah
 	description = "The ever-popular Cards Against The Galaxy word game. Warning: may include traces of broken fourth wall. This is the white deck."
 
 /datum/gear/cahblack
 	display_name = "Cards Against The Galaxy (black deck)"
-	path = /obj/item/weapon/deck/cah/black
+	path = /obj/item/deck/cah/black
 	description = "The ever-popular Cards Against The Galaxy word game. Warning: may include traces of broken fourth wall. This is the black deck."

code/modules/client/preference_setup/loadout/loadout_smoking.dm

@@ -13,27 +13,27 @@
 
 /datum/gear/matchbook
 	display_name = "matchbook"
-	path = /obj/item/weapon/storage/box/matches
+	path = /obj/item/storage/box/matches
 
 /datum/gear/lighter
 	display_name = "cheap lighter"
-	path = /obj/item/weapon/flame/lighter
+	path = /obj/item/flame/lighter
 
 /datum/gear/lighter/zippo
 	display_name = "Zippo selection"
-	path = /obj/item/weapon/flame/lighter/zippo
+	path = /obj/item/flame/lighter/zippo
 
 /datum/gear/lighter/zippo/New()
 	..()
 	var/list/zippos = list()
-	for(var/zippo in typesof(/obj/item/weapon/flame/lighter/zippo))
-		var/obj/item/weapon/flame/lighter/zippo/zippo_type = zippo
+	for(var/zippo in typesof(/obj/item/flame/lighter/zippo))
+		var/obj/item/flame/lighter/zippo/zippo_type = zippo
 		zippos[initial(zippo_type.name)] = zippo_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(zippos))
 
 /datum/gear/ashtray
 	display_name = "ashtray, plastic"
-	path = /obj/item/weapon/material/ashtray/plastic
+	path = /obj/item/material/ashtray/plastic
 
 /datum/gear/cigar
 	display_name = "cigar"
@@ -41,13 +41,13 @@
 
 /datum/gear/cigarettes
 	display_name = "cigarette selection"
-	path = /obj/item/weapon/storage/fancy/cigarettes
+	path = /obj/item/storage/fancy/cigarettes
 
 /datum/gear/cigarettes/New()
 	..()
 	var/list/cigarettes = list()
-	for(var/cigarette in (typesof(/obj/item/weapon/storage/fancy/cigarettes) - typesof(/obj/item/weapon/storage/fancy/cigarettes/killthroat)))
-		var/obj/item/weapon/storage/fancy/cigarettes/cigarette_brand = cigarette
+	for(var/cigarette in (typesof(/obj/item/storage/fancy/cigarettes) - typesof(/obj/item/storage/fancy/cigarettes/killthroat)))
+		var/obj/item/storage/fancy/cigarettes/cigarette_brand = cigarette
 		cigarettes[initial(cigarette_brand.name)] = cigarette_brand
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cigarettes))
 

code/modules/client/preference_setup/loadout/loadout_utility.dm

@@ -1,12 +1,12 @@
 // "Useful" items - I'm guessing things that might be used at work?
 /datum/gear/utility
 	display_name = "briefcase"
-	path = /obj/item/weapon/storage/briefcase
+	path = /obj/item/storage/briefcase
 	sort_category = "Utility"
 
 /datum/gear/utility/clipboard
 	display_name = "clipboard"
-	path = /obj/item/weapon/clipboard
+	path = /obj/item/clipboard
 
 /datum/gear/utility/tts_device
 	display_name = "text to speech device"
@@ -32,43 +32,43 @@
 
 /datum/gear/utility/codex
 	display_name = "the traveler's guide to vir"
-	path = /obj/item/weapon/book/codex/lore/vir
+	path = /obj/item/book/codex/lore/vir
 	cost = 0
 
 /datum/gear/utility/news
 	display_name = "daedalus pocket newscaster"
-	path = /obj/item/weapon/book/codex/lore/news
+	path = /obj/item/book/codex/lore/news
 	cost = 0
 
 /datum/gear/utility/corp_regs
 	display_name = "corporate regulations and legal code"
-	path = /obj/item/weapon/book/codex/corp_regs
+	path = /obj/item/book/codex/corp_regs
 	cost = 0
 
 /datum/gear/utility/robutt
 	display_name = "a buyer's guide to artificial bodies"
-	path = /obj/item/weapon/book/codex/lore/robutt
+	path = /obj/item/book/codex/lore/robutt
 	cost = 0
 
 /datum/gear/utility/folder_blue
 	display_name = "folder, blue"
-	path = /obj/item/weapon/folder/blue
+	path = /obj/item/folder/blue
 
 /datum/gear/utility/folder_grey
 	display_name = "folder, grey"
-	path = /obj/item/weapon/folder
+	path = /obj/item/folder
 
 /datum/gear/utility/folder_red
 	display_name = "folder, red"
-	path = /obj/item/weapon/folder/red
+	path = /obj/item/folder/red
 
 /datum/gear/utility/folder_white
 	display_name = "folder, white"
-	path = /obj/item/weapon/folder/white
+	path = /obj/item/folder/white
 
 /datum/gear/utility/folder_yellow
 	display_name = "folder, yellow"
-	path = /obj/item/weapon/folder/yellow
+	path = /obj/item/folder/yellow
 
 /datum/gear/utility/paicard
 	display_name = "personal AI device"
@@ -76,7 +76,7 @@
 
 /datum/gear/utility/securecase
 	display_name = "secure briefcase"
-	path =/obj/item/weapon/storage/secure/briefcase
+	path =/obj/item/storage/secure/briefcase
 	cost = 2
 
 /datum/gear/utility/laserpointer
@@ -111,15 +111,15 @@
 
 /datum/gear/utility/battery
 	display_name = "cell, device"
-	path = /obj/item/weapon/cell/device
+	path = /obj/item/cell/device
 
 /datum/gear/utility/pen
 	display_name = "Fountain Pen"
-	path = /obj/item/weapon/pen/fountain
+	path = /obj/item/pen/fountain
 
 /datum/gear/utility/umbrella
 	display_name = "Umbrella"
-	path = /obj/item/weapon/melee/umbrella
+	path = /obj/item/melee/umbrella
 	cost = 3
 
 /datum/gear/utility/umbrella/New()