bunch more repaths from merge

_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm

@@ -2982,7 +2982,7 @@
 	dir = 1
 	},
 /obj/machinery/light/directional/west,
-/obj/item/kitchen/knife/hunting,
+/obj/item/melee/knife/hunting,
 /obj/item/clothing/suit/hooded/cloak/goliath,
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plasteel/white,
@@ -3828,7 +3828,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/item/kitchen/knife/shiv,
+/obj/item/melee/knife/shiv,
 /turf/open/floor/plasteel/white,
 /area/ruin/lavaland/factory/adminstrative)
 "LX" = (

_maps/shuttles/independent/independent_sunskipper.dmm

@@ -873,8 +873,8 @@
 	},
 /obj/item/pickaxe,
 /obj/item/pickaxe,
-/obj/item/kitchen/knife/hunting,
-/obj/item/kitchen/knife/hunting,
+/obj/item/melee/knife/hunting,
+/obj/item/melee/knife/hunting,
 /obj/item/clothing/suit/hazardvest,
 /obj/item/clothing/suit/hazardvest,
 /obj/item/clothing/head/hardhat/mining,

_maps/shuttles/roumain/srm_elder.dmm

@@ -1533,7 +1533,7 @@
 /obj/item/clothing/shoes/cowboy,
 /obj/item/clothing/shoes/cowboy/black,
 /obj/item/clothing/shoes/combat,
-/obj/item/kitchen/knife/hunting,
+/obj/item/melee/knife/hunting,
 /obj/item/gps{
 	pixel_x = -7
 	},

_maps/shuttles/syndicate/syndicate_panacea.dmm

@@ -7344,7 +7344,7 @@
 /obj/item/cutting_board{
 	pixel_y = 3
 	},
-/obj/item/kitchen/knife/butcher{
+/obj/item/melee/knife/butcher{
 	pixel_y = 4;
 	pixel_x = 4
 	},

code/datums/components/crafting/recipes/weapon.dm

@@ -161,7 +161,7 @@
 
 /datum/crafting_recipe/spear
 	name = "Spear"
-	result = /obj/item/spear
+	result = /obj/item/melee/spear
 	reqs = list(/obj/item/restraints/handcuffs/cable = 1,
 				/obj/item/shard = 1,
 				/obj/item/stack/rods = 1)
@@ -261,7 +261,7 @@
 
 /datum/crafting_recipe/bonespear
 	name = "Bone Spear"
-	result = /obj/item/spear/bonespear
+	result = /obj/item/melee/spear/bone
 	time = 30
 	reqs = list(/obj/item/stack/sheet/bone = 4,
 				/obj/item/stack/sheet/sinew = 1)

code/game/gamemodes/nuclear/nuclear.dm

@@ -169,7 +169,7 @@
 	backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\
 		/obj/item/tank/jetpack/oxygen/harness=1,\
 		/obj/item/gun/ballistic/automatic/pistol/ringneck=1,\
-		/obj/item/kitchen/knife/combat/survival)
+		/obj/item/melee/knife/survival)
 
 
 /datum/game_mode/nuclear/generate_credit_text()

code/game/objects/items/melee/spear.dm

@@ -45,7 +45,7 @@
 /*
  * Bone Spear
  */
-/obj/item/melee/spear/bonespear	//Blatant imitation of spear, but made out of bone. Not valid for explosive modification.
+/obj/item/melee/spear/bone	//Blatant imitation of spear, but made out of bone. Not valid for explosive modification.
 	icon_state = "bone_spear0"
 	name = "bone spear"
 	base_icon_state = "bone_spear0"
@@ -55,7 +55,7 @@
 	force = 11
 	throwforce = 21
 
-/obj/item/melee/spear/bonespear/ComponentInitialize()
+/obj/item/melee/spear/bone/ComponentInitialize()
 	. = ..()
 	AddComponent(/datum/component/two_handed, force_unwielded=11, force_wielded=19, icon_wielded="[icon_prefix]1")
 

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

@@ -519,7 +519,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
 
 GLOBAL_LIST_INIT(bone_recipes, list( \
 	new /datum/stack_recipe("mortar", /obj/item/reagent_containers/glass/mortar/bone, 3), \
-	new /datum/stack_recipe("bone dagger", /obj/item/kitchen/knife/combat/bone, 2)))
+	new /datum/stack_recipe("bone dagger", /obj/item/melee/knife/bone, 2)))
 
 /obj/item/stack/sheet/bone
 	name = "bones"

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

