From 5aeede675b24be748544ecc60f08ea1cae54e491 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Wed, 20 Jan 2021 09:54:26 +0000 Subject: [PATCH] Fixes one handed dswords (#15289) * One handed deswords * Reverts unintended changes Got a bit confused, I need more coffee --- code/game/objects/items/weapons/twohanded.dm | 3 +++ code/modules/surgery/organs/helpers.dm | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index cb399b19ac6..95dfb79dfdc 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -68,6 +68,9 @@ if(user.get_inactive_hand()) to_chat(user, "You need your other hand to be empty!") return FALSE + if(!user.has_both_hands()) + to_chat(user, "You need both hands to wield this!") + return FALSE wielded = TRUE force = force_wielded if(sharp_when_wielded) diff --git a/code/modules/surgery/organs/helpers.dm b/code/modules/surgery/organs/helpers.dm index 4102319a3fe..f872b97a70b 100644 --- a/code/modules/surgery/organs/helpers.dm +++ b/code/modules/surgery/organs/helpers.dm @@ -66,6 +66,13 @@ return TRUE return FALSE +/mob/proc/has_both_hands() + return TRUE + +/mob/living/carbon/human/has_both_hands() + if(has_left_hand() && has_right_hand()) + return TRUE + return FALSE //Limb numbers /mob/proc/get_num_arms()