Device and weapon

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

@@ -13,7 +13,7 @@
 
 /*
 /datum/gear/fluff/testhorn
-	path = /obj/item/weapon/bikehorn
+	path = /obj/item/bikehorn
 	display_name = "Airhorn - Example Item" //Don't use the same as another item
 	description = "An example item that you probably shouldn't see!"
 	ckeywhitelist = list("broman2000")
@@ -65,7 +65,7 @@
 	character_name = list("Madoka Koto")
 
 /datum/gear/fluff/madoka_koto_1
-	path = /obj/item/weapon/oldtwohanded/spear/fluff/madoka_koto_1
+	path = /obj/item/oldtwohanded/spear/fluff/madoka_koto_1
 	display_name = "Madoka's spear"
 	description = "A 10 foot long spear, with a sturdy wooden shaft to which is attached a strange, double spiked steel blade. One is slightly larger than the other."
 	ckeywhitelist = list("blackangelsace")
@@ -124,7 +124,7 @@
 	character_name = list("Strix Hades")
 
 /datum/gear/fluff/strix_headset
-	path = /obj/item/device/radio/headset/fluff/strix
+	path = /obj/item/radio/headset/fluff/strix
 	display_name = "Strix\'s headset"
 	description = "A headset that seems custom made for a avali skull shape, the sounds coming from it are very quiet."
 	ckeywhitelist = list("blackangelsace")
@@ -146,7 +146,7 @@
 
 //Plague Doctor Boye
 /datum/gear/fluff/kel_plague_box
-	path = /obj/item/weapon/storage/box/fluff/kelplague
+	path = /obj/item/storage/box/fluff/kelplague
 	display_name = "Plague Outfit Box"
 	description = "Yes"
 	ckeywhitelist = list("blackangelsace")
@@ -199,7 +199,7 @@
 //captmatt4
 //Payton Joghs
 /datum/gear/fluff/payton_joghs_1
-	path = /obj/item/weapon/material/hatchet/unathiknife/fluff/payton_joghs_1
+	path = /obj/item/material/hatchet/unathiknife/fluff/payton_joghs_1
 	display_name = "Payton's Knife"
 	description = "It appears to be a traditional unathi knife, though with 'Payton' written on the side and appearing to be made of steel."
 	ckeywhitelist = list("captmatt4")
@@ -232,7 +232,7 @@
 //championfire
 //Yuki Windroar
 /datum/gear/fluff/anoki_implant
-	path = /obj/item/weapon/implanter/reagent_generator/roiz/yuki
+	path = /obj/item/implanter/reagent_generator/roiz/yuki
 	display_name = "Egg laying implanter"
 	description = "This is an implant that allows the user to lay eggs."
 	ckeywhitelist = list("championfire")
@@ -264,7 +264,7 @@
 //codavanistok
 //Coda Vanistok // (Yes, I'm aware they're the same. Yes, this is correct.)
 /datum/gear/fluff/coda_implant
-	path = /obj/item/weapon/implanter/fluff/coda
+	path = /obj/item/implanter/fluff/coda
 	display_name = "Locked size implant"
 	description = "It seems to be locked to two settings."
 	ckeywhitelist = list("codavanistok")
@@ -275,7 +275,7 @@
 //dameonowen
 //Dameon Owen
 /datum/gear/fluff/dameon_1
-	path = /obj/item/weapon/reagent_containers/food/snacks/cookie/mysterious
+	path = /obj/item/reagent_containers/food/snacks/cookie/mysterious
 	display_name = "A mysterious cookie"
 	description = "DAS A BIG COOKIE!!!"
 	ckeywhitelist = list("dameonowen")
@@ -291,14 +291,14 @@
 	character_name = list("Melissa Krutz")
 
 /datum/gear/fluff/melissa_1
-	path = /obj/item/weapon/flame/lighter/zippo/fluff/melissa
+	path = /obj/item/flame/lighter/zippo/fluff/melissa
 	display_name = "Zippo"
 	description = "A custom made zippo lighter with word 'Mel' engraved in white font on the bottom right corner. It's black, with red lines around the edges."
 	ckeywhitelist = list("dawidoe")
 	character_name = list("Melissa Krutz")
 
 /datum/gear/fluff/melissa_gun_kit
-	path = /obj/item/device/modkit_conversion/fluff/melissa_gun_kit
+	path = /obj/item/modkit_conversion/fluff/melissa_gun_kit
 	display_name = "Melissa's modkit"
 	description = "A kit containing all the needed tools and parts to modify a 45 Pistol."
 	ckeywhitelist = list("dawidoe")
@@ -307,7 +307,7 @@
 //Dopiotl
 //Jeanne Petite
 /datum/gear/fluff/jeans_chocolates
-	path = /obj/item/weapon/storage/secure/briefcase/fluff/jeans
+	path = /obj/item/storage/secure/briefcase/fluff/jeans
 	display_name = "ChocoBox"
 	description = "M-M-M-M-MONEY SHOT"
 	ckeywhitelist = list("dopiotl")
@@ -321,7 +321,7 @@
 //dwaggy90
 //Saur Darastrix
 /datum/gear/fluff/saur_rig
-	path = /obj/item/weapon/rig/medical/equipped/fluff/saur
+	path = /obj/item/rig/medical/equipped/fluff/saur
 	display_name = "AMR-DRGN"
 	description = "This seems to be a highly customized Medical RIG suit, coloured black and purple, and with an added extendable plating to include a pair of wings and a tail comfortably within the suits protection. There's a nametag on the chest piece, and on the control module itself, with the name 'Saur Darastrix' on it."
 	ckeywhitelist = list("dwaggy90")
@@ -337,7 +337,7 @@
 	allowed_roles = list("Blueshield Guard")
 
 /datum/gear/fluff/saur_dufflebag
-	path = /obj/item/weapon/storage/backpack/dufflebag/fluff/saur_dufflebag
+	path = /obj/item/storage/backpack/dufflebag/fluff/saur_dufflebag
 	display_name = "Saur's Dufflebag"
 	description = "A large custom made dufflebag to fit snug between a pair of wings, fitted with custom purple straps and golden medical cross, with the name 'Saur Darastrix' written under it."
 	ckeywhitelist = list("dwaggy90")
@@ -368,7 +368,7 @@
 //deepindigo
 //Amina Dae-Kouri
 /datum/gear/fluff/amina_1
-	path = /obj/item/weapon/storage/bible/fluff/amina
+	path = /obj/item/storage/bible/fluff/amina
 	display_name = "New Space Pioneer's Bible"
 	description = "This one says it was printed in 2492. The name \"Eric Hayvers\" is written on the inside of the cover, crossed out. Under it is written \"Kouri, Amina, Marine Unit 14, Fifth Echelon. Service number NTN-5528928522372\""
 	ckeywhitelist = list("deepindigo")
@@ -379,7 +379,7 @@
 //esperkin
 //Sheri Calen
 /datum/gear/fluff/sheri_rig_kit
-	path = /obj/item/device/modkit_conversion/fluff/sheri_rig_kit
+	path = /obj/item/modkit_conversion/fluff/sheri_rig_kit
 	display_name = "Sheri's modkit"
 	description = "A kit containing all the needed tools and parts to modify a Research Director rig suit. It has a snake painted on it."
 	ckeywhitelist = list("esperkin")
@@ -391,14 +391,14 @@
 //Foxicide
 //Kaith
 /datum/gear/fluff/kaith_modkit
-	path = /obj/item/device/modkit_conversion/fluff/kaith_knife_kit
+	path = /obj/item/modkit_conversion/fluff/kaith_knife_kit
 	display_name = "Kaith's modkit"
 	description = "A kit containing all the needed tools and parts to modify a survival knife"
 	ckeywhitelist = list("foxicide")
 	character_name = list("Kaith")
 
 /datum/gear/fluff/kaith_bag
-	path = /obj/item/weapon/storage/backpack/fluff/kaith
+	path = /obj/item/storage/backpack/fluff/kaith
 	display_name = "Light duffle bag"
 	description = "A compact duffle bag, meant for long hikes."
 	ckeywhitelist = list("foxicide")
@@ -452,14 +452,14 @@
 	character_name = list("Amara Faell")
 
 /datum/gear/fluff/amara_zippo
-	path = /obj/item/weapon/flame/lighter/zippo/fluff/amara
+	path = /obj/item/flame/lighter/zippo/fluff/amara
 	display_name = "Amara's Zippo"
 	description = "A zippo that comes in a metallic blood red case. How the flame can be lime green is an enigma in itself."
 	ckeywhitelist = list("generalpantsu")
 	character_name = list("Amara Faell")
 
 /datum/gear/fluff/amara_hos_kit
-	path = /obj/item/device/modkit_conversion/fluff/amara_hos_kit
+	path = /obj/item/modkit_conversion/fluff/amara_hos_kit
 	display_name = "Amara's modkit"
 	description = "A kit containing all the needed tools and parts to modify a Head of security armored coat. It has a red wolf painted on it."
 	ckeywhitelist = list("generalpantsu")
@@ -467,7 +467,7 @@
 	allowed_roles = list("Head of Security")
 
 /datum/gear/fluff/amara_belt
-	path = /obj/item/weapon/storage/belt/security/tactical/amara_belt
+	path = /obj/item/storage/belt/security/tactical/amara_belt
 	display_name = "Mercenary belt"
 	description = "A sturdy military belt with a shiny buckle and a bunch of pouches."
 	ckeywhitelist = list("generalpantsu")
@@ -533,7 +533,7 @@
 	character_name = list("Samantha Quzix")
 
 /datum/gear/fluff/sam_belt
-	path = /obj/item/weapon/storage/belt/utility/fluff/sam_belt
+	path = /obj/item/storage/belt/utility/fluff/sam_belt
 	display_name = "Mech Pilot Belt"
 	description = "A white-blue toolbelt with many slots to hold tools in, seems to be made to literally be attached onto a suit."
 	ckeywhitelist = list("generalpantsu")
@@ -550,7 +550,7 @@
 //Glitterpaws
 
 /datum/gear/fluff/goz_whitecane
-	path = /obj/item/weapon/melee/goz_whitecane
+	path = /obj/item/melee/goz_whitecane
 	display_name = "Telescopic White Cane."
 	description = "A telescoping white cane. They are commonly used by the blind or visually impaired as a mobility tool or as a courtesy to others."
 	ckeywhitelist = list("gozulio")
@@ -598,7 +598,7 @@
 
 //Raja Bastet
 /datum/gear/fluff/raja_belt
-	path = /obj/item/weapon/storage/belt/utility/fluff/raja_belt
+	path = /obj/item/storage/belt/utility/fluff/raja_belt
 	display_name = "Mech Engineer Belt"
 	description = "A black-golden toolbelt with many slots to hold tools in. Also comes with a blue buckle."
 	ckeywhitelist = list("izac112")
@@ -697,7 +697,7 @@
 //lukevale
 //Mira Rezus
 /datum/gear/fluff/mira_1
-	path = /obj/item/weapon/implanter/reagent_generator/mira
+	path = /obj/item/implanter/reagent_generator/mira
 	display_name = "Mira's implanter"
 	description = ""
 	ckeywhitelist = list("lukevale")
@@ -749,7 +749,7 @@
 	character_name = list("Mitsuko Jiao")
 
 /datum/gear/fluff/jiao_belt
-	path = /obj/item/weapon/storage/belt/medical/fluff/jiao_belt
+	path = /obj/item/storage/belt/medical/fluff/jiao_belt
 	display_name = "Navy medical belt"
 	description = "A customized medical belt to sport the navy colors of the Kanghu force."
 	ckeywhitelist = list("lukevale")
@@ -763,21 +763,21 @@
 	character_name = list("Mitsuko Jiao")
 
 /datum/gear/fluff/jiao_anynlizer_kit_a
-	path = /obj/item/device/modkit_conversion/fluff/jiao_anynlizer_kit/a
+	path = /obj/item/modkit_conversion/fluff/jiao_anynlizer_kit/a
 	display_name = "Mitsuko's modkit Mk1"
 	description = "A kit containing all the needed tools and parts to modify a heath analyzer. It has a Emblem painted on it."
 	ckeywhitelist = list("lukevale")
 	character_name = list("Mitsuko Jiao")
 
 /datum/gear/fluff/jiao_anynlizer_kit_b
-	path = /obj/item/device/modkit_conversion/fluff/jiao_anynlizer_kit/b
+	path = /obj/item/modkit_conversion/fluff/jiao_anynlizer_kit/b
 	display_name = "Mitsuko's modkit Mk2"
 	description = "A kit containing all the needed tools and parts to modify a heath analyzer. It has a Emblem painted on it."
 	ckeywhitelist = list("lukevale")
 	character_name = list("Mitsuko Jiao")
 
 /datum/gear/fluff/jiao_anynlizer_kit_c
-	path = /obj/item/device/modkit_conversion/fluff/jiao_anynlizer_kit/c
+	path = /obj/item/modkit_conversion/fluff/jiao_anynlizer_kit/c
 	display_name = "Mitsuko's modkit Mk3"
 	description = "A kit containing all the needed tools and parts to modify a heath analyzer. It has a Emblem painted on it."
 	ckeywhitelist = list("lukevale")
@@ -805,7 +805,7 @@
 	allowed_roles = list("Explorer", "Pathfinder")
 
 /datum/gear/fluff/mocha_suit_kit
-	path = /obj/item/device/modkit_conversion/fluff/mocha_suit_kit
+	path = /obj/item/modkit_conversion/fluff/mocha_suit_kit
 	display_name = "Mocha's modkit"
 	description = "A kit containing all the needed tools and parts to modify a Explorer Suit"
 	ckeywhitelist = list("mocatheporg1")
@@ -822,7 +822,7 @@
 //  N CKEYS
 //NESgamer190
 /datum/gear/fluff/lucy_flask
-	path = /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask/fluff/lucyprice
+	path = /obj/item/reagent_containers/food/drinks/flask/vacuumflask/fluff/lucyprice
 	display_name = "Cryostasis Thermos"
 	description = "A thermos that has been designed to look something akin to a mix between a cryostasis beaker and a thermos.  Does NOT keep the drinks cold, surprisingly enough.."
 	ckeywhitelist = list("nesgamer190")
@@ -890,7 +890,7 @@
 	ckeywhitelist = list("radiantflash")
 	character_name = list("Vasharr Zahirn")
 /datum/gear/fluff/vasharr_coffee
-	path = /obj/item/weapon/reagent_containers/food/drinks/bluespace_coffee
+	path = /obj/item/reagent_containers/food/drinks/bluespace_coffee
 	display_name = "Bluespace Coffee"
 	description = "Dreamt up in a strange feverish dream, this coffee cup seems to have been heavily modified with a variety of unlikely parts and wires, and never seems to run out of coffee. Truly the differance between madmen and genius is success."
 	ckeywhitelist = list("radiantflash")