From 3cfbd7ecff76fe5cb8d6f55e5dfb0f6b6e1422f0 Mon Sep 17 00:00:00 2001 From: adrix89 Date: Fri, 29 Nov 2013 16:20:17 +0200 Subject: [PATCH] Added putting in box if you have it in your other hand --- code/modules/mob/living/carbon/human/inventory.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index d9a7d1d4499..b916df2c0be 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -5,6 +5,7 @@ if(ishuman(src)) var/mob/living/carbon/human/H = src var/obj/item/I = H.get_active_hand() + var/obj/item/weapon/storage/S = H.get_inactive_hand() if(!I) H << "You are not holding anything to equip." return @@ -15,8 +16,10 @@ update_inv_r_hand(0) else if(s_active && s_active.can_be_inserted(I,1)) //if storage active insert there s_active.handle_item_insertion(I) - else - var/obj/item/weapon/storage/S = H.get_item_by_slot(slot_belt) + else if(S && S.can_be_inserted(I,1)) //see if we have box in other hand + S.handle_item_insertion(I) + else + S = H.get_item_by_slot(slot_belt) if(S && S.can_be_inserted(I,1)) //else we put in belt S.handle_item_insertion(I) else