kinda_working

2017-05-10 03:41:01 -07:00
parent 9687080cd0
commit 29a3968f48
4 changed files with 681 additions and 630 deletions
@@ -354,8 +354,8 @@
 		dropItemToGround(I)
 	drop_all_held_items()

-/obj/item/proc/equip_to_best_slot(var/mob/M)
-	if(src != M.get_active_held_item())
+/obj/item/proc/equip_to_best_slot(var/mob/M, override_held_check = FALSE)
+	if((src != M.get_active_held_item()) && !override_held_check)
 		to_chat(M, "<span class='warning'>You are not holding anything to equip!</span>")
 		return FALSE