Two-handed component

_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm

@@ -146,8 +146,8 @@
 /area/ruin/powered/fishing/shop)
 "dV" = (
 /obj/structure/rack,
-/obj/item/twohanded/fishingrod,
-/obj/item/twohanded/fishingrod,
+/obj/item/fishingrod,
+/obj/item/fishingrod,
 /obj/item/storage/toolbox/mechanical/insulateds{
 	pixel_x = 1;
 	pixel_y = -1
@@ -1537,7 +1537,7 @@
 /obj/machinery/vending/fishing{
 	contraband = list(/obj/item/reagent_containers/food/snacks/bait/type = 6);
 	premium = list(/obj/item/reagent_containers/food/snacks/bait/master = 10);
-	products = list(/obj/item/twohanded/fishingrod = 12, /obj/item/reagent_containers/food/snacks/bait/apprentice = 30, /obj/item/reagent_containers/food/snacks/bait/journeyman = 20, /obj/item/clothing/head/fishing = 6, /obj/item/clothing/suit/fishing = 6, /obj/item/clothing/gloves/fishing = 6, /obj/item/clothing/shoes/fishing = 6)
+	products = list(/obj/item/fishingrod = 12, /obj/item/reagent_containers/food/snacks/bait/apprentice = 30, /obj/item/reagent_containers/food/snacks/bait/journeyman = 20, /obj/item/clothing/head/fishing = 6, /obj/item/clothing/suit/fishing = 6, /obj/item/clothing/gloves/fishing = 6, /obj/item/clothing/shoes/fishing = 6)
 	},
 /turf/open/floor/plasteel,
 /area/ruin/powered/fishing/shop)

_maps/RandomRuins/LavaRuins/lavaland_surface_I.dmm

@@ -181,7 +181,7 @@
 "BJ" = (
 /obj/structure/closet/crate/coffin,
 /obj/item/shield/riot/buckler,
-/obj/item/twohanded/spear,
+/obj/item/melee/spear,
 /turf/open/floor/plasteel/dark/lavaland,
 /area/ruin/unpowered)
 "Ch" = (
@@ -200,7 +200,7 @@
 /turf/open/floor/plasteel/dark/lavaland,
 /area/ruin/unpowered)
 "He" = (
-/obj/item/twohanded/spear,
+/obj/item/melee/spear,
 /turf/open/floor/plating/lavaland_baseturf{
 	icon_state = "panelscorched"
 	},
@@ -221,14 +221,14 @@
 "NG" = (
 /obj/structure/closet/crate/coffin,
 /obj/effect/mob_spawn/human/skeleton,
-/obj/item/twohanded/spear,
+/obj/item/melee/spear,
 /turf/open/floor/plasteel/dark/lavaland,
 /area/ruin/unpowered)
 "Pa" = (
 /obj/structure/closet/crate/coffin,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/shield/riot/buckler,
-/obj/item/twohanded/spear,
+/obj/item/melee/spear,
 /turf/open/floor/plasteel/dark/lavaland,
 /area/ruin/unpowered)
 "QE" = (

_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm

@@ -529,7 +529,7 @@
 /turf/open/floor/plasteel,
 /area/ruin/powered/animal_hospital)
 "bt" = (
-/obj/item/twohanded/required/kirbyplants,
+/obj/item/kirbyplants,
 /turf/open/floor/plasteel,
 /area/ruin/powered/animal_hospital)
 "bu" = (

_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm

@@ -1276,7 +1276,7 @@
 	dir = 4
 	},
 /obj/effect/mapping_helpers/no_lava,
-/obj/item/twohanded/bonespear,
+/obj/item/melee/spear/bonespear,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "AD" = (
@@ -1305,12 +1305,12 @@
 	dir = 8
 	},
 /obj/structure/table/wood,
-/obj/item/twohanded/bonespear,
-/obj/item/twohanded/bonespear{
+/obj/item/melee/spear/bonespear,
+/obj/item/melee/spear/bonespear{
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/obj/item/twohanded/bonespear{
+/obj/item/melee/spear/bonespear{
 	pixel_x = -3;
 	pixel_y = 3
 	},

_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm

@@ -334,7 +334,7 @@
 /turf/open/floor/plating,
 /area/ruin/powered/snow_biodome)
 "As" = (
-/obj/item/twohanded/required/kirbyplants/random,
+/obj/item/kirbyplants/random,
 /turf/open/floor/wood,
 /area/ruin/powered/snow_biodome)
 "AM" = (
@@ -372,7 +372,7 @@
 /turf/open/floor/pod/dark,
 /area/ruin/powered/snow_biodome)
 "KS" = (
-/obj/item/twohanded/required/chainsaw,
+/obj/item/melee/chainsaw,
 /obj/structure/closet,
 /obj/machinery/light/small{
 	dir = 4

_maps/RandomRuins/LavaRuins/lavaland_surface_cursedtoyshop.dmm

@@ -479,7 +479,7 @@
 /area/ruin/powered)
 "bb" = (
 /obj/structure/table/wood,
-/obj/item/twohanded/dualsaber/toy,
+/obj/item/melee/dualsaber/toy,
 /obj/item/toy/katana{
 	pixel_x = 6
 	},

_maps/RandomRuins/LavaRuins/lavaland_surface_forgottenkitchen.dmm

@@ -198,7 +198,7 @@
 /turf/open/floor/plating/lavaland_baseturf,
 /area/ruin/powered)
 "kb" = (
-/obj/item/twohanded/required/kirbyplants/random,
+/obj/item/kirbyplants/random,
 /obj/effect/turf_decal/tile/dark/opposingcorners,
 /obj/effect/turf_decal/tile/red/opposingcorners,
 /turf/open/floor/plasteel/lavaland,
@@ -213,7 +213,7 @@
 	},
 /area/ruin/powered)
 "kD" = (
-/obj/item/twohanded/required/kirbyplants/dead,
+/obj/item/kirbyplants/dead,
 /obj/effect/turf_decal/tile/dark/opposingcorners,
 /obj/effect/turf_decal/tile/red/opposingcorners,
 /obj/item/stack/sheet/metal,

_maps/RandomRuins/LavaRuins/lavaland_surface_kinggoatboss.dmm

@@ -139,7 +139,7 @@
 /area/lavaland/surface/outdoors)
 "G" = (
 /obj/effect/decal/cleanable/blood/old,
-/obj/item/twohanded/spear,
+/obj/item/melee/spear,
 /mob/living/simple_animal/hostile/retaliate/goat,
 /turf/open/floor/wood,
 /area/ruin/powered/kinggoatlair)

_maps/RandomRuins/LavaRuins/lavaland_surface_medical.dmm

@@ -612,7 +612,7 @@
 /turf/open/floor/plasteel/white,
 /area/ruin/powered)
 "bI" = (
-/obj/item/twohanded/required/kirbyplants,
+/obj/item/kirbyplants,
 /obj/machinery/light,
 /turf/open/floor/plasteel/white,
 /area/ruin/powered)

_maps/RandomRuins/LavaRuins/lavaland_surface_meteorite.dmm

@@ -337,7 +337,7 @@
 	pixel_x = -3;
 	pixel_y = -6
 	},
-/obj/item/twohanded/fireaxe/boneaxe,
+/obj/item/fireaxe/boneaxe,
 /mob/living/simple_animal/hostile/asteroid/gutlunch,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
@@ -1339,7 +1339,7 @@
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "yJ" = (
-/obj/item/twohanded/bonespear{
+/obj/item/melee/spear/bonespear{
 	pixel_x = 3;
 	pixel_y = -3
 	},
@@ -1912,7 +1912,7 @@
 /obj/structure/closet/crate/necropolis{
 	anchored = 1
 	},
-/obj/item/twohanded/required/gibtonite{
+/obj/item/melee/gibtonite{
 	quality = 3
 	},
 /obj/item/survivalcapsule/luxuryelite{
@@ -2636,11 +2636,11 @@
 /obj/structure/stone_tile/cracked{
 	dir = 1
 	},
-/obj/item/twohanded/bonespear{
+/obj/item/melee/spear/bonespear{
 	pixel_x = -11;
 	pixel_y = 1
 	},
-/obj/item/twohanded/bonespear{
+/obj/item/melee/spear/bonespear{
 	pixel_x = 3;
 	pixel_y = -1
 	},
@@ -2651,11 +2651,11 @@
 /obj/structure/stone_tile/cracked{
 	dir = 1
 	},
-/obj/item/twohanded/bonespear{
+/obj/item/melee/spear/bonespear{
 	pixel_x = -11;
 	pixel_y = 1
 	},
-/obj/item/twohanded/bonespear{
+/obj/item/melee/spear/bonespear{
 	pixel_x = 3;
 	pixel_y = -1
 	},

_maps/RandomRuins/LavaRuins/lavaland_surface_weavernest.dmm

@@ -30,7 +30,7 @@
 "dV" = (
 /obj/structure/table,
 /obj/effect/turf_decal/sand,
-/obj/item/twohanded/bonespear,
+/obj/item/melee/spear/bonespear,
 /turf/open/floor/plasteel/lavaland,
 /area/ruin/unpowered)
 "fQ" = (
@@ -150,7 +150,7 @@
 /area/ruin/unpowered)
 "za" = (
 /obj/effect/mob_spawn/human/skeleton,
-/obj/item/twohanded/bonespear,
+/obj/item/melee/spear/bonespear,
 /obj/item/reagent_containers/food/snacks/spidereggs,
 /obj/effect/spawner/lootdrop/mob/marrow_weaver,
 /obj/structure/spider/stickyweb,
@@ -222,7 +222,7 @@
 "He" = (
 /obj/effect/mob_spawn/human/skeleton,
 /obj/item/clothing/suit/armor/bone,
-/obj/item/twohanded/fireaxe/boneaxe,
+/obj/item/fireaxe/boneaxe,
 /obj/structure/spider/stickyweb,
 /obj/structure/spider/cocoon,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,

_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm

@@ -165,7 +165,7 @@
 /turf/open/floor/plasteel/grimy,
 /area/ruin/space/has_grav/hilbertresearchfacility)
 "D" = (
-/obj/item/twohanded/required/kirbyplants/random,
+/obj/item/kirbyplants/random,
 /turf/open/floor/plasteel/grimy,
 /area/ruin/space/has_grav/hilbertresearchfacility)
 "E" = (

_maps/RandomRuins/SpaceRuins/listeningstation.dmm

@@ -878,7 +878,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
-/obj/item/twohanded/required/kirbyplants,
+/obj/item/kirbyplants,
 /turf/open/floor/plasteel/grimy,
 /area/ruin/space/has_grav/listeningstation/quarters)
 "hv" = (
@@ -1193,7 +1193,7 @@
 /obj/item/clothing/head/HoS/syndicate{
 	desc = "A black cap fit for a Syndicate recon officer."
 	},
-/obj/item/twohanded/binoculars,
+/obj/item/binoculars,
 /obj/item/clothing/under/syndicate,
 /obj/item/clothing/under/syndicate/combat,
 /obj/item/clothing/under/syndicate/camo,
@@ -1215,7 +1215,7 @@
 /obj/effect/turf_decal/tile/red/anticorner/contrasted{
 	dir = 8
 	},
-/obj/item/twohanded/required/kirbyplants/photosynthetic,
+/obj/item/kirbyplants/photosynthetic,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/listeningstation/hallway)
@@ -2378,7 +2378,7 @@
 /obj/effect/turf_decal/tile/red/half/contrasted{
 	dir = 1
 	},
-/obj/item/twohanded/required/kirbyplants/random,
+/obj/item/kirbyplants/random,
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/listeningstation/hallway)
 "JS" = (
@@ -2700,7 +2700,7 @@
 /area/ruin/space/has_grav/listeningstation/warehouse)
 "OJ" = (
 /obj/effect/turf_decal/tile/red/anticorner/contrasted,
-/obj/item/twohanded/required/kirbyplants/random,
+/obj/item/kirbyplants/random,
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/listeningstation/hallway)
 "OV" = (
@@ -3359,7 +3359,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
-/obj/item/twohanded/required/kirbyplants,
+/obj/item/kirbyplants,
 /turf/open/floor/plasteel/grimy,
 /area/ruin/space/has_grav/listeningstation/quarters)
 "YH" = (

_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm

@@ -198,7 +198,7 @@
 /area/ruin/space/has_grav/powered/cat_man)
 "aE" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/item/twohanded/required/kirbyplants/random,
+/obj/item/kirbyplants/random,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -211,7 +211,7 @@
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/powered/cat_man)
 "aF" = (
-/obj/item/twohanded/required/kirbyplants/random,
+/obj/item/kirbyplants/random,
 /obj/effect/turf_decal/tile/neutral,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
@@ -520,7 +520,7 @@
 /area/ruin/space/has_grav/powered/cat_man)
 "bv" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/item/twohanded/required/kirbyplants/random,
+/obj/item/kirbyplants/random,
 /obj/effect/turf_decal/tile/neutral,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8

_maps/RandomRuins/SpaceRuins/nicelittlenest.dmm

@@ -37,7 +37,7 @@
 /turf/open/floor/grass,
 /area/ruin/space/has_grav/powered)
 "dc" = (
-/obj/item/twohanded/required/kirbyplants/photosynthetic,
+/obj/item/kirbyplants/photosynthetic,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/powered)
 "dm" = (
@@ -310,7 +310,7 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
-/obj/item/twohanded/required/kirbyplants/random,
+/obj/item/kirbyplants/random,
 /turf/open/floor/plasteel/white,
 /area/ruin/space/has_grav/powered)
 "uf" = (

_maps/RandomRuins/SpaceRuins/oldstation.dmm

@@ -215,7 +215,7 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
-/obj/item/twohanded/required/kirbyplants{
+/obj/item/kirbyplants{
 	icon_state = "plant-25"
 	},
 /obj/effect/decal/cleanable/cobweb,
@@ -595,7 +595,7 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
-/obj/item/twohanded/required/kirbyplants{
+/obj/item/kirbyplants{
 	icon_state = "plant-25"
 	},
 /turf/open/floor/plasteel,
@@ -1502,7 +1502,7 @@
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/ancientstation/sec)
 "ft" = (
-/obj/item/twohanded/required/kirbyplants{
+/obj/item/kirbyplants{
 	icon_state = "plant-25"
 	},
 /turf/open/floor/plasteel,
@@ -1751,7 +1751,7 @@
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/ancientstation/hydroponics)
 "gF" = (
-/obj/item/twohanded/required/kirbyplants{
+/obj/item/kirbyplants{
 	icon_state = "plant-25"
 	},
 /obj/effect/decal/cleanable/cobweb,
@@ -6126,7 +6126,7 @@
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/ancientstation/deltacorridor)
 "CV" = (
-/obj/item/twohanded/required/kirbyplants{
+/obj/item/kirbyplants{
 	icon_state = "plant-25"
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -6380,7 +6380,7 @@
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/ancientstation/atmo)
 "EW" = (
-/obj/item/twohanded/required/kirbyplants{
+/obj/item/kirbyplants{
 	icon_state = "plant-25"
 	},
 /obj/effect/decal/cleanable/dirt,