From b40d875d11aef75a5ddbfad0e7fb2a6370aed15d Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 14 Feb 2021 05:52:16 -0500 Subject: [PATCH 01/18] Update say.dm --- code/modules/mob/living/carbon/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm index d75843a3e5..146d159032 100644 --- a/code/modules/mob/living/carbon/say.dm +++ b/code/modules/mob/living/carbon/say.dm @@ -10,7 +10,7 @@ /mob/living/carbon/can_speak_vocal(message) if(silent) return 0 - if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == held_items.len)) + if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == 2 || (get_num_held items == 1 && (!src.get_bodypart(BODY_ZONE_L_ARM) || !src.get_bodypart(BODY_ZONE_R_ARM))))) return 0 return ..() From 6c6cad632b0c46f81fd8642c34f73de2b58ecd29 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 14 Feb 2021 05:53:21 -0500 Subject: [PATCH 02/18] Update say.dm --- code/modules/mob/living/carbon/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm index 146d159032..83b57bb0c2 100644 --- a/code/modules/mob/living/carbon/say.dm +++ b/code/modules/mob/living/carbon/say.dm @@ -10,7 +10,7 @@ /mob/living/carbon/can_speak_vocal(message) if(silent) return 0 - if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == 2 || (get_num_held items == 1 && (!src.get_bodypart(BODY_ZONE_L_ARM) || !src.get_bodypart(BODY_ZONE_R_ARM))))) + if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == 2 || (get_num_held items == 1 && (!src.get_bodypart(BODY_ZONE_L_ARM) || !src.get_bodypart(BODY_ZONE_R_ARM)))) return 0 return ..() From f49deabe0f9b61ce82513c77dcbdfbfea1354c10 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 14 Feb 2021 05:58:41 -0500 Subject: [PATCH 03/18] Update say.dm --- code/modules/mob/living/carbon/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm index 83b57bb0c2..146d159032 100644 --- a/code/modules/mob/living/carbon/say.dm +++ b/code/modules/mob/living/carbon/say.dm @@ -10,7 +10,7 @@ /mob/living/carbon/can_speak_vocal(message) if(silent) return 0 - if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == 2 || (get_num_held items == 1 && (!src.get_bodypart(BODY_ZONE_L_ARM) || !src.get_bodypart(BODY_ZONE_R_ARM)))) + if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == 2 || (get_num_held items == 1 && (!src.get_bodypart(BODY_ZONE_L_ARM) || !src.get_bodypart(BODY_ZONE_R_ARM))))) return 0 return ..() From 72ae19e0369d52546fa8a385611dd05503f62fa6 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 14 Feb 2021 06:00:26 -0500 Subject: [PATCH 04/18] Update say.dm --- code/modules/mob/living/carbon/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm index 146d159032..8c9f4c2c52 100644 --- a/code/modules/mob/living/carbon/say.dm +++ b/code/modules/mob/living/carbon/say.dm @@ -10,7 +10,7 @@ /mob/living/carbon/can_speak_vocal(message) if(silent) return 0 - if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == 2 || (get_num_held items == 1 && (!src.get_bodypart(BODY_ZONE_L_ARM) || !src.get_bodypart(BODY_ZONE_R_ARM))))) + if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == 2 || (get_num_held items() == 1 && (!src.get_bodypart(BODY_ZONE_L_ARM) || !src.get_bodypart(BODY_ZONE_R_ARM)))) return 0 return ..() From 6c76e584f8d58dee800132f342db001534cad0f4 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 14 Feb 2021 06:02:21 -0500 Subject: [PATCH 05/18] Update say.dm --- code/modules/mob/living/carbon/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm index 8c9f4c2c52..2b167e9050 100644 --- a/code/modules/mob/living/carbon/say.dm +++ b/code/modules/mob/living/carbon/say.dm @@ -10,7 +10,7 @@ /mob/living/carbon/can_speak_vocal(message) if(silent) return 0 - if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == 2 || (get_num_held items() == 1 && (!src.get_bodypart(BODY_ZONE_L_ARM) || !src.get_bodypart(BODY_ZONE_R_ARM)))) + if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == 2 || (get_num_held items() == 1 && (!src.get_bodypart(BODY_ZONE_L_ARM) || !src.get_bodypart(BODY_ZONE_R_ARM))))) return 0 return ..() From e9e82cedc27c8ef7abb0cfddcb83befea186d98b Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 14 Feb 2021 06:07:30 -0500 Subject: [PATCH 06/18] Update say.dm --- code/modules/mob/living/carbon/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm index 2b167e9050..9c76f9255e 100644 --- a/code/modules/mob/living/carbon/say.dm +++ b/code/modules/mob/living/carbon/say.dm @@ -10,7 +10,7 @@ /mob/living/carbon/can_speak_vocal(message) if(silent) return 0 - if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == 2 || (get_num_held items() == 1 && (!src.get_bodypart(BODY_ZONE_L_ARM) || !src.get_bodypart(BODY_ZONE_R_ARM))))) + if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == 2 || (get_num_held_items() == 1 && (!src.get_bodypart(BODY_ZONE_L_ARM) || !src.get_bodypart(BODY_ZONE_R_ARM)))) return 0 return ..() From 1c552480d896225203d25077247dfb0b4593affd Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 14 Feb 2021 06:10:10 -0500 Subject: [PATCH 07/18] Update say.dm --- code/modules/mob/living/carbon/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm index 9c76f9255e..0b9d957948 100644 --- a/code/modules/mob/living/carbon/say.dm +++ b/code/modules/mob/living/carbon/say.dm @@ -10,7 +10,7 @@ /mob/living/carbon/can_speak_vocal(message) if(silent) return 0 - if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == 2 || (get_num_held_items() == 1 && (!src.get_bodypart(BODY_ZONE_L_ARM) || !src.get_bodypart(BODY_ZONE_R_ARM)))) + if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == 2 || (get_num_held_items() == 1 && (!src.get_bodypart(BODY_ZONE_L_ARM) || !src.get_bodypart(BODY_ZONE_R_ARM))) return 0 return ..() From 7a7c15f266631ee69f110f92969348c120943d0c Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 14 Feb 2021 06:11:09 -0500 Subject: [PATCH 08/18] Update say.dm --- code/modules/mob/living/carbon/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm index 0b9d957948..942ff90322 100644 --- a/code/modules/mob/living/carbon/say.dm +++ b/code/modules/mob/living/carbon/say.dm @@ -10,7 +10,7 @@ /mob/living/carbon/can_speak_vocal(message) if(silent) return 0 - if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == 2 || (get_num_held_items() == 1 && (!src.get_bodypart(BODY_ZONE_L_ARM) || !src.get_bodypart(BODY_ZONE_R_ARM))) + if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == 2 || (get_num_held_items() == 1 && (!src.get_bodypart(BODY_ZONE_L_ARM) || !src.get_bodypart(BODY_ZONE_R_ARM))))) return 0 return ..() From 6703bd720525787c3294f58d922b2949fddb982b Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 14 Feb 2021 06:35:55 -0500 Subject: [PATCH 09/18] Update say.dm --- code/modules/mob/living/carbon/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm index 942ff90322..a6e3e27a05 100644 --- a/code/modules/mob/living/carbon/say.dm +++ b/code/modules/mob/living/carbon/say.dm @@ -10,7 +10,7 @@ /mob/living/carbon/can_speak_vocal(message) if(silent) return 0 - if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == 2 || (get_num_held_items() == 1 && (!src.get_bodypart(BODY_ZONE_L_ARM) || !src.get_bodypart(BODY_ZONE_R_ARM))))) + if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || held_items.len == 2 || (held_items.len == 1 && (!src.get_bodypart(BODY_ZONE_L_ARM) || !src.get_bodypart(BODY_ZONE_R_ARM))))) return 0 return ..() From 4650c97c6127d3792ee47fd7a626d9ef2f2cc9d7 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 14 Feb 2021 11:23:43 -0500 Subject: [PATCH 10/18] Update say.dm --- code/modules/mob/living/say.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 606daed0c5..a2fc28484d 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -329,8 +329,13 @@ GLOBAL_LIST_INIT(department_radio_keys, list( return 1 /mob/living/proc/can_speak_vocal(message) //Check AFTER handling of xeno and ling channels - if(HAS_TRAIT(src, TRAIT_MUTE) && get_message_language(message) != /datum/language/signlanguage) - return 0 + if(HAS_TRAIT(src, TRAIT_MUTE)) + if (get_selected_language() != /datum/language/signlanguage) + return 0 + + if (get_bodypart(BODY_ZONE_R_ARM).is_disabled() && get_bodypart(BODY_ZONE_L_ARM).is_disabled()) + if (get_selected_language() == /datum/language/signlanguage) + return 0 if(is_muzzled()) return 0 From 95c9e8b94c557ad8b8e65cc0a9c490365c976a3e Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 14 Feb 2021 11:24:19 -0500 Subject: [PATCH 11/18] Update say.dm --- code/modules/mob/living/carbon/say.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm index a6e3e27a05..7b9217c135 100644 --- a/code/modules/mob/living/carbon/say.dm +++ b/code/modules/mob/living/carbon/say.dm @@ -10,8 +10,9 @@ /mob/living/carbon/can_speak_vocal(message) if(silent) return 0 - if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || held_items.len == 2 || (held_items.len == 1 && (!src.get_bodypart(BODY_ZONE_L_ARM) || !src.get_bodypart(BODY_ZONE_R_ARM))))) - return 0 + if(get_selected_language() == /datum/language/signlanguage) + if(handcuffed) + return 0 return ..() /mob/living/carbon/could_speak_language(datum/language/language) From 11bae949e59b83b1b2468eb6448d159f4410eefd Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 14 Feb 2021 11:32:36 -0500 Subject: [PATCH 12/18] Update say.dm --- code/modules/mob/living/carbon/say.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm index 7b9217c135..6d7ec0371c 100644 --- a/code/modules/mob/living/carbon/say.dm +++ b/code/modules/mob/living/carbon/say.dm @@ -10,9 +10,8 @@ /mob/living/carbon/can_speak_vocal(message) if(silent) return 0 - if(get_selected_language() == /datum/language/signlanguage) - if(handcuffed) - return 0 + if(get_selected_language() == /datum/language/signlanguage && handcufffed) + return 0 return ..() /mob/living/carbon/could_speak_language(datum/language/language) From 15d1146531a3dce3ca6bb3ee8ed755173554af61 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 14 Feb 2021 11:33:41 -0500 Subject: [PATCH 13/18] Update say.dm --- code/modules/mob/living/say.dm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index a2fc28484d..abc9542a2e 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -329,13 +329,11 @@ GLOBAL_LIST_INIT(department_radio_keys, list( return 1 /mob/living/proc/can_speak_vocal(message) //Check AFTER handling of xeno and ling channels - if(HAS_TRAIT(src, TRAIT_MUTE)) - if (get_selected_language() != /datum/language/signlanguage) - return 0 + if(HAS_TRAIT(src, TRAIT_MUTE) && get_selected_language() != /datum/language/signlanguage) + return 0 - if (get_bodypart(BODY_ZONE_R_ARM).is_disabled() && get_bodypart(BODY_ZONE_L_ARM).is_disabled()) - if (get_selected_language() == /datum/language/signlanguage) - return 0 + if (get_bodypart(BODY_ZONE_R_ARM).is_disabled() && get_bodypart(BODY_ZONE_L_ARM).is_disabled() && get_selected_language() == /datum/language/signlanguage) + return 0 if(is_muzzled()) return 0 From a889f41a8648e6f1ba5bbf26d53c49ba1f0e14ca Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 14 Feb 2021 11:41:29 -0500 Subject: [PATCH 14/18] Update say.dm --- code/modules/mob/living/carbon/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm index 6d7ec0371c..67c29b4211 100644 --- a/code/modules/mob/living/carbon/say.dm +++ b/code/modules/mob/living/carbon/say.dm @@ -10,7 +10,7 @@ /mob/living/carbon/can_speak_vocal(message) if(silent) return 0 - if(get_selected_language() == /datum/language/signlanguage && handcufffed) + if(get_selected_language() == /datum/language/signlanguage && handcuffed) return 0 return ..() From f1d9f288cb7a11d19b8cd1f2289527230dad4596 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 14 Feb 2021 11:47:26 -0500 Subject: [PATCH 15/18] Update say.dm --- code/modules/mob/living/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index abc9542a2e..e5c380b9ed 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -332,7 +332,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( if(HAS_TRAIT(src, TRAIT_MUTE) && get_selected_language() != /datum/language/signlanguage) return 0 - if (get_bodypart(BODY_ZONE_R_ARM).is_disabled() && get_bodypart(BODY_ZONE_L_ARM).is_disabled() && get_selected_language() == /datum/language/signlanguage) + if (src.get_bodypart(BODY_ZONE_R_ARM).is_disabled() && src.get_bodypart(BODY_ZONE_L_ARM).is_disabled() && get_selected_language() == /datum/language/signlanguage) return 0 if(is_muzzled()) From 58469ea2a12ef54e01c10f77f33fd203bac48215 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 14 Feb 2021 11:53:44 -0500 Subject: [PATCH 16/18] Update say.dm --- code/modules/mob/living/say.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index e5c380b9ed..129f3feb69 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -329,10 +329,12 @@ GLOBAL_LIST_INIT(department_radio_keys, list( return 1 /mob/living/proc/can_speak_vocal(message) //Check AFTER handling of xeno and ling channels + var/obj/item/bodypart/leftarm = get_bodypart(BODY_ZONE_L_ARM) + var/obj/item/bodypart/rightarm = get_bodypart(BODY_ZONE_R_ARM) if(HAS_TRAIT(src, TRAIT_MUTE) && get_selected_language() != /datum/language/signlanguage) return 0 - if (src.get_bodypart(BODY_ZONE_R_ARM).is_disabled() && src.get_bodypart(BODY_ZONE_L_ARM).is_disabled() && get_selected_language() == /datum/language/signlanguage) + if (rightarm.is_disabled() && leftarm.is_disabled() && get_selected_language() == /datum/language/signlanguage) return 0 if(is_muzzled()) From 915b911a409ae196db178fdf4f10aaa746e7eaf1 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Mon, 15 Feb 2021 17:15:30 -0500 Subject: [PATCH 17/18] Update say.dm --- code/modules/mob/living/say.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 129f3feb69..8731dc18e8 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -333,8 +333,8 @@ GLOBAL_LIST_INIT(department_radio_keys, list( var/obj/item/bodypart/rightarm = get_bodypart(BODY_ZONE_R_ARM) if(HAS_TRAIT(src, TRAIT_MUTE) && get_selected_language() != /datum/language/signlanguage) return 0 - - if (rightarm.is_disabled() && leftarm.is_disabled() && get_selected_language() == /datum/language/signlanguage) + + if ((rightarm == null || rightarm.is_disabled()) && (leftarm == null ||leftarm.is_disabled()) && get_selected_language() == /datum/language/signlanguage) return 0 if(is_muzzled()) From 6f25b652909fb70495430a634db3a00478ac331c Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Tue, 16 Feb 2021 03:24:27 -0500 Subject: [PATCH 18/18] Apply suggestions from code review Let's see if it will? Co-authored-by: Lin --- code/modules/mob/living/say.dm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 8731dc18e8..9646796802 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -334,8 +334,21 @@ GLOBAL_LIST_INIT(department_radio_keys, list( if(HAS_TRAIT(src, TRAIT_MUTE) && get_selected_language() != /datum/language/signlanguage) return 0 - if ((rightarm == null || rightarm.is_disabled()) && (leftarm == null ||leftarm.is_disabled()) && get_selected_language() == /datum/language/signlanguage) - return 0 + if (get_selected_language() == /datum/language/signlanguage) + var/left_disabled = FALSE + var/right_disabled = FALSE + if (istype(leftarm)) // Need to check if the arms exist first before checking if they are disabled or else it will runtime + if (leftarm.is_disabled()) + left_disabled = TRUE + else + left_disabled = TRUE + if (istype(rightarm)) + if (rightarm.is_disabled()) + right_disabled = TRUE + else + right_disabled = TRUE + if (left_disabled && right_disabled) // We want this to only return false if both arms are either missing or disabled since you could technically sign one-handed. + return 0 if(is_muzzled()) return 0