Porting the twohanded component.

code/modules/research/designs/autoylathe_designs.dm

@@ -63,7 +63,7 @@
 	name = "Double-Bladed Toy Sword"
 	id = "dbtoysword"
 	materials = list(/datum/material/plastic = 1000)
-	build_path = /obj/item/twohanded/dualsaber/toy
+	build_path = /obj/item/dualsaber/toy
 	category = list("initial", "Melee")
 
 /datum/design/autoylathe/toykatana

code/modules/research/designs/misc_designs.dm

@@ -295,7 +295,7 @@
 	id = "broom"
 	build_type = PROTOLATHE | AUTOLATHE
 	materials = list(/datum/material/iron = 1000, /datum/material/glass = 600)
-	build_path = /obj/item/twohanded/broom
+	build_path = /obj/item/broom
 	category = list("initial", "Equipment", "Misc")
 	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
 

code/modules/research/xenobiology/crossbreeding/burning.dm

@@ -276,7 +276,7 @@ Burning extracts:
 
 /obj/item/slimecross/burning/adamantine/do_effect(mob/user)
 	user.visible_message("<span class='notice'>[src] crystallizes into a large shield!</span>")
-	new /obj/item/twohanded/required/adamantineshield(get_turf(user))
+	new /obj/item/shield/adamantineshield(get_turf(user))
 	..()
 
 /obj/item/slimecross/burning/rainbow
@@ -440,7 +440,7 @@ Burning extracts:
 			attack_verb = list("irradiated","mutated","maligned")
 	return ..()
 
-/obj/item/twohanded/required/adamantineshield
+/obj/item/shield/adamantineshield
 	name = "adamantine shield"
 	desc = "A gigantic shield made of solid adamantium."
 	icon = 'icons/obj/slimecrossing.dmi'
@@ -450,12 +450,15 @@ Burning extracts:
 	armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
 	slot_flags = ITEM_SLOT_BACK
 	block_chance = 75
+	force = 0
 	throw_range = 1 //How far do you think you're gonna throw a solid crystalline shield...?
 	throw_speed = 2
-	force = 15 //Heavy, but hard to wield.
 	attack_verb = list("bashed","pounded","slammed")
 	item_flags = SLOWS_WHILE_IN_HAND
 
+/obj/item/shield/adamantineshield/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/two_handed, require_twohands=TRUE, force_wielded=15)
 
 /obj/effect/proc_holder/spell/targeted/shapeshift/slimeform
 	name = "Slime Transformation"