Fixed alt-click not working with stacks (#34396)

* Can disable auto-merge

New argument which lets you stop stacks from automatically merging when picking them up

* Fix 0 stacks

* Updated simple_animal/put_in_hands()
This commit is contained in:
John Ginnane
2018-01-15 04:04:18 +00:00
committed by CitadelStationBot
parent 969a8ac9ef
commit ac1b2f76ef
3 changed files with 17 additions and 13 deletions
@@ -502,8 +502,8 @@
if(H)
H.update_icon()
/mob/living/simple_animal/put_in_hands(obj/item/I)
..()
/mob/living/simple_animal/put_in_hands(obj/item/I, del_on_fail = FALSE, merge_stacks = TRUE)
..(I, del_on_fail, merge_stacks)
update_inv_hands()
/mob/living/simple_animal/update_inv_hands()