@@ -22,7 +22,7 @@
 			new /obj/item/multitool/ai_detect(src) // 1 tc
 			new /obj/item/encryptionkey/syndicate(src) // 2 tc
 			new /obj/item/reagent_containers/syringe/mulligan(src) // 4 tc
-			new /obj/item/kitchen/knife/switchblade(src) //I'll count this as 2 tc
+			new /obj/item/melee/knife/switchblade(src) //I'll count this as 2 tc
 			new /obj/item/storage/fancy/cigarettes/cigpack_syndicate (src) // 2 tc this shit heals
 			new /obj/item/flashlight/emp(src) // 2 tc
 			new /obj/item/chameleon(src) // 7 tc
@@ -184,7 +184,7 @@
 		if("made_man")
 			new /obj/effect/spawner/lootdrop/mafia_outfit(src) // 0 TC, just an outfit for the new 'don of this family
 			new /obj/item/gun/ballistic/automatic/smg/firestorm/pan(src) // 20 TC, a gun with 50 .45 bullets on a three round burst is kinda outstanding
-			new /obj/item/kitchen/knife/switchblade(src) // 3 TC? It's nice, but it's really a stealth/oh fuck I'm out of ammo weapon
+			new /obj/item/melee/knife/switchblade(src) // 3 TC? It's nice, but it's really a stealth/oh fuck I'm out of ammo weapon
 			new /obj/item/reagent_containers/food/drinks/bottle/vodka (src) // 5 TC, free molotov assemblies
 			new /obj/item/reagent_containers/food/drinks/bottle/vodka (src)
 			new /obj/item/reagent_containers/food/drinks/bottle/vodka (src)

code/game/objects/structures/headpike.dm

@@ -24,9 +24,9 @@
 		victim = new(src)
 		victim.real_name = random_unique_name(prob(50))
 
-	spear = locate(bonespear ? /obj/item/melee/spear/bonespear : /obj/item/melee/spear) in parts_list
+	spear = locate(bonespear ? /obj/item/melee/spear/bone : /obj/item/melee/spear) in parts_list
 	if(!spear)
-		spear = bonespear ? new/obj/item/melee/spear/bonespear(src) : new/obj/item/melee/spear(src)
+		spear = bonespear ? new/obj/item/melee/spear/bone(src) : new/obj/item/melee/spear(src)
 
 	update_appearance()
 	return ..()

code/modules/cargo/blackmarket/blackmarket_items/weapons.dm

@@ -15,7 +15,7 @@
 /datum/blackmarket_item/weapon/bone_spear
 	name = "Bone Spear"
 	desc = "Authentic tribal spear, made from real bones! A steal at any price, especially if you're a caveman."
-	item = /obj/item/melee/spear/bonespear
+	item = /obj/item/melee/spear/bone
 
 	price_min = 200
 	price_max = 300
@@ -25,7 +25,7 @@
 /datum/blackmarket_item/weapon/switchblade
 	name = "Switchblade"
 	desc = "Extra shrap switchblades for intimidation AND style. Bandages not included if you cut yourself."
-	item = /obj/item/kitchen/knife/switchblade
+	item = /obj/item/melee/knife/switchblade
 
 	price_min = 500
 	price_max = 700

code/modules/cargo/packs/costumes_toys.dm

@@ -115,7 +115,7 @@
 		if(prob(30)) //Not all mafioso have mustaches, some people also find this item annoying.
 			new /obj/item/clothing/mask/fakemoustache/italian(C)
 	if(prob(10)) //A little extra sugar every now and then to shake things up.
-		new	/obj/item/kitchen/knife/switchblade(C)
+		new	/obj/item/melee/knife/switchblade(C)
 
 /datum/supply_pack/costumes_toys/mech_suits
 	name = "Exosuit Pilot's Suit Crate"

code/modules/clothing/outfits/ert/frontiersmen_ert.dm

