New Content Update (#43)

* New Content Update

* readded shuttle autocall

code/game/objects/items/weapons/twohanded.dm

@@ -83,13 +83,6 @@
 	user.put_in_inactive_hand(O)
 	return
 
-/obj/item/weapon/twohanded/mob_can_equip(mob/M, slot)
-	//Cannot equip wielded items.
-	if(wielded)
-		M << "<span class='warning'>Unwield the [name] first!</span>"
-		return 0
-	return ..()
-
 /obj/item/weapon/twohanded/dropped(mob/user)
 	..()
 	//handles unwielding a twohanded weapon when dropped as well as clearing up the offhand
@@ -109,6 +102,11 @@
 	else //Trying to wield it
 		wield(user)
 
+/obj/item/weapon/twohanded/equip_to_best_slot(mob/M)
+		if(..())
+				unwield(M)
+				return
+
 ///////////OFFHAND///////////////
 /obj/item/weapon/twohanded/offhand
 	name = "offhand"
@@ -131,7 +129,7 @@
 	return
 
 /obj/item/weapon/twohanded/required/mob_can_equip(mob/M, slot)
-	if(wielded)
+	if(wielded && !slot_flags)
 		M << "<span class='warning'>\The [src] is too cumbersome to carry with anything but your hands!</span>"
 		return 0
 	return ..()
@@ -143,9 +141,17 @@
 	if(H != null)
 		user << "<span class='notice'>\The [src] is too cumbersome to carry in one hand!</span>"
 		return
-	wield(user)
+	if(src.loc != user)
+		wield(user)
 	..()
 
+/obj/item/weapon/twohanded/required/equipped(mob/user, slot)
+	..()
+	if(slot == slot_l_hand || slot == slot_r_hand)
+		wield(user)
+	else
+		unwield(user)
+
 
 /obj/item/weapon/twohanded/