Porting the twohanded component.

code/modules/cargo/bounties/assistant.dm

@@ -31,7 +31,7 @@
 	description = "CentCom's security forces are going through budget cuts. You will be paid if you ship a set of spears."
 	reward = 1000
 	required_count = 5
-	wanted_types = list(/obj/item/twohanded/spear)
+	wanted_types = list(/obj/item/spear)
 
 /datum/bounty/item/assistant/toolbox
 	name = "Toolboxes"
@@ -134,7 +134,7 @@
 	description = "Central Command is looking to commission a new BirdBoat-class station. You've been ordered to supply the potted plants."
 	reward = 2000
 	required_count = 8
-	wanted_types = list(/obj/item/twohanded/required/kirbyplants)
+	wanted_types = list(/obj/item/kirbyplants)
 
 // /datum/bounty/item/assistant/earmuffs
 // 	name = "Earmuffs"
@@ -160,7 +160,7 @@
 	name = "Chainsaw"
 	description = "The chef at CentCom is having trouble butchering her animals. She requests one chainsaw, please."
 	reward = 2500
-	wanted_types = list(/obj/item/twohanded/required/chainsaw)
+	wanted_types = list(/obj/item/chainsaw)
 
 /datum/bounty/item/assistant/ied
 	name = "IED"

code/modules/cargo/bounties/mining.dm

@@ -22,7 +22,7 @@
 	name = "Bone Axe"
 	description = "Station 12 has had their fire axes stolen by marauding clowns. Ship them a bone axe as a replacement."
 	reward = 3500
-	wanted_types = list(/obj/item/twohanded/fireaxe/boneaxe)
+	wanted_types = list(/obj/item/fireaxe/boneaxe)
 
 /datum/bounty/item/mining/bone_armor
 	name = "Bone Armor"

code/modules/cargo/exports/weapons.dm

@@ -267,7 +267,7 @@
 /datum/export/weapon/duelsaber
 	cost = 360 //Get it?
 	unit_name = "energy saber"
-	export_types = list(/obj/item/twohanded/dualsaber)
+	export_types = list(/obj/item/dualsaber)
 
 /datum/export/weapon/esword
 	cost = 130

code/modules/cargo/packs/misc.dm

@@ -294,11 +294,11 @@
 	name = "Potted Plants Crate"
 	desc = "Spruce up the station with these lovely plants! Contains a random assortment of five potted plants from Nanotrasen's potted plant research division. Warranty void if thrown."
 	cost = 730
-	contains = list(/obj/item/twohanded/required/kirbyplants/random,
-					/obj/item/twohanded/required/kirbyplants/random,
-					/obj/item/twohanded/required/kirbyplants/random,
-					/obj/item/twohanded/required/kirbyplants/random,
-					/obj/item/twohanded/required/kirbyplants/random)
+	contains = list(/obj/item/kirbyplants/random,
+					/obj/item/kirbyplants/random,
+					/obj/item/kirbyplants/random,
+					/obj/item/kirbyplants/random,
+					/obj/item/kirbyplants/random)
 	crate_name = "potted plants crate"
 	crate_type = /obj/structure/closet/crate/hydroponics