From 1782d074a87bb91216030ba6aa7b5b2c6eaefe37 Mon Sep 17 00:00:00 2001 From: py01 Date: Fri, 15 Nov 2019 22:13:40 -0600 Subject: [PATCH] heavy guns require a non-disabled inactive hand (#47754) --- code/modules/projectiles/gun.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 2828a23c363..57eeea65899 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -222,11 +222,10 @@ process_fire(user, user, FALSE, params, shot_leg) user.dropItemToGround(src, TRUE) return - - if(weapon_weight == WEAPON_HEAVY && user.get_inactive_held_item()) - to_chat(user, "You need both hands free to fire \the [src]!") + var/obj/item/bodypart/other_hand = user.has_hand_for_held_index(user.get_inactive_hand_index()) //returns non-disabled inactive hands + if(weapon_weight == WEAPON_HEAVY && (user.get_inactive_held_item() || !other_hand)) + to_chat(user, "You need two hands to fire \the [src]!") return - //DUAL (or more!) WIELDING var/bonus_spread = 0 var/loop_counter = 0