Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being qdel'd more than once (#1753)

2017-06-30 23:22:45 -05:00
parent 32c35a211b
commit 8627946f72
4 changed files with 21 additions and 27 deletions
@@ -84,21 +84,17 @@
 	return

 /obj/item/weapon/twohanded/dropped(mob/user)
-	..()
+	. = ..()
 	//handles unwielding a twohanded weapon when dropped as well as clearing up the offhand
 	if(!wielded)
 		return
-	if(user)
-		var/obj/item/weapon/twohanded/O = user.get_inactive_held_item()
-		if(istype(O))
-			O.unwield(user, FALSE)
 	unwield(user)

 /obj/item/weapon/twohanded/update_icon()
 	return

 /obj/item/weapon/twohanded/attack_self(mob/user)
-	..()
+	. = ..()
 	if(wielded) //Trying to unwield it
 		unwield(user)
 	else //Trying to wield it