@@ -123,7 +123,7 @@
 				/obj/item/gun/energy/e_gun/mini))
 		if("Melee")
 			r_hand = pickweight(list(
-			/obj/item/kitchen/knife/combat/survival = 15,
+			/obj/item/melee/knife/survival = 15,
 			/obj/item/melee/baseball_bat = 10,
 			/obj/item/melee/roastingstick = 2,
 			/obj/item/kitchen/fork = 1,
@@ -173,14 +173,14 @@
 	suit = /obj/item/clothing/suit/armor/frontier
 	suit_store = /obj/item/gun/ballistic/automatic/pistol/deagle
 
-	backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/ammo_box/magazine/m50=2, /obj/item/binoculars=1, /obj/item/kitchen/knife/combat/survival)
+	backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/ammo_box/magazine/m50=2, /obj/item/binoculars=1, /obj/item/melee/knife/survival)
 
 /datum/outfit/job/frontiersmen/ert/leader/unnarmed
 	name = "ERT - Frontiersman Officer (Unnarmed)"
 
 	suit_store = null
 
-	backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/binoculars=1, /obj/item/kitchen/knife/combat/survival)
+	backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/binoculars=1, /obj/item/melee/knife/survival)
 
 /datum/outfit/job/frontiersmen/ert/medic
 	name = "ERT - Frontiersman Medic"

code/modules/clothing/outfits/ert/nanotrasen_ert.dm

@@ -29,7 +29,7 @@
 	belt = /obj/item/storage/belt/security/full
 	backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
 		/obj/item/melee/baton/loaded=1)
-	l_pocket = /obj/item/kitchen/knife/switchblade
+	l_pocket = /obj/item/melee/knife/switchblade
 
 /datum/outfit/centcom/ert/commander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	..()

code/modules/clothing/outfits/factions/frontiersmen.dm

@@ -184,7 +184,7 @@
 	accessory = /obj/item/clothing/accessory/armband/med
 	uniform = /obj/item/clothing/under/frontiersmen
 	glasses = /obj/item/clothing/glasses/hud/health
-	r_pocket = /obj/item/kitchen/knife/combat/survival
+	r_pocket = /obj/item/melee/knife/survival
 	suit = /obj/item/clothing/suit/frontiersmen
 	head = /obj/item/clothing/head/frontier
 	belt = /obj/item/storage/belt/medical/webbing/frontiersmen

code/modules/clothing/outfits/factions/independent.dm

@@ -349,7 +349,7 @@
 	uniform = /obj/item/clothing/under/utility
 	head = /obj/item/clothing/head/soft/black
 	shoes = /obj/item/clothing/shoes/combat
-	l_pocket = /obj/item/kitchen/knife/combat/survival
+	l_pocket = /obj/item/melee/knife/survival
 	gloves = /obj/item/clothing/gloves/color/red/insulated
 
 	implants = list(/obj/item/implant/radio)

code/modules/clothing/outfits/factions/nanotrasen.dm

@@ -316,7 +316,7 @@
 
 	backpack_contents = list(
 						/obj/item/flashlight/seclite=1,
-						/obj/item/kitchen/knife/combat/survival=1,
+						/obj/item/melee/knife/survival=1,
 						/obj/item/stack/marker_beacon/ten=1,
 						/obj/item/radio/weather_monitor=1,
 						)

code/modules/clothing/outfits/factions/syndicate.dm

@@ -711,7 +711,7 @@
 	head = /obj/item/clothing/head/hardliners
 	suit = /obj/item/clothing/suit/hardliners
 	glasses = /obj/item/clothing/glasses/hud/health
-	r_pocket = /obj/item/kitchen/knife/combat/survival
+	r_pocket = /obj/item/melee/knife/survival
 	back = /obj/item/storage/backpack/duffelbag/syndie/med
 	id = /obj/item/card/id/syndicate_command/crew_id
 	backpack_contents = list(/obj/item/storage/box/survival/syndie=1, /obj/item/storage/firstaid/medical,)
@@ -723,7 +723,7 @@
 	head = /obj/item/clothing/head/ngr/surgical
 	suit = /obj/item/clothing/suit/ngr/smock
 	glasses = /obj/item/clothing/glasses/hud/health
-	r_pocket = /obj/item/kitchen/knife/combat/survival
+	r_pocket = /obj/item/melee/knife/survival
 	back = /obj/item/storage/backpack/duffelbag/syndie/med
 	id = /obj/item/card/id/syndicate_command/crew_id
 	backpack_contents = list(/obj/item/storage/box/survival/syndie=1, /obj/item/storage/firstaid/medical,)

code/modules/mapping/mapping_helpers.dm

@@ -280,7 +280,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
 	//cake + knife to cut it!
 	if(length(table))
 		var/turf/food_turf = get_turf(pick(table))
