From 1319ae8a2eeb2c13c7b13c600ff7ce186ea26139 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Tue, 1 Aug 2017 02:17:29 -0300 Subject: [PATCH] Probably fixes most of the issue related with dropping/throwing off hand items. (#3199) Fixes #3172 Fixes #1110 --- code/modules/mob/living/carbon/carbon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 94f0ffe5a27..7f8334a9145 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -133,7 +133,7 @@ /mob/living/carbon/swap_hand() var/obj/item/item_in_hand = src.get_active_hand() if(item_in_hand) //this segment checks if the item in your hand is twohanded. - if(istype(item_in_hand,/obj/item/weapon/material/twohanded)) + if(istype(item_in_hand,/obj/item/weapon/material/twohanded) || istype(item_in_hand,/obj/item/weapon/gun) || istype(item_in_hand,/obj/item/weapon/pickaxe)) if(item_in_hand:wielded == 1) usr << "Your other hand is too busy holding the [item_in_hand.name]" return