-		new /obj/item/kitchen/knife(food_turf)
+		new /obj/item/melee/knife/kitchen(food_turf)
 		var/obj/item/food/cake/birthday/iancake = new(food_turf)
 		iancake.desc = "Happy birthday, Ian!"
 

code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm

@@ -9,7 +9,7 @@
 	melee_damage_lower = 15
 	melee_damage_upper = 15
 	loot = list(/obj/effect/mob_spawn/human/corpse/frontier,
-				/obj/item/kitchen/knife/combat/survival)
+				/obj/item/melee/knife/survival)
 	atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
 	faction = list(FACTION_ANTAG_FRONTIERSMEN)
 	footstep_type = FOOTSTEP_MOB_SHOE

code/modules/mob/living/simple_animal/hostile/megafauna/cult_templar.dm

@@ -23,8 +23,8 @@
 	ranged_cooldown_time = 20
 	vision_range = 10
 	damage_coeff = list(BRUTE = 1, BURN = 0.5, TOX = 0.5, CLONE = 0.5, STAMINA = 0, OXY = 0.5)
-	loot = list(/obj/item/claymore/cursed, /obj/item/clothing/suit/space/hardsuit/cult/enchanted)
-	mob_trophy = list(/obj/item/claymore/cursed, /obj/item/clothing/suit/space/hardsuit/cult/enchanted, /obj/item/upgradescroll)
+	loot = list(/obj/item/melee/sword/claymore, /obj/item/clothing/suit/space/hardsuit/cult/enchanted)
+	mob_trophy = list(/obj/item/melee/sword/claymore, /obj/item/clothing/suit/space/hardsuit/cult/enchanted, /obj/item/upgradescroll)
 	wander = FALSE
 	del_on_death = TRUE
 	blood_volume = BLOOD_VOLUME_NORMAL

code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm

@@ -230,7 +230,7 @@
 					/obj/item/stack/marker_beacon/ten = 2,
 					/obj/item/mining_scanner = 2,
 					/obj/item/extinguisher/mini = 2,
-					/obj/item/kitchen/knife/combat/survival = 3,
+					/obj/item/melee/knife/survival = 3,
 					/obj/item/flashlight/seclite = 3,
 					/obj/item/stack/sheet/sinew = 3,
 					/obj/item/stack/sheet/bone = 3
@@ -275,7 +275,7 @@
 	if(prob(75))
 		back = pick(/obj/item/storage/backpack/industrial, /obj/item/storage/backpack/satchel/eng, /obj/item/storage/backpack/duffelbag/engineering, /obj/item/storage/backpack/messenger/engi)
 	if(prob(10))
-		back = /obj/item/fireaxe
+		back = /obj/item/melee/axe/fire
 	for(var/i = 1 to 3)
 		if(prob(75))
 			backpack_contents += pickweight(list(

code/modules/mod/modules/modules_ninja.dm

@@ -170,7 +170,7 @@
 	/// The item linked to the module that will get recalled.
 	var/obj/item/linked_weapon
 	/// The accepted typepath we can link to.
-	var/accepted_type = /obj/item/energy_katana
+	var/accepted_type = /obj/item/melee/sword/energy_katana
 
 /obj/item/mod/module/weapon_recall/on_suit_activation()
 	ADD_TRAIT(mod.wearer, TRAIT_NOGUNS, MOD_TRAIT)

code/modules/research/designs/autolathe_designs.dm

@@ -865,7 +865,7 @@
 	id = "cleaver"
 	build_type = AUTOLATHE
 	materials = list(/datum/material/iron = 18000)
-	build_path = /obj/item/kitchen/knife/butcher
+	build_path = /obj/item/melee/knife/butcher
 	category = list("initial", "Dinnerware")
 
 /datum/design/spraycan

code/modules/vending/drinnerware.dm

@@ -16,9 +16,9 @@
 		/obj/item/clothing/suit/apron/chef = 2,
 		/obj/item/kitchen/rollingpin = 2,
 		/obj/item/melee/knife/kitchen = 2,
-		/obj/item/kitchen/knife/pizza_cutter = 2,
+		/obj/item/melee/knife/pizza_cutter = 2,
 		/obj/item/book/granter/crafting_recipe/cooking_sweets_101 = 2,
-		/obj/item/kitchen/knife/butcher = 1)
+		/obj/item/melee/knife/butcher = 1)
 	refill_canister = /obj/item/vending_refill/dinnerware
 	default_price = 50
 	extra_price = 250